rez_core 5.0.32 → 5.0.34

package/dist/module/mapper/controller/mapper.controller.d.ts

@@ -4,5 +4,11 @@ export declare class MapperController {
     constructor(mapperService: MapperService);
     getByMappedEntityType(mappedEntityType: string, req: Request & {
         user: any;
-    }, filter?: string, status?: string): Promise<any>;
+    }, filter?: string, status?: string): Promise<{
+        id: any;
+        label: any;
+        value: any;
+        code: any;
+        status: any;
+    }[]>;
 }

package/dist/module/mapper/mapper.module.js

@@ -21,15 +21,16 @@ const mapper_service_1 = require("./service/mapper.service");
 const mapper_entity_1 = require("./entity/mapper.entity");
 const mapper_controller_1 = require("./controller/mapper.controller");
 const mapper_repository_1 = require("./repository/mapper.repository");
+const list_master_items_entity_1 = require("../listmaster/entity/list-master-items.entity");
 let MapperModule = class MapperModule {
 };
 exports.MapperModule = MapperModule;
 exports.MapperModule = MapperModule = __decorate([
     (0, common_1.Module)({
         imports: [
-            typeorm_1.TypeOrmModule.forFeature([field_mapper_entity_1.FieldMapper, field_lovs_entity_1.FieldLovMapper, mapper_entity_1.Mapper]),
+            typeorm_1.TypeOrmModule.forFeature([field_mapper_entity_1.FieldMapper, field_lovs_entity_1.FieldLovMapper, mapper_entity_1.Mapper, list_master_items_entity_1.ListMasterItems]),
             filter_module_1.FilterModule,
-            entity_module_1.EntityModule,
+            entity_module_1.EntityModule
         ],
         providers: [
             { provide: 'FieldMapperService', useClass: field_mapper_service_1.FieldMapperService },

package/dist/module/mapper/mapper.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapper.module.js","sourceRoot":"","sources":["../../../src/module/mapper/mapper.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,sEAA2D;AAC3D,yEAAoE;AACpE,kFAA6E;AAC7E,2DAAuD;AACvD,yDAAqD;AACrD,kFAA6E;AAC7E,kEAA4D;AAC5D,8EAAyE;AACzE,6DAAyD;AACzD,0DAAgD;AAChD,sEAAkE;AAClE,sEAAkE;AAoB3D,IAAM,YAAY,GAAlB,MAAM,YAAY;CACxB,CAAA;AADY,oCAAY;uBAAZ,YAAY;IAlBxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,iCAAW,EAAE,kCAAc,EAAC,sBAAM,CAAC,CAAC;YAC9D,4BAAY;YACZ,4BAAY;SACb;QACD,SAAS,EAAE;YACT,EAAE,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,yCAAkB,EAAE;YAC/D,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,8BAAa,EAAE;YACrD,+CAAqB;YACrB,2CAAmB;YACnB,oCAAgB;SACjB;QACD,OAAO,EAAE;YACP,EAAE,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,yCAAkB,EAAE;SAChE;QACD,WAAW,EAAE,CAAC,+CAAqB,EAAC,oCAAgB,CAAC;KACtD,CAAC;GACW,YAAY,CACxB"}
+{"version":3,"file":"mapper.module.js","sourceRoot":"","sources":["../../../src/module/mapper/mapper.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,sEAA2D;AAC3D,yEAAoE;AACpE,kFAA6E;AAC7E,2DAAuD;AACvD,yDAAqD;AACrD,kFAA6E;AAC7E,kEAA4D;AAC5D,8EAAyE;AACzE,6DAAyD;AACzD,0DAAgD;AAChD,sEAAkE;AAClE,sEAAkE;AAClE,4FAAgF;AAoBzE,IAAM,YAAY,GAAlB,MAAM,YAAY;CACxB,CAAA;AADY,oCAAY;uBAAZ,YAAY;IAlBxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,iCAAW,EAAE,kCAAc,EAAC,sBAAM,EAAC,0CAAe,CAAC,CAAC;YAC9E,4BAAY;YACZ,4BAAY;SACb;QACD,SAAS,EAAE;YACT,EAAE,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,yCAAkB,EAAE;YAC/D,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,8BAAa,EAAE;YACrD,+CAAqB;YACrB,2CAAmB;YACnB,oCAAgB;SACjB;QACD,OAAO,EAAE;YACP,EAAE,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,yCAAkB,EAAE;SAChE;QACD,WAAW,EAAE,CAAC,+CAAqB,EAAC,oCAAgB,CAAC;KACtD,CAAC;GACW,YAAY,CACxB"}

package/dist/module/mapper/repository/mapper.repository.d.ts

@@ -3,5 +3,5 @@ import { Repository } from 'typeorm';
 export declare class MapperRepository {
     private readonly mapperRepository;
     constructor(mapperRepository: Repository<Mapper>);
-    findByMappedEntityType(mapped_entity_type: string): Promise<Mapper[]>;
+    findByMappedEntityType(mapped_entity_type: string, organizationId: number, filter?: string): Promise<any[]>;
 }

package/dist/module/mapper/repository/mapper.repository.js

@@ -21,8 +21,20 @@ let MapperRepository = class MapperRepository {
     constructor(mapperRepository) {
         this.mapperRepository = mapperRepository;
     }
-    async findByMappedEntityType(mapped_entity_type) {
-        return await this.mapperRepository.find({ where: { mapped_entity_type } });
+    async findByMappedEntityType(mapped_entity_type, organizationId, filter) {
+        const qb = this.mapperRepository
+            .createQueryBuilder('m')
+            .select('m.*')
+            .where('m.mapped_entity_type = :mapped_entity_type', {
+            mapped_entity_type,
+        })
+            .andWhere('m.organization_id = :organizationId', { organizationId });
+        if (filter && filter.trim() !== '') {
+            qb.andWhere('(m.name ILIKE :filter OR m.code ILIKE :filter)', {
+                filter: `%${filter}%`,
+            });
+        }
+        return await qb.getRawMany();
     }
 };
 exports.MapperRepository = MapperRepository;

package/dist/module/mapper/repository/mapper.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapper.repository.js","sourceRoot":"","sources":["../../../../src/module/mapper/repository/mapper.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,2DAAiD;AACjD,qCAAqC;AAG9B,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YAC6C,gBAAoC;QAApC,qBAAgB,GAAhB,gBAAgB,CAAoB;IAEjF,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,kBAA0B;QACrD,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,kBAAkB,EAAE,EAAE,CAAC,CAAC;IAC7E,CAAC;CACF,CAAA;AATY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,sBAAM,CAAC,CAAA;qCAAoC,oBAAU;GAF9D,gBAAgB,CAS5B"}
+{"version":3,"file":"mapper.repository.js","sourceRoot":"","sources":["../../../../src/module/mapper/repository/mapper.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,2DAAiD;AACjD,qCAAqC;AAG9B,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YAC6C,gBAAoC;QAApC,qBAAgB,GAAhB,gBAAgB,CAAoB;IAEjF,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,kBAA0B,EAC1B,cAAsB,EACtB,MAAe;QAEf,MAAM,EAAE,GAAG,IAAI,CAAC,gBAAgB;aAC7B,kBAAkB,CAAC,GAAG,CAAC;aACvB,MAAM,CAAC,KAAK,CAAC;aACb,KAAK,CAAC,4CAA4C,EAAE;YACnD,kBAAkB;SACnB,CAAC;aACD,QAAQ,CAAC,qCAAqC,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QAEvE,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACnC,EAAE,CAAC,QAAQ,CAAC,gDAAgD,EAAE;gBAC5D,MAAM,EAAE,IAAI,MAAM,GAAG;aACtB,CAAC,CAAC;QACL,CAAC;QACD,OAAO,MAAM,EAAE,CAAC,UAAU,EAAE,CAAC;IAC/B,CAAC;CACF,CAAA;AA1BY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,sBAAM,CAAC,CAAA;qCAAoC,oBAAU;GAF9D,gBAAgB,CA0B5B"}

package/dist/module/mapper/service/mapper.service.d.ts

@@ -1,15 +1,23 @@
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
-import { DataSource } from 'typeorm';
+import { DataSource, Repository } from 'typeorm';
 import { MapperRepository } from '../repository/mapper.repository';
 import { FieldMapperRepository } from '../repository/field-mapper.repository';
 import { FieldLovsRepository } from '../repository/field-lovs.repository';
+import { ListMasterItems } from '../../listmaster/entity/list-master-items.entity';
 export declare class MapperService extends EntityServiceImpl {
     private readonly dataSource;
     private mapperRepository;
     private fieldMapperRepository;
     private fieldLovsRepository;
-    constructor(dataSource: DataSource, mapperRepository: MapperRepository, fieldMapperRepository: FieldMapperRepository, fieldLovsRepository: FieldLovsRepository);
-    getByMappedEntityType(mappedEntityType: string, loggedInUser: any, filter?: string, status?: string): Promise<any>;
+    private readonly listMasterItemsRepo;
+    constructor(dataSource: DataSource, mapperRepository: MapperRepository, fieldMapperRepository: FieldMapperRepository, fieldLovsRepository: FieldLovsRepository, listMasterItemsRepo: Repository<ListMasterItems>);
+    getByMappedEntityType(mappedEntityType: string, loggedInUser: any, filter?: string, status?: string): Promise<{
+        id: any;
+        label: any;
+        value: any;
+        code: any;
+        status: any;
+    }[]>;
     deleteEntity(entityType: string, entityId: number, loggedInUser: any): Promise<{
         success: boolean;
         message: string;

package/dist/module/mapper/service/mapper.service.js

@@ -8,6 +8,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MapperService = void 0;
 const common_1 = require("@nestjs/common");
@@ -16,26 +19,31 @@ const typeorm_1 = require("typeorm");
 const mapper_repository_1 = require("../repository/mapper.repository");
 const field_mapper_repository_1 = require("../repository/field-mapper.repository");
 const field_lovs_repository_1 = require("../repository/field-lovs.repository");
+const typeorm_2 = require("@nestjs/typeorm");
+const list_master_items_entity_1 = require("../../listmaster/entity/list-master-items.entity");
 let MapperService = class MapperService extends entity_service_impl_service_1.EntityServiceImpl {
-    constructor(dataSource, mapperRepository, fieldMapperRepository, fieldLovsRepository) {
+    constructor(dataSource, mapperRepository, fieldMapperRepository, fieldLovsRepository, listMasterItemsRepo) {
         super();
         this.dataSource = dataSource;
         this.mapperRepository = mapperRepository;
         this.fieldMapperRepository = fieldMapperRepository;
         this.fieldLovsRepository = fieldLovsRepository;
+        this.listMasterItemsRepo = listMasterItemsRepo;
     }
     async getByMappedEntityType(mappedEntityType, loggedInUser, filter, status) {
         if (!mappedEntityType)
             return [];
-        const mappers = await this.dataSource.query(`SELECT id, name, code, status
-       FROM frm_mapper_master
-       WHERE mapped_entity_type = $1 AND organization_id = $2 AND (-1 = $3 OR name LIKE $4 OR code LIKE $5)`, [mappedEntityType, loggedInUser.organization_id, filter || -1, `%${filter}%`, `%${filter}%`]);
+        const mappers = await this.mapperRepository.findByMappedEntityType(mappedEntityType, loggedInUser.organization_id, filter);
         const distinctStatuses = [
             ...new Set(mappers.map((m) => m.status).filter((s) => s !== null)),
         ];
         const statusMap = new Map();
         if (distinctStatuses.length > 0) {
-            const statuses = await this.dataSource.query(`SELECT id, name FROM frm_list_master_items WHERE id IN ($1)`, [distinctStatuses]);
+            const statuses = await this.listMasterItemsRepo.find({
+                where: {
+                    id: (0, typeorm_1.In)(distinctStatuses)
+                }
+            });
             statuses.forEach((status) => {
                 statusMap.set(status.id, status.name);
             });
@@ -68,9 +76,11 @@ let MapperService = class MapperService extends entity_service_impl_service_1.En
 exports.MapperService = MapperService;
 exports.MapperService = MapperService = __decorate([
     (0, common_1.Injectable)(),
+    __param(4, (0, typeorm_2.InjectRepository)(list_master_items_entity_1.ListMasterItems)),
     __metadata("design:paramtypes", [typeorm_1.DataSource,
         mapper_repository_1.MapperRepository,
         field_mapper_repository_1.FieldMapperRepository,
-        field_lovs_repository_1.FieldLovsRepository])
+        field_lovs_repository_1.FieldLovsRepository,
+        typeorm_1.Repository])
 ], MapperService);
 //# sourceMappingURL=mapper.service.js.map

package/dist/module/mapper/service/mapper.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapper.service.js","sourceRoot":"","sources":["../../../../src/module/mapper/service/mapper.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mapper.service.js","sourceRoot":"","sources":["../../../../src/module/mapper/service/mapper.service.ts"],"names":[],"mappings":"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"}

package/dist/module/meta/service/entity-master.service.d.ts

@@ -3,13 +3,15 @@ import { EntityMaster } from '../entity/entity-master.entity';
 import { EntityMasterRepository } from '../repository/entity-master.repository';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 import { SavedFilterRepositoryService } from 'src/module/filter/repository/saved-filter.repository';
+import { AttributeMasterRepository } from '../repository/attribute-master.repository';
 export declare class EntityMasterService {
     private entityMasterRepository;
+    private attributeMasterRepo;
     private entityMasterRepo;
     private readonly dataSource;
     private readonly listMasterService;
     private readonly savedFilterRepoService;
-    constructor(entityMasterRepository: Repository<EntityMaster>, entityMasterRepo: EntityMasterRepository, dataSource: DataSource, listMasterService: ListMasterService, savedFilterRepoService: SavedFilterRepositoryService);
+    constructor(entityMasterRepository: Repository<EntityMaster>, attributeMasterRepo: AttributeMasterRepository, entityMasterRepo: EntityMasterRepository, dataSource: DataSource, listMasterService: ListMasterService, savedFilterRepoService: SavedFilterRepositoryService);
     getEntityById(id: number): Promise<EntityMaster | null>;
     getAllEntityDropDown(entity_type: string, loggedInUser: any): Promise<{
         label: string;

package/dist/module/meta/service/entity-master.service.js

@@ -20,9 +20,11 @@ const entity_master_entity_1 = require("../entity/entity-master.entity");
 const entity_master_repository_1 = require("../repository/entity-master.repository");
 const list_master_service_1 = require("../../listmaster/service/list-master.service");
 const saved_filter_repository_1 = require("../../filter/repository/saved-filter.repository");
+const attribute_master_repository_1 = require("../repository/attribute-master.repository");
 let EntityMasterService = class EntityMasterService {
-    constructor(entityMasterRepository, entityMasterRepo, dataSource, listMasterService, savedFilterRepoService) {
+    constructor(entityMasterRepository, attributeMasterRepo, entityMasterRepo, dataSource, listMasterService, savedFilterRepoService) {
         this.entityMasterRepository = entityMasterRepository;
+        this.attributeMasterRepo = attributeMasterRepo;
         this.entityMasterRepo = entityMasterRepo;
         this.dataSource = dataSource;
         this.listMasterService = listMasterService;
@@ -77,10 +79,7 @@ let EntityMasterService = class EntityMasterService {
         if (!entityMasterData) {
             throw new Error(`Entity master with mapped_entity_type "${entityType}" not found.`);
         }
-        const attributes = await this.dataSource.query(`SELECT * 
-     FROM frm_entity_attribute 
-     WHERE mapped_entity_type = $1 
-       AND organization_id = $2 `, [entityMasterData.mapped_entity_type, loggedInUser.organization_id]);
+        const attributes = await this.attributeMasterRepo.findAttributesByMappedEntityType(entityMasterData.mapped_entity_type, loggedInUser);
         entityMasterData['attribute_list'] = attributes;
         entityMasterData['operation_list'] = {
             text: await this.listMasterService.getDropdownOptions('OPT', {}, [], loggedInUser),
@@ -109,8 +108,9 @@ exports.EntityMasterService = EntityMasterService;
 exports.EntityMasterService = EntityMasterService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, typeorm_2.InjectRepository)(entity_master_entity_1.EntityMaster)),
-    __param(3, (0, common_1.Inject)('ListMasterService')),
+    __param(4, (0, common_1.Inject)('ListMasterService')),
     __metadata("design:paramtypes", [typeorm_1.Repository,
+        attribute_master_repository_1.AttributeMasterRepository,
         entity_master_repository_1.EntityMasterRepository,
         typeorm_1.DataSource,
         list_master_service_1.ListMasterService,

package/dist/module/meta/service/entity-master.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-master.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entity-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAgE;AAChE,qCAAiD;AACjD,6CAAmD;AACnD,yEAA8D;AAC9D,qFAAgF;AAChF,sFAAsF;AACtF,6FAAoG;AACpG,2FAAsF;AAG/E,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YAEU,sBAAgD,EAChD,mBAA8C,EAC9C,gBAAwC,EAC/B,UAAsB,EAEtB,iBAAoC,EACpC,sBAAoD;QAN7D,2BAAsB,GAAtB,sBAAsB,CAA0B;QAChD,wBAAmB,GAAnB,mBAAmB,CAA2B;QAC9C,qBAAgB,GAAhB,gBAAgB,CAAwB;QAC/B,eAAU,GAAV,UAAU,CAAY;QAEtB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,2BAAsB,GAAtB,sBAAsB,CAA8B;IACpE,CAAC;IAEJ,KAAK,CAAC,aAAa,CAAC,EAAU;QAC5B,OAAO,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,WAAkB,EAAC,YAAY;QACxD,OAAO,IAAI,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,WAAW,EAAC,YAAY,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,gBAA+B,EAC/B,YAAY,EACZ,gBAAyB;QAEzB,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,eAAe,GAAG;gBACpB,kBAAkB,EAAE,gBAAgB;gBACpC,eAAe,EAAE,YAAY,CAAC,eAAe;aAC9C,CAAC;YACF,IAAI,gBAAgB,EAAE,CAAC;gBACrB,eAAe,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC;YAC3C,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC;gBAC7D,KAAK,EAAE,eAAe;aACvB,CAAC,CAAC;YAEH,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CACb,iCAAiC,gBAAgB,cAAc,CAChE,CAAC;YACJ,CAAC;YAED,OAAO,YAAY,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,EAAE,CAAC;QACpB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,SAAiB;QAC1C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC;YAC7D,KAAK,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE;SACpC,CAAC,CAAC;QACH,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,YAA0B;QACnC,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,YAA0B;QACjD,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,gBAAwB;QACnD,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC;YAC/C,KAAK,EAAE,EAAE,kBAAkB,EAAE,gBAAgB,EAAE;SAChD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,UAAkB,EAAE,YAAiB;QAE3D,MAAM,gBAAgB,GACpB,MAAM,IAAI,CAAC,gBAAgB,CAAC,2BAA2B,CACrD,UAAU,EACV,YAAY,CAAC,eAAe,CAC7B,CAAC;QAEJ,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CACb,0CAA0C,UAAU,cAAc,CACnE,CAAC;QACJ,CAAC;QAID,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,gCAAgC,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;QAGtI,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,UAAU,CAAC;QAGhD,gBAAgB,CAAC,gBAAgB,CAAC,GAAG;YACnC,IAAI,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CACnD,KAAK,EACL,EAAE,EACF,EAAE,EACF,YAAY,CACb;YACD,MAAM,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CACrD,KAAK,EACL,EAAE,EACF,EAAE,EACF,YAAY,CACb;YACD,IAAI,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CACnD,KAAK,EACL,EAAE,EACF,EAAE,EACF,YAAY,CACb;YACD,MAAM,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CACrD,KAAK,EACL,EAAE,EACF,EAAE,EACF,YAAY,CACb;YACD,WAAW,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAC1D,KAAK,EACL,EAAE,EACF,EAAE,EACF,YAAY,CACb;YACD,IAAI,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CACnD,KAAK,EACL,EAAE,EACF,EAAE,EACF,YAAY,CACb;SACF,CAAC;QAGF,gBAAgB,CAAC,gBAAgB,CAAC;YAChC,MAAM,IAAI,CAAC,sBAAsB,CAAC,4BAA4B,CAC5D,UAAU,CACX,CAAC;QAEJ,IAAI,YAAY,CAAC,EAAE,EAAE,CAAC;YACpB,gBAAgB,CAAC,cAAc,CAAC;gBAC9B,MAAM,IAAI,CAAC,sBAAsB,CAAC,oCAAoC,CACpE,YAAY,CAAC,EAAE,EACf,UAAU,CACX,CAAC;QACN,CAAC;QAED,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,YAAiB;QACtC,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,UAAkB,EAAE,YAAiB;QACjE,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,YAAY,CACb,CAAC;IACJ,CAAC;CAGF,CAAA;AAhKY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,mCAAY,CAAC,CAAA;IAK9B,WAAA,IAAA,eAAM,EAAC,mBAAmB,CAAC,CAAA;qCAJI,oBAAU;QACb,uDAAyB;QAC5B,iDAAsB;QACnB,oBAAU;QAEH,uCAAiB;QACZ,sDAA4B;GAT5D,mBAAmB,CAgK/B"}