Merge pull request #124 from imbus/SIT-202-more-codacy-cleanup

Sit 202 more codacy cleanup

Author: JonasGoseberg

app/Services/PredefinedFilterService.php

@@ -11,6 +11,7 @@
 use App\Models\Supplier;
 use DB;
 use Exception;
+use Log;
 use Throwable;
 use App\Models\PredefinedFilter;
 use App\Services\FilterService\FilterService;
@@ -194,7 +195,7 @@ public function updateFilter(PredefinedFilter $filter, array $validated): Predef
                 });
             } catch (Throwable $e) {
                 // If any exception occurs, the transaction is automatically rolled back.
-                throw new Exception($e->getMessage());
+                Log::error($e->getMessage());
             }
         }
 

database/seeders/DatabaseSeeder.php

@@ -36,9 +36,6 @@ public function run()
         $this->call(DepreciationSeeder::class);
         $this->call(StatuslabelSeeder::class);
         $this->call(AccessorySeeder::class);
-
-        $dataset = env('TEST_DATASET', 'default');
-
         $this->call(CustomFieldSeeder::class);
 
         $this->call(AssetSeeder::class);

public/js/dist/apiService.js

@@ -28,7 +28,8 @@ export default class ApiService {
             return Promise.reject(new Error(`Invalid id ${id}. Must be a positive integer.`));
         }
 
-        const path = `${this.baseUrl}/${typeMap[type]}/${id}`;
+        const safeType = String(type);
+        const path = `${this.baseUrl}/${safeType}/${id}`;
         return this.fetchFromBackend('GET', path);
     }
 

public/js/dist/apiService.min.js

@@ -1,5 +1,4 @@
 import {
-    FilterInput,
     SelectFilterInput,
     AssignedEntityFilterInput,
     DateFilterInput,
@@ -11,7 +10,7 @@ export default class FilterFormManager {
     constructor() {
         this.filters = [];
         this.inputs = [];
-        this.apiService = container.resolve("apiService");;
+        this.apiService = container.resolve("apiService");
     }
 
     async collectFilterInputs() {
@@ -115,7 +114,7 @@ export default class FilterFormManager {
         queueMicrotask(() => {
             const fields = document.getElementById("advancedSearchPanel").getElementsByTagName('*');
             for (let i = 0; i < fields.length; i++) {
-                fields[i].disabled = state;
+                fields[i].disabled = !!state;
             }
         });
     }

public/js/dist/filterFormManager.js

@@ -133,7 +133,7 @@ export default class FloatingButtons {
             document.addEventListener('keydown', (e) => {
                 if (e.key === 'Escape') {
                     this.closeMenu();
-                    try { this.menuToggleButton.focus(); } catch (err) { }
+                    try { this.menuToggleButton.focus(); } catch (err) { /* empty */ }
                 }
             });
 
@@ -373,7 +373,7 @@ export default class FloatingButtons {
                     this.fabMenu && this.fabMenu.setAttribute('aria-hidden', 'false');
                     this.menuToggleButton?.setAttribute('aria-expanded', 'true');
 
-                    this.menuItems?.forEach((item, idx) => {
+                    this.menuItems?.forEach((item) => {
                         item.setAttribute('tabindex', '0');
                     });
                     this.menuItems?.[0]?.focus();
@@ -384,7 +384,7 @@ export default class FloatingButtons {
 
                     this.menuItems?.forEach(item => item.setAttribute('tabindex', '-1'));
                 }
-            } catch { };
+            } catch { /* empty */ }
         });
     }
 

public/js/dist/filterFormManager.min.js

@@ -30,14 +30,14 @@
     "/css/dist/advanced-search.min.css": "/css/dist/advanced-search.min.css?id=25e17d991928af339721a66106c73df1",
     "/css/dist/advanced-search-index.css": "/css/dist/advanced-search-index.css?id=5f4c11cf828f8294021ba605a06f1852",
     "/css/dist/advanced-search-index.min.css": "/css/dist/advanced-search-index.min.css?id=5f4c11cf828f8294021ba605a06f1852",
-    "/js/dist/floating-buttons.js": "/js/dist/floating-buttons.js?id=34a95a7f6708b4c96ec28c2bedc0c455",
-    "/js/dist/floating-buttons.min.js": "/js/dist/floating-buttons.min.js?id=34a95a7f6708b4c96ec28c2bedc0c455",
-    "/js/dist/apiService.js": "/js/dist/apiService.js?id=1a98522ece27e267ddf17c8519f85298",
-    "/js/dist/apiService.min.js": "/js/dist/apiService.min.js?id=1a98522ece27e267ddf17c8519f85298",
+    "/js/dist/floating-buttons.js": "/js/dist/floating-buttons.js?id=a5bc2f6104a7037e74b91fd263136f71",
+    "/js/dist/floating-buttons.min.js": "/js/dist/floating-buttons.min.js?id=a5bc2f6104a7037e74b91fd263136f71",
+    "/js/dist/apiService.js": "/js/dist/apiService.js?id=a0f11fcdc93781f064fd4be0e67633ca",
+    "/js/dist/apiService.min.js": "/js/dist/apiService.min.js?id=a0f11fcdc93781f064fd4be0e67633ca",
     "/js/dist/filterInputs.js": "/js/dist/filterInputs.js?id=dd094dbfc5519a6615aa2b3c3b206156",
     "/js/dist/filterInputs.min.js": "/js/dist/filterInputs.min.js?id=dd094dbfc5519a6615aa2b3c3b206156",
-    "/js/dist/filterFormManager.js": "/js/dist/filterFormManager.js?id=38704ad253d6ffa04ae3bfde672a18af",
-    "/js/dist/filterFormManager.min.js": "/js/dist/filterFormManager.min.js?id=38704ad253d6ffa04ae3bfde672a18af",
+    "/js/dist/filterFormManager.js": "/js/dist/filterFormManager.js?id=65946749d3717955e895e649703064f4",
+    "/js/dist/filterFormManager.min.js": "/js/dist/filterFormManager.min.js?id=65946749d3717955e895e649703064f4",
     "/js/dist/filterUiController.js": "/js/dist/filterUiController.js?id=fccf71183bb344505368b76f6faf05e7",
     "/js/dist/filterUiController.min.js": "/js/dist/filterUiController.min.js?id=fccf71183bb344505368b76f6faf05e7",
     "/js/dist/search-inputs.js": "/js/dist/search-inputs.js?id=372e611bb6569edb6c229d1a58310b71",

public/js/dist/floating-buttons.js

@@ -28,7 +28,8 @@ export default class ApiService {
             return Promise.reject(new Error(`Invalid id ${id}. Must be a positive integer.`));
         }
 
-        const path = `${this.baseUrl}/${typeMap[type]}/${id}`;
+        const safeType = String(type);
+        const path = `${this.baseUrl}/${safeType}/${id}`;
         return this.fetchFromBackend('GET', path);
     }