rez_core 2.1.90 → 2.1.92

package/package.json

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

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

@@ -14,6 +14,7 @@ import { EntityManager } from 'typeorm';
 import { EntityMasterService } from 'src/module/meta/service/entity-master.service';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { STATUS_ACTIVE, STATUS_INACTIVE } from 'src/constant/global.constant';
 
 @Injectable()
 export class ListMasterService {
@@ -97,10 +98,7 @@ export class ListMasterService {
     );
     const tableName = entityMaster.db_table_name;
 
-    const applyCommonFilters = (
-      qb: any,
-      status: 'active' | null = 'active',
-    ) => {
+    const applyCommonFilters = (qb: any, status?: number) => {
       if (status) {
         qb.where(`${tableName}.status = :status`, { status });
       }
@@ -141,13 +139,18 @@ export class ListMasterService {
       return qb;
     };
 
+    const resolveStatus = await this.getResolvedListCode(
+      STATUS_ACTIVE,
+      loggedInUser?.organization_id || 0,
+    );
+
     // Fetch active records
     const activeQuery = applyCommonFilters(
       this.entityManager
         .createQueryBuilder()
         .select('*')
         .from(tableName, tableName),
-      'active',
+      resolveStatus.id || null,
     );
 
     const activeResults = await activeQuery.getRawMany();
@@ -158,6 +161,11 @@ export class ListMasterService {
       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(
@@ -165,7 +173,7 @@ export class ListMasterService {
           .createQueryBuilder()
           .select('*')
           .from(tableName, tableName),
-        null, // exclude status filter
+        resolveInactiveStatus.id || null,
       );
 
       inactiveQuery.andWhere(`${tableName}.id IN (:...ids)`, {
@@ -178,7 +186,7 @@ export class ListMasterService {
       inactiveResults.forEach((item) => {
         if (!activeIds.has(item.id)) {
           result.push({
-            label: `${item.name}_INACTIVE`,
+            label: `${item.name} [INACTIVE]`,
             value: item.id,
           });
         }

package/src/module/meta/entity/entity-table-column.entity.ts

@@ -9,8 +9,6 @@ export class EntityTableColumn extends BaseEntity {
     this.entity_type = ENTITYTYPE_ENTITYTABLECOLUMN;
   }
 
-
-
   @Column({ name: 'mapped_entity_type', nullable: true })
   mapped_entity_type: string;
 
@@ -51,4 +49,7 @@ export class EntityTableColumn extends BaseEntity {
 
   @Column({ name: 'visible', nullable: true })
   visible: string;
+
+  @Column({ nullable: true })
+  display_type: string;
 }

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

@@ -80,62 +80,50 @@ export class PopulateMetaService {
         .execute();
     }
 
-    // Step 2: Insert cr_entity_table and map mapped_entity_type -> new ID
-    const factoryEntityData = await this.dataSource.query(
+    const entityTables = await this.dataSource.query(
       `SELECT * FROM cr_entity_table WHERE organization_id = -1 AND level_type = 'ORG' AND level_id = -1`,
     );
 
-    if (factoryEntityData.length) {
-      const transformedEntityData = factoryEntityData.map(
-        ({ id, created_date, modified_date, ...rest }) => ({
-          ...rest,
-          organization_id,
-          level_type: 'ORG',
-          level_id: organization_id,
-        }),
-      );
-
+    for (let entityTable of entityTables) {
+      const { id, mapped_entity_type, display_type, ...rest } = entityTable;
+      entityTable = {
+        ...rest,
+        organization_id,
+        mapped_entity_type: mapped_entity_type,
+        level_type: 'ORG',
+        level_id: organization_id,
+        display_type: display_type,
+      };
       const insertResult = await this.dataSource
         .createQueryBuilder()
         .insert()
         .into('cr_entity_table')
-        .values(transformedEntityData)
+        .values(entityTable)
         .execute();
 
-      // Build mapped_entity_type -> new id mapping
-      for (let i = 0; i < factoryEntityData.length; i++) {
-        const key = factoryEntityData[i].mapped_entity_type;
-        const newId = insertResult.identifiers[i].id;
-        entityTypeToNewIdMap.set(key, newId);
-      }
-    }
+      const newId = insertResult.identifiers[0].id; // or insertResult.raw.insertId if needed
 
-    // Step 3: Insert cr_entity_table_column with parent_id from mapped_entity_type
-    const factoryColumnData = await this.dataSource.query(
-      `SELECT * FROM cr_entity_table_column WHERE organization_id = -1 AND level_type = 'ORG' AND level_id = -1`,
-    );
-
-    if (factoryColumnData.length) {
-      const transformedColumnData = factoryColumnData.map(
-        ({ id, created_date, modified_date, ...rest }) => {
-          const mappedEntityType = rest.mapped_entity_type;
-          const newParentId = entityTypeToNewIdMap.get(mappedEntityType);
-          return {
-            ...rest,
-            parent_id: newParentId ?? null,
-            organization_id,
-            level_type: 'ORG',
-            level_id: organization_id,
-          };
-        },
+      const entityTableColumns = await this.dataSource.query(
+        `SELECT * FROM cr_entity_table_column WHERE organization_id = -1 AND level_type = 'ORG' AND level_id = -1 AND mapped_entity_type = '${mapped_entity_type}' AND display_type = '${display_type}'`,
       );
-
-      await this.dataSource
-        .createQueryBuilder()
-        .insert()
-        .into('cr_entity_table_column')
-        .values(transformedColumnData)
-        .execute();
+      for (const column of entityTableColumns) {
+        const { id, created_date, modified_date, ...columnRest } = column;
+        const newColumn = {
+          ...columnRest,
+          organization_id,
+          parent_id: newId,
+          level_type: 'ORG',
+          level_id: organization_id,
+          mapped_entity_type: mapped_entity_type,
+          display_type: display_type,
+        };
+        await this.dataSource
+          .createQueryBuilder()
+          .insert()
+          .into('cr_entity_table_column')
+          .values(newColumn)
+          .execute();
+      }
     }
 
     return {