rez_core 4.0.45 → 4.0.46

package/package.json

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

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

@@ -256,41 +256,45 @@ 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';
 
-    // check level_id and level_type
-// ✅ Special condition for TEMPLATE entity
-if (entity_type === 'TEM') {
   if (level_type === 'ORG') {
-    // ORG level → no extra filter
+    // ORG level → no additional filter
   } else if (level_type === 'SCH') {
     baseWhere.push({
       query: `
         (
-          (e.level_type = 'SCH' AND e.level_id = :school_id)
+          (e.level_type = 'SCH' AND e.level_id = :sch_level_id)
           OR 
           (
-            e.level_type = 'ORG' 
-            AND e.level_id = :org_id 
-            AND e.template_code NOT IN (
-              SELECT template_code 
-              FROM frm_wf_comm_template 
-              WHERE level_type = 'SCH' AND level_id = :school_id
+            e.level_type = 'ORG'
+            AND e.level_id = :org_level_id
+            AND e.code NOT IN (
+              SELECT sub.code 
+              FROM ${templateTable} AS sub 
+              WHERE sub.level_type = 'SCH' AND sub.level_id = :sch_level_id
             )
           )
         )
       `,
       params: {
-        school_id: level_id,
-        org_id: organization_id,
-      },
+        sch_level_id: loggedInUser.level_id,
+        org_level_id: loggedInUser.organization_id,
+      }
     });
   }
-} 
+}
 
+// Default org/level clause — skip TEMPLATE entity
 if (
-  entity_type != 'ORGP' &&
+  entity_type !== 'ORGP' &&
+  entity_type !== 'TEMP' &&
+  entity_type !== 'TEM' && // ✅ skip TEMPLATE
   level_type &&
   level_id &&
   organization_id &&
@@ -305,6 +309,9 @@ if (
 }
 
 
+
+
+
     if (entity_type == "USR" || entity_type == "UPR") {
       baseWhere.push({
         query: 'e.is_customer is NULL',

package/src/module/meta/service/resolver.service.ts

@@ -102,8 +102,8 @@ export class ResolverService {
 
       // --------UPLOAD / IMAGE --------
       else if (
-        (attr.element_type === 'upload' || attr.element_type === 'image') &&
-        typeof resolvedEntityData[field] !== 'object'
+        attr.element_type === 'upload' ||
+        attr.element_type === 'image'
       ) {
         const mediaService = await this.getMediaDataService();
         const uploadData = await mediaService.getMediaDownloadUrl(

package/.vscode/extensions.json

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