rez_core 6.5.39 → 6.5.41

package/package.json

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

package/src/app.module.ts

@@ -28,6 +28,7 @@ import { WorkflowAutomationModule } from './module/workflow-automation/workflow-
 import { LinkedAttributesModule } from './module/linked_attributes/linked_attributes.module';
 import { EntityJSONModule } from './module/entity_json/entity_json.module';
 import { ExportModule } from './module/export/export.module';
+import { AppMasterModule } from './module/app_master/app-master.module';
 
 @Module({
   imports: [
@@ -63,6 +64,7 @@ import { ExportModule } from './module/export/export.module';
     EntityJSONModule,
     ExportModule,
     EntityModule,
+    AppMasterModule
   ],
 })
 export class AppModule { }

package/src/core.module.ts

@@ -19,6 +19,7 @@ import { MapperModule } from './module/mapper/mapper.module';
 import { WorkflowScheduleModule } from './module/workflow-schedule/workflow-schedule.module';
 import { LinkedAttributesModule } from './module/linked_attributes/linked_attributes.module';
 import { ExportModule } from './module/export/export.module';
+import { AppMasterModule } from './module/app_master/app-master.module';
 
 @Global()
 @Module({})
@@ -55,7 +56,8 @@ export class CoreModule {
         EnterpriseModule,
         UtilsModule,
         AuthModule,
-        NotificationModule
+        NotificationModule,
+        AppMasterModule
       ];
     } else {
       importsArray = [

package/src/module/app_master/app-master.module.ts

@@ -0,0 +1,15 @@
+import { Module } from '@nestjs/common';
+import { AppMasterController } from './controller/app-master.controller';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { AppMaster } from './entity/app-master.entity';
+import { AppMasterService } from './service/app-master.service';
+import { AppMasterRespository } from './repository/app-master.repository';
+import { UserModule } from '../user/user.module';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([AppMaster]), UserModule],
+  controllers: [AppMasterController],
+  providers: [AppMasterService, AppMasterRespository],
+  exports: [AppMasterRespository, AppMasterService]
+})
+export class AppMasterModule {}

package/src/module/{meta → app_master}/repository/app-master.repository.ts

@@ -7,13 +7,13 @@ import { AppMaster } from '../entity/app-master.entity';
 export class AppMasterRespository {
   constructor(
     @InjectRepository(AppMaster)
-    private readonly AppMasterRespository: Repository<AppMaster>,
+    private readonly appMasterRespository: Repository<AppMaster>,
   ) {}
 
   async getAppMasterDataByAppCode(
     appCode: string,
   ): Promise<AppMaster[] | null> {
-    return await this.AppMasterRespository.find({
+    return await this.appMasterRespository.find({
       where: { code: appCode },
     });
   }

package/src/module/enterprise/entity/organization-app-mapping.entity.ts

@@ -1,6 +1,6 @@
 import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn, Unique } from 'typeorm';
 import { OrganizationData } from './organization.entity';
-import { AppMaster } from '../../meta/entity/app-master.entity';
+import { AppMaster } from '../../app_master/entity/app-master.entity';
 
 @Entity({ name: 'sso_organization_app_mapping' })
 @Unique(['organization', 'app'])

package/src/module/meta/entity.module.ts

@@ -38,12 +38,8 @@ import { FilterModule } from '../filter/filter.module';
 // import { UserAppMappingService } from './service/user-app-mapping.service';
 // import { UserAppMappingRepository } from './repository/user-app-mapping.repository';
 // import { UserAppMapping } from './entity/user-app-mapping.entity';
-import { AppMasterController } from './controller/app-master.controller';
 import { UserRoleMappingRepository } from '../user/repository/user-role-mapping.repository';
 import { UserRoleMapping } from '../user/entity/user-role-mapping.entity';
-import { AppMasterService } from './service/app-master.service';
-import { AppMasterRespository } from './repository/app-master.repository';
-import { AppMaster } from './entity/app-master.entity';
 import { AttributeMasterController } from './controller/attribute-master.controller';
 import { EntityDynamicController } from './controller/entity-dynamic.controller';
 import { EntityDynamicService } from './service/entity-dynamic.service';
@@ -61,6 +57,7 @@ import { EntityPublicController } from './controller/entity.public.controller';
 import { EntityUpdateService } from './service/entity-attribute-update.service';
 import { EntityUpdateRepository } from './repository/entity-attribute-update.repository';
 import { EntityRelationRepository } from './repository/entity-relation.repository';
+import { AppMasterModule } from '../app_master/app-master.module';
 
 @Module({
   imports: [
@@ -73,7 +70,6 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
       MediaData,
       ViewMaster,
       UserRoleMapping,
-      AppMaster,
       EntityRelation,
       EntityRelationData,
     ]),
@@ -81,7 +77,7 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     forwardRef(() => FilterModule),
     UtilsModule,
     forwardRef(() => WorkflowAutomationModule),
-
+    AppMasterModule,
   ],
   providers: [
     EntityMasterService,
@@ -115,8 +111,6 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     // UserAppMappingService,
     // UserAppMappingRepository,
     UserRoleMappingRepository,
-    AppMasterRespository,
-    AppMasterService,
     ResolverService,
     EntityMasterRepository,
     EntityRelationRepository,
@@ -131,19 +125,13 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     MediaDataService,
     EntityUpdateService,
     EntityUpdateRepository,
-    // SectionMasterService,
-    // FieldGroupService,
     'ViewMasterService',
     AttributeMasterService,
-    // UserAppMappingService,
-    // UserAppMappingRepository,
-    AppMasterService,
     MasterService,
     ResolverService,
     EntityDynamicService,
     'CommonService',
     'EntityRelationService',
-    AppMasterRespository,
   ],
   controllers: [
     EntityController,
@@ -151,7 +139,6 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     MediaController,
     ViewMasterController,
     MetaController,
-    AppMasterController,
     AttributeMasterController,
     EntityDynamicController,
     EntityRelationController,

package/src/module/module/entity/menu.entity.ts

@@ -1,6 +1,7 @@
 import { Column, Entity, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn } from 'typeorm';
 import { ModuleData } from './module.entity';
-import { AppMaster } from 'src/module/meta/entity/app-master.entity';
+import { AppMaster } from 'src/module/app_master/entity/app-master.entity';
+import { Exclude } from 'class-transformer';
 
 @Entity({ name: 'sso_menu' })
 export class MenuData {
@@ -10,6 +11,9 @@ export class MenuData {
   @Column({ type: 'varchar', length: 100, nullable: true })
   name: string;
 
+  @Exclude()
+  module_code:string;
+
   @Column({ type: 'int', nullable: true })
   module_id: number
 

package/src/module/module/entity/module-access.entity.ts

@@ -3,7 +3,7 @@ import { ModuleData } from './module.entity';
 import { Role } from 'src/module/user/entity/role.entity';
 import { ModuleAction } from './module-action.entity';
 import { EnterpriseData } from 'src/module/enterprise/entity/enterprise.entity';
-import { AppMaster } from '../../meta/entity/app-master.entity';
+import { AppMaster } from '../../app_master/entity/app-master.entity';
 
 @Entity({ name: 'sso_module_access' })
 export class ModuleAccess {

package/src/module/module/entity/module.entity.ts

@@ -1,4 +1,4 @@
-import { AppMaster } from 'src/module/meta/entity/app-master.entity';
+import { AppMaster } from 'src/module/app_master/entity/app-master.entity';
 import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity({ name: 'sso_module' })

package/src/module/module/repository/menu.repository.ts

@@ -88,6 +88,7 @@ export class MenuRepository extends Repository<MenuData> {
       .andWhere('menu.ui_visible = 1')
       .select([
         'menu.*',
+        'module.module_code AS module_code',
         'module.component_name AS component',
         'module.title AS title',
         'module.entity_type AS entity_type',

package/src/module/user/entity/role.entity.ts

@@ -9,7 +9,7 @@ import {
 } from 'typeorm';
 import { Exclude } from 'class-transformer';
 import { EnterpriseData } from '../../enterprise/entity/enterprise.entity';
-import { AppMaster } from '../../meta/entity/app-master.entity';
+import { AppMaster } from '../../app_master/entity/app-master.entity';
 
 @Entity({ name: 'sso_role' })
 export class Role {

package/src/module/user/entity/user-role-mapping.entity.ts

@@ -1,6 +1,6 @@
 import { ENTITYTYPE_USRROLMAP } from 'src/constant/global.constant';
 import { EnterpriseData } from 'src/module/enterprise/entity/enterprise.entity';
-import { AppMaster } from 'src/module/meta/entity/app-master.entity';
+import { AppMaster } from 'src/module/app_master/entity/app-master.entity';
 import { Column, Entity, JoinColumn, ManyToMany, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
 import { UserData } from './user.entity';
 import { Role } from './role.entity';

package/src/module/user/entity/user.entity.ts

@@ -1,5 +1,5 @@
 import { EnterpriseData } from 'src/module/enterprise/entity/enterprise.entity';
-import { AppMaster } from 'src/module/meta/entity/app-master.entity';
+import { AppMaster } from 'src/module/app_master/entity/app-master.entity';
 import { Column, CreateDateColumn, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
 import { Exclude } from 'class-transformer';
 

package/src/module/user/user.module.ts

@@ -57,6 +57,7 @@ import { EnterpriseData } from '../enterprise/entity/enterprise.entity';
     UserRoleMappingService,
     RoleRepository,
     LoginService,
+    UserRoleMappingRepository
   ],
   controllers: [LoginController, UserController],
 })

package/src/table.config.ts

@@ -18,7 +18,7 @@ import { ListMasterData } from './module/listmaster/entity/list-master.entity';
 import { FieldLovMapper } from './module/mapper/entity/field-lovs.entity';
 import { FieldMapper } from './module/mapper/entity/field-mapper.entity';
 import { Mapper } from './module/mapper/entity/mapper.entity';
-import { AppMaster } from './module/meta/entity/app-master.entity';
+import { AppMaster } from './module/app_master/entity/app-master.entity';
 import { AttributeMaster } from './module/meta/entity/attribute-master.entity';
 import { EntityMaster } from './module/meta/entity/entity-master.entity';
 import { EntityRelationData } from './module/meta/entity/entity-relation-data.entity';

package/dist/module/meta/controller/app-master.controller.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"app-master.controller.js","sourceRoot":"","sources":["../../../../src/module/meta/controller/app-master.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,2DAA2D;AAE3D,sEAAiE;AAI1D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YAAoB,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAGpD,AAAN,KAAK,CAAC,eAAe,CACZ,GAA4B,EAC5B,GAAa;QAEpB,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAEhC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,EAAE,CAAC,CAAC;YAEvE,OAAO,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC;gBACvD,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,4BAA4B;aACvD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF,CAAA;AArBY,kDAAmB;AAIxB;IADL,IAAA,YAAG,EAAC,EAAE,CAAC;IAEL,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;;;;0DAcP;8BApBU,mBAAmB;IAF/B,IAAA,mBAAU,EAAC,MAAM,CAAC;IAClB,IAAA,kBAAS,EAAC,wBAAY,CAAC;qCAEgB,qCAAgB;GAD3C,mBAAmB,CAqB/B"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"app-master.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/app-master.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,SAAS,GAAf,MAAM,SAAS;CA8CrB,CAAA;AA9CY,8BAAS;AAGpB;IADC,IAAA,gCAAsB,GAAE;;qCACd;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCAC1D;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;;yCAC1D;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCAC1D;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CAC5C;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAClC,IAAI;+CAAC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5C;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACnC,IAAI;gDAAC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCAC7C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC7C;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC7C;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC7C;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC7C;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC7C;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CAC7C;oBA7CL,SAAS;IADrB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;GACtB,SAAS,CA8CrB"}

package/dist/module/meta/repository/app-master.repository.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"app-master.repository.js","sourceRoot":"","sources":["../../../../src/module/meta/repository/app-master.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAiD;AACjD,mEAAwD;AAGjD,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YAEmB,oBAA2C;QAA3C,yBAAoB,GAApB,oBAAoB,CAAuB;IAC3D,CAAC;IAEJ,KAAK,CAAC,yBAAyB,CAC7B,OAAe;QAEf,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;YAC1C,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;SACzB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAbY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,6BAAS,CAAC,CAAA;qCACW,oBAAU;GAHxC,oBAAoB,CAahC"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"app-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/app-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qGAAoG;AACpG,+EAA2E;AAGpE,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACmB,mBAAyC,EACzC,yBAAoD;QADpD,wBAAmB,GAAnB,mBAAmB,CAAsB;QACzC,8BAAyB,GAAzB,yBAAyB,CAA2B;IACpE,CAAC;IAEJ,KAAK,CAAC,yBAAyB,CAAC,MAAc;QAC5C,MAAM,QAAQ,GACZ,MAAM,IAAI,CAAC,yBAAyB,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC;QAE3E,MAAM,WAAW,GAAU,EAAE,CAAC;QAE9B,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CACpC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACrC,MAAM,IAAI,GACR,MAAM,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;gBACpE,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,CAAC,CAAC,CACH,CAAC;YAEF,YAAY,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACnC,WAAW,CAAC,IAAI,CAAC;oBACf,GAAG,EAAE,IAAI,CAAC,IAAI;oBACd,OAAO,EAAE,IAAI;iBACd,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CACF,CAAA;AA/BY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAG6B,4CAAoB;QACd,wDAAyB;GAH5D,gBAAgB,CA+B5B"}