rez_core 4.0.65 → 4.0.70

package/package.json

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

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

@@ -36,28 +36,28 @@ export class FilterService {
   ) {
     if (!column) return [];
   
-    if (!/^[a-zA-Z0-9_]+$/.test(tableName) || !/^[a-zA-Z0-9_]+$/.test(column)) {
-      throw new Error('Invalid table or column name');
-    }
-  
     let whereSQL = '';
     const values: any[] = [];
   
     if (whereClauses.length > 0) {
       const clauseParts = whereClauses.map((clause) => {
-        let parsedQuery = clause.query.replace(/\be\./g, '');
+        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}\\b`, 'g'), placeholders);
-            values.push(...val);
+            parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), `(${placeholders})`);
+            values.push(...val); // flatten values
           } else {
-            parsedQuery = parsedQuery.replace(new RegExp(`:${key}\\b`, 'g'), '?');
+            parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), '?');
             values.push(val);
           }
         });
-        return `(${parsedQuery})`;
+  
+        return parsedQuery;
       });
+  
       whereSQL = `WHERE ${clauseParts.join(' AND ')}`;
     }
   
@@ -68,9 +68,21 @@ export class FilterService {
       GROUP BY ${column}
     `;
   
-    return await this.dataSource.query(rawSQL, values);
-  }
+    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) => ({
+        tab_value: r.tab_value ?? 'UNKNOWN',
+        tab_value_count: parseInt(r.tab_value_count, 10),
+      })),
+    ];
+  }
   
 
   async applyFilterWrapper(dto: FilterRequestDto) {
@@ -850,22 +862,22 @@ if (
     if (Array.isArray(val) && val.length === 0) {
       return { query: '1=1', params: {} };
     }
-  
+
     if ((op === 'equal' || op === 'not_equal') && !Array.isArray(val)) {
       throw new BadRequestException(
         `Value for multi-select must be an array for operator: ${op}`,
       );
     }
-  
+
     switch (op) {
       case 'equal':
         return {
-          query: `e.${attr} IN (:...${key})`, // <-- use :... for arrays
+          query: `e.${attr} IN (:${key})`,
           params: { [key]: val },
         };
       case 'not_equal':
         return {
-          query: `e.${attr} NOT IN (:...${key})`,
+          query: `e.${attr} NOT IN (:${key})`,
           params: { [key]: val },
         };
       case 'contains':
@@ -888,7 +900,7 @@ if (
         );
     }
   }
-  
+
   private buildYearCondition(attr: string, op: string, val: any, key: string) {
     switch (op) {
       case 'equal':

package/src/module/workflow/service/action.service.ts

@@ -58,8 +58,11 @@ export class ActionService extends EntityServiceImpl {
   ): Promise<any> {
     const actionData = entityData as any;
 
-    // Step 1: Create main action entity
-    const action = await super.createEntity(entityData, loggedInUser);
+    // 🔧 Remove 'template' array before inserting main action
+  const { template, ...actionWithoutTemplates } = actionData;
+
+  // Step 1: Create main action entity
+  const action = await super.createEntity(actionWithoutTemplates, loggedInUser);
 
     // Step 2: Create stage mapping
     const stageActionMapping = {