@openinc/parse-server-opendash 4.0.34 → 4.0.38

package/README.md

@@ -30,3 +30,4 @@ For a full list of options see the file at [CONFIG.md](https://github.com/open-i
 ## Development
 
 See the file at [DEVELOPMENT.md](https://github.com/open-inc/node-parse-server-opendash/blob/master/DEVELOPMENT.md)
+

package/dist/features/permissions/types/Permissions.d.ts

@@ -25,4 +25,7 @@ export declare namespace Permissions {
     enum DOCUMENTATION {
         see_app = "documentation:can-see-app"
     }
+    enum BDE {
+        timetracking_can_edit_times = "bde:timetracking-edit-times"
+    }
 }

package/dist/features/permissions/types/Permissions.js

@@ -39,6 +39,10 @@ var Permissions;
         // Access
         DOCUMENTATION["see_app"] = "documentation:can-see-app";
     })(DOCUMENTATION = Permissions.DOCUMENTATION || (Permissions.DOCUMENTATION = {}));
+    let BDE;
+    (function (BDE) {
+        BDE["timetracking_can_edit_times"] = "bde:timetracking-edit-times";
+    })(BDE = Permissions.BDE || (Permissions.BDE = {}));
     // can also be used for nested permissions
     // Example:
     //   export namespace TestPlugin {

package/dist/functions/openinc-config.js

@@ -12,13 +12,7 @@ async function init(name) {
         const userId = request.user?.id;
         let roles = [];
         if (request.user) {
-            // TODO, search roles recursivly
-            const roleObjects = await new node_1.default.Query(node_1.default.Role)
-                .equalTo("users", request.user)
-                .find({ useMasterKey: true });
-            roles = roleObjects
-                .map((role) => role.getName())
-                .filter(Boolean);
+            roles = await getUserRoles(request.user);
         }
         const parseSchema = await node_1.default.Schema.all();
         const schema = parseSchema
@@ -50,6 +44,27 @@ async function init(name) {
         };
     });
 }
+// Returns all role names the user belongs to, including transitive parent roles.
+// In Parse, roles can contain other roles via the "roles" relation, so a user in
+// role "staff" also inherits permissions from "admin" if "staff" is a child of "admin".
+async function getUserRoles(user) {
+    // visited prevents infinite loops in case of cyclic role definitions
+    const visited = new Set();
+    async function collect(roleQuery) {
+        const found = await roleQuery.find({ useMasterKey: true });
+        for (const role of found) {
+            const name = role.getName();
+            if (name && !visited.has(name)) {
+                visited.add(name);
+                // Find parent roles that contain this role as a child and continue upward
+                await collect(new node_1.default.Query(node_1.default.Role).equalTo("roles", role));
+            }
+        }
+    }
+    // Entry point: direct roles of the user
+    await collect(new node_1.default.Query(node_1.default.Role).equalTo("users", user));
+    return [...visited];
+}
 async function getTenants() {
     try {
         const tenants = await new node_1.default.Query(index_js_2.Tenant)

package/dist/hooks/Alarm.js

@@ -8,7 +8,11 @@ async function init() {
     (0, index_js_2.beforeSaveHook)(index_js_3.Alarm, async (request) => {
         const { object, original, user } = request;
         await (0, index_js_2.defaultHandler)(request);
-        // TODO
+        //Do not allow tenant users to read alarms of other users by default, but allow custom ACLs
+        await (0, index_js_2.defaultAclHandler)(request, {
+            allowCustomACL: true,
+            denyTenantUserRead: true,
+        });
     });
     (0, index_js_2.afterSaveHook)(index_js_3.Alarm, async ({ object, original, user }) => {
         if (index_js_1.ConfigInstance.getInstance().getBoolean("OPENWARE")) {

package/dist/hooks/BDE_WorkTime.js

@@ -12,6 +12,8 @@ async function init() {
     });
     (0, index_js_1.afterSaveHook)(index_js_2.BDE_WorkTime, async (request) => {
         const { object, original, user } = request;
+        if (object.get("status") === "disrupted")
+            return;
         await addToWorkOrder(object);
     });
 }
@@ -22,7 +24,7 @@ async function addToWorkOrder(workTime) {
     const workOrder = await workTime.workOrder?.fetch({ useMasterKey: true });
     if (!workOrder)
         return;
-    workOrder.set("amountGood", (workOrder.amountGood || 0) + workTime.amountGood);
-    workOrder.set("amountScrap", (workOrder.amountScrap || 0) + workTime.amountScrap);
+    workOrder.set("amountGood", (workOrder.amountGood || 0) + (workTime.amountGood || 0));
+    workOrder.set("amountScrap", (workOrder.amountScrap || 0) + (workTime.amountScrap || 0));
     await workOrder.save(null, { useMasterKey: true });
 }

package/dist/types/Alarm.d.ts

@@ -1,4 +1,5 @@
 import Parse from "parse/node";
+import type { Tenant } from "./Tenant";
 import type { _User } from "./_User";
 export interface AlarmAttributes {
     id: string;
@@ -12,6 +13,7 @@ export interface AlarmAttributes {
     item_source?: string | undefined;
     name?: string | undefined;
     sent?: number | undefined;
+    tenant?: Tenant | undefined;
     trigger?: any | undefined;
     user: _User;
 }
@@ -32,6 +34,8 @@ export declare class Alarm extends Parse.Object<AlarmAttributes> {
     set name(value: string | undefined);
     get sent(): number | undefined;
     set sent(value: number | undefined);
+    get tenant(): Tenant | undefined;
+    set tenant(value: Tenant | undefined);
     get trigger(): any | undefined;
     set trigger(value: any | undefined);
     get user(): _User;

package/dist/types/Alarm.js

@@ -52,6 +52,12 @@ class Alarm extends node_1.default.Object {
     set sent(value) {
         super.set("sent", value);
     }
+    get tenant() {
+        return super.get("tenant");
+    }
+    set tenant(value) {
+        super.set("tenant", value);
+    }
     get trigger() {
         return super.get("trigger");
     }

package/dist/types/Meta_Config.d.ts

@@ -1,6 +1,6 @@
 import Parse from "parse/node";
-import type { Tenant } from "./Tenant";
 import { MetaConfig } from "./custom/MetaField";
+import type { Tenant } from "./Tenant";
 export interface Meta_ConfigAttributes {
     id: string;
     objectId: string;

package/dist/types/Meta_Entry.d.ts

@@ -1,7 +1,7 @@
 import Parse from "parse/node";
+import { MetaConfig } from "./custom/MetaField";
 import type { Meta_Config } from "./Meta_Config";
 import type { Tenant } from "./Tenant";
-import { MetaConfig } from "./custom/MetaField";
 export interface Meta_EntryAttributes {
     id: string;
     objectId: string;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@openinc/parse-server-opendash",
-  "version": "4.0.34",
+  "version": "4.0.38",
   "description": "Parse Server Cloud Code for open.INC Stack.",
-  "packageManager": "pnpm@10.33.0",
+  "packageManager": "pnpm@11.9.0",
   "keywords": [
     "parse",
     "opendash"
@@ -69,14 +69,14 @@
     "@openinc/parse-server-schema": "^4.1.1",
     "amqplib": "^0.10.9",
     "cron": "^4.4.0",
-    "dayjs": "^1.11.20",
+    "dayjs": "^1.11.21",
     "dotenv": "^17.4.2",
     "fast-equals": "^6.0.0",
     "i18next": "^26.2.0",
     "i18next-fs-backend": "^2.6.5",
     "jsonwebtoken": "^9.0.3",
-    "jwks-rsa": "^4.0.1",
-    "nodemailer": "^8.0.7",
+    "jwks-rsa": "^4.1.0",
+    "nodemailer": "^9.0.1",
     "nunjucks": "^3.2.4",
     "parse": "^8.6.0",
     "parse-server": "^9.9.0",
@@ -88,22 +88,15 @@
   },
   "devDependencies": {
     "@types/jsonwebtoken": "^9.0.10",
-    "@types/node": "^25.9.0",
-    "@types/nodemailer": "^7.0.11",
+    "@types/node": "^25.9.4",
+    "@types/nodemailer": "^8.0.1",
     "@types/nunjucks": "^3.2.6",
     "@types/safe-timers": "^1.1.2",
     "@types/web-push": "^3.6.4",
-    "concurrently": "^9.2.1",
+    "concurrently": "^9.2.3",
     "ts-node": "^10.9.2",
     "typedoc": "^0.28.19",
-    "typedoc-plugin-markdown": "^4.11.0",
+    "typedoc-plugin-markdown": "^4.12.0",
     "typescript": "^5.9.3"
-  },
-  "pnpm": {
-    "auditConfig": {
-      "ignoreGhsas": [
-        "GHSA-w5hq-g745-h8pq"
-      ]
-    }
   }
 }

package/schema/Alarm.json

@@ -23,6 +23,11 @@
       "type": "Number",
       "required": false
     },
+    "tenant": {
+      "type": "Pointer",
+      "targetClass": "{{PREFIX}}Tenant",
+      "required": false
+    },
     "trigger": {
       "type": "Object"
     },