rez_core 6.5.30 → 6.5.32

package/package.json

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

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

@@ -145,7 +145,7 @@ export class EntityJSONService  {
           id: a.id,
           name: a.name,
           data_type: a.data_type,
-          flat_json_key: a.flat_json_key,
+          attribute_key: a.flat_json_key,
           source: 'main',
         })),
       );
@@ -156,7 +156,7 @@ export class EntityJSONService  {
           id: a.id,
           name: a.name,
           data_type: a.data_type,
-          flat_json_key: a.flat_json_key,
+          attribute_key: a.flat_json_key,
           source: 'related',
         })),
       );
@@ -167,7 +167,7 @@ export class EntityJSONService  {
           id: l.id,
           name: l.name,
           data_type: l.data_type,
-          flat_json_key: l.target_attribute_key, // attribute_key
+          attribute_key: l.target_attribute_key, // attribute_key
           source: 'linked',
         })),
       );

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

@@ -5,6 +5,7 @@ import { EntityTableDto } from '../dto/entity-table.dto';
 import { DISPLAY_LIST } from '../../../constant/global.constant';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 import { SavedFilterRepositoryService } from 'src/module/filter/repository/saved-filter.repository';
+import { AttributeMasterService } from './attribute-master.service';
 
 @Injectable()
 export class EntityTableService {
@@ -19,6 +20,7 @@ export class EntityTableService {
 
     @Inject(forwardRef(() => SavedFilterRepositoryService))
     private readonly savedFilterRepoService: SavedFilterRepositoryService,
+    private readonly attributeMasterService:AttributeMasterService
   ) {}
 
   async getEntityData(mappedEntityType: string | null, loggedInUser) {
@@ -81,25 +83,10 @@ export class EntityTableService {
     displayType: string,
     loggedInUser: any,
   ) {
-    // const entityTable = await this.findByEntityTypeAndListTypeAndDisplayType(
-    //   entityType,
-    //   listType,
-    //   displayType,
-    //   loggedInUser?.organization_id,
-    // );
-    // const entityTableDto = entityTable as EntityTableDto;
-    let entityTableDto;
-
-    // if (entityTable) {
-    //   entityTableDto.column_list = this.entityJSONService.getAttributesByMappedEntityType(
-    //   entityType,
-    //   loggedInUser,
-    // );
-        // await this.entityTableColumnRepository.findByParentIdAndParentType(
-        //   entityTable.id,
-        //   entityTable.entity_type,
-        //   loggedInUser.organization_id,
-        // );
+    let entityTableDto: any = {};
+   
+    entityTableDto.column_list = await this.attributeMasterService.getAttributes(entityType,loggedInUser)
+    
       entityTableDto.operation_list = {
         text: await this.listMasterService.getDropdownOptions(
           'OPT',