rez_core 6.6.6 → 7.0.0

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/repository/saved-filter.repository.js

@@ -87,7 +87,7 @@ let SavedFilterRepositoryService = class SavedFilterRepositoryService {
                 user_id: loggedInUser.id,
                 mapped_entity_type: entityType,
                 level_type: loggedInUser.level_type,
-                level_id: loggedInUser.level_id,
+                level_id: Number(loggedInUser.level_id),
                 status: 'ACTIVE',
                 is_shared: false,
             },
@@ -119,7 +119,7 @@ let SavedFilterRepositoryService = class SavedFilterRepositoryService {
         const filters = await this.savedFilterMasterRepo.find({
             where: {
                 level_type: loggedInUser.level_type,
-                level_id: loggedInUser.level_id,
+                level_id: Number(loggedInUser.level_id),
                 mapped_entity_type: entityType,
                 is_shared: true,
                 status: 'ACTIVE',
@@ -184,8 +184,6 @@ let SavedFilterRepositoryService = class SavedFilterRepositoryService {
             return null;
         }
         const filterDetails = await this.getDetailsByCode(filterMaster.code);
-        filterMaster.is_owner =
-            loggedInUser.id == filterMaster.user_id ? true : false;
         return {
             ...filterMaster,
             filterDetails,

package/dist/module/filter/repository/saved-filter.repository.js.map

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

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

@@ -8,60 +8,25 @@ 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: {
             entity_tabs: any[];
             entity_list: any[];
+            is_hierarchical: boolean;
             pagination: {
                 total: number;
                 page: number;
@@ -84,6 +49,7 @@ export declare class FilterService {
         data: {
             entity_tabs: any[];
             entity_list: any[];
+            is_hierarchical: boolean;
             pagination: {
                 total: number;
                 page: number;
@@ -94,6 +60,7 @@ export declare class FilterService {
             };
         };
     }>;
+    private buildHierarchyList;
     private getFilteredTabs;
     private sortTabsByShowList;
     private parseFilters;

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) {
@@ -51,16 +49,12 @@ let FilterService = class FilterService {
                 Object.entries(clause.params).forEach(([key, val]) => {
                     if (Array.isArray(val)) {
                         const placeholders = val.map(() => `$${paramIndex++}`).join(', ');
-                        parsedQuery = parsedQuery
-                            .replace(new RegExp(`:...${key}`, 'g'), `(${placeholders})`)
-                            .replace(new RegExp(`:${key}`, 'g'), `(${placeholders})`);
+                        parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), `(${placeholders})`);
                         values.push(...val.map((v) => String(v)));
                     }
                     else {
                         const placeholder = `$${paramIndex++}`;
-                        parsedQuery = parsedQuery
-                            .replace(new RegExp(`:...${key}`, 'g'), placeholder)
-                            .replace(new RegExp(`:${key}`, 'g'), placeholder);
+                        parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), placeholder);
                         values.push(String(val));
                     }
                 });
@@ -68,10 +62,10 @@ let FilterService = class FilterService {
             });
             whereSQL = `WHERE ${clauseParts.join(' AND ')}`;
         }
-        const rawSQL = `
-        SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
-        FROM ${this.schema}.${tableName} ${whereSQL}
-        GROUP BY ${column}
+        const rawSQL = `
+        SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
+        FROM ${this.schema}.${tableName} ${whereSQL}
+        GROUP BY ${column}
     `;
         const rows = await this.entityManager.query(rawSQL, values);
         const total = rows.reduce((sum, r) => sum + parseInt(r.tab_value_count, 10), 0);
@@ -83,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);
@@ -175,8 +145,8 @@ let FilterService = class FilterService {
         return await this.applyFilter(mainDto);
     }
     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 { entity_type, quickFilter, savedFilterCode, attributeFilter, tabs, sortby, loggedInUser, queryParams, customLevelType, customLevelId, customAppCode, defaultfilter, } = dto;
+        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) {
@@ -209,21 +179,21 @@ let FilterService = class FilterService {
             }
             else if (level_type === 'SCH') {
                 baseWhere.push({
-                    query: `
-        (
-          (e.level_type = 'SCH' AND e.level_id = '${loggedInUser.level_id}')
-          OR 
-          (
-            e.level_type = 'ORG'
-            AND e.level_id = '${loggedInUser.enterprise_id}'
-            AND e.enterprise_id = '${loggedInUser.enterprise_id}'
-            AND e.code NOT IN (
-              SELECT sub.code 
-              FROM ${this.schema}.frm_wf_comm_template AS sub 
-              WHERE sub.level_type = 'SCH' AND sub.level_id = '${loggedInUser.level_id}'
-            )
-          )
-        )
+                    query: `
+        (
+          (e.level_type = 'SCH' AND e.level_id = '${loggedInUser.level_id}')
+          OR 
+          (
+            e.level_type = 'ORG'
+            AND e.level_id = '${loggedInUser.enterprise_id}'
+            AND e.enterprise_id = '${loggedInUser.enterprise_id}'
+            AND e.code NOT IN (
+              SELECT sub.code 
+              FROM frm_wf_comm_template AS sub 
+              WHERE sub.level_type = 'SCH' AND sub.level_id = '${loggedInUser.level_id}'
+            )
+          )
+        )
       `,
                     params: {},
                 });
@@ -235,9 +205,10 @@ let FilterService = class FilterService {
             entity_type !== 'SCH' &&
             level_type &&
             level_id &&
-            organization_id &&
+            enterprise_id &&
             !customLevelType &&
-            !customLevelId) {
+            !customLevelId &&
+            defaultfilter !== 'false') {
             baseWhere.push({
                 query: 'e.level_type = :level_type AND e.level_id = :level_id',
                 params: {
@@ -306,15 +277,53 @@ 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.*')
             .from(`${this.schema}.${tableName}`, 'e');
         dataWhere.forEach((clause) => qb.andWhere(clause.query, clause.params));
         qb = await this.sortTabsByShowList(qb, sortby, layoutPreference, tabs);
-        const page = dto.page && dto.page > 0 ? dto.page : 1;
-        const size = dto.size && dto.size > 0 ? dto.size : 10;
-        if (dto.page && dto.size) {
+        const isHierarchical = entityMeta?.is_hierarchical === true;
+        let page = dto.page && dto.page > 0 ? dto.page : 1;
+        let size = dto.size && dto.size > 0 ? dto.size : 10;
+        if (!isHierarchical && dto.page && dto.size) {
             qb.skip((page - 1) * size).take(size);
         }
         let query = await qb.getQuery();
@@ -324,7 +333,7 @@ let FilterService = class FilterService {
         const entity_list = await qb.getRawMany();
         console.log(`📦 [FilterService] Fetched ${entity_list.length} records`);
         const dateAttributes = Object.entries(attributeMetaMap)
-            .filter(([_, attr]) => attr.data_type === 'date')
+            .filter(([_, attr]) => attr.element_type === 'date')
             .map(([key]) => key);
         const formatDate = (dateStr) => dateStr ? moment(dateStr).format('DD-MM-YYYY') : '';
         const formatDatesInRow = (row) => {
@@ -336,15 +345,30 @@ let FilterService = class FilterService {
             return formattedRow;
         };
         const formattedEntityList = entity_list.map(formatDatesInRow);
-        const resolvedTabs = await Promise.all(filteredTabs.map(async (tab) => {
+        let finalEntityList = formattedEntityList;
+        if (isHierarchical) {
+            finalEntityList = this.buildHierarchyList(formattedEntityList);
+            console.log(`🌳 [FilterService] Built hierarchical structure with ${finalEntityList.length} root nodes`);
+        }
+        let resolvedTabs = await Promise.all(filteredTabs.map(async (tab) => {
             const tabAttrKey = layout?.attribute || tabs?.columnName;
             if (!tabAttrKey ||
                 tab.tab_value?.toLowerCase() === 'all' ||
                 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 };
         }));
+        resolvedTabs = Object.values(resolvedTabs.reduce((acc, item) => {
+            if (!acc[item.tab_value]) {
+                acc[item.tab_value] = { ...item };
+            }
+            else {
+                acc[item.tab_value].tab_value_count += item.tab_value_count;
+            }
+            return acc;
+        }, {}));
         const countQb = this.entityManager
             .createQueryBuilder()
             .select('COUNT(*)', 'count')
@@ -357,7 +381,8 @@ let FilterService = class FilterService {
             success: true,
             data: {
                 entity_tabs: resolvedTabs,
-                entity_list: formattedEntityList,
+                entity_list: finalEntityList,
+                is_hierarchical: isHierarchical,
                 pagination: {
                     total,
                     page,
@@ -369,6 +394,32 @@ let FilterService = class FilterService {
             },
         };
     }
+    buildHierarchyList(entityList) {
+        const entityMap = new Map();
+        const rootEntities = [];
+        entityList.forEach((entity) => {
+            if (entity.wbs_code) {
+                entityMap.set(entity.wbs_code, {
+                    ...entity,
+                    children: [],
+                });
+            }
+        });
+        entityList.forEach((entity) => {
+            if (!entity.wbs_code) {
+                rootEntities.push({ ...entity, children: [] });
+                return;
+            }
+            const parentWbs = entity.wbs_code.split('.').slice(0, -1).join('.');
+            if (parentWbs && entityMap.has(parentWbs)) {
+                entityMap.get(parentWbs).children.push(entityMap.get(entity.wbs_code));
+            }
+            else {
+                rootEntities.push(entityMap.get(entity.wbs_code));
+            }
+        });
+        return rootEntities;
+    }
     async getFilteredTabs(layout, showList, entityMeta, baseWhere, tabs, loggedInUser) {
         let allTabs;
         if (layout.attribute) {
@@ -440,17 +491,16 @@ let FilterService = class FilterService {
         return filteredTabs;
     }
     async sortTabsByShowList(qb, sortby, layoutPreference, tabs) {
-        const sorting = layoutPreference?.mapped_json?.sorting;
-        if (sorting) {
-            if (Array.isArray(sorting?.tabs)) {
-                const preferenceTabArray = sorting?.tabs;
-                const tabFilter = preferenceTabArray.find((tabData) => tabData.tab_name?.value === tabs?.value);
-                tabFilter?.sortby?.forEach(({ column, order }) => {
+        if (layoutPreference && layoutPreference[0]?.mapped_json?.sorting) {
+            if (Array.isArray(layoutPreference[0]?.mapped_json?.sorting?.tabs)) {
+                const preferenceTabArray = layoutPreference[0]?.mapped_json?.sorting?.tabs;
+                const tabFilter = preferenceTabArray.find((tabData) => tabData.tab_name === tabs?.value);
+                tabFilter?.sortby.forEach(({ column, order }) => {
                     qb.addOrderBy(`e.${column}`, order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC');
                 });
             }
-            else if (Array.isArray(sorting.sortby)) {
-                sorting?.sortby?.forEach(({ column, order }) => {
+            else if (Array.isArray(layoutPreference[0]?.mapped_json?.sorting?.sortby)) {
+                layoutPreference[0]?.mapped_json?.sorting?.sortby?.forEach(({ column, order }) => {
                     qb.addOrderBy(`e.${column}`, order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC');
                 });
             }
@@ -515,7 +565,7 @@ let FilterService = class FilterService {
         const val = filter.filter_value;
         const op = filter.filter_operator;
         const key = `param_${attr}_${Math.random().toString(36).substring(2, 8)}`;
-        switch (meta.data_type) {
+        switch (meta.element_type) {
             case 'text':
                 return this.buildTextCondition(attr, op, val, key);
             case 'number':
@@ -833,14 +883,14 @@ let FilterService = class FilterService {
         }
         if (op === 'equal') {
             return {
-                query: `e.${attr}::text IN (:...${key})`,
-                params: { [key]: arr },
+                query: `e.${attr}::text = ANY(:${key})`,
+                params: { [key]: `{${arr.join(',')}}` },
             };
         }
         if (op === 'not_equal') {
             return {
-                query: `e.${attr}::text NOT IN (:...${key})`,
-                params: { [key]: arr },
+                query: `NOT (e.${attr}::text = ANY(:${key}))`,
+                params: { [key]: `{${arr.join(',')}}` },
             };
         }
         if (op === 'contains') {
@@ -898,23 +948,19 @@ 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(1, (0, common_1.Inject)('AttributeMasterService')),
+    __param(2, (0, common_1.Inject)('EntityMasterService')),
+    __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