rez_core 4.0.104 → 4.0.106

package/package.json

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

package/src/module/layout_preference/service/layout_preference.service.ts

@@ -80,7 +80,7 @@ export class LayoutPreferenceService extends EntityServiceImpl {
     column: string,
     sort_by: string,
     loggedInUser: UserData,
-  ): Promise<string[]> {
+  ): Promise<{ label: string; value: string }[]> {
     try {
       const getTableMeta =
         await this.entityTableService.findByEntityTypeAndListTypeAndDisplayType(
@@ -135,7 +135,8 @@ export class LayoutPreferenceService extends EntityServiceImpl {
         const resolvedValue =
           resolvedEntityList[index]?.[column] || row.column_value;
         return {
-          resolvedValue,
+          label: resolvedValue, // Human-readable label
+          value: row.column_value, // Original DB value
           count: Number(row.count),
         };
       });
@@ -143,14 +144,10 @@ export class LayoutPreferenceService extends EntityServiceImpl {
       // Sort based on sort_by parameter
       switch (sort_by) {
         case 'asc':
-          resolvedWithCounts.sort((a, b) =>
-            a.resolvedValue.localeCompare(b.resolvedValue),
-          );
+          resolvedWithCounts.sort((a, b) => a.label.localeCompare(b.label));
           break;
         case 'dsc':
-          resolvedWithCounts.sort((a, b) =>
-            b.resolvedValue.localeCompare(a.resolvedValue),
-          );
+          resolvedWithCounts.sort((a, b) => b.label.localeCompare(a.label));
           break;
         case 'count_asc':
           resolvedWithCounts.sort((a, b) => a.count - b.count);
@@ -162,16 +159,18 @@ export class LayoutPreferenceService extends EntityServiceImpl {
           break;
       }
 
-      // Return only the resolved value list
+      // Clean and return only label/value pairs
       return resolvedWithCounts
-        .map((item) => item.resolvedValue)
         .filter(
-          (val) =>
-            val !== null &&
-            val !== undefined &&
-            val !== '' &&
-            val.toString().trim() !== '',
-        );
+          (item) =>
+            item.label !== null &&
+            item.label !== undefined &&
+            item.label.toString().trim() !== '',
+        )
+        .map((item) => ({
+          label: item.label,
+          value: item.value,
+        }));
     } catch (error) {
       this.logger.error(`getColumnValue ERROR: ${error.message}`, error.stack);
       return [];

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

@@ -29,7 +29,7 @@ export class ListMasterController {
   @Post('/getDropdownData/:type')
   @UseGuards(JwtAuthGuard)
   @HttpCode(HttpStatus.OK)
-  async getDropdownData(
+  async getDropdownDataO(
     @Param('type') type: string,
     @Query() queryParams: Record<string, string>,
     @Request() req,
@@ -184,4 +184,27 @@ export class ListMasterController {
   ): Promise<string> {
     return await this.listMasterItemService.deleteListMasterItem(type, code);
   }
+
+  @Post('/getDropdownData')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async getDropdownData(
+    @Query('entity_type') entity_type: string,
+    @Query('attribute_key') attribute_key: string,
+    @Body() body: Record<string, string>,
+    @Request() req,
+  ) {
+
+    const loggedInUser = req.user.userData;
+    const authHeader = req.headers.authorization || '';
+    const token = authHeader.replace('Bearer ', '').trim();
+
+    return await this.service.getDropDownData(
+      entity_type,
+      attribute_key,
+      token,
+      loggedInUser,
+      body
+    );
+  }
 }

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

@@ -20,6 +20,7 @@ import { ListMasterEngine } from './list-master-engine';
 import { Action } from '../../workflow-automation/interface/action.interface';
 import axios from 'axios';
 import { ConfigService } from '@nestjs/config';
+import { AttributeMasterService } from '../../meta/service/attribute-master.service';
 
 @Injectable()
 export class ListMasterService {
@@ -35,6 +36,7 @@ export class ListMasterService {
     private readonly httpService: HttpService,
     private readonly listMasterEngine: ListMasterEngine,
     private readonly configService: ConfigService,
+    private readonly attributeMasterService: AttributeMasterService,
   ) {}
 
   private readonly skipLevelFilterEntities = ['BRN', 'USR', 'UPR', 'BRNP'];
@@ -437,4 +439,104 @@ export class ListMasterService {
   ): Promise<any[]> {
     return await this.listMasterRepo.findAllItems(organizationId, search);
   }
+
+  async getDropDownData(entity_type: string,
+                        attribute_key: string,
+                        token: string,
+                        loggedInUser: UserData,
+                        body: Record<string, string>
+                        ) {
+    let entityMaster = await this.entityMasterService.getEntityData(entity_type, loggedInUser);
+    let appCode = entityMaster.appcode;
+
+    const { inactiveIds, ...params } = body;
+
+    const inactiveIdsArray = inactiveIds
+      ? inactiveIds.split(',').map((id) => parseInt(id, 10))
+      : [];
+
+    const currentAppCode = this.configService.get<string>('appcode');
+
+    if (currentAppCode === appCode || !currentAppCode) {
+      const entityAttribute =  await this.attributeMasterService.findByMappedEntityTypeAndAttributeKey(
+        entity_type,
+        attribute_key,
+        loggedInUser
+      );
+
+      if (entityAttribute && entityAttribute.data_source_type) {
+        const listMaster = await this.listMasterRepo.findByType(
+          entityAttribute.datasource_list,
+          loggedInUser?.organization_id,
+        );
+
+        if (!listMaster) {
+          return;
+        }
+
+        switch (listMaster.source) {
+          case 'entity':
+            return this.fetchFromEntity(
+              listMaster.type,
+              params,
+              inactiveIdsArray,
+              loggedInUser,
+            );
+
+          case 'master':
+            return this.listItemsRepo.findItemsByType(
+              listMaster.type,
+              listMaster.sort_by,
+              inactiveIdsArray,
+              loggedInUser.organization_id,
+              params,
+            );
+
+          case 'operator':
+            return this.listItemsRepo.findOperatorsByType(
+              listMaster?.type,
+              loggedInUser?.organization_id,
+            );
+
+          case 'custom':
+            // If you want Axios call here too:
+            try {
+              const response = await axios.get(
+                `https://external-source.com/${listMaster.custom_source_id}`,
+                { params },
+              );
+              return response.data;
+            } catch (error) {
+              console.error('⚠️ Custom source fetch failed:', error.message);
+              throw new BadRequestException('Failed to fetch custom source');
+            }
+
+          default:
+            throw new BadRequestException(`Unknown source: ${listMaster.source}`);
+        }
+      }
+    } else {
+      const baseUrl = this.configService.get<string>(appCode);
+
+      if (!baseUrl) {
+        return;
+      }
+
+      const response = await axios.post(
+        `${baseUrl}/list-master/getDropdownData`,
+        {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+          params: {
+            entity_type: entity_type,
+            attribute_key: attribute_key,
+          },
+          body: body
+        }
+      );
+
+      return response.data;
+    }
+  }
 }

package/src/module/meta/repository/attribute-master.repository.ts

@@ -107,4 +107,12 @@ export class AttributeMasterRepository {
     const alterQuery = `ALTER TABLE \`${tableName}\` ADD COLUMN \`${columnName}\` ${columnType} NULL`;
     await this.dataSource.query(alterQuery);
   }
+
+  async findByMappedEntityTypeAndAttributeKeyAndOrganizationId(mapped_entity_type: string, attribute_key: string, organization_id: number) {
+    return await this.attributeMasterRepository.findOne({
+      where: {
+        mapped_entity_type, attribute_key, organization_id
+      }
+    })
+  }
 }

package/src/module/meta/service/attribute-master.service.ts

@@ -7,7 +7,8 @@ import { AttributeMaster } from '../entity/attribute-master.entity';
 export class AttributeMasterService {
   constructor(
     private readonly attributeMasterRepository: AttributeMasterRepository,
-  ) {}
+  ) {
+  }
 
   async findAttributesByMappedEntityType(
     entity_type: string,
@@ -114,4 +115,12 @@ export class AttributeMasterService {
       loggedInUser,
     );
   }
+
+  async findByMappedEntityTypeAndAttributeKey(mapped_entity_type: string, attribute_key: string, loggedInUser: UserData) {
+    return await this.attributeMasterRepository.findByMappedEntityTypeAndAttributeKeyAndOrganizationId(
+      mapped_entity_type,
+      attribute_key,
+      loggedInUser.organization_id
+    );
+  }
 }

package/src/resources/dev.properties.yaml

@@ -4,7 +4,7 @@ DB_HOST: '13.234.25.234'
 DB_PORT: '3306'
 DB_USER: 'root'
 DB_PASS: 'Rezolut@123'
-DB_NAME: 'ether_dev'
+DB_NAME: 'ether_rez'
 MASTER_KEY: '0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh'
 MASTER_IV: 'heuUQf5uPVtkotrFAOKUVw=='
 SECRET_KEY: '1hard_to_guess_secret7890a'

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "dbaeumer.vscode-eslint"
-    ]
-}