rez_core 7.1.86 → 7.1.87

package/package.json

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

package/src/module/entity/meta/meta/service/listing-layout.service.ts

@@ -52,6 +52,13 @@ export class ListingLayoutService {
     entityTableDto.list_type = listType;
     entityTableDto.display_type = displayType;
 
+    // Get entity master data to check if flat JSON is enabled
+    const entityMaster = await this.entityMasterService.getEntityMasterData(
+      entityType,
+      loggedInUser,
+    );
+    const isFlatJson = entityMaster?.is_flat_json || false;
+
     // Fetch columns from layout preference using service
     const layoutPreference =
       await this.layoutPreferenceService.getLayoutPreferenceByUserID(
@@ -63,12 +70,13 @@ export class ListingLayoutService {
       );
 
     // Mandatory columns that are used as fallback when no layout preference exists
+    // For flat JSON, prefix attribute_key with entity_type
     const mandatoryColumns: { name: string; attribute_key: string }[] = [
-      { name: 'Id', attribute_key: 'id' },
-      { name: 'Code', attribute_key: 'code' },
-      { name: 'Name', attribute_key: 'name' },
-      { name: 'Status', attribute_key: 'status' },
-      { name: 'Description', attribute_key: 'description' },
+      { name: 'Id', attribute_key: isFlatJson ? `${entityType}__id` : 'id' },
+      { name: 'Code', attribute_key: isFlatJson ? `${entityType}__code` : 'code' },
+      { name: 'Name', attribute_key: isFlatJson ? `${entityType}__name` : 'name' },
+      { name: 'Status', attribute_key: isFlatJson ? `${entityType}__status` : 'status' },
+      { name: 'Description', attribute_key: isFlatJson ? `${entityType}__description` : 'description' },
       { name: 'Action', attribute_key: 'action' },
     ];
 
@@ -181,14 +189,8 @@ export class ListingLayoutService {
         );
     }
 
-    // Get entity master data to fetch is_flat_json flag
-    const entityMaster = await this.entityMasterService.getEntityMasterData(
-      entityType,
-      loggedInUser,
-    );
-    
-    // Add is_flat_json flag to response
-    entityTableDto.is_flat_json = entityMaster?.is_flat_json || false;
+    // Add is_flat_json flag to response (using entityMaster from earlier)
+    entityTableDto.is_flat_json = isFlatJson;
 
     return entityTableDto;
   }