rez_core 3.1.121 → 3.1.123

package/package.json

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

package/src/module/meta/service/populate-meta.service.ts

@@ -59,6 +59,11 @@ export class PopulateMetaService {
     ];
     const entityTypeToNewIdMap = new Map<string, number>();
 
+    const getStatus = await this.dataSource.query(
+      `SELECT * FROM cr_list_master_items WHERE organization_id = ${organization_id} AND code = "STATUS_ACTIVE"`,
+    );
+    const status = getStatus[0]?.id ? getStatus[0].id : 'ACTIVE';
+
     // Step 1: Insert basic metadata tables
     for (const table of metadataTables) {
       const factoryData = await this.dataSource.query(
@@ -78,6 +83,7 @@ export class PopulateMetaService {
             level_id: organization_id,
             is_unique: rest.is_unique == 1 ? true : false,
             required: rest.required == 1 ? true : false,
+            status: status,
           }),
         );
       } else {
@@ -87,6 +93,7 @@ export class PopulateMetaService {
             organization_id,
             level_type: 'ORG',
             level_id: organization_id,
+            status: status,
           }),
         );
       }

package/src/module/module/repository/module-access.repository.ts

@@ -144,7 +144,7 @@ export class ModuleAccessRepository {
 
     const wbsCodes = mainModules.map((mod) => mod.wbs_code);
 
-    const allModules = await this.moduleRepo
+    let allModules = await this.moduleRepo
     .createQueryBuilder('module')
     .where(
       wbsCodes
@@ -155,8 +155,9 @@ export class ModuleAccessRepository {
     .andWhere('module.appcode = :appcode', { appcode })
     .andWhere('module.module_code != :excludedCode', { excludedCode: 'all_organization_adm_org' })
     .getMany();
-  
 
+    allModules = allModules.filter((mod) => mod.module_code!= 'all_organization_adm_org');
+  
     const moduleCodes = allModules.map((m) => m.module_code);
 
     const allActions = await this.moduleActionRepo.find({

package/src/module/workflow/service/workflow-meta.service.ts

@@ -64,8 +64,25 @@ export class WorkflowMetaService extends EntityServiceImpl {
     });
 
     if (!currentStage) {
-      // If no current stage found, return null
-      return null;
+      // Fetch the latest stage movement for the given entity
+      const latestMovement = await this.stageMovementRepo.findOne({
+        where: {
+          mapped_entity_type,
+          mapped_entity_id,
+        },
+        order: { id: 'DESC' }, // Get the most recent movement
+      });
+
+      if (!latestMovement) return null;
+
+      const getGroupName = await this.dataSource.query(
+        `SELECT name FROM cr_wf_stage_group WHERE id = ${latestMovement?.stage_group_id}`,
+      );
+
+      return {
+        ...latestMovement,
+        stage_group_name: getGroupName[0]?.name,
+      };
     }
 
     // get group name for the current stage