feat: refs #7119 update ACLs for vehicle management and refine vehicle filter logic

db/versions/11394-brownAsparagus/00-firstScript.sql

@@ -1,7 +1,10 @@
 INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
-	VALUES ('Vehicle', 'filter', 'READ', 'ALLOW', 'ROLE', 'delivery'),
+	VALUES ('Vehicle', 'filter', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-			('Vehicle', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'delivery'),
+			('Vehicle', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-			('BankPolicy', 'find', 'READ', 'ALLOW', 'ROLE', 'delivery'),
+			('Vehicle', 'findById', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-			('VehicleState', 'find', 'READ', 'ALLOW', 'ROLE', 'delivery' ),
+			('Vehicle', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
-			('Ppe', 'find', 'READ', 'ALLOW', 'ROLE', 'delivery' ),
+			('BankPolicy', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-			('Vehicle', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss');
+			('VehicleState', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative' ),
+			('Ppe', 'find', 'READ', 'ALLOW', 'ROLE', 'administrative' ),
+			('Vehicle', 'deleteById', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+			('Vehicle', '__get__active', 'READ', 'ALLOW', 'ROLE', 'employee');

modules/route/back/methods/vehicle/filter.js

@@ -94,7 +94,7 @@ module.exports = Self => {
             }
         }) || {};
 
-        const myFilter = mergeFilters(filter, {where: {...where, isActive: true}});
+        const myFilter = mergeFilters(filter, {where});
 
         const stmt = new ParameterizedSQL(`
             SELECT v.id,

modules/route/back/models/vehicle.json

@@ -104,19 +104,17 @@
             "property": "ppeFk"
         }
     },
-    "scope": {
+    "scopes": {
-        "where": {
+        "active": {
-            "isActive": {
+            "fields": [
-                "neq": false
+                "id",
+                "numberPlate"
+            ],
+            "where": {
+                "isActive": {
+                    "neq": false
+                }
             }
         }
-    },
+    }
-    "acls": [
-        {
-            "accessType": "READ",
-            "principalType": "ROLE",
-            "principalId": "$everyone",
-            "permission": "ALLOW"
-        }
-    ]
 }