vcomply-workflow-engine 6.6.1 → 6.6.3

package/fesm2022/vcomply-workflow-engine.mjs

@@ -31914,7 +31914,16 @@ class WorkflowComplianceComponent {
         this.unSubscribeProgram = new Subject();
         this.customFields = [];
         this.selectedPrograms = {};
-        this.checkCustomFields();
+        this.getOrgUserInfo();
+    }
+    ngOnInit() {
+        this.setFeatureFlags();
+        this.getInitialData();
+        this.populateRCList();
+        this.pickerChanged.emit(false);
+    }
+    getOrgUserInfo() {
+        this.loader = true;
         this.organizationCommonService?.getOrgUserInfo()?.subscribe({
             next: (res) => {
                 const complianceSubmodule = res?.roleActions[res?.roleActions?.findIndex((ele) => ele?.moduleName === 'compliance')]?.subModule;
@@ -31930,15 +31939,10 @@ class WorkflowComplianceComponent {
                     this.hiddenList.push('PROGRAM');
                     this.getCategoryList();
                 }
+                this.loader = false;
             },
         });
     }
-    ngOnInit() {
-        this.setFeatureFlags();
-        this.pickerChanged.emit(false);
-        this.getInitialData();
-        this.populateRCList();
-    }
     populateRCList() {
         if (this.openedFrom === 'RISK_TREATMENT' && this.mode === 'CREATE') {
             this.getRCList();
@@ -31959,6 +31963,7 @@ class WorkflowComplianceComponent {
         this.checkWhetherAllListsLoaded();
         this.getOrganizationDetails();
         this.getUserDetails();
+        this.checkCustomFields();
         this.shortMonth = this.frequencyService.monthArray.map((month) => month.substring(0, 3));
         if (this.openedFrom === 'RISK_TREATMENT') {
             this.getRCDetailsinRiskTreatment();
@@ -31981,16 +31986,19 @@ class WorkflowComplianceComponent {
     }
     checkCustomFields() {
         if (!this.customFields?.length) {
-            console.log('No custom fields');
-            this.hiddenList.push('CUSTOM_FIELDS');
-            this.hideElementsFromMoreOptions.emit(this.hiddenList);
+            if (!this.hiddenList.includes('CUSTOM_FIELDS')) {
+                this.hiddenList.push('CUSTOM_FIELDS');
+            }
         }
+        this.hideElementsFromMoreOptions.emit(this.hiddenList);
     }
     getRCDetailsinRiskTreatment() {
         this.responsibilityForm.rc = this.setList(this.responsibilityCentersList, [this.selectedRC], 'item_id');
         this.moreOptions.RC = true;
     }
     getOrgDetails() {
+        this.uiKitService.isLoader = true;
+        this.entrustLoader = true;
         this.organizationCommonService?.getOrgDetailsInfo()?.subscribe({
             next: (res) => {
                 this.isRiskEnable = res?.enable_riskclass ? true : false;
@@ -31998,9 +32006,13 @@ class WorkflowComplianceComponent {
                     this.hiddenList.push('RISK_CLASSIFICATION');
                     this.hideElementsFromMoreOptions.emit(this.hiddenList);
                 }
+                this.uiKitService.isLoader = false;
+                this.entrustLoader = false;
             },
             error: (err) => {
                 console.error(err);
+                this.uiKitService.isLoader = false;
+                this.entrustLoader = false;
             },
         });
     }