rez_core 1.0.46 → 1.0.48

package/src/module/meta/service/section-master.service.ts

@@ -0,0 +1,104 @@
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from './entity-service-impl.service';
+import { BaseEntity } from '../entity/base-entity.entity';
+import { UserData } from '../../user/entity/user.entity';
+import { EntityManager } from 'typeorm';
+import { ViewMaster } from '../entity/view-master.entity';
+
+@Injectable()
+export class SectionMasterService extends EntityServiceImpl {
+  constructor() {
+    super();
+  }
+
+  async createEntity(
+    entityData: BaseEntity,
+    loggedInUser: UserData | null,
+    manager?: EntityManager,
+  ): Promise<BaseEntity> {
+    const entityMaster = await this.entityMasterService.getEntityData(
+      entityData.entity_type,
+    );
+    entityData.parent_id = entityMaster.id;
+    entityData.parent_type = entityMaster.entity_type;
+
+    const savedEntity = await super.createEntity(
+      entityData,
+      loggedInUser,
+      manager,
+    );
+    return savedEntity;
+  }
+
+  async updateEntity(
+    entityData: ViewMaster,
+    loggedInUserData: UserData | null,
+  ): Promise<BaseEntity> {
+    return entityData;
+  }
+
+  parseLayout(layoutJson: any) {
+    const stepsData: {
+      stepType: string;
+      stepId: string;
+      stepLabel: string;
+      stepPosition: number;
+      fieldsGroup: {
+        type: string;
+        label: string;
+        id: string;
+      }[];
+    }[] = [];
+
+    if (layoutJson?.form?.children && Array.isArray(layoutJson.form.children)) {
+      const firstChild = layoutJson.form.children[0];
+      console.log('First Child:', firstChild);
+
+      if (firstChild.type === 'wizard' && Array.isArray(firstChild.steps)) {
+        console.log('Wizard Steps:', firstChild.steps);
+        let i = 0;
+        for (const step of firstChild.steps) {
+          if (step.type === 'step') {
+            const fields = this.extractFields(step.fields);
+
+            stepsData.push({
+              stepType: step.type,
+              stepId: step.id,
+              stepLabel: step.label,
+              stepPosition: ++i,
+              fieldsGroup: fields,
+            });
+          }
+        }
+      }
+    }
+    return stepsData;
+  }
+
+  extractFields(fieldsArray: any[]): {
+    type: string;
+    label: string;
+    id: string;
+  }[] {
+    const extractedFields: { type: string; label: string; id: string }[] = [];
+
+    function traverse(fields: any[]) {
+      for (const field of fields) {
+        if (field.type === 'field-set') {
+          extractedFields.push({
+            type: field.type || 'Default Type',
+            label: field.label || 'Default Label',
+            id: field.id || 'Default ID',
+          });
+        }
+        if (Array.isArray(field.fields)) {
+          traverse(field.fields);
+        }
+      }
+    }
+
+    traverse(fieldsArray);
+
+    return extractedFields;
+  }
+}

package/src/module/meta/service/view-master.service.ts

@@ -4,10 +4,16 @@ import { BaseEntity } from '../entity/base-entity.entity';
 import { UserData } from '../../user/entity/user.entity';
 import { EntityManager } from 'typeorm';
 import { ViewMaster } from '../entity/view-master.entity';
-
+import { SectionMasterService } from './section-master.service';
+import { SectionMaster } from '../entity/section-master.entity';
+import { FieldGroup } from '../entity/field-group.entity';
+import { FieldGroupService } from './field-group.service';
 @Injectable()
 export class ViewMasterService extends EntityServiceImpl {
-  constructor() {
+  constructor(
+    private readonly sectionMasterService: SectionMasterService,
+    private readonly fieldGroupService: FieldGroupService,
+  ) {
     super();
   }
 
@@ -27,6 +33,40 @@ export class ViewMasterService extends EntityServiceImpl {
       loggedInUser,
       manager,
     );
+    let viewMaster = savedEntity as ViewMaster;
+
+    let layout = viewMaster.published_form_layout;
+
+    const stepsData = this.sectionMasterService.parseLayout(layout);
+    for (var step of stepsData) {
+      let sectionMaster = new SectionMaster();
+      sectionMaster.name = step.stepLabel;
+      sectionMaster.position = step.stepPosition;
+      sectionMaster.description = step.stepLabel;
+      sectionMaster.parent_id = viewMaster.id;
+      sectionMaster.parent_type = viewMaster.entity_type;
+
+      const savedSectionMaster = await this.sectionMasterService.createEntity(
+        sectionMaster,
+        loggedInUser,
+        manager,
+      );
+
+      const fieldGroups = step.fieldsGroup;
+      console.log('fieldGroups', fieldGroups);
+
+      for (var fieldGroup of fieldGroups) {
+        let fieldsGroup = new FieldGroup();
+        fieldsGroup.view_id = viewMaster.id;
+        fieldsGroup.parent_id = savedSectionMaster.id;
+        fieldsGroup.field_type = fieldGroup.type;
+        fieldsGroup.label = fieldGroup.label;
+        fieldsGroup.description = fieldGroup.label;
+
+        this.fieldGroupService.createEntity(fieldsGroup, loggedInUser, manager);
+      }
+    }
+
     return savedEntity;
   }
 
@@ -34,8 +74,6 @@ export class ViewMasterService extends EntityServiceImpl {
     entityData: ViewMaster,
     loggedInUserData: UserData | null,
   ): Promise<BaseEntity> {
-
     return entityData;
   }
-
 }

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

@@ -199,6 +199,7 @@ export class ModuleAccessRepository {
       role: {
         id: savedRole.id,
         name: savedRole.name,
+        status: savedRole.status,
         code: savedRole.code,
       },
     };
@@ -250,6 +251,7 @@ export class ModuleAccessRepository {
       role: {
         id: role.id,
         name: role.name,
+        status: role.status,
         code: role.code,
       },
     };

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

@@ -1,10 +1,15 @@
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { ModuleAccessRepository } from '../repository/module-access.repository';
+import { RoleRepository } from 'src/module/user/repository/role.repository';
+import { RoleService } from '../../user/service/role.service';
+import { ENTITYTYPE_ROLE } from '../../../constant/global.constant';
+import { Role } from '../../user/entity/role.entity';
 
 @Injectable()
 export class ModuleAccessService {
   constructor(
     private readonly moduleAccessRepository: ModuleAccessRepository,
+    @Inject('RoleService') private readonly roleService: RoleService,
   ) {}
 
   async getRoles() {
@@ -49,16 +54,33 @@ export class ModuleAccessService {
     return this.moduleAccessRepository.createRole(body);
   }
 
-  async updateRole(id: number, body: {
-    name?: string;
-    description?: string;
-    status?: 'ACTIVE' | 'INACTIVE';
-    copyFromRoleId?: number;
-  }) {
+  async updateRole(
+    id: number,
+    body: {
+      name?: string;
+      description?: string;
+      status?: 'ACTIVE' | 'INACTIVE';
+      copyFromRoleId?: number;
+    },
+  ) {
     if (!body.name) {
-      throw new Error('Role name is required');
+      throw new BadRequestException('Role name is required');
+    }
+
+    //get role by id
+    const entityData = await this.roleService.getEntityData(ENTITYTYPE_ROLE,id);
+
+    if (!entityData) {
+      throw new BadRequestException('Role not found');
+    }
+    const role = entityData as Role;
+    if (body.status === 'INACTIVE' && role.is_system === 1) {
+      throw new BadRequestException('Cannot deactivate system role');
     }
-  
+
+    //if body.status =="INACTIVE" and role.is_system==1:
+    //  throw new Error('Cannot deactivate system role');
+
     return this.moduleAccessRepository.updateRole(id, {
       name: body.name,
       description: body.description,
@@ -66,7 +88,4 @@ export class ModuleAccessService {
       copyFromRoleId: body.copyFromRoleId,
     });
   }
-  
-  
-  
-}
+}

package/src/resources/dev.properties.yaml

@@ -15,7 +15,7 @@ VERIFY_OTP: "false"
 DEFAULT_OTP: "123456"
 AWS:
   S3:
-    AWS_ACCESS_KEY_ID: "AKIAYYKIBDDSVJMYCJUV"
-    AWS_SECRET_KEY: "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"
+    AWS_ACCESS_KEY_ID: "AKIAYYKIBDDSQF3KILGE"
+    AWS_SECRET_KEY: "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"
     AWS_REGION: "ap-south-1"
     BUCKET_NAME: "testether"