rez_core 5.0.166 → 5.0.168

package/dist/module/module/service/module-access.service.js.map

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

package/dist/module/notification/service/notification.service.js

@@ -69,12 +69,12 @@ let NotificationsService = class NotificationsService {
             isReadFilter = isRead ? '1' : '0';
         }
         let paramIndex = 1;
-        let sql = `
-    SELECT n.*
-    FROM frm_notification n
-    WHERE n.user_id = $${paramIndex}
-      AND n.level_id = $${paramIndex + 1}
-      AND n.level_type = $${paramIndex + 2}
+        let sql = `
+    SELECT n.*
+    FROM frm_notification n
+    WHERE n.user_id = $${paramIndex}
+      AND n.level_id = $${paramIndex + 1}
+      AND n.level_type = $${paramIndex + 2}
   `;
         const params = [String(id), String(level_id), String(level_type)];
         paramIndex += 3;

package/dist/module/user/controller/login.controller.js

@@ -58,27 +58,27 @@ let LoginController = class LoginController {
             try {
                 const actualState = state.replace('gmail_config:', '');
                 const result = await this.integrationService.handleGmailTokensCallback(email, googleAccessToken, googleRefreshToken, actualState);
-                return res.send(`<html><body><script>
-    window.opener.postMessage({ type: 'CONFIG_SUCCESS' }, '*');
-    window.close();
+                return res.send(`<html><body><script>
+    window.opener.postMessage({ type: 'CONFIG_SUCCESS' }, '*');
+    window.close();
   </script> <p>Configuration successful. You can close this window.</p> </body></html>`);
             }
             catch (error) {
-                return res.send(`
-         <html>
-        <body>
-          <script>
-            if (window.opener) {
-              window.opener.postMessage({ 
-                type: "CONFIG_FAILED", 
-                error: "${error.message || 'Something went wrong'}" 
-              }, "*");
-            }
-            window.close();
-          </script>
-          <p>Configuration failed. Please close this window.</p>
-        </body>
-      </html>
+                return res.send(`
+         <html>
+        <body>
+          <script>
+            if (window.opener) {
+              window.opener.postMessage({ 
+                type: "CONFIG_FAILED", 
+                error: "${error.message || 'Something went wrong'}" 
+              }, "*");
+            }
+            window.close();
+          </script>
+          <p>Configuration failed. Please close this window.</p>
+        </body>
+      </html>
         `);
             }
         }

package/dist/module/workflow/repository/action.repository.js

@@ -114,8 +114,8 @@ let ActionRepository = class ActionRepository {
         ])
             .from('frm_wf_action', 'a')
             .leftJoin('frm_wf_action_category', 'ac', 'ac.id::text = a.action_category')
-            .leftJoin('frm_list_master_items', 'ar', `ar.id::text = a.action_requirement 
-      AND ar.listtype = 'ACRQ' 
+            .leftJoin('frm_list_master_items', 'ar', `ar.id::text = a.action_requirement 
+      AND ar.listtype = 'ACRQ' 
       AND ar.organization_id = :orgId`, { orgId: organization_id })
             .where('a.organization_id = :orgId', { orgId: organization_id })
             .andWhere('a.id::text IN (:...actionIds)', { actionIds })

package/dist/module/workflow/repository/stage.repository.js

@@ -62,14 +62,14 @@ let StageRepository = class StageRepository {
         if (!stageGroup) {
             return [];
         }
-        const rows = await this.dataSource.query(`
-    SELECT 
-      g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
-      s.*
-    FROM frm_wf_stage_group g
-    INNER JOIN frm_wf_stage s ON s.stage_group_id = g.id
-    WHERE g.workflow_id = $1 AND g.organization_id = $2 AND g.id = $3
-    ORDER BY g.id, s.id
+        const rows = await this.dataSource.query(`
+    SELECT 
+      g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
+      s.*
+    FROM frm_wf_stage_group g
+    INNER JOIN frm_wf_stage s ON s.stage_group_id = g.id
+    WHERE g.workflow_id = $1 AND g.organization_id = $2 AND g.id = $3
+    ORDER BY g.id, s.id
     `, [stageGroup.workflow_id, organization_id, stage_group_id]);
         if (!rows || rows.length === 0) {
             return [];

package/dist/module/workflow/service/action-template-mapping.service.js

@@ -108,8 +108,8 @@ let ActionTemplateMappingService = class ActionTemplateMappingService extends en
             'ct.name AS label',
             'ct.id AS id',
         ])
-            .innerJoin('frm_list_master_items', 'fmi', `fmi.id = ct.status::bigint 
-     AND fmi.code = 'STATUS_ACTIVE'
+            .innerJoin('frm_list_master_items', 'fmi', `fmi.id = ct.status::bigint 
+     AND fmi.code = 'STATUS_ACTIVE'
      AND fmi.organization_id::text = :orgId`, { orgId: String(loggedInUser.organization_id) })
             .where('ct.code IN (:...codes)', { codes: templateCodes })
             .andWhere('ct.mode::text = :mode', { mode: String(mode) })

package/dist/module/workflow/service/action.service.js

@@ -165,11 +165,11 @@ let ActionService = class ActionService extends entity_service_impl_service_1.En
         await this.actionTemplateMappingRepository
             .createQueryBuilder()
             .delete()
-            .where(`stg_act_mapping_id IN (
-          SELECT sam.id 
-          FROM frm_wf_stage_action_mapping sam
-          WHERE sam.action_id = :actionId
-          AND sam.entity_type = 'WFSA'
+            .where(`stg_act_mapping_id IN (
+          SELECT sam.id 
+          FROM frm_wf_stage_action_mapping sam
+          WHERE sam.action_id = :actionId
+          AND sam.entity_type = 'WFSA'
       )`)
             .setParameter('actionId', id)
             .execute();

package/dist/module/workflow/service/entity-modification.service.js

@@ -29,8 +29,8 @@ let EntityModificationService = class EntityModificationService extends entity_s
             throw new common_1.NotFoundException('Entity metadata not found in frm_entity_master');
         }
         const tableName = entityMeta.db_table_name;
-        const [entityRow] = await this.entityManager.query(`
-    SELECT * FROM ${tableName} WHERE id = $1
+        const [entityRow] = await this.entityManager.query(`
+    SELECT * FROM ${tableName} WHERE id = $1
     `, [mapped_entity_id]);
         if (!entityRow) {
             throw new common_1.NotFoundException(`No record found in ${tableName} with ID ${mapped_entity_id}`);

package/dist/module/workflow/service/task.service.js

@@ -226,14 +226,14 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
             });
         }
         if (overdue) {
-            qb.andWhere(`
-      (
-        t.due_date < CURRENT_DATE
-        OR (
-          t.due_date = CURRENT_DATE 
-          AND t.due_time::time < CURRENT_TIME
-        )
-      )
+            qb.andWhere(`
+      (
+        t.due_date < CURRENT_DATE
+        OR (
+          t.due_date = CURRENT_DATE 
+          AND t.due_time::time < CURRENT_TIME
+        )
+      )
     `).andWhere('t.is_done = :is_done', { is_done: false });
         }
         qb.orderBy('t.created_date', 'DESC');

package/dist/module/workflow-automation/service/schedule-handler.service.js

@@ -67,21 +67,21 @@ let ScheduleHandlerService = ScheduleHandlerService_1 = class ScheduleHandlerSer
         const fixedTime = scheduleJson.fixedTime;
         let comparisonDateCondition = '';
         if (executionDateName.includes('after')) {
-            comparisonDateCondition = `
-    ${executionDataOrTime} >= CURDATE() + INTERVAL ${executionUnits} DAY
-    AND ${executionDataOrTime} < CURDATE() + INTERVAL ${executionUnits + 1} DAY
+            comparisonDateCondition = `
+    ${executionDataOrTime} >= CURDATE() + INTERVAL ${executionUnits} DAY
+    AND ${executionDataOrTime} < CURDATE() + INTERVAL ${executionUnits + 1} DAY
   `;
         }
         else if (executionDateName.includes('before')) {
-            comparisonDateCondition = `
-    ${executionDataOrTime} >= CURDATE() - INTERVAL ${executionUnits + 1} DAY
-    AND ${executionDataOrTime} < CURDATE() - INTERVAL ${executionUnits} DAY
+            comparisonDateCondition = `
+    ${executionDataOrTime} >= CURDATE() - INTERVAL ${executionUnits + 1} DAY
+    AND ${executionDataOrTime} < CURDATE() - INTERVAL ${executionUnits} DAY
   `;
         }
         else if (executionDateName.includes('same')) {
-            comparisonDateCondition = `
-    ${executionDataOrTime} >= CURDATE()
-    AND ${executionDataOrTime} < CURDATE() + INTERVAL 1 DAY
+            comparisonDateCondition = `
+    ${executionDataOrTime} >= CURDATE()
+    AND ${executionDataOrTime} < CURDATE() + INTERVAL 1 DAY
   `;
         }
         const qb = this.dataSource