Filter dropdown is now set when applying a predefined filter over the…

app/Http/Controllers/Assets/AssetsController.php

@@ -76,21 +76,26 @@ public function index(Request $request): View
 
         // $predefined_filter_edit_modal_open = $request->input('predefinedFilterEditModalOpen');
         $predefined_filter_id = $request->input('predefinedFilterId');
-
+        
         // Validate if it's a valid integer
         if (filter_var($predefined_filter_id, FILTER_VALIDATE_INT) === false && $predefined_filter_id != null) {
             throw new InvalidArgumentException('You provided an invalid parameter for predefinedFilterId (must be an integer).');
         }
 
+        $predefined_filter_name = ""; // Just an empty string to not fail other stuff because it is only needed when a predefined filter is set using the url
+
         if ($predefined_filter_id !== null) {
-            if (!$this->predefinedFilterService->getFilterById($predefined_filter_id)) {
+            $filter = $this->predefinedFilterService->getFilterById($predefined_filter_id);
+            if (!$filter) {
+                $predefined_filter_name = $filter->name;
                 $predefined_filter_id = null;
             }
-        }
-
+        } 
 
         // TODO maybe switch later to user / role based view
-        return view('hardware/index')->with('company', $company)/*->with('predefined_filter_edit_modal_open', $predefined_filter_edit_modal_open)*/->with('predefined_filter_id', $predefined_filter_id);
+        return view('hardware/index')->with('company', $company)/*->with('predefined_filter_edit_modal_open', $predefined_filter_edit_modal_open)*/
+                                     ->with('predefined_filter_id', $predefined_filter_id)
+                                     ->with('predefined_filter_name', $predefined_filter_name);
     }
 
     /**

resources/views/partials/advanced-search/advanced-search.blade.php

@@ -76,10 +76,12 @@
     controller.bindEvents();
 
 
-
     @if(isset($predefined_filter_id))
         controller.updateFilterWithPredefined(null, {{ $predefined_filter_id }});
 
+        const option = new Option("{{ $predefined_filter_name }}", {{ $predefined_filter_id }}, true, true);
+        document.getElementById("predefinedfilters-select").append(option);
+
         const filterSection = document.getElementById('filterSection');
         filterSection.classList.remove('hide');