Merge pull request #127 from imbus/preDevelop2

Pre develop2

Author: cz-lucas

.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
 
 # --------------------------------------------

.gitignore

@@ -70,4 +70,7 @@ storage/ldap_client_tls.cert
 storage/ldap_client_tls.key
 /storage/framework/testing
 
-/.phpunit.cache
+/.phpunit.cache
+
+#Ignore vscode AI rules
+.github/instructions/codacy.instructions.md

app/Console/Commands/Purge.php

@@ -180,11 +180,11 @@ public function handle()
                 $status_label->forceDelete();
             }
 
-            $predefined_filters = PredefinedFilter::whereNotNull('deleted_at')->withTrashed()->get();
-            $this->info($predefined_filters->count().' predefined filters purged.');
-            foreach ($predefined_filters as $predefined_filter) {
-                $this->info('- Predefined Filter "'.$predefined_filter->name.'" deleted.');
-                $predefined_filter->forceDelete();
+            $predefinedFilters = PredefinedFilter::whereNotNull('deleted_at')->withTrashed()->get();
+            $this->info($predefinedFilters->count().' predefined filters purged.');
+            foreach ($predefinedFilters as $predefinedFilter) {
+                $this->info('- Predefined Filter "'.$predefinedFilter->name.'" deleted.');
+                $predefinedFilter->forceDelete();
             }
 
         } else {

app/Exceptions/Handler.php

@@ -150,19 +150,19 @@ public function render($request, Throwable $e)
             // Sigh.
             if ($route == 'assets.index') {
                 $route = 'hardware.index';
-            } elseif ($route == 'reporttemplates.index') {
+            } else if ($route == 'reporttemplates.index') {
                 $route = 'reports/custom';
-            } elseif ($route == 'assetmodels.index') {
+            } else if ($route == 'assetmodels.index') {
                 $route = 'models.index';
-            } elseif ($route == 'predefinedkits.index') {
+            } else if ($route == 'predefinedkits.index') {
                 $route = 'kits.index';
-            } elseif ($route == 'assetmaintenances.index') {
+            } else if ($route == 'assetmaintenances.index') {
                 $route = 'maintenances.index';
-            } elseif ($route === 'licenseseats.index') {
+            } else if ($route === 'licenseseats.index') {
                 $route = 'licenses.index';
-            } elseif (($route === 'customfieldsets.index') || ($route === 'customfields.index')) {
+            } else if (($route === 'customfieldsets.index') || ($route === 'customfields.index')) {
                 $route = 'fields.index';
-            } elseif ($route === 'predefinedfilters.index') {
+            } else if ($route === 'predefinedfilters.index') {
                 $route = 'predefined-filters.index';
             }
 

app/Http/Controllers/Api/AssetsController.php

@@ -148,7 +148,7 @@ public function index(FilterRequest $request, $action = null, $upcoming_status =
             $filter = json_decode($request->input('filter'), true);
         }
 
-        if (!isset($filter[0]['field'])){
+        if (!isset($filter[0]['field'])) {
             $filter = array_filter($filter, function ($key) use ($allowed_columns){
                 return in_array($key, $allowed_columns);
             }, ARRAY_FILTER_USE_KEY);
@@ -588,8 +588,14 @@ public function show(Request $request, $id): JsonResponse|array
     {
         if (
             $asset = Asset::with('assetstatus')
-                ->with('assignedTo')->withTrashed()
-                ->withCount('checkins as checkins_count', 'checkouts as checkouts_count', 'userRequests as user_requests_count')->find($id)
+                ->with('assignedTo')
+                ->withTrashed()
+                ->withCount(
+                    'checkins as checkins_count', 
+                    'checkouts as checkouts_count', 
+                    'userRequests as user_requests_count'
+                )
+                ->find($id)
         ) {
             $this->authorize('view', $asset);
 

app/Http/Controllers/Api/PredefinedFilterController.php

@@ -15,6 +15,7 @@
 
 class PredefinedFilterController extends Controller
 {
+
     protected PredefinedFilterService $service;
 
     public function __construct(PredefinedFilterService $service)
@@ -37,9 +38,9 @@ public function index(Request $request) : JsonResponse | array
         $sort = $request->input('sort', 'name');
         $order = $request->input('order', 'asc');
 
-        $allowed_columns = ['id', 'name', 'is_public', 'created_by'];
+        $allowedColumns = ['id', 'name', 'is_public', 'created_by'];
 
-        if (!in_array($sort, $allowed_columns)) {
+        if (!in_array($sort, $allowedColumns)) {
             $sort = 'name';
         }
 
@@ -67,7 +68,7 @@ public function show(int $id)
             return response()->json(['message' => trans('admin/predefinedFilters/message.does_not_exist')], 404);
         }
 
-        if ($filter->userHasPermission(Auth::user(), 'view')){
+        if ($filter->userHasPermission(Auth::user(), 'view')) {
             return response()->json($filter->toArray());
         }
 
@@ -124,16 +125,9 @@ public function update(Request $request, int $id): JsonResponse
 
         $validated = $validator->validated();
 
-        $newIsPublic = $validated['is_public'] ?? $filter->is_public;
-        $currentIsPublic = $filter->is_public;
-
-        if (!$filter->userHasPermission($user, 'edit')){
-            return response()->json(['message' => trans('admin/predefinedFilters/message.not_allowed_to_edit')], 403);
-        }
-
-        //create permission
-        if ((!$currentIsPublic && $newIsPublic) && !$filter->userHasPermission($user, 'create')){
-            return response()->json(['message' => trans('admin/predefinedFilters/message.update.not_allowed_to_change_isPublic')], 403);
+        $updatedPermission = $this->updatePermissions($validated, $filter, $user);
+        if ($updatedPermission !== null) {
+            return $updatedPermission;
         }
 
         $updated = $this->service->updateFilter($filter, $validated);
@@ -143,6 +137,7 @@ public function update(Request $request, int $id): JsonResponse
             'filter_data' => $updated,
         ]);
     }
+
     public function destroy(int $id)
     {
         $user = auth()->user();
@@ -165,4 +160,21 @@ public function selectlist(Request $request)
         $filters = $this->service->selectList($request, true);
         return (new SelectlistTransformer)->transformSelectlist($filters);
     }
+
+    private function updatePermissions($validated, $filter, $user) {
+        $newIsPublic = $validated['is_public'] ?? $filter->is_public;
+        $currentIsPublic = $filter->is_public;
+
+        if (!$filter->userHasPermission($user, 'edit')) {
+            return response()->json(['message' => trans('admin/predefinedFilters/message.not_allowed_to_edit')], 403);
+        }
+
+        //create permission
+        if ((!$currentIsPublic && $newIsPublic) 
+            && !$filter->userHasPermission($user, 'create')) {
+            return response()->json(['message' => trans('admin/predefinedFilters/message.update.not_allowed_to_change_isPublic')], 403);
+        }
+
+        return null;
+    }
 }

app/Http/Controllers/Api/PredefinedFilterPermissionController.php

@@ -11,6 +11,7 @@
 
 class PredefinedFilterPermissionController extends Controller
 {
+    
     protected PredefinedFilterPermissionService $service;
 
     public function __construct(PredefinedFilterPermissionService $service)

app/Http/Controllers/Assets/AssetsController.php

@@ -47,8 +47,11 @@
 class AssetsController extends Controller
 {
     protected $qrCodeDimensions = ['height' => 3.5, 'width' => 3.5];
+
     protected $barCodeDimensions = ['height' => 2, 'width' => 22];
+    
     protected PredefinedFilterService $predefinedFilterService;
+
     public function __construct(PredefinedFilterService $predefinedFilterService)
     {
         $this->middleware('auth');
@@ -74,7 +77,7 @@ public function index(Request $request): View
         $advancedSearchViewPermission = AdvancedSearch::userHasViewPermission($user);
         $predefined_filter_id = $request->input('predefinedFilterId');
 
-        if($advancedSearchViewPermission) {
+        if ($advancedSearchViewPermission) {
             // 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).');
@@ -96,10 +99,11 @@ public function index(Request $request): View
             $predefined_filter_name = null;
         }
 
-        return view('hardware/index')->with('company', $company)
-                                     ->with('advanced_search_permission', $advancedSearchViewPermission)
-                                     ->with('predefined_filter_id', $predefined_filter_id)
-                                     ->with('predefined_filter_name', $predefined_filter_name);
+        return view('hardware/index')
+            ->with('company', $company)
+            ->with('advanced_search_permission', $advancedSearchViewPermission)
+            ->with('predefined_filter_id', $predefined_filter_id)
+            ->with('predefined_filter_name', $predefined_filter_name);
     }
 
     /**
@@ -589,7 +593,7 @@ public function getAssetBySerial(Request $request): RedirectResponse
      * @since [v3.0]
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function getAssetByTag(Request $request, $tag = null): RedirectResponse
+    public function getAssetByTag(Request $request, $tag=null): RedirectResponse
     {
         $tag = $tag ? $tag : $request->get('assetTag');
         $topsearch = ($request->get('topsearch') == 'true');