mmhglobal-dynamicform 2.12.3 → 2.12.4

package/fesm2020/mmhglobal-dynamicform.mjs

@@ -1923,7 +1923,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
 // import { ZComponentHelper, ZComponentOutputEvent, ModalPageParams, ZGrid } from '../dynamicform/zcomponent.model';
 // import { ZGroup, ZField } from '../model/zgroup.model';
 class MainService {
-    constructor(router, activatedRoute, modalCtrl, navController, alertService, cacheService, fieldService, resourceApiService, componentErrorHandlerService, webApiService, zcoreService, modalService, storageService, debugService, translationService, signalrService, dialogService, oauth2Service, sharepointService, toastService) {
+    constructor(router, activatedRoute, modalCtrl, navController, alertService, cacheService, fieldService, resourceApiService, componentErrorHandlerService, webApiService, zcoreService, modalService, storageService, debugService, translationService, signalrService, dialogService, oauth2Service, toastService, authService) {
         this.router = router;
         this.activatedRoute = activatedRoute;
         this.modalCtrl = modalCtrl;
@@ -1942,8 +1942,8 @@ class MainService {
         this.signalrService = signalrService;
         this.dialogService = dialogService;
         this.oauth2Service = oauth2Service;
-        this.sharepointService = sharepointService;
         this.toastService = toastService;
+        this.authService = authService;
         this.backNavigationPath = [];
         this.routeParam = [];
         this.currentUrl = '';
@@ -2994,63 +2994,69 @@ class MainService {
         }
     }
     alertFormModified(formId, group, resp, eventName) {
-        // TODO: 20230830: need to further enhance handling data refresh if there linked child/Id at same page. currently unsure how to pull the linked child record.
         if (!resp) {
             return false;
         }
         const respResult = JSON.parse(resp);
+        if (!respResult.UserName) {
+            return false;
+        }
         if (formId === respResult.Id?.toString() && eventName === window.location.href) {
-            if (respResult.Action === ActionType.Delete) {
-                this.alertService.show("Record Deleted by Another User", "The current record has been deleted by another user.", [
-                    { text: "OK", cssClass: "primary" }
-                ], ["col-6"], undefined, true).pipe(switchMap((reply) => {
-                    if (reply === "OK") {
-                        this.navigateBackToPreviousPage(group);
-                        return of(true);
-                    }
-                })).subscribe();
-            }
-            else if (respResult.Action === ActionType.Update) {
-                this.webApiService.httpGet$(`${this.group.resourceURL}/${formId}`, null).subscribe(resp => {
-                    if (resp && resp.RowVersion) {
-                        // Find properties starting with 'zworkflowbuttons_'
-                        const workflowButtons = [];
-                        for (const key in this.group.zComponents) {
-                            if (key.startsWith("zworkflowbuttons_")) {
-                                workflowButtons.push(this.group.zComponents[key]);
-                            }
-                        }
-                        if (resp.RowVersion !== this.group.zModel?.RowVersion) {
-                            this.alertService.show("The current page has been modified by other users.", "Would you like to refresh the page data?", [
-                                { text: "No", cssClass: "secondary" },
-                                { text: "Yes", cssClass: "primary" }
-                            ], ["col-6"], undefined, true).pipe(switchMap((reply) => {
-                                if (reply === "Yes") {
-                                    this.group.zModel = resp;
-                                    const fg = this.group.form;
-                                    fg.patchValue(this.group.zModel);
-                                    fg.markAsPristine();
-                                    //reload workflow buttons
-                                    workflowButtons.forEach(buttons => {
-                                        buttons.loadButton();
-                                    });
-                                    return of(true);
-                                }
-                                workflowButtons.forEach(buttons => {
-                                    buttons.removeGotoButton();
-                                });
-                                this.toastService.showPermanently('The data on the current page is not up to date, as it has been saved and overwritten by another user. Please refresh the page.', 'top', 'warning');
-                                return of(false);
-                            })).subscribe();
+            if (respResult.UserName === this.authService.e1Token.myProfile.UserName) {
+                if (respResult.Action === ActionType.Update) {
+                    this.reloadDataAndWorkflowButton(resp);
+                }
+            }
+            else {
+                if (respResult.Action === ActionType.Delete) {
+                    this.alertService.show("Record Deleted by Another User", "The current record has been deleted by another user.", [
+                        { text: "OK", cssClass: "primary" }
+                    ], ["col-6"], undefined, true).pipe(switchMap((reply) => {
+                        if (reply === "OK") {
+                            this.navigateBackToPreviousPage(group);
+                            return of(true);
                         }
-                        else {
-                            console.log(`Alert received regarding form modification, RowVersion remains unaltered. No further action has been taken.`);
+                    })).subscribe();
+                }
+                else if (respResult.Action === ActionType.Update) {
+                    this.webApiService.httpGet$(`${this.group.resourceURL}/${formId}`, null).subscribe(resp => {
+                        if (resp && resp.RowVersion) {
+                            if (resp.RowVersion !== this.group.zModel?.RowVersion) {
+                                this.alertService.show("The current page has been modified by other users.", "Would you like to refresh the page data?", [
+                                    { text: "No", cssClass: "secondary" },
+                                    { text: "Yes", cssClass: "primary" }
+                                ], ["col-6"], undefined, true).pipe(switchMap((reply) => {
+                                    if (reply === "Yes") {
+                                        this.reloadDataAndWorkflowButton(resp);
+                                        return of(true);
+                                    }
+                                    this.toastService.showPermanently('The data on the current page is not up to date, as it has been saved and overwritten by another user. Please refresh the page.', 'top', 'warning');
+                                    return of(false);
+                                })).subscribe();
+                            }
+                            else {
+                                console.log(`Alert received regarding form modification, RowVersion remains unaltered. No further action has been taken.`);
+                            }
                         }
-                    }
-                });
+                    });
+                }
             }
         }
     }
+    reloadDataAndWorkflowButton(zModel) {
+        this.group.zModel = zModel;
+        const fg = this.group.form;
+        fg.patchValue(this.group.zModel);
+        fg.markAsPristine();
+        // Capture all workflow buttons
+        const workflowButtons = Object.keys(this.group.zComponents)
+            .filter(key => key.startsWith("zworkflowbuttons_"))
+            .map(key => this.group.zComponents[key]);
+        // Reload workflow buttons
+        workflowButtons.forEach(button => {
+            button.loadButton();
+        });
+    }
     //#endregion
     // #region DEC
     async loadContainerView(elementContainer, containerPage, data, group) {
@@ -3100,14 +3106,14 @@ class MainService {
         }
     }
 }
-MainService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: MainService, deps: [{ token: i1$1.Router }, { token: i1$1.ActivatedRoute }, { token: i2$1.ModalController }, { token: i2$1.NavController }, { token: i2.AlertService }, { token: i2.CacheService }, { token: i2.FieldService }, { token: i2.ResourceApiService }, { token: i2.ComponentErrorHandlerService }, { token: i2.WebApiService }, { token: i2.ZCoreService }, { token: i3.ModalService }, { token: i2.StorageSessionService }, { token: ZComponentDebugService }, { token: i2.TranslationService }, { token: i2.SignalrService }, { token: i1$2.DialogService }, { token: i2.OAuth2Service }, { token: i2.SharePointService }, { token: i2.ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
+MainService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: MainService, deps: [{ token: i1$1.Router }, { token: i1$1.ActivatedRoute }, { token: i2$1.ModalController }, { token: i2$1.NavController }, { token: i2.AlertService }, { token: i2.CacheService }, { token: i2.FieldService }, { token: i2.ResourceApiService }, { token: i2.ComponentErrorHandlerService }, { token: i2.WebApiService }, { token: i2.ZCoreService }, { token: i3.ModalService }, { token: i2.StorageSessionService }, { token: ZComponentDebugService }, { token: i2.TranslationService }, { token: i2.SignalrService }, { token: i1$2.DialogService }, { token: i2.OAuth2Service }, { token: i2.ToastService }, { token: i2.AuthService }], target: i0.ɵɵFactoryTarget.Injectable });
 MainService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: MainService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: MainService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: i2$1.ModalController }, { type: i2$1.NavController }, { type: i2.AlertService }, { type: i2.CacheService }, { type: i2.FieldService }, { type: i2.ResourceApiService }, { type: i2.ComponentErrorHandlerService }, { type: i2.WebApiService }, { type: i2.ZCoreService }, { type: i3.ModalService }, { type: i2.StorageSessionService }, { type: ZComponentDebugService }, { type: i2.TranslationService }, { type: i2.SignalrService }, { type: i1$2.DialogService }, { type: i2.OAuth2Service }, { type: i2.SharePointService }, { type: i2.ToastService }]; } });
+        }], ctorParameters: function () { return [{ type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: i2$1.ModalController }, { type: i2$1.NavController }, { type: i2.AlertService }, { type: i2.CacheService }, { type: i2.FieldService }, { type: i2.ResourceApiService }, { type: i2.ComponentErrorHandlerService }, { type: i2.WebApiService }, { type: i2.ZCoreService }, { type: i3.ModalService }, { type: i2.StorageSessionService }, { type: ZComponentDebugService }, { type: i2.TranslationService }, { type: i2.SignalrService }, { type: i1$2.DialogService }, { type: i2.OAuth2Service }, { type: i2.ToastService }, { type: i2.AuthService }]; } });
 function refreshGrid(group) {
     const zgridControl = group["gridOptions"];
     if (zgridControl) {
@@ -3168,16 +3174,7 @@ class ZGridBindingDirective extends DataBindingDirective {
                 }
                 return;
             }
-            const array = this.resourceURL.split("/api/");
-            if (!!array[1]) {
-                array[1] = "Page" + array[1];
-                this.paginationApiPostUrl = array.join("/api/");
-            }
-            else {
-                const arr = this.resourceURL.split("/");
-                arr[arr.length - 2] = "Page" + arr[arr.length - 2];
-                this.paginationApiPostUrl = arr.join("/");
-            }
+            this.setResourceUrl(this.resourceURL);
             this.setFilterParamsByParentRefId();
         }
         // this.gridSubject.next(this);
@@ -3198,6 +3195,18 @@ class ZGridBindingDirective extends DataBindingDirective {
             this.generateGridColumns();
         }
     }
+    setResourceUrl(resourceUrl) {
+        const array = resourceUrl.split("/api/");
+        if (!!array[1]) {
+            array[1] = "Page" + array[1];
+            this.paginationApiPostUrl = array.join("/api/");
+        }
+        else {
+            const arr = this.resourceURL.split("/");
+            arr[arr.length - 2] = "Page" + arr[arr.length - 2];
+            this.paginationApiPostUrl = arr.join("/");
+        }
+    }
     setFilterParamsByParentRefId() {
         // Use field own referenceId if available
         const refId = this.getFieldReferenceId() || this.grp.referenceId;
@@ -4438,7 +4447,7 @@ class UipageComponent {
                 this.setupRouteParams(routeParam);
             }
             else {
-                console.warn("Error in uipage init.");
+                console.warn("routeParam is undefined.");
             }
         }), switchMap(() => {
             const formType = isListForm ? FieldType.listField : FieldType.formField;