fix rows, permissions filter

GTFB · Apr 6, 2022 · b1dd5f4 · b1dd5f4
1 parent ba21120
commit b1dd5f4
Show file tree

Hide file tree

Showing 6 changed files with 79,438 additions and 79,497 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,6 @@
 {
   "presets": [
-    "@babel/env",
+    "@babel/preset-env",
     "@babel/preset-react"
   ],
   "plugins": [
@@ -16,6 +16,7 @@
       {
         "loose": true
       }
-    ]
+    ],
+    ["@babel/plugin-proposal-private-property-in-object", { "loose": true }]
   ]
 }
diff --git a/altrpnjs/app/Controllers/Http/users/PermissionsController.ts b/altrpnjs/app/Controllers/Http/users/PermissionsController.ts
@@ -18,8 +18,15 @@ export default class PermissionsController {
 
     const params = request.qs();
     const page = parseInt(params.page) || 1
+    const searchWord = params.s
+    let permissions
+
+    if (searchWord) {
+      permissions = await Permission.query().where('name', 'LIKE', `%${searchWord}%`).paginate(page, 20)
+    } else {
+      permissions = await Permission.query().paginate(page, 20)
+    }
 
-    const permissions = await Permission.query().paginate(page, 20)
 
     return {
       count: permissions.getMeta().total,

diff --git a/altrpnjs/app/Controllers/Http/users/RolesController.ts b/altrpnjs/app/Controllers/Http/users/RolesController.ts
@@ -17,8 +17,14 @@ export default class RolesController {
 
     const params = request.qs();
     const page = parseInt(params.page) || 1
+    const searchWord = params.s
+    let roles
 
-    const roles = await Role.query().paginate(page, 20)
+    if (searchWord) {
+      roles = await Role.query().orWhere('name', 'LIKE', `%${searchWord}%`).orWhere('display_name', 'LIKE', `%${searchWord}%`).paginate(page, 20)
+    } else {
+      roles = await Role.query().paginate(page, 20)
+    }
 
     return {
       count: roles.getMeta().total,