@openinc/parse-server-opendash 2.4.101 → 2.4.102

package/dist/app_types/OpenWareTicketObject.d.ts

@@ -1,11 +1,11 @@
 import { Maintenance_Downtime, Maintenance_Frequency, Maintenance_Priority, Maintenance_Restriction, Maintenance_Ticket, Maintenance_Ticket_Issuecategory, Maintenance_Ticket_Kanban_State, Maintenance_Ticket_Source } from "../types";
 export type OpenWareTicketObject = {
     ticket: Maintenance_Ticket;
-    priority: Maintenance_Priority | undefined;
-    downtime: Maintenance_Downtime | undefined;
-    frequency: Maintenance_Frequency | undefined;
-    restriction: Maintenance_Restriction | undefined;
-    issuecategory: Maintenance_Ticket_Issuecategory | undefined;
-    state: Maintenance_Ticket_Kanban_State | undefined;
+    priority: Maintenance_Priority | Number;
+    downtime: Maintenance_Downtime | Number;
+    frequency: Maintenance_Frequency | Number;
+    restriction: Maintenance_Restriction | Number;
+    issuecategory: Maintenance_Ticket_Issuecategory | String;
+    state: Maintenance_Ticket_Kanban_State | String;
     source: Maintenance_Ticket_Source;
 };

package/dist/functions/openinc-openservice-save-ticket-data.d.ts

@@ -1,5 +1,5 @@
-import { _User, Maintenance_Ticket } from "../types";
 import { Material } from "../hooks/Maintenance_Ticket_Material";
+import { _User, Maintenance_Ticket } from "../types";
 export type MessageData = {
     type?: "userinput" | "system";
     translation?: {

package/dist/functions/openinc-openservice-save-ticket-data.js

@@ -55,12 +55,12 @@ async function saveTicketData(data, user) {
     const ticket = await getTicketObject(data, user, fetchOptions);
     const owticketobj = {
         ticket: ticket,
-        priority: undefined,
-        downtime: undefined,
-        restriction: undefined,
-        frequency: undefined,
-        issuecategory: undefined,
-        state: undefined,
+        priority: 0,
+        downtime: 0,
+        restriction: 0,
+        frequency: 0,
+        issuecategory: "",
+        state: "",
         source: new types_1.Maintenance_Ticket_Source(),
     };
     // needs to be the first save to save a message before data change messages are created on ticket creation
@@ -78,23 +78,75 @@ async function saveTicketData(data, user) {
         const savedpriority = await savePriority(ticket, data.priority, fetchOptions);
         owticketobj.priority = savedpriority;
     }
+    else {
+        //Fetch last value so it won't publish a 0 value to openware and overwrite the last value with default 0
+        const [lastPriorityError, lastPriority] = await (0, catchError_1.catchError)(new Parse.Query(types_1.Maintenance_Priority)
+            .equalTo("ticket", ticket)
+            .descending("createdAt")
+            .first(fetchOptions));
+        if (lastPriorityError) {
+            console.log("Error fetching last priority", lastPriorityError);
+        }
+        else {
+            owticketobj.priority = lastPriority?.get("value") ?? 0;
+        }
+    }
     if (data.downtime !== undefined) {
         const saveddowntime = await saveDowntime(ticket, data.downtime, fetchOptions);
         owticketobj.downtime = saveddowntime;
     }
+    else {
+        //Fetch last value so it won't publish a 0 value to openware and overwrite the last value with default 0
+        const [lastDowntimeError, lastDowntime] = await (0, catchError_1.catchError)(new Parse.Query(types_1.Maintenance_Downtime)
+            .equalTo("ticket", ticket)
+            .descending("createdAt")
+            .first(fetchOptions));
+        if (lastDowntimeError) {
+            console.log("Error fetching last downtime", lastDowntimeError);
+        }
+        else {
+            owticketobj.downtime = lastDowntime?.get("value") ?? 0;
+        }
+    }
     if (data.frequency !== undefined) {
         const savedfrequency = await saveFrequency(ticket, data.frequency, fetchOptions);
         owticketobj.frequency = savedfrequency;
     }
+    else {
+        //Fetch last value so it won't publish a 0 value to openware and overwrite the last value with default 0
+        const [lastFrequencyError, lastFrequency] = await (0, catchError_1.catchError)(new Parse.Query(types_1.Maintenance_Frequency)
+            .equalTo("ticket", ticket)
+            .descending("createdAt")
+            .first(fetchOptions));
+        if (lastFrequencyError) {
+            console.log("Error fetching last frequency", lastFrequencyError);
+        }
+        else {
+            owticketobj.frequency = lastFrequency?.get("value") ?? 0;
+        }
+    }
     if (data.restriction !== undefined) {
         const savedrestriction = await saveRestriction(ticket, data.restriction, fetchOptions);
         owticketobj.restriction = savedrestriction;
     }
+    else {
+        //Fetch last value so it won't publish a 0 value to openware and overwrite the last value with default 0
+        const [lastRestrictionError, lastRestriction] = await (0, catchError_1.catchError)(new Parse.Query(types_1.Maintenance_Restriction)
+            .equalTo("ticket", ticket)
+            .descending("createdAt")
+            .first(fetchOptions));
+        if (lastRestrictionError) {
+            console.log("Error fetching last restriction", lastRestrictionError);
+        }
+        else {
+            owticketobj.restriction = lastRestriction?.get("value") ?? 0;
+        }
+    }
     if (data.issuecategory) {
         const savedissuecategory = await saveIssueCategory(ticket, data.issuecategory, fetchOptions);
         const [fetchedSavedIssuecategoryError, fetchedSavedIssuecategory] = await (0, catchError_1.catchError)(new Parse.Query(types_1.Maintenance_Ticket_Issuecategory)
             .include("issuecategory")
-            .get(savedissuecategory.id));
+            .get(savedissuecategory.id, fetchOptions));
         if (fetchedSavedIssuecategoryError) {
             console.log("Error fetching saved issue category", fetchedSavedIssuecategoryError);
         }
@@ -106,7 +158,7 @@ async function saveTicketData(data, user) {
         const savedstate = await saveState(ticket, data.state, fetchOptions);
         const [fetchedSavedStateError, fetchedSavedState] = await (0, catchError_1.catchError)(new Parse.Query(types_1.Maintenance_Ticket_Kanban_State)
             .include("state")
-            .get(savedstate.id));
+            .get(savedstate.id, fetchOptions));
         if (fetchedSavedStateError) {
             console.log("Error fetching saved state", fetchedSavedStateError);
         }
@@ -141,7 +193,9 @@ async function saveTicketData(data, user) {
     else if (ticketsource && ticketsource.get("source")) {
         owticketobj.source = ticketsource;
         // publish to openware
-        await publishToOpenWare(owticketobj, ticket, ticketsource.get("source").id);
+        await publishToOpenWare(owticketobj, ticket, ticketsource.get("source").get("tag")
+            ? ticketsource.get("source").get("tag")
+            : "");
     }
     return ticket;
 }
@@ -154,90 +208,112 @@ async function publishToOpenWare(owticketobj, ticket, source) {
     const time = new Date().getTime();
     const values = {
         date: time,
-        value: Object.values(owticketobj)
-            .map((value) => {
-            if (value instanceof types_1.Maintenance_Downtime) {
-                return value.get("value");
+        value: Object.entries(owticketobj).map(([key, value]) => {
+            if (key === "downtime") {
+                if (value instanceof types_1.Maintenance_Downtime) {
+                    return value.get("value");
+                }
+                return value;
             }
-            else if (value instanceof types_1.Maintenance_Frequency) {
-                return value.get("value");
+            else if (key === "frequency") {
+                if (value instanceof types_1.Maintenance_Frequency) {
+                    return value.get("value");
+                }
+                return value;
             }
-            else if (value instanceof types_1.Maintenance_Priority) {
-                return value.get("value");
+            else if (key === "priority") {
+                if (value instanceof types_1.Maintenance_Priority) {
+                    return value.get("value");
+                }
+                return value;
             }
-            else if (value instanceof types_1.Maintenance_Restriction) {
-                return value.get("value");
+            else if (key === "restriction") {
+                if (value instanceof types_1.Maintenance_Restriction) {
+                    return value.get("value");
+                }
+                return value;
             }
-            else if (value instanceof types_1.Maintenance_Ticket_Issuecategory) {
-                return value.get("issuecategory").id;
+            else if (key === "issuecategory") {
+                if (value instanceof types_1.Maintenance_Ticket_Issuecategory) {
+                    return value.get("issuecategory").id;
+                }
+                return value;
             }
-            else if (value instanceof types_1.Maintenance_Ticket_Kanban_State) {
-                return value.get("state").id;
+            else if (key === "state") {
+                if (value instanceof types_1.Maintenance_Ticket_Kanban_State) {
+                    return value.get("state").id;
+                }
+                return value;
             }
-            else if (value instanceof types_1.Maintenance_Ticket) {
-                return value.id;
+            else if (key === "ticket") {
+                if (value instanceof types_1.Maintenance_Ticket) {
+                    return value.id;
+                }
+                return value;
             }
-            else if (value instanceof types_1.Maintenance_Ticket_Source) {
-                return value.get("source").id;
+            else if (key === "source") {
+                if (value instanceof types_1.Maintenance_Ticket_Source) {
+                    return value.get("source").id;
+                }
+                return value;
             }
-            return undefined;
-        })
-            .filter((v) => v !== undefined),
+            return value;
+        }),
     };
-    const valueTypes = Object.entries(owticketobj).map(([key, value]) => {
+    const valueTypes = Object.keys(owticketobj).map((key) => {
         const tmpvaluetype = {
             name: "",
             unit: "",
             type: "String",
         };
-        if (value instanceof types_1.Maintenance_Downtime) {
-            tmpvaluetype.name = types_1.Maintenance_Downtime.className;
+        if (key === "downtime") {
+            tmpvaluetype.name = types_1.Maintenance_Downtime.className.replace("OD3_Maintenance_", "");
             tmpvaluetype.unit = "%";
             tmpvaluetype.type = "Number";
         }
-        else if (value instanceof types_1.Maintenance_Frequency) {
-            tmpvaluetype.name = types_1.Maintenance_Frequency.className;
+        else if (key === "frequency") {
+            tmpvaluetype.name = types_1.Maintenance_Frequency.className.replace("OD3_Maintenance_", "");
             tmpvaluetype.unit = "%";
             tmpvaluetype.type = "Number";
         }
-        else if (value instanceof types_1.Maintenance_Priority) {
-            tmpvaluetype.name = types_1.Maintenance_Priority.className;
+        else if (key === "priority") {
+            tmpvaluetype.name = types_1.Maintenance_Priority.className.replace("OD3_Maintenance_", "");
             tmpvaluetype.unit = "%";
             tmpvaluetype.type = "Number";
         }
-        else if (value instanceof types_1.Maintenance_Restriction) {
-            tmpvaluetype.name = types_1.Maintenance_Restriction.className;
+        else if (key === "restriction") {
+            tmpvaluetype.name = types_1.Maintenance_Restriction.className.replace("OD3_Maintenance_", "");
             tmpvaluetype.unit = "%";
             tmpvaluetype.type = "Number";
         }
-        else if (value instanceof types_1.Maintenance_Ticket_Issuecategory) {
-            tmpvaluetype.name = types_1.Maintenance_Ticket_Issuecategory.className;
+        else if (key === "issuecategory") {
+            tmpvaluetype.name = types_1.Maintenance_Ticket_Issuecategory.className.replace("OD3_Maintenance_", "");
             tmpvaluetype.unit = "";
             tmpvaluetype.type = "String";
         }
-        else if (value instanceof types_1.Maintenance_Ticket_Kanban_State) {
-            tmpvaluetype.name = types_1.Maintenance_Ticket_Kanban_State.className;
+        else if (key === "state") {
+            tmpvaluetype.name = types_1.Maintenance_Ticket_Kanban_State.className.replace("OD3_Maintenance_", "");
             tmpvaluetype.unit = "";
             tmpvaluetype.type = "String";
         }
-        else if (value instanceof types_1.Maintenance_Ticket) {
-            tmpvaluetype.name = types_1.Maintenance_Ticket.className;
+        else if (key === "ticket") {
+            tmpvaluetype.name = types_1.Maintenance_Ticket.className.replace("OD3_Maintenance_", "");
             tmpvaluetype.unit = "";
             tmpvaluetype.type = "String";
         }
-        else if (value instanceof types_1.Maintenance_Ticket_Source) {
-            tmpvaluetype.name = types_1.Maintenance_Ticket_Source.className;
+        else if (key === "source") {
+            tmpvaluetype.name = types_1.Maintenance_Ticket_Source.className.replace("OD3_Maintenance_", "");
             tmpvaluetype.unit = "";
             tmpvaluetype.type = "String";
         }
         return tmpvaluetype;
     });
     const dataitem = {
-        id: "openservice_ticket",
-        name: `Ticket`,
+        id: `openservice_ticket_${ticket.id}`,
+        name: `Ticket ${owticketobj.ticket.get("title")}`,
         source: source,
         values: [values],
-        valueTypes: valueTypes.filter((v) => v.name !== ""),
+        valueTypes: valueTypes,
         meta: {},
     };
     console.log("Publishing ticket to openware: ", dataitem, "with values", JSON.stringify(dataitem.values));
@@ -552,7 +628,7 @@ async function saveMaterial(ticket, material, fetchOptions) {
     await materialObject.save(null, fetchOptions);
 }
 async function saveTicketProject(ticket, project, fetchOptions) {
-    const projectObj = await new Parse.Query(types_1.Maintenance_Project).get(project);
+    const projectObj = await new Parse.Query(types_1.Maintenance_Project).get(project, fetchOptions);
     if (!projectObj)
         throw new Error("Project not found");
     const ticketProjectObject = new types_1.Maintenance_Ticket_Project({
@@ -562,7 +638,7 @@ async function saveTicketProject(ticket, project, fetchOptions) {
         user: ticket.get("user"),
     });
     await ticketProjectObject.save(null, fetchOptions);
-    ticket.set("project", new types_1.Maintenance_Project({ objectId: project }));
+    ticket.set("project", projectObj);
     await ticket.save(null, fetchOptions);
     projectObj.relation("tickets").add(ticket);
     await projectObj.save(null, fetchOptions);

package/dist/functions/openinc-openservice-ticket-data.js

@@ -108,6 +108,7 @@ async function getTicketData(tickets) {
         const dailySchedule = getDailySchedule(ticket);
         const messages = getMessages(ticket);
         const material = getTicketMaterial(ticket);
+        const project = ticket.get("project")?.fetch({ useMasterKey: true });
         const dataPromises = await Promise.all([
             downtimes,
             duedate,
@@ -120,6 +121,7 @@ async function getTicketData(tickets) {
             dailySchedule,
             messages,
             material,
+            project,
         ]);
         return {
             ticket: ticket,
@@ -135,6 +137,7 @@ async function getTicketData(tickets) {
             messages: dataPromises[9]?.messages,
             assignedTo: [...assignedusers, ...assignedroles],
             material: dataPromises[10],
+            project: dataPromises[11],
         };
     });
     return await Promise.all(ticketDataPromises);

package/dist/helper/TicketData.d.ts

@@ -1,4 +1,4 @@
-import { Maintenance_Ticket, Maintenance_DailySchedule, Maintenance_Downtime, Maintenance_Duedate, Maintenance_Frequency, Maintenance_Issuecategory, Maintenance_Kanban_State, Maintenance_Message, Maintenance_Priority, Maintenance_Restriction, Source, Maintenance_Ticket_Material } from "../types";
+import { Maintenance_Ticket, Maintenance_DailySchedule, Maintenance_Downtime, Maintenance_Duedate, Maintenance_Frequency, Maintenance_Issuecategory, Maintenance_Kanban_State, Maintenance_Message, Maintenance_Priority, Maintenance_Restriction, Source, Maintenance_Ticket_Material, Maintenance_Project } from "../types";
 export type TicketData = {
     ticket: Maintenance_Ticket;
     dailySchedule?: Maintenance_DailySchedule;
@@ -13,4 +13,5 @@ export type TicketData = {
     source?: Source;
     assignedTo?: Array<Parse.User | Parse.Role>;
     material?: Maintenance_Ticket_Material;
+    project?: Maintenance_Project;
 };

package/dist/index.js

@@ -176,10 +176,14 @@ async function initDefaultData() {
     }
 }
 async function initPermissions() {
-    const tenant = await new Parse.Query(types_1.Tenant)
+    const tenants = await new Parse.Query(types_1.Tenant)
         .descending("createdAt")
-        .first({ useMasterKey: true });
-    tenant && (await registerPermissions(tenant));
+        .find({ useMasterKey: true });
+    if (tenants) {
+        for await (const tenant of tenants) {
+            await registerPermissions(tenant);
+        }
+    }
 }
 /**
  * Register all permissions in the database, if not already registered.
@@ -189,6 +193,7 @@ async function registerPermissions(tenant) {
     (0, registerPermissions_1.getAllPermissions)().forEach((permission) => {
         new Parse.Query(types_1.Permission)
             .equalTo("key", permission.key)
+            .equalTo("tenant", tenant)
             .first({ useMasterKey: true })
             .then((result) => {
             if (!result) {
@@ -196,14 +201,10 @@ async function registerPermissions(tenant) {
                 const newPermission = new types_1.Permission();
                 newPermission.set("key", permission.key);
                 newPermission.set("label", permission.label);
+                newPermission.set("tenant", tenant);
                 newPermission.set("description", permission.description);
                 newPermission.save({}, { useMasterKey: true });
             }
-            else if (result.get("tenant") === undefined) {
-                console.log("Update permission tenant to default tenant", permission.key);
-                result.set("tenant", tenant);
-                result.save({}, { useMasterKey: true });
-            }
             else {
                 console.log("Permission already exists", permission.key);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openinc/parse-server-opendash",
-  "version": "2.4.101",
+  "version": "2.4.102",
   "description": "Parse Server Cloud Code for open.DASH",
   "packageManager": "pnpm@10.2.1",
   "keywords": [