rez_core 4.0.90 → 4.0.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "4.0.90",
+  "version": "4.0.92",
   "description": "",
   "author": "",
   "private": false,

package/src/module/integration/service/integration.service.ts

@@ -963,6 +963,8 @@ export class IntegrationService {
               let variables;
               let richText;
               let externalTemplateId: string | undefined = undefined;
+              const profile = this.configService.get('PROFILE');
+              const subjectPrefix = this.configService.get('SUBJECT_PREFIX');
               if (templateId) {
                 const templateData = await this.processTemplate(
                   parseInt(templateId, 10),
@@ -977,6 +979,16 @@ export class IntegrationService {
                 subject = templateData.subject;
               }
 
+              if (subjectPrefix) {
+                const updatedSubject =
+                  profile?.charAt(0).toUpperCase() +
+                  profile?.slice(1) +
+                  ' : ' +
+                  subject; // << use current subject
+
+                subject = updatedSubject;
+              }
+
               // Merge config with enhanced parameters
               let finalConfig = {
                 ...hub.config_json,

package/src/module/meta/service/entity-dynamic.service.ts

@@ -441,21 +441,6 @@ export class EntityDynamicService {
         entityData.enterprise_id = loggedInUser.enterprise_id;
     }
 
-    if (!entityData.code && loggedInUser) {
-      const result = await this.dataSource.query(
-        `SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
-     FROM ${tableName}
-     WHERE entity_type = ?`,
-        [entityData.entity_type],
-      );
-
-      // result will be like [ { max_seq_no: 12 } ]
-      let maxSeqNo = result?.[0]?.max_seq_no ? Number(result[0].max_seq_no) : 0;
-
-      maxSeqNo += 1;
-      entityData.code = `${entityData.entity_type}${maxSeqNo}`;
-    }
-
     // Set parent_id if mainID is provided
     if (mainID) {
       entityData.parent_id = mainID;

package/src/module/workflow/service/action-template-mapping.service.ts

@@ -46,13 +46,14 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
         `
   SELECT code as value, name as label , id
   FROM frm_wf_comm_template
-  WHERE mode = ? AND organization_id = ? AND level_type = ? AND level_id = ?
+  WHERE mode = ? AND organization_id = ? AND level_type = ? AND level_id = ? AND status IN (SELECT id FROM frm_list_master_items WHERE code = "STATUS_ACTIVE" AND organization_id = ?)
   `,
         [
           modeId,
           loggedInUser.organization_id,
           loggedInUser.level_type,
           loggedInUser.level_id,
+          loggedInUser.organization_id,
         ],
       );
 
@@ -88,7 +89,7 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
       `
   SELECT code as value, name as label , id
   FROM frm_wf_comm_template
-  WHERE code IN (?) AND mode = ? AND organization_id = ? AND level_type = ? AND level_id = ?
+  WHERE code IN (?) AND mode = ? AND organization_id = ? AND level_type = ? AND level_id = ? AND status IN (SELECT id FROM frm_list_master_items WHERE code = "STATUS_ACTIVE" AND organization_id = ?)
   `,
       [
         templateCodes,
@@ -96,6 +97,7 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
         loggedInUser.organization_id,
         loggedInUser.level_type,
         loggedInUser.level_id,
+        loggedInUser.organization_id,
       ],
     );