rez_core 4.0.91 → 4.0.93

package/package.json

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

package/src/module/listmaster/service/list-master.service.ts

@@ -37,7 +37,7 @@ export class ListMasterService {
     private readonly configService: ConfigService,
   ) {}
 
-  private readonly skipLevelFilterEntities = ['BRN','USR','UPR'];
+  private readonly skipLevelFilterEntities = ['BRN', 'USR', 'UPR', 'BRNP'];
   private readonly actions = new Map<string, Action>();
 
   registerAction(actionName: string, actionInstance: Action) {
@@ -174,20 +174,20 @@ export class ListMasterService {
     );
     let result: { label: string; value: number }[] = [];
     if (!sourceList) return result;
-  
+
     const entityMaster = await this.entityMasterService.getEntityData(
       sourceList,
       loggedInUser,
     );
     const tableName = entityMaster.data_source;
-  
+
     const applyCommonFilters = (qb: any, status?: number) => {
       if (status) {
         const isView = tableName.endsWith('_vw'); // auto-detect view
         const statusColumn = isView ? 'status_id' : 'status';
         qb.andWhere(`${tableName}.${statusColumn} = :status`, { status });
       }
-  
+
       if (loggedInUser?.level_type && loggedInUser?.level_id) {
         // Skip level filter for certain entities
         if (!this.skipLevelFilterEntities.includes(sourceList)) {
@@ -199,31 +199,31 @@ export class ListMasterService {
               organization_id: loggedInUser.organization_id,
             },
           );
-        } 
-      }
-
-      if(sourceList=="BRN"){
-
-          // IN the case of BRN, we don't filter by level
-          qb.andWhere(
-            `${tableName}.parent_id = :organization_id AND ${tableName}.type = 'BRN'`,
-            { organization_id: loggedInUser?.organization_id },
-          );
-        
+        }
       }
 
-      if(sourceList=="USR" || sourceList=="UPR"){
-
+      if (sourceList == 'BRN') {
         // IN the case of BRN, we don't filter by level
         qb.andWhere(
-          `${tableName}.organization_id = :organization_id`,
+          `${tableName}.parent_id = :organization_id AND ${tableName}.type = 'BRN'`,
           { organization_id: loggedInUser?.organization_id },
         );
-      
-    }
+      }
+
+      if (sourceList == 'BRNP') {
+        // IN the case of BRNP, we only filter by organization_id
+        qb.andWhere(`${tableName}.organization_id = :organization_id`, {
+          organization_id: loggedInUser?.organization_id,
+        });
+      }
+
+      if (sourceList == 'USR' || sourceList == 'UPR') {
+        // IN the case of USR/UPR, we don't filter by level
+        qb.andWhere(`${tableName}.organization_id = :organization_id`, {
+          organization_id: loggedInUser?.organization_id,
+        });
+      }
 
-      
-  
       if (loggedInUser?.appcode && sourceList === 'ROL') {
         if (!this.skipLevelFilterEntities.includes(sourceList)) {
           qb.andWhere(`${tableName}.appcode = :appcode`, {
@@ -231,27 +231,27 @@ export class ListMasterService {
           });
         }
       }
-  
+
       // ✅ Apply dynamic params
       for (const key in params) {
         qb.andWhere(`${tableName}.${key} = :${key}`, {
           [key]: params[key],
         });
       }
-  
+
       // ✅ New: Exclude customers for USR/UPR
       if (sourceList === 'USR' || sourceList === 'UPR') {
         qb.andWhere(`${tableName}.is_customer is NULL`);
       }
-  
+
       return qb;
     };
-  
+
     const resolveStatus = await this.getResolvedListCode(
       STATUS_ACTIVE,
       loggedInUser?.organization_id || 0,
     );
-  
+
     // Fetch active records
     const activeQuery = applyCommonFilters(
       this.entityManager
@@ -260,20 +260,20 @@ export class ListMasterService {
         .from(tableName, tableName),
       resolveStatus.id,
     );
-  
+
     const activeResults = await activeQuery.getRawMany();
     const activeIds = new Set(activeResults.map((r) => r.id));
-  
+
     // Add active entries first
     activeResults.forEach((r) => {
       result.push({ label: r.name, value: r.id });
     });
-  
+
     const resolveInactiveStatus = await this.getResolvedListCode(
       STATUS_INACTIVE,
       loggedInUser?.organization_id || 0,
     );
-  
+
     // Fetch inactive records (with same filters but without status condition)
     if (inactiveIdsArray?.length) {
       const inactiveQuery = applyCommonFilters(
@@ -283,13 +283,13 @@ export class ListMasterService {
           .from(tableName, tableName),
         resolveInactiveStatus.id,
       );
-  
+
       inactiveQuery.andWhere(`${tableName}.id IN (:...ids)`, {
         ids: inactiveIdsArray,
       });
-  
+
       const inactiveResults = await inactiveQuery.getRawMany();
-  
+
       inactiveResults.forEach((item) => {
         if (!activeIds.has(item.id)) {
           result.push({
@@ -299,10 +299,9 @@ export class ListMasterService {
         }
       });
     }
-  
+
     return result;
   }
-  
 
   private async fetchFromExternalSource(
     customSourceId: number,

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,
       ],
     );
 

package/.idea/250218_nodejs_core.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/codeStyles/Project.xml

@@ -1,59 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/250218_nodejs_core.iml" filepath="$PROJECT_DIR$/.idea/250218_nodejs_core.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>