rez_core 3.1.15 → 3.1.18

package/package.json

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

package/src/module/filter/entity/saved-filter-detail.entity.ts

@@ -35,4 +35,7 @@ export class SavedFilterDetail extends BaseEntity {
 
   @Column({ nullable: true })
   data_type: string;
+
+  @Column({ nullable: true })
+  datasource_list: string;
 }

package/src/module/filter/repository/saved-filter.repository.ts

@@ -112,6 +112,7 @@ export class SavedFilterRepositoryService {
       filter_attribute_name: detail.filter_attribute_name,
       filter_entity_name: detail.filter_entity_name,
       filter_entity_type: detail.filter_entity_type,
+      datasource_list: detail.datasource_list,
       filter_value:
         detail.data_type === 'multiselect'
           ? detail.filter_value?.trim() === ''

package/src/module/filter/service/filter.service.ts

@@ -92,7 +92,7 @@ export class FilterService {
       ...savedFilters,
     ].filter((f) => f.filter_value !== '');
 
-    console.log(allFilters,"STEP 1: ALL FILTERS");
+    console.log(allFilters, 'STEP 1: ALL FILTERS');
 
     // 🔹 Step 2: Group filters by filter_entity_type
     const grouped = allFilters.reduce(
@@ -104,14 +104,14 @@ export class FilterService {
       {} as Record<string, any[]>,
     );
 
-    console.log(grouped,"STEP 2: GROUPED FILTERS BY ENTITY TYPE");
+    console.log(grouped, 'STEP 2: GROUPED FILTERS BY ENTITY TYPE');
 
     // 🔹 Step 3: Handle sub-entities first
     let intersectionIds: number[] | null = null;
     for (const [subEntityType, filters] of Object.entries(grouped)) {
       if (subEntityType === entity_type) continue; // skip main entity for now
 
-      let { queryParams,tabs, ...newDto } = dto;
+      let { queryParams, tabs, ...newDto } = dto;
 
       const subDto: FilterRequestDto = {
         ...newDto,
@@ -132,12 +132,11 @@ export class FilterService {
           data: { entity_tabs: [], entity_list: [], pagination: {} },
         };
       }
-      
 
       const relatedIds = await this.entityRelationService.getRelatedEntityIds(
         entity_type,
-        subEntityType, 
-        subEntityIds, 
+        subEntityType,
+        subEntityIds,
         dto.loggedInUser.organization_id,
       );
 
@@ -156,20 +155,25 @@ export class FilterService {
       }
     }
 
-    console.log(intersectionIds,"STEP 3: INTERSECTION IDS FOR MAIN ENTITY");
+    console.log(intersectionIds, 'STEP 3: INTERSECTION IDS FOR MAIN ENTITY');
 
     // 🔹 Step 4: Call applyFilter for main entity
     const mainFilters = grouped[entity_type] || [];
     const mainDto: FilterRequestDto = {
       ...dto,
-      quickFilter: mainFilters,
+      quickFilter: [...mainFilters], // this guarantees it's an array
       savedFilterCode: null,
       attributeFilter: [],
     };
 
     // pass intersection ids as an extra constraint
     if (intersectionIds && intersectionIds.length > 0) {
-      mainDto['restrictIds'] = intersectionIds;
+      (mainDto.quickFilter ??= []).push({
+        filter_attribute: 'id',
+        filter_operator: 'equal',
+        filter_value: intersectionIds,
+        filter_entity_type: entity_type,
+      });
     }
 
     return this.applyFilter(mainDto);
@@ -229,6 +233,8 @@ export class FilterService {
         loggedInUser,
       );
 
+    console.log(getAttributeColumnMeta, 'ATTRIBUTE META FOR ENTITY');
+
     const attributeMetaMap = getAttributeColumnMeta.reduce(
       (acc, attr) => {
         acc[attr.attribute_key] = attr;
@@ -261,7 +267,7 @@ export class FilterService {
       ),
     ];
 
-    console.log(baseFilters,"STEP 1B: BASE FILTERS FOR MAIN ENTITY");
+    console.log(baseFilters, 'STEP 1B: BASE FILTERS FOR MAIN ENTITY');
 
     // Build where clauses
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
@@ -638,6 +644,7 @@ export class FilterService {
     filter: any,
     meta: any,
   ): { query: string; params: any } | null {
+    console.log(filter, meta, 'FILTER AND META');
     if (!meta) return null;
 
     let attr = filter.filter_attribute;