rez_core 4.0.100 → 4.0.102

package/package.json

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

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

@@ -28,53 +28,55 @@ export class FilterService {
   private readonly skipAppCodeFilterEntities = ['ORGP'];
   private readonly skipOrgFilterEntities = ['ORGP'];
 
-
   private async gettab_value_counts(
     tableName: string,
     column: string | undefined,
     whereClauses: { query: string; params: Record<string, any> }[],
   ) {
     if (!column) return [];
-  
+
     let whereSQL = '';
     const values: any[] = [];
-  
+
     if (whereClauses.length > 0) {
       const clauseParts = whereClauses.map((clause) => {
         let parsedQuery = clause.query.replace(/\be\./g, ''); // remove e.
-  
+
         Object.entries(clause.params).forEach(([key, val]) => {
           if (Array.isArray(val)) {
             // if it's an array → expand placeholders (?, ?, ?)
             const placeholders = val.map(() => '?').join(', ');
-            parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), `(${placeholders})`);
+            parsedQuery = parsedQuery.replace(
+              new RegExp(`:${key}`, 'g'),
+              `(${placeholders})`,
+            );
             values.push(...val); // flatten values
           } else {
             parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), '?');
             values.push(val);
           }
         });
-  
+
         return parsedQuery;
       });
-  
+
       whereSQL = `WHERE ${clauseParts.join(' AND ')}`;
     }
-  
+
     const rawSQL = `
       SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
       FROM ${tableName}
       ${whereSQL}
       GROUP BY ${column}
     `;
-  
+
     const rows = await this.dataSource.query(rawSQL, values);
-  
+
     const total = rows.reduce(
       (sum, r) => sum + parseInt(r.tab_value_count, 10),
       0,
     );
-  
+
     return [
       { tab_value: 'All', tab_value_count: total },
       ...rows.map((r) => ({
@@ -83,7 +85,6 @@ export class FilterService {
       })),
     ];
   }
-  
 
   async applyFilterWrapper(dto: FilterRequestDto) {
     const {
@@ -265,25 +266,21 @@ export class FilterService {
       ),
     ];
 
-// 🧱 Build where clauses
-const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
+    // 🧱 Build where clauses
+    const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
 
-// Handle TEMPLATE entity special condition
-if (entity_type === 'TEMP' || entity_type === 'TEM') {
-  const templateTable = entityMeta?.data_source || 'frm_wf_comm_template';
+    // Handle TEMPLATE entity special condition
+    if (entity_type === 'TEMP' || entity_type === 'TEM') {
+      const templateTable = entityMeta?.data_source || 'frm_wf_comm_template';
 
-  if (level_type === 'ORG') {
- 
-    baseWhere.push({
-      query: `  ((e.level_type = 'ORG' AND e.level_id = ${loggedInUser.organization_id} AND e.organization_id = ${loggedInUser.organization_id}))`,
-      params: {
-        
-      }
-    })
-    
-  } else if (level_type === 'SCH') {
-    baseWhere.push({
-      query: `
+      if (level_type === 'ORG') {
+        baseWhere.push({
+          query: `  ((e.level_type = 'ORG' AND e.level_id = ${loggedInUser.organization_id} AND e.organization_id = ${loggedInUser.organization_id}))`,
+          params: {},
+        });
+      } else if (level_type === 'SCH') {
+        baseWhere.push({
+          query: `
         (
           (e.level_type = 'SCH' AND e.level_id = ${loggedInUser.level_id} AND e.organization_id = ${loggedInUser.organization_id})
           OR 
@@ -299,43 +296,35 @@ if (entity_type === 'TEMP' || entity_type === 'TEM') {
           )
         )
       `,
-      params: {
-    
+          params: {},
+        });
       }
-    });
-    
-  }
-}
-
-// Default org/level clause — skip TEMPLATE entity
-if (
-  entity_type !== 'ORGP' &&
-  entity_type !== 'TEMP' &&
-  entity_type !== 'TEM' && // ✅ skip TEMPLATE
-  level_type &&
-  level_id &&
-  organization_id &&
-  !customLevelType &&
-  !customLevelId
-) {
-  baseWhere.push({
-    query:
-      'e.organization_id = :organization_id AND e.level_type = :level_type AND e.level_id = :level_id',
-    params: { organization_id, level_type, level_id },
-  });
-}
-
-
-
+    }
 
+    // Default org/level clause — skip TEMPLATE entity
+    if (
+      entity_type !== 'ORGP' &&
+      entity_type !== 'TEMP' &&
+      entity_type !== 'TEM' && // ✅ skip TEMPLATE
+      level_type &&
+      level_id &&
+      organization_id &&
+      !customLevelType &&
+      !customLevelId
+    ) {
+      baseWhere.push({
+        query:
+          'e.organization_id = :organization_id AND e.level_type = :level_type AND e.level_id = :level_id',
+        params: { organization_id, level_type, level_id },
+      });
+    }
 
-    if (entity_type == "USR" || entity_type == "UPR") {
+    if (entity_type == 'USR' || entity_type == 'UPR') {
       baseWhere.push({
         query: 'e.is_customer is NULL',
         params: {},
       });
     }
-    
 
     if (customLevelType && customLevelId && customAppCode) {
       baseWhere.push({
@@ -385,82 +374,14 @@ if (
     const layout = layoutPreference?.[0]?.mapped_json?.quick_tab || {};
     const showList = layout?.show_list?.map((val) => val.toLowerCase()) || [];
 
-    let allTabs;
-    if (layout.attribute) {
-      allTabs = await this.gettab_value_counts(
-        entityMeta?.data_source,
-        layout.attribute,
-        baseWhere,
-      );
-    } else {
-      allTabs = await this.gettab_value_counts(
-        entityMeta?.data_source,
-        tabs?.columnName,
-        baseWhere,
-      );
-    }
-
-    let filteredTabs;
-
-    if (showList?.length > 0) {
-      const isAllNeeded = layout?.isAllSelected && !showList.includes('all');
-      if (isAllNeeded) showList.push('all');
-
-      filteredTabs = allTabs.filter((tab) =>
-        showList.includes(tab.tab_value.toLowerCase()),
-      );
-
-      const allTab = filteredTabs.find(
-        (tab) => tab.tab_value?.toLowerCase() === 'all',
-      );
-      filteredTabs = filteredTabs.filter(
-        (tab) => tab.tab_value?.toLowerCase() !== 'all',
-      );
-
-      // SORTING LOGIC
-      if (layout.sorting === 'asc') {
-        filteredTabs.sort((a, b) =>
-          a.tab_value.toLowerCase().localeCompare(b.tab_value.toLowerCase()),
-        );
-      } else if (layout.sorting === 'dsc') {
-        filteredTabs.sort((a, b) =>
-          b.tab_value.toLowerCase().localeCompare(a.tab_value.toLowerCase()),
-        );
-      } else if (layout.sorting === 'count_asc') {
-        filteredTabs.sort((a, b) => a.tab_value_count - b.tab_value_count);
-      } else if (layout.sorting === 'count_dsc') {
-        filteredTabs.sort((a, b) => b.tab_value_count - a.tab_value_count);
-      } else if (layout.sorting === 'custom') {
-        const orderMap = new Map<string, number>(
-          showList.map((val, index) => [val.toLowerCase(), index]),
-        );
-        filteredTabs.sort((a, b) => {
-          const aIndex = orderMap.get(a.tab_value.toLowerCase()) ?? Infinity;
-          const bIndex = orderMap.get(b.tab_value.toLowerCase()) ?? Infinity;
-          return aIndex - bIndex;
-        });
-      }
-
-      if (allTab) filteredTabs.unshift(allTab);
-
-      if (layout?.isCombineOther) {
-        const originalAllTab = allTabs.find(
-          (tab) => tab.tab_value.toLowerCase() === 'all',
-        );
-        const allCount = originalAllTab?.tab_value_count ?? 0;
-        const knownTabCountSum = filteredTabs
-          .filter((tab) => tab.tab_value.toLowerCase() !== 'all')
-          .reduce((acc, tab) => acc + tab.tab_value_count, 0);
-
-        const othersCount = allCount - knownTabCountSum;
-        filteredTabs.push({
-          tab_value: 'OTHERS',
-          tab_value_count: othersCount < 0 ? 0 : othersCount,
-        });
-      }
-    } else {
-      filteredTabs = allTabs;
-    }
+    let filteredTabs = await this.getFilteredTabs(
+      layout,
+      showList,
+      entityMeta,
+      baseWhere,
+      tabs,
+      loggedInUser,
+    );
 
     const dataWhere = [...baseWhere];
 
@@ -515,51 +436,14 @@ if (
       }
     }
 
-    const qb = this.dataSource
+    let qb = this.dataSource
       .createQueryBuilder()
       .select('e.*')
       .from(tableName, 'e');
     dataWhere.forEach((clause) => qb.andWhere(clause.query, clause.params));
 
-    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(layoutPreference[0]?.mapped_json?.sorting?.sortby)
-      ) {
-        layoutPreference[0]?.mapped_json?.sorting?.sortby?.forEach(
-          ({ column, order }) => {
-            qb.addOrderBy(
-              `e.${column}`,
-              order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
-            );
-          },
-        );
-      }
-    }
-    
-    if (Array.isArray(sortby) && sortby.length > 0) {
-      sortby.forEach(({ sortColum, sortType }) => {
-        if (sortColum) {
-          qb.addOrderBy(`e.${sortColum}`, sortType?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC');
-        }
-      });
-    } else {
-      // fallback if no explicit sortby sent
-      qb.addOrderBy('e.created_date', 'DESC');
-    }
-    
-   
+    // Apply sorting
+    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;
@@ -645,6 +529,146 @@ if (
     };
   }
 
+  // GET FILTERED TABS LOGIC
+  private async getFilteredTabs(
+    layout: any,
+    showList: any,
+    entityMeta: any,
+    baseWhere: any,
+    tabs: any,
+    loggedInUser: any,
+  ) {
+    let allTabs;
+    if (layout.attribute) {
+      allTabs = await this.gettab_value_counts(
+        entityMeta?.data_source,
+        layout.attribute,
+        baseWhere,
+      );
+    } else {
+      allTabs = await this.gettab_value_counts(
+        entityMeta?.data_source,
+        tabs?.columnName,
+        baseWhere,
+      );
+    }
+
+    let filteredTabs: any[] = [];
+
+    if (showList?.length > 0) {
+      const isAllNeeded = layout?.isAllSelected && !showList.includes('all');
+      if (isAllNeeded) showList.push('all');
+
+      filteredTabs = allTabs.filter((tab) =>
+        showList.includes(tab.tab_value.toLowerCase()),
+      );
+
+      const allTab = filteredTabs.find(
+        (tab) => tab.tab_value?.toLowerCase() === 'all',
+      );
+      filteredTabs = filteredTabs.filter(
+        (tab) => tab.tab_value?.toLowerCase() !== 'all',
+      );
+
+      // SORTING LOGIC
+      if (layout.sorting === 'asc') {
+        filteredTabs.sort((a, b) =>
+          a.tab_value.toLowerCase().localeCompare(b.tab_value.toLowerCase()),
+        );
+      } else if (layout.sorting === 'dsc') {
+        filteredTabs.sort((a, b) =>
+          b.tab_value.toLowerCase().localeCompare(a.tab_value.toLowerCase()),
+        );
+      } else if (layout.sorting === 'count_asc') {
+        filteredTabs.sort((a, b) => a.tab_value_count - b.tab_value_count);
+      } else if (layout.sorting === 'count_dsc') {
+        filteredTabs.sort((a, b) => b.tab_value_count - a.tab_value_count);
+      } else if (layout.sorting === 'custom') {
+        const orderMap = new Map<string, number>(
+          showList.map((val, index) => [val.toLowerCase(), index]),
+        );
+        filteredTabs.sort((a, b) => {
+          const aIndex = orderMap.get(a.tab_value.toLowerCase()) ?? Infinity;
+          const bIndex = orderMap.get(b.tab_value.toLowerCase()) ?? Infinity;
+          return aIndex - bIndex;
+        });
+      }
+
+      if (allTab) filteredTabs.unshift(allTab);
+
+      if (layout?.isCombineOther) {
+        const originalAllTab = allTabs.find(
+          (tab) => tab.tab_value.toLowerCase() === 'all',
+        );
+        const allCount = originalAllTab?.tab_value_count ?? 0;
+        const knownTabCountSum = filteredTabs
+          .filter((tab) => tab.tab_value.toLowerCase() !== 'all')
+          .reduce((acc, tab) => acc + tab.tab_value_count, 0);
+
+        const othersCount = allCount - knownTabCountSum;
+        filteredTabs.push({
+          tab_value: 'OTHERS',
+          tab_value_count: othersCount < 0 ? 0 : othersCount,
+        });
+      }
+    } else {
+      filteredTabs = allTabs;
+    }
+
+    return filteredTabs;
+  }
+
+  // SORTING LOGIC FOR TABS
+  private async sortTabsByShowList(
+    qb: any,
+    sortby: any,
+    layoutPreference: any,
+    tabs: any,
+  ) {
+    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(layoutPreference[0]?.mapped_json?.sorting?.sortby)
+      ) {
+        layoutPreference[0]?.mapped_json?.sorting?.sortby?.forEach(
+          ({ column, order }) => {
+            qb.addOrderBy(
+              `e.${column}`,
+              order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
+            );
+          },
+        );
+      }
+    }
+
+    if (Array.isArray(sortby) && sortby.length > 0) {
+      sortby.forEach(({ sortColum, sortType }) => {
+        if (sortColum) {
+          qb.addOrderBy(
+            `e.${sortColum}`,
+            sortType?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
+          );
+        }
+      });
+    } else {
+      // fallback if no explicit sortby sent
+      qb.addOrderBy('e.created_date', 'DESC');
+    }
+
+    return qb;
+  }
+
   private parseFilters(raw: any, isSingle = false): any[] {
     if (!raw) return [];
 

package/src/module/meta/service/entity-dynamic.service.ts

@@ -538,6 +538,7 @@ export class EntityDynamicService {
     const validAttributes = await this.getAttributeCodes(
       entityType,
       organizationId,
+      false,
     );
 
     const columns = validAttributes
@@ -590,7 +591,6 @@ export class EntityDynamicService {
     const validAttributes = await this.getAttributeCodes(
       entityType,
       organizationId,
-      false,
     );
 
     const columns = validAttributes
@@ -676,6 +676,7 @@ export class EntityDynamicService {
       .select('fea.attribute_key', 'attribute_key')
       .addSelect('MAX(fea.db_datatype)', 'db_datatype')
       .addSelect('MAX(fea.element_type)', 'element_type')
+      .addSelect('MAX(fea.is_hidden)', 'is_hidden')
       .from('frm_entity_attribute', 'fea')
       .where('fea.mapped_entity_type = :entityType', { entityType })
       .andWhere('fea.organization_id = :organizationId', { organizationId });

package/.vscode/extensions.json

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