rez_core 2.1.30 → 2.1.31

package/package.json

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

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

@@ -25,7 +25,6 @@ export class FilterService {
     column: string | undefined,
     whereClauses: { query: string; params: Record<string, any> }[],
   ) {
-    console.log('GTETABCOUNTS', tableName, column, whereClauses);
     if (!column) return [];
 
     let whereSQL = '';
@@ -96,8 +95,6 @@ export class FilterService {
         'LIST',
       );
 
-    console.log(getTableMeta, 'GETTABLEMETA');
-
     if (!getTableMeta) {
       throw new BadRequestException(
         `Table meta not found for entity_type: ${entity_type}`,
@@ -110,7 +107,6 @@ export class FilterService {
         true,
       );
 
-    console.log(getTableColumnMeta, 'GETTABLECOLUMNMETA');
     // const attributeMeta =
     //   await this.attributeMasterService.findAttributesByMappedEntityType(
     //     entity_type,
@@ -123,7 +119,6 @@ export class FilterService {
       {} as Record<string, any>,
     );
 
-    console.log(attributeMetaMap, 'ATTRIBUTEMETAMAP');
     // Get and parse filters
     const savedFilters = await this.getSavedFilters(savedFilterCode);
     const baseFilters = [
@@ -133,7 +128,7 @@ export class FilterService {
     ];
 
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
-    console.log(baseWhere, 'BASEWHERE', level_type, level_id);
+
     if (level_type && level_id) {
       baseWhere.push({
         query: 'e.level_type = :level_type AND e.level_id = :level_id',
@@ -144,9 +139,7 @@ export class FilterService {
       });
     }
 
-    console.log('OUSTSIDE SKIP');
     if (this.skipLevelFilterEntities.includes(entity_type)) {
-      console.log('INSIDE SKIP');
       baseWhere.push({
         query: 'e.appcode = :appcode',
         params: { appcode },
@@ -160,15 +153,12 @@ export class FilterService {
       [user_id, entity_type],
     );
 
-    console.log('LAYOUTPREFERNECE', layoutPreference);
-
     // Extract layout preference
     const layout = layoutPreference?.[0]?.layout_json?.quick_tab || {};
     let showList = layout?.show_list?.map((val) => val.toLowerCase()) || [];
 
     let allTabs;
     if (layout.attribute) {
-      console.log('IN LAYOUT');
       allTabs = await this.gettab_value_counts(
         getTableMeta.data_source,
         layout.attribute,
@@ -220,8 +210,6 @@ export class FilterService {
       filteredTabs = allTabs;
     }
 
-    console.log(allTabs, 'ALLTABSE');
-
     const dataWhere = [...baseWhere];
 
     if (tabs?.columnName && tabs?.value) {
@@ -255,6 +243,7 @@ export class FilterService {
           },
           tabAttrMeta,
         );
+
         if (tabCondition) {
           dataWhere.push(tabCondition);
         }
@@ -272,21 +261,33 @@ export class FilterService {
       qb.andWhere(clause.query, clause.params);
     });
 
-    if (Array.isArray(sortby)) {
-      // Optional sorting
-      sortby.forEach(({ sortColum, sortType }) => {
-        qb.addOrderBy(
-          `e.${sortColum}`,
-          sortType.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
+    // if (Array.isArray(sortby)) {
+    //   // Optional sorting
+    //   sortby.forEach(({ sortColum, sortType }) => {
+    //     qb.addOrderBy(
+    //       `e.${sortColum}`,
+    //       sortType.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
+    //     );
+    //   });
+    // }
+
+    if (layoutPreference && layoutPreference[0]?.layout_json?.sorting) {
+      if (Array.isArray(layoutPreference[0]?.layout_json?.sorting?.tabs)) {
+        let preferenceTabArray =
+          layoutPreference[0]?.layout_json?.sorting?.tabs;
+        let tabFilter = preferenceTabArray.find(
+          (tabData) => tabData.tab_name === tabs?.value,
         );
-      });
-    }
 
-    if (
-      layoutPreference &&
-      layoutPreference[0]?.layout_json?.sorting?.sortby?.length > 0
-    ) {
-      if (Array.isArray(layoutPreference[0]?.layout_json?.sorting?.sortby)) {
+        tabFilter?.sortby.forEach(({ column, order }) => {
+          qb.addOrderBy(
+            `e.${column}`,
+            order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
+          );
+        });
+      } else if (
+        Array.isArray(layoutPreference[0]?.layout_json?.sorting?.sortby)
+      ) {
         // Optional sorting
         layoutPreference[0]?.layout_json?.sorting?.sortby?.forEach(
           ({ column, order }) => {