rez_core 4.0.234 → 4.0.236

package/package.json

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

package/src/module/entity_json/service/entity_json.service.ts

@@ -124,14 +124,20 @@ export class EntityJSONService extends EntityServiceImpl {
         if (attr.flat_json_key) result[attr.flat_json_key] = null;
       });
       linkedAttributes.forEach((link) => {
-        if (link.applicable_attribute_key)
-          result[link.applicable_attribute_key] = null;
+        // Use target_attribute_key instead of applicable_attribute_key
+        if (link.target_attribute_key) result[link.target_attribute_key] = null;
       });
-      if(flag === 'all')
-        return {flat_json: result,attributes: {mainAttributes,relatedAttributes,linkedAttributes}};
-
-        return result;
+    
+      if(flag === 'all') {
+        return { 
+          flat_json: result, 
+          attributes: { mainAttributes, relatedAttributes, linkedAttributes } 
+        };
+      }
+    
+      return result;
     }
+    
 
     const dropdown: any[] = [];
     dropdown.push(
@@ -322,6 +328,7 @@ for (const linkAttr of safeAttributes.linkedAttributes) {
 
     const result = await this.filterService.applyFilter(dto);
     const rows = result?.data?.entity_list || [];
-    return rows.length ? (rows[0][targetAttribute] ?? null) : null;
+    return rows.length ? (rows[0][childFilterAttribute] ?? null) : null;
+
   }
 }