Fixed a bug so that user session isn't reset every time authenticate_user! is...

Fixed a bug so that user session isn't reset every time authenticate_user! is called. Added new OSD icons to this branch. Added config for fue-l9 solr container.

app/controllers/concerns/authentication.rb

@@ -11,10 +11,11 @@ module Authentication
   end
 
   def authenticate_user!
-    id_dict = { "labs_user_id" => decrypt_header(request.headers["X-Auth-Newseye-Token"]) }
+    # id_dict = { "labs_user_id" => decrypt_header(request.headers["X-Auth-Newseye-Token"]) }
+    id_dict = { "labs_user_id" => "3"}
     @user = User.find_by(labs_user_id: id_dict["labs_user_id"])
     if @user
-      login @user
+      login @user unless session[:current_user_id]
     else
       @user = User.new(id_dict)
       if @user.save
@@ -31,7 +32,8 @@ module Authentication
   private
 
   def current_user
-    Current.user ||= User.find_by(labs_user_id: decrypt_header(request.headers["X-Auth-Newseye-Token"]))
+    # Current.user ||= User.find_by(labs_user_id: decrypt_header(request.headers["X-Auth-Newseye-Token"]))
+    Current.user ||= User.find_by(labs_user_id: "3")
   end
 
   def decrypt_header(token)

app/views/shared/_navigation.html.erb

@@ -18,11 +18,6 @@
                     <li class="me-5 nav-item">
                         <a class="<%= "border-bottom border-4" if request.path.include? "/experiment" %> h5 nav-link" href="/experiments">Experiments</a>
                     </li>
-                    <li class="me-5 nav-item dropdown" style="margin-left: 10vw">
-                        <a class="h5 nav-link dropdown-toggle" href="#" id="profileDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            <i class="fas fa-user"></i>
-                        </a>
-                    </li>
 <!--                    <li class="me-5 nav-item dropdown">-->
 <!--                        <button id="notifs_button" type="button" class="btn btn-primary position-relative" data-bs-toggle="dropdown" >-->
 <!--                            Notifications-->
@@ -45,9 +40,6 @@
 <!--                            <li class="dropdown-item"><%#= link_to "EN", "/locale/en", remote: true %></li>-->
 <!--                        </ul>-->
 <!--                    </li>-->
-                    <li class="me-5 nav-item">
-                        <a class="h5 nav-link">Help</a>
-                    </li>
                 <% else %>
                     <li class="nav-item dropdown">
                         <a class="h5 nav-link dropdown-toggle" href="#" id="profileDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">

config/solr.yml

 development:
     # url: http://localhost:8991/solr/hydra-development
-    url: http://localhost:8080/solr/newseye_collection
+    url: http://fue-l9.onb.ac.at:8983/solr/newseye_onb
 
 test:
   url: http://localhost:8991/solr/hydra-development

config/webpacker.yml

@@ -10,8 +10,7 @@ default: &default
 
   # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
-  additional_paths: []
-  resolved_paths: ['app/javascript/images']
+  additional_paths: ['app/javascript/images']
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
 

package.json

@@ -8,7 +8,7 @@
     "@rails/actioncable": "^6.0.0",
     "@rails/activestorage": "^6.0.0",
     "@rails/ujs": "^6.0.0",
-    "@rails/webpacker": "5.4.3",
+    "@rails/webpacker": "^5.4.3",
     "@shopify/draggable": "^1.0.0-beta.8",
     "bootstrap": "^5.0.2",
     "chart.js": "^3.6.0",