rez_core 5.0.104 → 5.0.105

package/package.json

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

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

@@ -6,6 +6,7 @@ import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.s
 import { LoggingService } from 'src/utils/service/loggingUtil.service';
 import { DataSource } from 'typeorm';
 import { EntityJSONRepository } from './entityJson.repository';
+import { FilterService } from '../../filter/service/filter.service';
 
 @Injectable()
 export class EntityJSONService extends EntityServiceImpl {
@@ -13,6 +14,7 @@ export class EntityJSONService extends EntityServiceImpl {
     private readonly dataSource: DataSource,
     private readonly loggerService: LoggingService,
     private readonly EntityJSONRepository: EntityJSONRepository,
+    private readonly filterService: FilterService,
   ) {
     super();
   }

package/src/module/mapper/service/field-mapper.service.ts

@@ -6,12 +6,14 @@ import { UserData } from '../../user/entity/user.entity';
 import { FieldLovsRepository } from '../repository/field-lovs.repository';
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { LoggingService } from 'src/utils/service/loggingUtil.service';
+import { FilterService } from '../../filter/service/filter.service';
 
 @Injectable()
 export class FieldMapperService extends EntityServiceImpl {
   constructor(
     private readonly fieldMapperRepository: FieldMapperRepository,
     private readonly fieldLovsRepository: FieldLovsRepository,
+    private readonly filterService: FilterService,
     @Inject() protected readonly loggingService: LoggingService,
   ) {
     super();

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

@@ -45,7 +45,6 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
   protected readonly attributeMasterService: AttributeMasterService;
   @Inject(forwardRef(() => ResolverService))
   protected readonly resolverService: ResolverService;
-  protected readonly filterService: FilterService;
 
   async createEntity(
     entityData: BaseEntity,
@@ -395,8 +394,8 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
         dto.loggedInUser,
       );
 
-    let filterData = await this.filterService.applyFilterWrapper(dto);
-    let entityList = filterData.data.entity_list;
+    // let filterData = await this.filterService.applyFilterWrapper(dto);
+    // let entityList = filterData.data.entity_list;
 
     const sheet: ExcelsheetData = {
       sheetName: entityMeta?.name || 'sheet',
@@ -410,11 +409,11 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
         (col) => col.attribute_key,
       );
 
-      sheet.rowList = entityList.map((item) =>
-        attributeList.map((attr) =>
-          item[attr] !== undefined ? item[attr] : null,
-        ),
-      );
+      // sheet.rowList = entityList.map((item) =>
+      //   attributeList.map((attr) =>
+      //     item[attr] !== undefined ? item[attr] : null,
+      //   ),
+      // );
       excelData.addSheet(sheet);
     }
   }