Added #17494: Advanced-search and predefined filters

app/Console/Commands/Purge.php

@@ -12,6 +12,7 @@
 use App\Models\License;
 use App\Models\Location;
 use App\Models\Manufacturer;
+use App\Models\PredefinedFilter;
 use App\Models\Statuslabel;
 use App\Models\Supplier;
 use App\Models\User;
@@ -178,6 +179,14 @@ public function handle()
                 $this->info('- Status Label "'.$status_label->name.'" deleted.');
                 $status_label->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 {
             $this->info('Action canceled. Nothing was purged.');
         }

app/Exceptions/Handler.php

@@ -162,6 +162,8 @@ public function render($request, Throwable $e)
                 $route = 'licenses.index';
             } elseif (($route === 'customfieldsets.index') || ($route === 'customfields.index')) {
                 $route = 'fields.index';
+            } elseif ($route === 'predefinedfilters.index') {
+                $route = 'predefined-filters.index';
             }
 
             return redirect()

app/Http/Controllers/Api/AssetsController.php

@@ -23,6 +23,7 @@
 use App\Models\License;
 use App\Models\LicenseSeat;
 use App\Models\Location;
+use App\Models\PredefinedFilter;
 use App\Models\Setting;
 use App\Models\User;
 use App\View\Label;
@@ -145,11 +146,17 @@ public function index(FilterRequest $request, $action = null, $upcoming_status =
 
         if ($request->filled('filter')) {
             $filter = json_decode($request->input('filter'), true);
+        }
 
-            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
+        if (!isset($filter[0]['field'])) {
+            $filter = array_filter($filter, function ($key) use ($allowed_columns){
                 return in_array($key, $allowed_columns);
             }, ARRAY_FILTER_USE_KEY);
+        }
 
+        $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
+        foreach ($all_custom_fields as $field) {
+            $allowed_columns[] = $field->db_column_name();
         }
 
         $assets = Asset::select('assets.*')
@@ -409,6 +416,7 @@ public function index(FilterRequest $request, $action = null, $upcoming_status =
                 break;
             case 'location':
                 $assets->OrderLocation($order);
+                break;
             case 'rtd_location':
                 $assets->OrderRtdLocation($order);
                 break;
@@ -453,6 +461,18 @@ public function index(FilterRequest $request, $action = null, $upcoming_status =
                 break;
         }
 
+        // Filter with predefinedFilter if one is given
+        if (isset($request->predefinedFilter)) {
+            $id = $request->predefinedFilter;
+            $predefinedFilters = PredefinedFilter::where('id', $id)
+                ->where('created_by', auth()->user()->id)
+                ->first();
+
+            if ($predefinedFilters) {
+                $assets = $predefinedFilters->filterAssets($assets);
+            }
+        }
+
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
         $offset = ($request->input('offset') > $assets->count()) ? $assets->count() : app('api_offset_value');
@@ -1392,7 +1412,7 @@ public function getLabels(Request $request): JsonResponse
 
 
                 $label = new Label();
-                
+
                 if (!$label) {
                     throw new \Exception('Label object could not be created');
                 }

app/Http/Controllers/Api/GroupsController.php

@@ -5,6 +5,7 @@
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\GroupsTransformer;
+use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Group;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
@@ -145,4 +146,33 @@ public function destroy($id) : JsonResponse
 
         return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/groups/message.delete.success')));
     }
+
+    /**
+     * Selectlist method that returns all groups wherere the user is member of
+     */
+    public function selectlist(Request $request): array
+    {
+        $user = auth()->user();
+
+        $this->authorize('superadmin');
+        $this->authorize('view', Group::class);
+
+        // Start with groups the user belongs to
+        $groups = Group::whereHas('users', function ($query) use ($user) {
+            $query->where('user_id', $user->id);
+        })
+            ->select('id', 'name');
+
+        // Search filter
+        if ($request->filled('search')) {
+            $groups = $groups->where('permission_groups.name', 'LIKE', '%' . $request->get('search') . '%');
+        }
+
+        // Apply sorting
+        $groups = $groups->orderBy('name', 'ASC')->paginate(50);
+
+        // Transform output to match selectlist style
+        return (new SelectlistTransformer)->transformSelectlist($groups);
+    }
+
 }

app/Http/Controllers/Api/PredefinedFilterController.php

@@ -0,0 +1,180 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Http\Transformers\PredefinedFiltersTransformer;
+use App\Http\Transformers\SelectlistTransformer;
+use App\Models\PredefinedFilter;
+use App\Services\PredefinedFilterService;
+use Auth;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
+use App\Helpers\Helper;
+
+class PredefinedFilterController extends Controller
+{
+
+    protected PredefinedFilterService $service;
+
+    public function __construct(PredefinedFilterService $service)
+    {
+        $this->service = $service;
+    }
+
+    public function index(Request $request) : JsonResponse | array
+    {
+        $filters = $this->service->getAllViewableFilters();
+
+        if ($request->filled('search')) {
+            $search = strtolower($request->get('search'));
+            $filters = $filters->filter(fn($filter) =>
+                str_contains(strtolower($filter->name), $search)
+            );
+        }
+
+        // --- Sorting ---
+        $sort = $request->input('sort', 'name');
+        $order = $request->input('order', 'asc');
+
+        $allowedColumns = ['id', 'name', 'is_public', 'created_by'];
+
+        if (!in_array($sort, $allowedColumns)) {
+            $sort = 'name';
+        }
+
+        $filters = $order === 'desc'
+            ? $filters->sortByDesc(fn($f) => strtolower(data_get($f, $sort, '')))
+            : $filters->sortBy(fn($f) => strtolower(data_get($f, $sort, '')));
+
+        // --- Pagination ---
+        $total = $filters->count();
+        $offset = (int) $request->input('offset', 0);
+        $limit = (int) $request->input('limit', config('app.max_results', 50));
+
+        $filters = $filters->slice($offset, $limit)->values();
+
+        return (new PredefinedFiltersTransformer)->transformPredefinedFilters($filters, $total);
+    }
+
+
+
+    public function show(int $id)
+    {
+        $filter = $this->service->getFilterWithIdAndNameValues($id);
+
+        if (!$filter) {
+            return response()->json(['message' => trans('admin/predefinedFilters/message.does_not_exist')], 404);
+        }
+
+        if ($filter->userHasPermission(Auth::user(), 'view')) {
+            return response()->json($filter->toArray());
+        }
+
+        return response()->json(['message' => trans('admin/predefinedFilters/message.show.not_allowed')], 403);
+    }
+
+    public function store(Request $request): JsonResponse | array
+    {
+
+        $user = auth()->user();
+
+        $validator = Validator::make($request->all(), [
+            'name' => 'required|string|max:191',
+            'filter_data' => 'required|array',
+            'is_public' => 'sometimes|boolean'
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json(Helper::formatStandardApiResponse(422, null, $validator->errors()),422);
+        }
+
+        $validated = $validator->validated();
+
+        if (!empty($validated['is_public']) && !$user->hasAccess('predefinedFilter.create')) {
+            return response()->json(['message' => trans('admin/predefinedFilters/message.create.not_allowed')], 403);
+        }
+
+        $filter = $this->service->createFilter($validated);
+
+        return response()->json([
+            'message' => trans('admin/predefinedFilters/message.create.success'),
+            'filter_data' => $filter,
+        ], 201);
+    }
+
+    public function update(Request $request, int $id): JsonResponse
+    {
+        $user = auth()->user();
+        $filter = PredefinedFilter::find($id);
+
+        if (!$filter) {
+            return response()->json(['message' => trans('admin/predefinedFilters/message.does_not_exist')], 404);
+        }
+
+        $validator = Validator::make($request->all(), [
+            'name' => 'required|string|max:191',
+            'filter_data' => 'required|array',
+            'is_public' => 'sometimes|boolean'
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json(Helper::formatStandardApiResponse(422, null, $validator->errors()),422);
+        }
+
+        $validated = $validator->validated();
+
+        $updatedPermission = $this->updatePermissions($validated, $filter, $user);
+        if ($updatedPermission !== null) {
+            return $updatedPermission;
+        }
+
+        $updated = $this->service->updateFilter($filter, $validated);
+
+        return response()->json([
+            'message' => trans('admin/predefinedFilters/message.update.success'),
+            'filter_data' => $updated,
+        ]);
+    }
+
+    public function destroy(int $id)
+    {
+        $user = auth()->user();
+        $filter = PredefinedFilter::find($id);
+
+        if (!$filter) {
+            return response()->json(['message' => trans('admin/predefinedFilters/message.does_not_exist')], 404);
+        }
+
+        if ($filter->userHasPermission($user, 'delete')) {
+            $this->service->deleteFilter($filter);
+            return response()->json(['message' => trans('admin/predefinedFilters/message.delete.success')]);
+        }
+
+        return response()->json(['message' => trans('admin/predefinedFilters/message.delete.not_allowed_to_delete')], 403);
+    }
+
+    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

@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Models\PredefinedFilter;
+use App\Models\PredefinedFilterPermission;
+use App\Services\PredefinedFilterPermissionService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class PredefinedFilterPermissionController extends Controller
+{
+
+    protected PredefinedFilterPermissionService $service;
+
+    public function __construct(PredefinedFilterPermissionService $service)
+    {
+        $this->service = $service;
+    }
+
+    public function store(Request $request): JsonResponse
+    {
+        $this->authorize('edit', PredefinedFilter::class);
+
+        $model = new PredefinedFilterPermission();
+        $validated = $request->validate($model->getRules());
+
+        $filter = PredefinedFilter::findOrFail($validated['predefined_filter_id']);
+        $this->authorize('update', $filter);
+
+        // Granular Permission
+        if (!$filter->userHasPermission($request->user(), 'edit')) {
+            return response()->json(['error' => 'Unauthorized'], 403);
+        }
+
+        $permission = $this->service->store($validated);
+
+        return response()->json([
+            'message' => __('admin/reports/message.create.success'),
+            'data' => $permission,
+        ]);
+    }
+
+    public function show(int $id): JsonResponse
+    {
+        $this->authorize('view', PredefinedFilter::class);
+
+        $permission = $this->service->show($id);
+
+        $filter = $permission->filter;
+
+        if (!$filter) {
+            return response()->json(['message' => trans('NotFound')], 404);
+        }
+
+        $this->authorize('view', $filter);
+
+        return response()->json($permission);
+    }
+
+    public function destroy(int $id): JsonResponse
+    {
+        $this->authorize('delete', PredefinedFilterPermission::class);
+
+        $permission = PredefinedFilterPermission::findOrFail($id);
+        $this->authorize('delete', $permission->filter);
+
+        $this->service->delete($id);
+
+        return response()->json([
+            'message' => __('admin/reports/message.delete.success'),
+        ], 204);
+    }
+}