rez_core 2.1.156 → 2.1.157

package/package.json

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

package/src/module/filter/service/filter.service.ts

@@ -196,10 +196,12 @@ export class FilterService {
     const layoutPreference = await this.dataSource.query(
       `SELECT layout_json
       FROM cr_layout_preference
-      WHERE user_id = ? AND mapped_entity_type = ?`,
-      [user_id, entity_type],
+      WHERE user_id = ? AND mapped_entity_type = ? AND mapped_level_id = ? AND mapped_level_type = ?`,
+      [user_id, entity_type, level_id, level_type],
     );
 
+    console.log('found layoutPreference', layoutPreference);
+
     // Extract layout preference
     const layout = layoutPreference?.[0]?.layout_json?.quick_tab || {};
 

package/src/module/workflow/controller/action.controller.ts

@@ -42,7 +42,7 @@ export class ActionController {
     return result;
   }
 
-  @Post('/getActions')
+  @Post('/getactions')
   @HttpCode(HttpStatus.OK)
   async getActions(
     @Req() req: Request & { user: any },

package/src/module/workflow/controller/task.controller.ts

@@ -25,9 +25,10 @@ export class TaskController {
     @Req() req: Request & { user: any },
     @Body()
     body: {
-      mapped_entity_type: string;
-      mapped_entity_id: number;
       stage_id: number;
+      mapped_entity_type?: string;
+      mapped_entity_id?: number;
+      user_id?: number;
     },
   ) {
     const loggedInUser = req.user.userData;

package/src/module/workflow/repository/action.repository.ts

@@ -94,6 +94,11 @@ export class ActionRepository {
       };
     });
 
+    enrichedResult.push({
+      value: 0,
+      label: 'Generic',
+    } as any);
+
     return enrichedResult;
   }
 }

package/src/module/workflow/repository/task.repository.ts

@@ -11,18 +11,10 @@ export class TaskRepository {
     private readonly dataSource: DataSource,
   ) {}
 
-  async getAllTaskByUserIdAndStageId(
-    userId,
-    stageId,
-    mapped_entity_type,
-    mapped_entity_id,
-  ) {
+  async getAllTaskByUserIdAndStageId(condition) {
     const result = await this.TaskRepository.find({
       where: {
-        user_id: userId,
-        stage_id: stageId,
-        mapped_entity_type,
-        mapped_entity_id,
+        ...condition,
       },
     });
 

package/src/module/workflow/service/action.service.ts

@@ -64,6 +64,7 @@ export class ActionService extends EntityServiceImpl {
       appcode,
     );
 
+    // template mapping
     if (Array.isArray(actionData.template) && actionData.template.length > 0) {
       const templates = actionData.template;
 
@@ -102,7 +103,7 @@ export class ActionService extends EntityServiceImpl {
     };
 
     // Pass only actionData (without template) to super.updateEntity
-    let action = await super.updateEntity(actionData, loggedInUser);
+    let action = await super.updateEntity({ ...actionData }, loggedInUser);
 
     if (!action) {
       throw new Error('Action not found or could not be updated');
@@ -126,17 +127,17 @@ export class ActionService extends EntityServiceImpl {
       loggedInUser,
     );
 
+    // delete existing template mappings for this action
+    await this.dataSource.query(
+      `DELETE FROM cr_wf_action_template_mapping WHERE stg_act_mapping_id = ?`,
+      [stageActionMappingData.id],
+    );
+
     // Handle template mapping (using the extracted template)
     if (Array.isArray(template) && template.length > 0) {
       for (let i = 0; i < template.length; i++) {
         const templateCode = template[i];
 
-        // delete existing template mappings for this action
-        await this.dataSource.query(
-          `DELETE FROM cr_wf_action_template_mapping WHERE stg_act_mapping_id = ? AND template_code = ?`,
-          [stageActionMappingData.id, templateCode],
-        );
-
         // Create Action-Template Mapping
         const actionTemplateMapping = {
           stg_act_mapping_id: stageActionMappingData.id,
@@ -291,8 +292,7 @@ export class ActionService extends EntityServiceImpl {
     const actionResults = await this.dataSource
       .createQueryBuilder()
       .select([
-        'a.id AS id',
-        'a.name AS name',
+        'a.*',
         'ac.name AS action_category',
         'ar.name AS action_requirement',
       ])

package/src/module/workflow/service/task.service.ts

@@ -17,12 +17,12 @@ export class TaskService extends EntityServiceImpl {
     loggedInUser: UserData,
     data,
   ): Promise<any> {
-    const taskData = await this.taskRepository.getAllTaskByUserIdAndStageId(
-      loggedInUser.id,
-      data.stage_id,
-      data.mapped_entity_type,
-      data.mapped_entity_id,
-    );
+    const taskData = await this.taskRepository.getAllTaskByUserIdAndStageId({
+      user_id: data.user_id,
+      stage_id: data.stage_id,
+      mapped_entity_type: data.mapped_entity_type,
+      mapped_entity_id: data.mapped_entity_id,
+    });
 
     const grouped: { mandatory: any[]; non_mandatory: any[] } = {
       mandatory: [],