@openinc/parse-server-opendash 3.29.1 → 3.29.3

package/dist/features/openservice/functions/assignUsersAndRoles.js

@@ -49,6 +49,7 @@ async function assignUsersAndRoles(ticket, assignedTo, fetchOptions, assigningUs
     const userNotifiedIds = [];
     for await (const assignedTo of newUsers) {
         const resipientlanguage = await (0, getUserLanguage_1.getUserLanguage)(assignedTo);
+        const recipientlink = await (0, getTicketLink_1.getTicketLink)(ticket, assignedTo);
         await i18next_1.default.changeLanguage(resipientlanguage);
         assignments.push(new types_1.Maintenance_Ticket_Assignment({
             ticket,
@@ -74,7 +75,7 @@ async function assignUsersAndRoles(ticket, assignedTo, fetchOptions, assigningUs
             description: i18next_1.default.t("maintenance:ticket.assignuser.notification.description", {
                 username: (0, openinc_openservice_save_ticket_data_1.getUsername)(assigningUser) ?? "System",
                 ticketName: ticket.get("title"),
-                ticketLink: (0, getTicketLink_1.getTicketLink)(ticket),
+                ticketLink: recipientlink,
             }),
         }).save(null, { useMasterKey: true });
         userNotifiedIds.push(assignedTo.id);
@@ -96,6 +97,7 @@ async function assignUsersAndRoles(ticket, assignedTo, fetchOptions, assigningUs
                 roleUser.id === assigningUser?.id)
                 continue;
             const resipientlanguage = await (0, getUserLanguage_1.getUserLanguage)(roleUser);
+            const recipientlink = await (0, getTicketLink_1.getTicketLink)(ticket, roleUser);
             await i18next_1.default.changeLanguage(resipientlanguage);
             await new types_1.Notification({
                 data: {
@@ -114,7 +116,7 @@ async function assignUsersAndRoles(ticket, assignedTo, fetchOptions, assigningUs
                     username: (0, openinc_openservice_save_ticket_data_1.getUsername)(assigningUser) ?? "System",
                     ticketName: ticket.get("title"),
                     role: assignedTo.get("label"),
-                    ticketLink: (0, getTicketLink_1.getTicketLink)(ticket),
+                    ticketLink: recipientlink,
                 }),
             }).save(null, { useMasterKey: true });
         }

package/dist/features/openservice/ticket/getTicketLink.d.ts

@@ -1,2 +1,7 @@
-import { Maintenance_Ticket } from "../../../types";
-export declare function getTicketLink(ticket: Maintenance_Ticket): string;
+import { _User, Maintenance_Ticket } from "../../../types";
+/**
+ * Returns the link to a ticket.
+ * @param ticket
+ * @returns
+ */
+export declare function getTicketLink(ticket: Maintenance_Ticket, user: _User): Promise<string>;

package/dist/features/openservice/ticket/getTicketLink.js

@@ -2,14 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTicketLink = getTicketLink;
 const config_1 = require("../../config");
-function getTicketLink(ticket) {
-    //Get hostname from environment variable or default to localhost
+/**
+ * Returns the link to a ticket.
+ * @param ticket
+ * @returns
+ */
+async function getTicketLink(ticket, user) {
+    //Get hostname from tenant or environment variable or default to localhost
     let hostname = "localhost";
     try {
+        const baseurl = user.get("tenant")?.get("baseUrl");
         const publicurl = config_1.ConfigInstance.getInstance()
             .get("PARSE_PUBLIC_SERVER_URL")
             .replace("/parse", "");
-        if (publicurl) {
+        if (baseurl !== undefined && baseurl !== "") {
+            hostname = baseurl;
+        }
+        else if (publicurl) {
             hostname = publicurl;
         }
     }

package/dist/types/Tenant.d.ts

@@ -5,6 +5,7 @@ export interface TenantAttributes {
     objectId: string;
     createdAt: Date;
     updatedAt: Date;
+    baseUrl: string;
     dataProtectionUrl: string;
     dataSource?: Source | undefined;
     description: string;
@@ -21,6 +22,8 @@ export interface TenantAttributes {
 export declare class Tenant extends Parse.Object<TenantAttributes> {
     static className: string;
     constructor(data?: Partial<TenantAttributes>);
+    get baseUrl(): string;
+    set baseUrl(value: string);
     get dataProtectionUrl(): string;
     set dataProtectionUrl(value: string);
     get dataSource(): Source | undefined;

package/dist/types/Tenant.js

@@ -5,6 +5,12 @@ class Tenant extends Parse.Object {
     constructor(data) {
         super("OD3_Tenant", data);
     }
+    get baseUrl() {
+        return super.get("baseUrl");
+    }
+    set baseUrl(value) {
+        super.set("baseUrl", value);
+    }
     get dataProtectionUrl() {
         return super.get("dataProtectionUrl");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openinc/parse-server-opendash",
-  "version": "3.29.1",
+  "version": "3.29.3",
   "description": "Parse Server Cloud Code for open.INC Stack.",
   "packageManager": "pnpm@10.20.0",
   "keywords": [

package/schema/Tenant.json

@@ -1,5 +1,10 @@
 {
   "fields": {
+    "baseUrl": {
+      "type": "String",
+      "required": false,
+      "defaultValue": ""
+    },
     "dataProtectionUrl": {
       "type": "String",
       "required": false,