rez_core 6.5.61 → 6.5.63

package/dist/module/entity_json/service/entity_json.service.js

@@ -31,18 +31,12 @@ let EntityJSONService = class EntityJSONService {
         this.entityServiceImpl = entityServiceImpl;
     }
     async getAttributeForFlatJSON(entityType, loggedInUser, flag) {
-        const entId = loggedInUser.enterprise_id;
-        await this.loggerService.log('info', 'EntityJSONService', 'getAttributeForFlatJSON', `Loading attributes for entity: ${entityType}, org: ${entId}`);
+        const entId = loggedInUser.entId;
+        await this.loggerService.log('info', 'EntityJSONService', 'getAttributeForFlatJSON', `Loading attributes for entity: ${entityType}, ent: ${entId}`);
         const mainAttributes = await this.dataSource
             .getRepository(attribute_master_entity_1.AttributeMaster)
             .createQueryBuilder('attr')
-            .select([
-            'attr.id',
-            'attr.name',
-            'attr.flat_json_key',
-            'attr.attribute_key',
-            'attr.data_type',
-        ])
+            .select(['attr.id', 'attr.name', 'attr.flat_json_key', 'attr.attribute_key'])
             .where('attr.mapped_entity_type = :entityType', { entityType })
             .andWhere('attr.enterprise_id = :entId', { entId })
             .getMany();
@@ -55,23 +49,14 @@ let EntityJSONService = class EntityJSONService {
             .andWhere('rel.enterprise_id = :entId', { entId })
             .andWhere('rel.relation_type = :relationType', { relationType: 'ONE_TO_ONE' })
             .getRawMany();
-        const relatedTypesList = relatedEntityTypes.map((x) => x.rel_target_entity_type);
+        const relatedTypesList = relatedEntityTypes.map(x => x.rel_target_entity_type);
         await this.loggerService.log('debug', 'EntityJSONService', 'getAttributeForFlatJSON', `Found ${relatedTypesList.length} ONE-TO-ONE related entity types`);
         const relatedAttributes = relatedTypesList.length
             ? await this.dataSource
                 .getRepository(attribute_master_entity_1.AttributeMaster)
                 .createQueryBuilder('attr')
-                .select([
-                'attr.id',
-                'attr.name',
-                'attr.flat_json_key',
-                'attr.mapped_entity_type',
-                'attr.attribute_key',
-                'attr.data_type',
-            ])
-                .where('attr.mapped_entity_type IN (:...types)', {
-                types: relatedTypesList,
-            })
+                .select(['attr.id', 'attr.name', 'attr.flat_json_key', 'attr.mapped_entity_type', 'attr.attribute_key'])
+                .where('attr.mapped_entity_type IN (:...types)', { types: relatedTypesList })
                 .andWhere('attr.enterprise_id = :entId', { entId })
                 .getMany()
             : [];
@@ -87,83 +72,41 @@ let EntityJSONService = class EntityJSONService {
             'fla.saved_filter_code AS saved_filter_code',
             'attr.name AS name',
             'attr.id AS id',
-            'attr.data_type AS data_type',
         ])
             .where('attr.enterprise_id = :entId', { entId })
             .getRawMany();
         await this.loggerService.log('debug', 'EntityJSONService', 'getAttributeForFlatJSON', `Loaded ${linkedAttributes.length} linked attributes`);
-        if (flag === 'filter_attribute') {
-            const filterAttributes = [];
-            filterAttributes.push(...mainAttributes.map((a) => ({
-                id: a.id,
-                name: a.name,
-                data_type: a.data_type,
-                attribute_key: a.flat_json_key,
-                source: 'main',
-            })));
-            filterAttributes.push(...relatedAttributes.map((a) => ({
-                id: a.id,
-                name: a.name,
-                data_type: a.data_type,
-                attribute_key: a.flat_json_key,
-                source: 'related',
-            })));
-            filterAttributes.push(...linkedAttributes.map((l) => ({
-                id: l.id,
-                name: l.name,
-                data_type: l.data_type,
-                attribute_key: l.target_attribute_key,
-                source: 'linked',
-            })));
-            return filterAttributes;
-        }
         if (flag === 'flat_json' || flag === 'all') {
             const result = {};
-            mainAttributes.forEach((attr) => {
+            mainAttributes.forEach(attr => {
                 if (attr.flat_json_key)
                     result[attr.flat_json_key] = null;
             });
-            relatedAttributes.forEach((attr) => {
+            relatedAttributes.forEach(attr => {
                 if (attr.flat_json_key)
                     result[attr.flat_json_key] = null;
             });
-            linkedAttributes.forEach((link) => {
+            linkedAttributes.forEach(link => {
                 if (link.target_attribute_key)
                     result[link.target_attribute_key] = null;
             });
             if (flag === 'all') {
-                return {
-                    flat_json: result,
-                    attributes: {
-                        mainAttributes,
-                        relatedAttributes,
-                        linkedAttributes,
-                    },
-                };
+                return { flat_json: result, attributes: { mainAttributes, relatedAttributes, linkedAttributes } };
             }
             return result;
         }
         const dropdown = [];
-        dropdown.push(...mainAttributes.map((a) => ({ label: a.name, value: a.flat_json_key })));
-        dropdown.push(...relatedAttributes.map((a) => ({
-            label: a.name,
-            value: a.flat_json_key,
-        })));
+        dropdown.push(...mainAttributes.map(a => ({ label: a.name, value: a.flat_json_key })));
+        dropdown.push(...relatedAttributes.map(a => ({ label: a.name, value: a.flat_json_key })));
         if (linkedAttributes.length > 0) {
-            dropdown.push(...linkedAttributes.map((a) => ({
-                label: a.name,
-                value: a.target_attribute_key,
-            })));
+            dropdown.push(...linkedAttributes.map(a => ({ label: a.name, value: a.attribute_key })));
         }
         return dropdown;
     }
     async updateEntityJSON(entityType, entityId, loggedInUser) {
         await this.loggerService.log('info', 'EntityJSONService', 'updateEntityJSON', `Building flat JSON for entity: ${entityType}#${entityId}`);
         const response = await this.getAttributeForFlatJSON(entityType, loggedInUser, 'all');
-        if (!response ||
-            !('flat_json' in response) ||
-            !('attributes' in response) ||
-            !response.attributes) {
+        if (!response || !('flat_json' in response) || !('attributes' in response) || !response.attributes) {
             await this.loggerService.log('error', 'EntityJSONService', 'updateEntityJSON', `getAttributeForFlatJSON() did not return expected structure`);
             return null;
         }
@@ -176,29 +119,23 @@ let EntityJSONService = class EntityJSONService {
             linkedAttributes: attributes.linkedAttributes || [],
         };
         const attrMap = {};
-        const allAttrs = [
-            ...safeAttributes.mainAttributes,
-            ...safeAttributes.relatedAttributes,
-        ];
-        allAttrs.forEach((attr) => {
+        const allAttrs = [...safeAttributes.mainAttributes, ...safeAttributes.relatedAttributes];
+        allAttrs.forEach(attr => {
             if (attr.attribute_key)
                 attrMap[attr.attribute_key] = attr.flat_json_key || attr.attribute_key;
         });
-        const mainData = await this.entityServiceImpl.getResolvedEntityData(entityType, entityId, loggedInUser, true);
+        const mainData = await this.entityServiceImpl.getResolvedEntityData(entityType, entityId, loggedInUser);
         this.mergeEntityDataIntoFlatJson(flatJson, mainData, attrMap);
         const relations = await this.dataSource
             .getRepository('frm_entity_relation_data')
             .createQueryBuilder('erd')
-            .select([
-            'erd.target_entity_id AS target_entity_id',
-            'erd.target_entity_type AS target_entity_type',
-        ])
+            .select(['erd.target_entity_id AS target_entity_id', 'erd.target_entity_type AS target_entity_type'])
             .where('erd.source_entity_type = :entityType', { entityType })
             .andWhere('erd.source_entity_id = :entityId', { entityId })
             .andWhere('erd.relation_type = :rt', { rt: 'ONE_TO_ONE' })
             .getRawMany();
         for (const rel of relations) {
-            const relatedData = await this.entityServiceImpl.getResolvedEntityData(rel.target_entity_type, rel.target_entity_id, loggedInUser, true);
+            const relatedData = await this.entityServiceImpl.getResolvedEntityData(rel.target_entity_type, rel.target_entity_id, loggedInUser);
             this.mergeEntityDataIntoFlatJson(flatJson, relatedData, attrMap);
         }
         for (const linkAttr of safeAttributes.linkedAttributes) {
@@ -210,7 +147,7 @@ let EntityJSONService = class EntityJSONService {
             const mappingValue = mainData?.[sourceKey] ?? null;
             const value = await this.applyLinkedFilterUsingSavedFilter(childEntityType, linkAttr.saved_filter_code, sourceKey, mappingValue, targetKey, loggedInUser, entityId);
             if (value !== null && value !== undefined) {
-                flatJson[targetKey] = typeof value === 'string' ? value.toLowerCase() : value;
+                flatJson[targetKey] = value;
             }
         }
         await this.loggerService.log('info', 'EntityJSONService', 'updateEntityJSON', `Saving flat JSON for entity: ${entityType}#${entityId}`);
@@ -231,40 +168,27 @@ let EntityJSONService = class EntityJSONService {
             for (const key of Object.keys(record)) {
                 const flatKey = attrMap[key] || key;
                 if (flatJson.hasOwnProperty(flatKey)) {
-                    const value = record[key];
-                    flatJson[flatKey] = typeof value === 'string' ? value.toLowerCase() : value;
+                    flatJson[flatKey] = record[key];
                 }
             }
         }
     }
     async applyLinkedFilterUsingSavedFilter(childEntityType, savedFilterCode, childFilterAttribute, mappingValue, targetAttribute, loggedInUser, entity_id) {
-        if (!savedFilterCode &&
-            (mappingValue === null || mappingValue === undefined))
+        if (!savedFilterCode && (mappingValue === null || mappingValue === undefined))
             return null;
         const dto = {
             entity_type: childEntityType,
             savedFilterCode,
             page: 1,
             size: 1,
-            loggedInUser
         };
-        if (mappingValue !== null &&
-            mappingValue !== undefined &&
-            mappingValue !== '') {
+        if (mappingValue !== null && mappingValue !== undefined && mappingValue !== '') {
             dto.quickFilter = [
-                {
-                    filter_attribute: childFilterAttribute,
-                    filter_operator: 'equal',
-                    filter_value: mappingValue,
-                },
+                { filter_attribute: childFilterAttribute, filter_operator: 'equal', filter_value: mappingValue },
             ];
         }
         dto.quickFilter = [
-            {
-                filter_attribute: 'parent_id',
-                filter_operator: 'equal',
-                filter_value: [entity_id],
-            },
+            { filter_attribute: 'parent_id', filter_operator: 'equal', filter_value: [entity_id] },
         ];
         const result = await this.filterService.applyFilter(dto);
         const rows = result?.data?.entity_list || [];

package/dist/module/entity_json/service/entity_json.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity_json.service.js","sourceRoot":"","sources":["../../../../src/module/entity_json/service/entity_json.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entity_json.service.js","sourceRoot":"","sources":["../../../../src/module/entity_json/service/entity_json.service.ts"],"names":[],"mappings":"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"}

package/dist/module/filter/controller/filter.controller.d.ts

@@ -27,18 +27,6 @@ export declare class FilterController {
             entity_list: never[];
             pagination: {};
         };
-    } | {
-        success: boolean;
-        data: {
-            entity_tabs: any;
-            entity_list: any;
-            pagination: {
-                total: any;
-                page: any;
-                size: any;
-                totalPages: any;
-            };
-        };
     }>;
     getFilterById(id: string): Promise<{
         filter_attribute: string;

package/dist/module/filter/controller/filter.controller.js

@@ -26,7 +26,7 @@ let FilterController = class FilterController {
         const loggedInUser = req.user.userData;
         const { page: _p, size: _s, ...otherQueryParams } = queryParams;
         const { entity_type, quickFilter, savedFilterCode, attributeFilter, tabs, sortby, } = body;
-        return this.filterService.applyFilterWithRouting({
+        return this.filterService.applyFilterWrapper({
             entity_type,
             quickFilter,
             savedFilterCode,

package/dist/module/filter/controller/filter.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter.controller.js","sourceRoot":"","sources":["../../../../src/module/filter/controller/filter.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filter.controller.js","sourceRoot":"","sources":["../../../../src/module/filter/controller/filter.controller.ts"],"names":[],"mappings":"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"}

package/dist/module/filter/filter.module.js

@@ -14,14 +14,10 @@ const saved_filter_detail_entity_1 = require("./entity/saved-filter-detail.entit
 const saved_filter_master_entity_1 = require("./entity/saved-filter-master.entity");
 const saved_filter_repository_1 = require("./repository/saved-filter.repository");
 const entity_module_1 = require("../meta/entity.module");
-const entity_json_module_1 = require("../entity_json/entity_json.module");
 const filter_service_1 = require("./service/filter.service");
 const filter_controller_1 = require("./controller/filter.controller");
 const filter_evaluator_service_1 = require("./service/filter-evaluator.service");
 const saved_filter_detail_repository_1 = require("./repository/saved.filter-detail.repository");
-const flatjson_filter_service_1 = require("./service/flatjson-filter.service");
-const config_1 = require("@nestjs/config");
-const utils_module_1 = require("../../utils/utils.module");
 let FilterModule = class FilterModule {
 };
 exports.FilterModule = FilterModule;
@@ -29,10 +25,7 @@ exports.FilterModule = FilterModule = __decorate([
     (0, common_1.Module)({
         imports: [
             typeorm_1.TypeOrmModule.forFeature([saved_filter_detail_entity_1.SavedFilterDetail, saved_filter_master_entity_1.SavedFilterMaster]),
-            (0, common_1.forwardRef)(() => entity_module_1.EntityModule),
-            (0, common_1.forwardRef)(() => entity_json_module_1.EntityJSONModule),
-            config_1.ConfigModule,
-            utils_module_1.UtilsModule,
+            (0, common_1.forwardRef)(() => entity_module_1.EntityModule)
         ],
         controllers: [filter_controller_1.FilterController],
         providers: [
@@ -40,15 +33,13 @@ exports.FilterModule = FilterModule = __decorate([
             saved_filter_repository_1.SavedFilterRepositoryService,
             filter_service_1.FilterService,
             filter_evaluator_service_1.FilterEvaluatorService,
-            saved_filter_detail_repository_1.SavedFilterDetailRepository,
-            flatjson_filter_service_1.FlatjsonFilterService,
+            saved_filter_detail_repository_1.SavedFilterDetailRepository
         ],
         exports: [
             'SavedFilterService',
             saved_filter_repository_1.SavedFilterRepositoryService,
             filter_service_1.FilterService,
             filter_evaluator_service_1.FilterEvaluatorService,
-            flatjson_filter_service_1.FlatjsonFilterService,
         ],
     })
 ], FilterModule);

package/dist/module/filter/filter.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter.module.js","sourceRoot":"","sources":["../../../src/module/filter/filter.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAChD,yEAAoE;AACpE,oFAAwE;AACxE,oFAAwE;AACxE,kFAAoF;AACpF,yDAAqD;AACrD,0EAAqE;AACrE,6DAAyD;AACzD,sEAAkE;AAClE,iFAA4E;AAC5E,gGAA0F;AAC1F,+EAA0E;AAC1E,2CAA8C;AAC9C,2DAAqD;AA2B9C,IAAM,YAAY,GAAlB,MAAM,YAAY;CAAG,CAAA;AAAf,oCAAY;uBAAZ,YAAY;IAzBxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,8CAAiB,EAAE,8CAAiB,CAAC,CAAC;YAChE,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,4BAAY,CAAC;YAC9B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,qCAAgB,CAAC;YAClC,qBAAY;YACZ,0BAAW;SACZ;QACD,WAAW,EAAE,CAAC,oCAAgB,CAAC;QAC/B,SAAS,EAAE;YACT,EAAE,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,yCAAkB,EAAE;YAC/D,sDAA4B;YAC5B,8BAAa;YACb,iDAAsB;YACtB,4DAA2B;YAC3B,+CAAqB;SACtB;QACD,OAAO,EAAE;YACP,oBAAoB;YACpB,sDAA4B;YAC5B,8BAAa;YACb,iDAAsB;YACtB,+CAAqB;SACtB;KACF,CAAC;GACW,YAAY,CAAG"}
+{"version":3,"file":"filter.module.js","sourceRoot":"","sources":["../../../src/module/filter/filter.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAChD,yEAAoE;AACpE,oFAAwE;AACxE,oFAAwE;AACxE,kFAAoF;AACpF,yDAAqD;AACrD,6DAAyD;AACzD,sEAAkE;AAClE,iFAA4E;AAC5E,gGAA0F;AAsBnF,IAAM,YAAY,GAAlB,MAAM,YAAY;CAAG,CAAA;AAAf,oCAAY;uBAAZ,YAAY;IApBxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,8CAAiB,EAAE,8CAAiB,CAAC,CAAC;YAChE,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,4BAAY,CAAC;SAC/B;QACD,WAAW,EAAE,CAAC,oCAAgB,CAAC;QAC/B,SAAS,EAAE;YACT,EAAE,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,yCAAkB,EAAE;YAC/D,sDAA4B;YAC5B,8BAAa;YACb,iDAAsB;YACtB,4DAA2B;SAC5B;QACD,OAAO,EAAE;YACP,oBAAoB;YACpB,sDAA4B;YAC5B,8BAAa;YACb,iDAAsB;SACvB;KACF,CAAC;GACW,YAAY,CAAG"}

package/dist/module/filter/service/filter.service.d.ts

@@ -8,55 +8,19 @@ import { LoggingService } from 'src/utils/service/loggingUtil.service';
 import { ConfigService } from '@nestjs/config';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 import { EntityManager } from 'typeorm';
-import { FlatjsonFilterService } from './flatjson-filter.service';
 export declare class FilterService {
     private entityManager;
     private readonly attributeMasterService;
     private readonly entityMasterService;
-    private readonly entityRelationService;
     private readonly savedFilterService;
+    private readonly entityRelationService;
     private readonly resolverService;
     protected readonly loggingService: LoggingService;
     private readonly configService;
     private readonly reflectionHelper;
-    private readonly flatjsonFilterService;
-    constructor(entityManager: EntityManager, attributeMasterService: AttributeMasterService, entityMasterService: EntityMasterService, entityRelationService: EntityRelationService, savedFilterService: SavedFilterService, resolverService: ResolverService, loggingService: LoggingService, configService: ConfigService, reflectionHelper: ReflectionHelper, flatjsonFilterService: FlatjsonFilterService);
+    constructor(entityManager: EntityManager, attributeMasterService: AttributeMasterService, entityMasterService: EntityMasterService, savedFilterService: SavedFilterService, entityRelationService: EntityRelationService, resolverService: ResolverService, loggingService: LoggingService, configService: ConfigService, reflectionHelper: ReflectionHelper);
     schema: any;
     private gettab_value_counts;
-    applyFilterWithRouting(dto: FilterRequestDto): Promise<{
-        success: boolean;
-        data: {
-            entity_tabs: any[];
-            entity_list: any[];
-            pagination: {
-                total: number;
-                page: number;
-                size: number;
-                totalPages: number;
-                hasNextPage: boolean;
-                hasPreviousPage: boolean;
-            };
-        };
-    } | {
-        success: boolean;
-        data: {
-            entity_tabs: never[];
-            entity_list: never[];
-            pagination: {};
-        };
-    } | {
-        success: boolean;
-        data: {
-            entity_tabs: any;
-            entity_list: any;
-            pagination: {
-                total: any;
-                page: any;
-                size: any;
-                totalPages: any;
-            };
-        };
-    }>;
     applyFilterWrapper(dto: FilterRequestDto): Promise<{
         success: boolean;
         data: {

package/dist/module/filter/service/filter.service.js

@@ -24,19 +24,17 @@ const loggingUtil_service_1 = require("../../../utils/service/loggingUtil.servic
 const config_1 = require("@nestjs/config");
 const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
 const typeorm_1 = require("typeorm");
-const flatjson_filter_service_1 = require("./flatjson-filter.service");
 let FilterService = class FilterService {
-    constructor(entityManager, attributeMasterService, entityMasterService, entityRelationService, savedFilterService, resolverService, loggingService, configService, reflectionHelper, flatjsonFilterService) {
+    constructor(entityManager, attributeMasterService, entityMasterService, savedFilterService, entityRelationService, resolverService, loggingService, configService, reflectionHelper) {
         this.entityManager = entityManager;
         this.attributeMasterService = attributeMasterService;
         this.entityMasterService = entityMasterService;
-        this.entityRelationService = entityRelationService;
         this.savedFilterService = savedFilterService;
+        this.entityRelationService = entityRelationService;
         this.resolverService = resolverService;
         this.loggingService = loggingService;
         this.configService = configService;
         this.reflectionHelper = reflectionHelper;
-        this.flatjsonFilterService = flatjsonFilterService;
         this.schema = this.configService.get('DB_SCHEMA');
     }
     async gettab_value_counts(tableName, column, whereClauses) {
@@ -79,30 +77,6 @@ let FilterService = class FilterService {
             })),
         ];
     }
-    async applyFilterWithRouting(dto) {
-        const useFlatjson = dto.queryParams?.use_flatjson === 'true';
-        if (useFlatjson) {
-            await this.loggingService.log('info', 'FilterService', 'applyFilterWithRouting', `Using FLATJSON filtering for ${dto.entity_type}`);
-            const result = await this.flatjsonFilterService.applyFlatjsonFilter(dto);
-            return {
-                success: true,
-                data: {
-                    entity_tabs: result.tabCounts || [],
-                    entity_list: result.data,
-                    pagination: {
-                        total: result.total,
-                        page: result.page,
-                        size: result.size,
-                        totalPages: result.totalPages,
-                    },
-                },
-            };
-        }
-        else {
-            await this.loggingService.log('info', 'FilterService', 'applyFilterWithRouting', `Using TRADITIONAL filtering for ${dto.entity_type}`);
-            return this.applyFilterWrapper(dto);
-        }
-    }
     async applyFilterWrapper(dto) {
         const { entity_type, quickFilter = [], savedFilterCode, attributeFilter = [], loggedInUser, } = dto;
         const savedFilters = await this.getSavedFilters(savedFilterCode ?? undefined);
@@ -172,7 +146,7 @@ let FilterService = class FilterService {
     }
     async applyFilter(dto) {
         const { entity_type, quickFilter, savedFilterCode, attributeFilter, tabs, sortby, loggedInUser, queryParams, customLevelType, customLevelId, customAppCode, } = dto;
-        const { level_type, level_id, id: user_id, appcode, organization_id, enterprise_id } = loggedInUser || {};
+        const { level_type, level_id, id: user_id, enterprise_id, } = loggedInUser || {};
         const entityMeta = await this.entityMasterService.getEntityData(entity_type, loggedInUser);
         const tableName = entityMeta?.data_source;
         if (!tableName) {
@@ -230,7 +204,7 @@ let FilterService = class FilterService {
             entity_type !== 'TEM' &&
             level_type &&
             level_id &&
-            organization_id &&
+            enterprise_id &&
             !customLevelType &&
             !customLevelId) {
             baseWhere.push({
@@ -301,6 +275,43 @@ let FilterService = class FilterService {
         }) || [];
         let filteredTabs = await this.getFilteredTabs(layout, showList, entityMeta, baseWhere, tabs, loggedInUser);
         const dataWhere = [...baseWhere];
+        if (tabs?.columnName && tabs?.value) {
+            const tabAttrMeta = attributeMetaMap[tabs.columnName];
+            const tabValue = tabs.value.toLowerCase();
+            if (tabValue === 'others') {
+                const valuesToExclude = showList
+                    .filter((v) => v.label.toLowerCase() !== 'all')
+                    .map((v) => v.value);
+                if (valuesToExclude.length > 0) {
+                    for (const value of valuesToExclude) {
+                        const resolvedId = await this.resolverService.getResolvedId(loggedInUser, tabs.columnName, value, entity_type);
+                        if (resolvedId) {
+                            const tabCondition = this.buildCondition({
+                                filter_attribute: tabs.columnName,
+                                filter_operator: 'not_equal',
+                                filter_value: [resolvedId],
+                                skip_id: true,
+                            }, tabAttrMeta);
+                            if (tabCondition)
+                                dataWhere.push(tabCondition);
+                        }
+                    }
+                }
+            }
+            else if (tabValue !== 'all') {
+                const resolvedId = await this.resolverService.getResolvedId(loggedInUser, tabs.columnName, tabs.value, entity_type);
+                if (resolvedId) {
+                    const tabCondition = this.buildCondition({
+                        filter_attribute: tabs.columnName,
+                        filter_operator: 'equal',
+                        filter_value: [resolvedId],
+                        skip_id: true,
+                    }, tabAttrMeta);
+                    if (tabCondition)
+                        dataWhere.push(tabCondition);
+                }
+            }
+        }
         let qb = this.entityManager
             .createQueryBuilder()
             .select('e.*')
@@ -331,6 +342,7 @@ let FilterService = class FilterService {
             return formattedRow;
         };
         const formattedEntityList = entity_list.map(formatDatesInRow);
+        const resolvedEntityList = await Promise.all(formattedEntityList.map((row) => this.resolverService.getResolvedData(loggedInUser, row, entity_type)));
         const resolvedTabs = await Promise.all(filteredTabs.map(async (tab) => {
             const tabAttrKey = layout?.attribute || tabs?.columnName;
             if (!tabAttrKey ||
@@ -338,7 +350,8 @@ let FilterService = class FilterService {
                 tab.tab_value?.toLowerCase() === 'others') {
                 return tab;
             }
-            return { ...tab, tab_value: tab.tab_value ?? tab.tab_value };
+            const resolvedVal = await this.resolverService.getResolvedValue(loggedInUser, tabAttrKey, tab.tab_value, entity_type);
+            return { ...tab, tab_value: resolvedVal ?? tab.tab_value };
         }));
         const countQb = this.entityManager
             .createQueryBuilder()
@@ -352,7 +365,7 @@ let FilterService = class FilterService {
             success: true,
             data: {
                 entity_tabs: resolvedTabs,
-                entity_list: formattedEntityList,
+                entity_list: resolvedEntityList,
                 pagination: {
                     total,
                     page,
@@ -892,23 +905,17 @@ let FilterService = class FilterService {
 exports.FilterService = FilterService;
 exports.FilterService = FilterService = __decorate([
     (0, common_1.Injectable)(),
-    __param(1, (0, common_1.Inject)((0, common_1.forwardRef)(() => attribute_master_service_1.AttributeMasterService))),
-    __param(2, (0, common_1.Inject)((0, common_1.forwardRef)(() => entity_master_service_1.EntityMasterService))),
-    __param(3, (0, common_1.Inject)('EntityRelationService')),
-    __param(4, (0, common_1.Inject)('SavedFilterService')),
-    __param(5, (0, common_1.Inject)((0, common_1.forwardRef)(() => resolver_service_1.ResolverService))),
-    __param(6, (0, common_1.Inject)((0, common_1.forwardRef)(() => loggingUtil_service_1.LoggingService))),
-    __param(8, (0, common_1.Inject)((0, common_1.forwardRef)(() => reflection_helper_service_1.ReflectionHelper))),
-    __param(9, (0, common_1.Inject)((0, common_1.forwardRef)(() => flatjson_filter_service_1.FlatjsonFilterService))),
+    __param(3, (0, common_1.Inject)('SavedFilterService')),
+    __param(4, (0, common_1.Inject)('EntityRelationService')),
+    __param(6, (0, common_1.Inject)()),
     __metadata("design:paramtypes", [typeorm_1.EntityManager,
         attribute_master_service_1.AttributeMasterService,
         entity_master_service_1.EntityMasterService,
-        entity_relation_service_1.EntityRelationService,
         saved_filter_service_1.SavedFilterService,
+        entity_relation_service_1.EntityRelationService,
         resolver_service_1.ResolverService,
         loggingUtil_service_1.LoggingService,
         config_1.ConfigService,
-        reflection_helper_service_1.ReflectionHelper,
-        flatjson_filter_service_1.FlatjsonFilterService])
+        reflection_helper_service_1.ReflectionHelper])
 ], FilterService);
 //# sourceMappingURL=filter.service.js.map