mmhglobal-dynamicform 2.27.0 → 2.28.0

package/fesm2020/mmhglobal-dynamicform.mjs

@@ -6,7 +6,7 @@ import { NavigationStart, NavigationEnd, NavigationError, RouterModule } from '@
 import { BehaviorSubject, forkJoin, of, tap as tap$1, map as map$1, first, isObservable, switchMap as switchMap$1, interval, takeWhile, from, Subject, delay as delay$1, filter, auditTime } from 'rxjs';
 import { tap, switchMap, map, take, delay, concatMap, ignoreElements } from 'rxjs/operators';
 import * as i2 from 'mmhglobal-zcore';
-import { ZGroup, FormType, ZComponentHelper, MESSAGETYPE, ActionType, DefaultMessage, DefaultDialogTitle, Delimiter, ZSelectPostApiParams, ComponentType as ComponentType$1, ZComponentProperties, SignalType, DropdownSearchOperator, InternalComponentType_DropDown, UploadMetaData, AttachmentConfig, DefaultPageSettingParams, ZCoreModule } from 'mmhglobal-zcore';
+import { ZGroup, FormType, ZComponentHelper, MESSAGETYPE, ActionType, DefaultMessage, DefaultDialogTitle, TriggerFromType, Delimiter, ZSelectPostApiParams, ComponentType as ComponentType$1, ZComponentProperties, SignalType, DropdownSearchOperator, InternalComponentType_DropDown, UploadMetaData, AttachmentConfig, DefaultPageSettingParams, ZCoreModule } from 'mmhglobal-zcore';
 import * as i2$1 from '@ionic/angular';
 import { IonicModule } from '@ionic/angular';
 import * as i3 from 'mmhglobal-zmodal';
@@ -828,8 +828,8 @@ class MainService {
     getResourceServerData() {
         return this.resourceApiService.loadData();
     }
-    getGroupFields(fieldElementName, formType, group, propertyName) {
-        return this.fieldService.getFormFieldCode(fieldElementName, formType, group, propertyName);
+    getGroupFields(fieldElementName, formType, triggerFrom, group, propertyName) {
+        return this.fieldService.getFormFieldCode(fieldElementName, formType, group, propertyName, triggerFrom);
     }
     initializeGroup(group, ctrlName, pageName, me) {
         if (me.subscription) {
@@ -839,7 +839,7 @@ class MainService {
         group.resourceURLName = resourceName;
         Object.assign(group, {
             resourceURL: this.resourceApiService.getURL(resourceName),
-            gridColumnFields: this.fieldService.getFormFieldCode(ctrlName, "FormField", null, null),
+            gridColumnFields: this.fieldService.getFormFieldCode(ctrlName, "FormField"),
             ctrlScope: me,
             pageName,
             ctrlName,
@@ -879,23 +879,12 @@ class MainService {
         me.subscription = group.subject.subscribe((event) => this.subjectEvent(event, group, me));
         return me.subscription;
     }
-    getModel$(group, id) {
+    getModel$(group, id, triggerFrom) {
         const recId = id || group.referenceId;
         return this.webApiService
-            .httpGet$(group.resourceURL + "/" + recId, null)
+            .httpGet$(`${group.resourceURL}/${recId}`, null, { triggerFrom: triggerFrom })
             .pipe(tap((zmodel) => {
             group.zModel = zmodel;
-            //if (
-            //  group.parentReferenceField &&
-            //  Object.keys(zmodel).indexOf(group.parentReferenceField) !== -1 &&
-            //  !group.backNavigationPage.endsWith(".edit")
-            //) {
-            //  group.backNavigationPage =
-            //    group.backNavigationPage +
-            //    "/" +
-            //    zmodel[group.parentReferenceField].toString() +
-            //    "/edit";
-            //}
         }), switchMap(() => {
             if (group.afterGetModelSuccess) {
                 return this.afterGetModelSuccess(group);
@@ -1365,7 +1354,7 @@ class MainService {
         }), switchMap(() => {
             const newModel = Object.assign({}, group.zModel);
             ZComponentHelper.removeNullFields(newModel);
-            return this.webApiService.httpPost$(group.resourceURL, newModel).pipe(tap((resp) => {
+            return this.webApiService.httpPost$(group.resourceURL, newModel, { buttonDetail: event, group: group, triggerFrom: event.triggerFrom }).pipe(tap((resp) => {
                 createModelres = resp;
                 return resp;
             }), tap((res) => {
@@ -1411,7 +1400,7 @@ class MainService {
             }
             return of(false);
         }
-        updateAPIObservable = updateAPIObservable || this.webApiService.httpPut$(`${group.resourceURL}/${group.zModel.Id}`, group.zModel, false).pipe(tap((res) => {
+        updateAPIObservable = updateAPIObservable || this.webApiService.httpPut$(`${group.resourceURL}/${group.zModel.Id}`, group.zModel, { buttonDetail: event, group: group, triggerFrom: event.triggerFrom }).pipe(tap((res) => {
             this.handleSuccess(res, resMessage);
         }
         //this.handleSuccess(res, "Record is updated successfully.")
@@ -1501,7 +1490,7 @@ class MainService {
                 group.zModel.Disabled = true;
                 let tempResponse = {};
                 return this.webApiService
-                    .httpPut$(group.resourceURL + "/" + group.zModel.Id, group.zModel)
+                    .httpPut$(`${group.resourceURL}/${group.zModel.Id}`, group.zModel, { buttonDetail: event, group: group, triggerFrom: event.triggerFrom })
                     .pipe(tap((res) => {
                     tempResponse = Object.assign({}, res);
                     this.handleSuccess(res, resMessage);
@@ -1795,7 +1784,7 @@ class MainService {
         if (formId === respResult.Id?.toString() && eventName === window.location.href) {
             if (respResult.UserName === this.authService.e1Token.myProfile.UserName) {
                 if (respResult.Action === ActionType.Update) {
-                    this.webApiService.httpGet$(`${this.group.resourceURL}/${formId}`, null).subscribe(resp => {
+                    this.webApiService.httpGet$(`${this.group.resourceURL}/${formId}`, null, { triggerFrom: TriggerFromType.signalRAlert }).subscribe(resp => {
                         this.reloadDataAndWorkflowButton(resp);
                     });
                 }
@@ -4004,7 +3993,7 @@ class UipageComponent {
             const fieldElementName = this.group.fieldName ? this.group.fieldName : ctrlName;
             this.group.fieldName = fieldElementName; // to be decprecated 
             this.group.fieldElementName = fieldElementName;
-            return this.mainService.getGroupFields(fieldElementName, formType, this.group, "fields");
+            return this.mainService.getGroupFields(fieldElementName, formType, TriggerFromType.initialPageLoad, this.group, "fields");
             //let formFieldName = this.group.fieldName ? this.group.fieldName : ctrlName;
             //this.group.fieldName = formFieldName;
             //if(UipageComponent.signalrEventSubscription){
@@ -4049,7 +4038,7 @@ class UipageComponent {
                     return this.group.getModel(this.group, this.group.referenceId);
                 }
                 else {
-                    return this.mainService.getModel$(this.group, this.group.referenceId);
+                    return this.mainService.getModel$(this.group, this.group.referenceId, TriggerFromType.initialPageLoad);
                 }
             }
             else {
@@ -5303,7 +5292,7 @@ class ZbuttonsComponent extends ButtonFieldBase {
         this.componentService.decrementComponentCounterForField(this.data);
     }
     loadButton() {
-        const field$ = this.fieldService.getFormFieldCode(this.data.Value, "FormField", null, null);
+        const field$ = this.fieldService.getFormFieldCode(this.data.Value, "FormField");
         this.group.zButtonsCount++;
         if (this.group.zButtonsCount === 1) {
             this.FirstZbtn = true;
@@ -5354,6 +5343,7 @@ class ZbuttonsComponent extends ButtonFieldBase {
                 SubType: this.data.SubType,
                 Type: button.Type,
                 buttonData: button,
+                eventId: ZComponentHelper.generateTimeStampId()
             };
         }
         if (button['PositionX'] && button['PositionX'] === "right") {
@@ -5378,7 +5368,8 @@ class ZbuttonsComponent extends ButtonFieldBase {
         this.group.subject.next({
             type: "buttonClick",
             target: item.clickEvent,
-            data: item
+            data: item,
+            triggerFrom: TriggerFromType.button
         });
     }
     getButtonDisableTriggerValue(data, button) {
@@ -6852,13 +6843,13 @@ class ZworkflowbuttonsComponent extends ButtonFieldBase {
             if (this.group.resourceURL) {
                 this.isLocalHostAPI = this.group.resourceURL.toLowerCase().includes("localhost") ? true : false;
             }
-            this.loadButton();
+            this.loadButton(TriggerFromType.initialPageLoad);
         });
     }
     ngAfterViewInit() {
         this.componentService.decrementComponentCounterForField(this.data);
     }
-    loadButton() {
+    loadButton(triggerFrom) {
         this.leftBtns = [];
         this.rightBtns = [];
         this.items = [];
@@ -6872,7 +6863,7 @@ class ZworkflowbuttonsComponent extends ButtonFieldBase {
         try {
             of(true).pipe(concatMap(() => {
                 // retrieve the workflow button
-                return this.workflowService.getWorkflowButtonsField(this.data.WorkflowCode, this.e1wfs_wfcGetWorkflowButtonURL, String(this.isLocalHostAPI));
+                return this.workflowService.getWorkflowButtonsField(this.data.WorkflowCode, this.e1wfs_wfcGetWorkflowButtonURL, String(this.isLocalHostAPI), triggerFrom);
             }), tap(resultData => {
                 if (resultData) {
                     resultData.forEach((button) => {
@@ -6908,7 +6899,7 @@ class ZworkflowbuttonsComponent extends ButtonFieldBase {
                     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);
@@ -6955,19 +6946,6 @@ class ZworkflowbuttonsComponent extends ButtonFieldBase {
         const formGroup = this.group.form;
         const attributes = JSON.parse(button.Attributes);
         const buttonTypeCode = button.TypeCode.toUpperCase();
-        //// Skip if the button's click event includes backnavigation
-        //if (buttonTypeCode === 'GOTO') {
-        //  // Check if the form has unsaved changes
-        //  if (!this.data.SkipCheckFormDirty && !formGroup.dirty) {
-        //    console.warn(`Record not saved because the form is not dirty.`);
-        //    return;
-        //  }
-        //  // Check if the form is valid
-        //  if (this.data.UseDefaultValidate && !formGroup.valid) {
-        //    this.componentErrorHandlerService.showFormGroupErrorMessage(this.group, formGroup);
-        //    return;
-        //  }
-        //}
         // Type 1 == functional;
         // Type 2 == GOTO;
         this.group.isTriggered = button.disableTrigger != undefined ? !button.disableTrigger : true;
@@ -6977,11 +6955,10 @@ class ZworkflowbuttonsComponent extends ButtonFieldBase {
                 if (!this.group.isTriggered) {
                     return;
                 }
-                const group = this.group;
                 // Disable trigger timer
                 if (!attributes['DisableTriggerTimer']) {
                     setTimeout(function () {
-                        group['isTriggered'] = false;
+                        this.group['isTriggered'] = false;
                     }, 500);
                 }
                 console.log("Functional Button: ", button.Name);
@@ -6993,7 +6970,7 @@ class ZworkflowbuttonsComponent extends ButtonFieldBase {
                 // Call the workflow service to handle the GOTO button click event
                 this.workflowService.gotoButton_Onclick(button, this.data, attributes, this.group, this.isLocalHostAPI).subscribe(res => {
                     // Reload the button
-                    this.loadButton();
+                    this.loadButton(TriggerFromType.goToButton);
                     // Reset trigger status
                     this.group.isTriggered = false;
                     if (res) {
@@ -7017,6 +6994,7 @@ class ZworkflowbuttonsComponent extends ButtonFieldBase {
         };
         const newButton = {
             ...button,
+            eventId: ZComponentHelper.generateTimeStampId(),
             Attributes: JSON.stringify(newAttributes),
             disableTrigger: this.isButtonDisableTrigger(this.data, button),
         };
@@ -7215,6 +7193,7 @@ class ZselectmultipleComponent extends InputFieldBase {
         this.itemDataField = null;
         this.itemTemplate = "{{item[itemTextField]}}";
         this.infiniteScrollPageNo = 0;
+        this.infiniteDataLoaded = false;
         this.isLoading = true;
         this.allowCustomValue = false;
         this.autoClose = true;
@@ -7432,6 +7411,8 @@ class ZselectmultipleComponent extends InputFieldBase {
                 this.infiniteScrollPageNo = 0;
                 this.modelzData = [];
             }
+            this.infiniteDataLoaded = false;
+            ZComponentHelper.cancelGetInfiniteData;
             this.getInfiniteData(event);
         }
         else {
@@ -7529,7 +7510,10 @@ class ZselectmultipleComponent extends InputFieldBase {
     }
     handleOpen(event) {
         if (this.data.HasInfiniteScroll) {
-            this.handleFilter(null);
+            if (!this.infiniteDataLoaded) {
+                this.infiniteDataLoaded = true;
+                this.handleFilter(null);
+            }
         }
         // Ensure multiselect value meets the search length requirement
         if (this.multiselect && this.data.SearchLength && this.multiselect.value.length < this.data.SearchLength) {