mmhglobal-dynamicform 2.16.0 → 2.17.0

package/fesm2020/mmhglobal-dynamicform.mjs

@@ -6670,20 +6670,14 @@ class ZworkflowbuttonsComponent extends ButtonFieldBase {
         this.rightBtns = [];
         this.items = [];
         // Get WFS_DocumentId if any.
-        let documentId = null;
-        if (this.group.zModel) {
-            documentId = this.group.zModel['WFS_DocumentId'];
-        }
+        const documentId = this.group.zModel?.['WFS_DocumentId'];
         // Set the documentId to the service
         this.workflowService.appendWFS_DocumentsInfo(this.data.WorkflowCode, documentId);
         // button count
         this.group.zButtonsCount++;
-        if (this.group.zButtonsCount === 1) {
-            this.FirstZbtn = true;
-        }
+        this.FirstZbtn = this.group.zButtonsCount === 1;
         try {
-            of(true)
-                .pipe(concatMap(() => {
+            of(true).pipe(concatMap(() => {
                 // retrieve the workflow button
                 return this.workflowService.getWorkflowButtonsField(this.data.WorkflowCode, this.e1wfs_wfcGetWorkflowButtonURL, String(this.isLocalHostAPI));
             }), tap(resultData => {
@@ -6696,7 +6690,7 @@ class ZworkflowbuttonsComponent extends ButtonFieldBase {
                         const attributes = JSON.parse(button.Attributes);
                         const isUseCustomClass = attributes.Color ? false : true;
                         button = this.appendToAttributeUsefulDetail(button);
-                        let btn = {
+                        const btn = {
                             name: button.Name,
                             text: label,
                             icon: ZComponentHelper.getIcon(attributes.Icon),
@@ -6711,39 +6705,33 @@ class ZworkflowbuttonsComponent extends ButtonFieldBase {
                                 this.buttonClick(button);
                             }
                         };
-                        if (attributes.PositionX && attributes.PositionX === "right") {
+                        if (attributes.PositionX && attributes.PositionX === 'right') {
                             this.rightBtns.push(btn);
                         }
                         else {
                             this.leftBtns.push(btn);
                         }
-                        const mappedInfo = {
-                            'role': [],
-                            'status': [],
-                            'parentStatus': []
-                        };
-                        //ZComponentHelper.collectWorkflowButton(this.group, this.data.WorkflowCode, buttonLabel, button, attributes, mappedInfo);
                     });
                     this.items.push(...this.leftBtns, ...this.rightBtns);
                 }
                 else {
-                    console.warn('unable to get workflow button. data returned null.');
+                    console.warn('Unable to get workflow button. Data returned null.');
                 }
             }), switchMap(() => {
                 return super.translateButtonsLabel(this.items);
-            }), map(() => {
+            }), switchMap(() => {
                 if (!this.data.DisableSyncWorkflowStatus) {
                     // Set default status
                     // eslint-disable-next-line @typescript-eslint/dot-notation
-                    if (!this.group.zModel["WFS_StatusName"]) {
+                    if (!this.group.zModel['WFS_StatusName']) {
                         const params = {
-                            "WorkflowMasterCode": this.data.WorkflowCode
+                            WorkflowMasterCode: this.data.WorkflowCode,
                         };
-                        return this.webApiService.httpPost$(this.e1wfs_wfc_getWorkflowInitialStatusURL, params).pipe(map(res => {
+                        return this.webApiService.httpPost$(this.e1wfs_wfc_getWorkflowInitialStatusURL, params).pipe(tap(res => {
                             if (res.Data) {
-                                ZComponentHelper.presetModelValue("WFS_StatusId", res.Data["Id"], this.group);
-                                ZComponentHelper.presetModelValue("WFS_StatusName", res.Data["Name"], this.group);
-                                ZComponentHelper.presetModelValue("WFS_StatusCode", res.Data["Code"], this.group);
+                                ZComponentHelper.presetModelValue('WFS_StatusId', res.Data['Id'], this.group);
+                                ZComponentHelper.presetModelValue('WFS_StatusName', res.Data['Name'], this.group);
+                                ZComponentHelper.presetModelValue('WFS_StatusCode', res.Data['Code'], this.group);
                                 this.workflowService.setCurrentDocumentStatus(res.Data);
                             }
                         }));
@@ -6751,10 +6739,10 @@ class ZworkflowbuttonsComponent extends ButtonFieldBase {
                     else {
                         // When loading also to get current Status Information if any.
                         const docInfoParam = {
-                            "WorkflowMasterCode": this.data.WorkflowCode,
-                            "DocumentId": documentId,
+                            WorkflowMasterCode: this.data.WorkflowCode,
+                            DocumentId: documentId,
                         };
-                        this.webApiService.httpPost$(this.e1wfs_wfc_getDocumentStatusURL, docInfoParam).pipe(map(res => {
+                        return this.webApiService.httpPost$(this.e1wfs_wfc_getDocumentStatusURL, docInfoParam).pipe(tap(res => {
                             this.workflowService.setCurrentDocumentStatus(res);
                             if (res.Data) {
                                 this.workflowService.setCurrentDocumentStatus(res.Data);
@@ -6762,10 +6750,11 @@ class ZworkflowbuttonsComponent extends ButtonFieldBase {
                         }));
                     }
                 }
+                return of(null);
             })).subscribe();
         }
         catch (error) {
-            console.error("error: ", error);
+            console.error('Error:', error);
         }
     }
     buttonClick(button) {
@@ -9423,7 +9412,7 @@ class ZgridComponent extends DataListingFieldBase {
         this.closeEditor(sender);
         // loop all column to get validation and create form control
         const colFormControl = {};
-        this.zgrid.gridColumns.forEach(col => {
+        this.columns.forEach(col => {
             const validators = [];
             if (col.IsRequired) {
                 validators.push(Validators.required);
@@ -9496,7 +9485,7 @@ class ZgridComponent extends DataListingFieldBase {
         this.closeEditor(sender);
         // loop all column to get validation and create form control, append current row value
         const colFormControl = {};
-        this.zgrid.gridColumns.forEach(col => {
+        this.columns.forEach(col => {
             const validators = [];
             if (col.IsRequired) {
                 validators.push(Validators.required);