More minor improvements

.env.dev.docker

@@ -137,6 +137,8 @@ PUBLIC_AWS_ACCESS_KEY_ID=null
 PUBLIC_AWS_DEFAULT_REGION=null
 PUBLIC_AWS_BUCKET=null
 PUBLIC_AWS_URL=null
+PUBLIC_AWS_ENDPOINT=null
+PUBLIC_AWS_PATH_STYLE=null
 PUBLIC_AWS_BUCKET_ROOT=null
 
 # --------------------------------------------
@@ -147,6 +149,8 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=null
 PRIVATE_AWS_DEFAULT_REGION=null
 PRIVATE_AWS_BUCKET=null
 PRIVATE_AWS_URL=null
+PRIVATE_AWS_ENDPOINT=null
+PRIVATE_AWS_PATH_STYLE=null
 PRIVATE_AWS_BUCKET_ROOT=null
 
 # --------------------------------------------

.env.docker

@@ -144,6 +144,8 @@ PUBLIC_AWS_ACCESS_KEY_ID=null
 PUBLIC_AWS_DEFAULT_REGION=null
 PUBLIC_AWS_BUCKET=null
 PUBLIC_AWS_URL=null
+PUBLIC_AWS_ENDPOINT=null
+PUBLIC_AWS_PATH_STYLE=null
 PUBLIC_AWS_BUCKET_ROOT=null
 
 # --------------------------------------------
@@ -154,6 +156,8 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=null
 PRIVATE_AWS_DEFAULT_REGION=null
 PRIVATE_AWS_BUCKET=null
 PRIVATE_AWS_URL=null
+PRIVATE_AWS_ENDPOINT=null
+PRIVATE_AWS_PATH_STYLE=null
 PRIVATE_AWS_BUCKET_ROOT=null
 
 # --------------------------------------------

.env.example

@@ -143,6 +143,8 @@ PUBLIC_AWS_ACCESS_KEY_ID=null
 PUBLIC_AWS_DEFAULT_REGION=null
 PUBLIC_AWS_BUCKET=null
 PUBLIC_AWS_URL=null
+PUBLIC_AWS_ENDPOINT=null
+PUBLIC_AWS_PATH_STYLE=null
 PUBLIC_AWS_BUCKET_ROOT=null
 
 # --------------------------------------------
@@ -153,6 +155,8 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=null
 PRIVATE_AWS_DEFAULT_REGION=null
 PRIVATE_AWS_BUCKET=null
 PRIVATE_AWS_URL=null
+PRIVATE_AWS_ENDPOINT=null
+PRIVATE_AWS_PATH_STYLE=null
 PRIVATE_AWS_BUCKET_ROOT=null
 
 # --------------------------------------------

app/Http/Controllers/Api/PredefinedFilterController.php

@@ -15,6 +15,7 @@
 
 class PredefinedFilterController extends Controller
 {
+
     protected PredefinedFilterService $service;
 
     public function __construct(PredefinedFilterService $service)
@@ -125,7 +126,7 @@ public function update(Request $request, int $id): JsonResponse
         $validated = $validator->validated();
 
         $updatedPermission = $this->updatePermissions($validated, $filter, $user);
-        if($updatedPermission !== null) {
+        if ($updatedPermission !== null) {
             return $updatedPermission;
         }
 
@@ -170,7 +171,7 @@ private function updatePermissions($validated, $filter, $user) {
 
         //create permission
         if ((!$currentIsPublic && $newIsPublic) 
-             && !$filter->userHasPermission($user, 'create')) {
+            && !$filter->userHasPermission($user, 'create')) {
             return response()->json(['message' => trans('admin/predefinedFilters/message.update.not_allowed_to_change_isPublic')], 403);
         }
 

app/Http/Controllers/PredefinedFilterController.php

@@ -27,10 +27,10 @@ public function index()
 
 
     /**
-    * Show the given Predefined Filter.
-    *
-    * @param PredefinedFilter
-    */
+     * Show the given Predefined Filter.
+     *
+     * @param PredefinedFilter
+     */
     public function view(PredefinedFilter $filter) : View|RedirectResponse
     {
         $user = auth()->user();
@@ -53,10 +53,10 @@ public function view(PredefinedFilter $filter) : View|RedirectResponse
     }
 
     /**
-    * Delete the given Predefined Filter.
-    *
-    * @param  int $id
-    */
+     * Delete the given Predefined Filter.
+     *
+     * @param  int $id
+     */
     public function destroy($id) : RedirectResponse
     {
         $user = auth()->user();

app/Livewire/Notifications.php

@@ -58,12 +58,14 @@ class Notifications extends Component
      *
      * @var array<int, array<string,mixed>>
      */
+
     public array $liveAlerts=[];
 
     /**
      * Main notification listener.
      * We bind both 'showNotification' (your current event) and 'notify' (optional alias).
      */
+
     #[On('showNotification')]
     #[On('notify')]
     public function notify(

app/Livewire/Partials/AdvancedSearch/Modal.php

@@ -25,6 +25,7 @@ enum AdvancedsearchModalAction: string
 
 class Modal extends Component
 {
+
     public $showModal=false;
     public AdvancedsearchModalAction $modalActionType;
 
@@ -134,7 +135,7 @@ public function savePredefinedFiltersModal(
     ) {
         $this->validate();
 
-        if(!$this->validateMaxLenghtForFiltername()) {
+        if (!$this->validateMaxLenghtForFiltername()) {
             return;
         }
 
@@ -164,7 +165,7 @@ public function savePredefinedFiltersModal(
                 ]);
                 return;
             }
-        }
+        } //end if
 
         if ($filter->checkIfNameAlreadyExists($this->name)) {
             $this->dispatch('showNotificationInFrontend', [

app/Models/PredefinedFilter.php

@@ -86,7 +86,7 @@ public function userHasPermission(User $user, string $action): bool
 
             default:
                 return false;
-        } // end switch
+        } //end switch
     }
 
     private function checkPermissions(User $user, $action): bool
@@ -190,7 +190,7 @@ public function filterAssets(Builder $assets)
         return $assets;
     }
 
-    public function checkIfNameAlreadyExists(string $name, int $id = null): bool
+    public function checkIfNameAlreadyExists(string $name, int $id=null): bool
     {
         if ($id === null) {
             $query = $this->where('name', '=', $name);

app/Presenters/PredefinedFilterPresenter.php

@@ -9,9 +9,9 @@
 class PredefinedFilterPresenter extends Presenter
 {
     /**
-    * Json Column Layout for bootstrap table
-    * @return string
-    */
+     * Json Column Layout for bootstrap table
+     * @return string
+     */
 
     public static function dataTableLayout()
     {

app/Services/FilterService/FilterService.php

@@ -215,7 +215,7 @@ protected function applyMorphRelation($inner, $meta, $value, $operator){
                         }
                     }
                 });
-            }
+            } //end foreach
         });
     }
 
@@ -292,18 +292,18 @@ protected function applyAssignedToAsset($inner, $assignedValue, $operator){
         // Use a whereExists subquery that selects a real column (b.id) — no DB::raw required.
         $inner->where(function ($q) use ($assignedValue, $operator) {
             $q->whereNotNull('assets.assigned_to')
-            ->where('assets.assigned_type', Asset::class)
+                ->where('assets.assigned_type', Asset::class)
                 ->whereExists(function ($sub) use ($assignedValue, $operator) {
                     $sub->from('assets as b')
-                ->select('b.id')
+                    ->select('b.id')
                     ->whereColumn('b.id', 'assets.assigned_to')
                     ->where(function ($q2) use ($assignedValue, $operator) {
                         if ($operator === 'equals') {
                             $q2->where('b.asset_tag', '=', $assignedValue)
-                            ->orWhere('b.name', '=', $assignedValue);
+                                ->orWhere('b.name', '=', $assignedValue);
                         } else {
                             $q2->where('b.asset_tag', 'LIKE', '%' . $assignedValue . '%')
-                            ->orWhere('b.name', 'LIKE', '%' . $assignedValue . '%');
+                                ->orWhere('b.name', 'LIKE', '%' . $assignedValue . '%');
                         }
                 });
             });
@@ -433,9 +433,9 @@ public function applyDateRangeFilter($query, $qualifiedField, $filters, bool $is
                     \Carbon\Carbon::parse($start)->startOfDay(),
                     \Carbon\Carbon::parse($end)->endOfDay(),
                 ]);
-            } elseif ($start) {
+            } else if ($start) {
                 $query->where($qualifiedField, '>=', \Carbon\Carbon::parse($start)->startOfDay());
-            } elseif ($end) {
+            } else if ($end) {
                 $query->where($qualifiedField, '<=', \Carbon\Carbon::parse($end)->endOfDay());
             }
         } else {
@@ -444,9 +444,9 @@ public function applyDateRangeFilter($query, $qualifiedField, $filters, bool $is
                     \Carbon\Carbon::parse($start)->toDateString(),
                     \Carbon\Carbon::parse($end)->toDateString(),
                 ]);
-            } elseif ($start) {
+            } else if ($start) {
                 $query->whereDate($qualifiedField, '>=', \Carbon\Carbon::parse($start)->toDateString());
-            } elseif ($end) {
+            } else if ($end) {
                 $query->whereDate($qualifiedField, '<=', \Carbon\Carbon::parse($end)->toDateString());
             }
         }

app/Services/PredefinedFilterPermissionService.php

@@ -38,7 +38,7 @@ public function delete(int $id): void
     public function deletePermissionByFilterId($filterId): void
     {
         $permissions = PredefinedFilterPermission::where('predefined_filter_id', '=', $filterId)->get();
-        foreach($permissions as $permission) {
+        foreach ($permissions as $permission) {
             $permission->delete();
         }
     }

app/Services/PredefinedFilterService.php

@@ -125,7 +125,7 @@ public function getFilterWithIdAndNameValues(int $id)
                             break;
                         default:
                             break;
-                    } // end switch
+                    } //end switch
 
                     if ($model) {
                         $values[] = [
@@ -134,7 +134,7 @@ public function getFilterWithIdAndNameValues(int $id)
                         ];
                     }
                     $filter['value'] = $values;
-                }
+                } // end foreach
 
             }
         }
@@ -176,18 +176,18 @@ public function updateFilter(PredefinedFilter $filter, array $validated): Predef
         if (array_key_exists('permissions', $validated)) {
             $currentlySetPermssions = $this->predefinedFilterPermissionService->getPermissionsByPredefinedFilterId($filter->id);
             $newPermissions = $validated['permissions'];
-            $permission_diff = $this->syncPermissions($currentlySetPermssions->toArray(), $newPermissions);
+            $permissionDiff = $this->syncPermissions($currentlySetPermssions->toArray(), $newPermissions);
 
             try {
-                DB::transaction(function () use ($permission_diff, $filter) {
-                    if (!empty($permission_diff['to_delete'])) {
-                        foreach ($permission_diff['to_delete'] as $permission) {
+                DB::transaction(function () use ($permissionDiff, $filter) {
+                    if (!empty($permissionDiff['to_delete'])) {
+                        foreach ($permissionDiff['to_delete'] as $permission) {
                             $this->predefinedFilterPermissionService->deletePermissionByFilterId($permission['predefined_filter_id']);
                         }
                     }
 
-                    if (!empty($permission_diff['to_add'])) {
-                        foreach ($permission_diff['to_add'] as $permission) {
+                    if (!empty($permissionDiff['to_add'])) {
+                        foreach ($permissionDiff['to_add'] as $permission) {
                             $permission['predefined_filter_id'] = $filter->id;
                             $this->predefinedFilterPermissionService->store($permission);
                         }
@@ -196,6 +196,7 @@ public function updateFilter(PredefinedFilter $filter, array $validated): Predef
             } catch (Throwable $e) {
                 // If any exception occurs, the transaction is automatically rolled back.
                 Log::error($e->getMessage());
+
             }
         }
 
@@ -216,7 +217,7 @@ public function selectList(Request $request, bool $visibilityInName=false): Leng
             ->get(['id', 'name', 'created_by', 'is_public']);
 
         $viewableFilters = $filters->filter(fn($f) => $f->userHasPermission($user, 'view'))
-                                   ->pluck('id');
+            ->pluck('id');
 
         $query = PredefinedFilter::select(['id', 'name', 'is_public'])
             ->whereIn('id', $viewableFilters);
@@ -250,7 +251,7 @@ protected function applySearchFilter($query, Request $request): void
             $query->where('is_public', 0);
             $search = preg_replace('/^(PRIVATE:|' . preg_quote($private, '/') . ')/i', '', $search);
 
-        } elseif (str_starts_with($upper, 'PUBLIC:') || str_starts_with($upper, $public)) {
+        } else if (str_starts_with($upper, 'PUBLIC:') || str_starts_with($upper, $public)) {
             $query->where('is_public', 1);
             $search = preg_replace('/^(PUBLIC:|' . preg_quote($public, '/') . ')/i', '', $search);
         }

config/filesystems.php

@@ -63,6 +63,8 @@
             'region' => env('PUBLIC_AWS_DEFAULT_REGION'),
             'bucket' => env('PUBLIC_AWS_BUCKET'),
             'url' => env('PUBLIC_AWS_URL'),
+            'endpoint' => env('PUBLIC_AWS_ENDPOINT'),
+            'use_path_style_endpoint' => env('PUBLIC_AWS_PATH_STYLE'),
             'root'   => env('PUBLIC_AWS_BUCKET_ROOT'),
             'visibility' => 'public'
         ],
@@ -78,6 +80,8 @@
             'region' => env('PRIVATE_AWS_DEFAULT_REGION'),
             'bucket' => env('PRIVATE_AWS_BUCKET'),
             'url' => env('PRIVATE_AWS_URL'),
+            'endpoint' => env('PRIVATE_AWS_ENDPOINT'),
+            'use_path_style_endpoint' => env('PRIVATE_AWS_PATH_STYLE'),
             'root'   => env('PRIVATE_AWS_BUCKET_ROOT'),
             'visibility' => 'private'
         ],
@@ -168,4 +172,4 @@
 $config['allowed_upload_extensions_for_validator'] = implode(',', $config['allowed_upload_extensions_array']);
 $config['allowed_upload_extensions'] = '.'.implode(', .', $config['allowed_upload_extensions_array']);
 
-return $config;
+return $config;

database/seeders/PredefinedFilterPermissionSeeder.php

@@ -54,7 +54,7 @@ public function run(): void
                     'created_by'           => $user->id,
                 ]);
             }
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             Log::debug($e);
         }
     }