mmhglobal-dynamicform 2.13.0 → 2.14.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, isObservable, switchMap as switchMap$1, interval, takeWhile, from, Subject, delay as delay$1, filter, first, auditTime } from 'rxjs';
 import { tap, switchMap, map, take, delay, concatMap, ignoreElements } from 'rxjs/operators';
 import * as i2 from 'mmhglobal-zcore';
-import { ZGroup, ZComponentHelper, MESSAGETYPE, DefaultMessage, DefaultDialogTitle, ActionType, Delimiter, ZSelectPostApiParams, FieldType, ZComponentProperties, ComponentType as ComponentType$1, InternalComponentType_DropDown, UploadMetaData, AttachmentConfig, DefaultPageSettingParams, ZCoreModule } from 'mmhglobal-zcore';
+import { ZGroup, FormType, ZComponentHelper, MESSAGETYPE, DefaultMessage, DefaultDialogTitle, ActionType, Delimiter, ZSelectPostApiParams, ZComponentProperties, ComponentType as ComponentType$1, 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';
@@ -183,19 +183,18 @@ class ZComponentDebugService {
         });
     }
     loadDebugZModel(me) {
-        const d = me.group._debug;
         const downloadList = [];
         downloadList.push(this.getProjectId());
-        const formType = me.group.isListForm ? 'ListField' : 'FormField';
+        const formType = me.group.isListForm ? FormType.listField : FormType.formField;
         const fieldName = me.group.fieldName;
         const fieldzModel = this.getFieldzModel(formType, fieldName);
         downloadList.push(fieldzModel);
         return forkJoin(downloadList);
     }
     getProjectId() {
-        const d = this.debug;
+        const debuggerGroup = this.debug;
         const url = this.resourceApiService.getURL('projectsURL');
-        return this.webApiService.getApi(url, {}, d.zData, 'ProjectOptions', null, d, false);
+        return this.webApiService.getApi(url, {}, debuggerGroup.zData, 'ProjectOptions', null, debuggerGroup, false);
     }
     getFieldzModel(type, activityName) {
         if (type === 'FormField') {
@@ -206,34 +205,41 @@ class ZComponentDebugService {
         }
     }
     getFormFieldzModel(activityName) {
-        const d = this.debug;
-        const url = this.resourceApiService.getURL('field');
-        return this.webApiService.httpGet$(url, { name: activityName, type: 'FormField' }).pipe(tap((respData) => {
+        const debuggerGroup = this.debug;
+        const fieldUrl = this.resourceApiService.getURL('field');
+        return this.webApiService.httpGet$(fieldUrl, { name: activityName, type: 'FormField' }).pipe(tap((respData) => {
             // console.log('respData: ', respData);
-            Object.assign(d.zModel, respData);
-            d.form.patchValue(d.zModel);
-            d.form.markAsPristine();
-            const fields = JSON.parse(d.zModel.Code);
-            Object.assign(d, {
+            Object.assign(debuggerGroup.zModel, respData);
+            debuggerGroup.form.patchValue(debuggerGroup.zModel);
+            debuggerGroup.form.markAsPristine();
+            const fields = JSON.parse(debuggerGroup.zModel.Code);
+            Object.assign(debuggerGroup, {
                 treeModel: ZComponentHelper.convertTreeModel(fields)
             });
         }));
     }
     getListFieldzModel(activityName) {
-        const d = this.debug;
-        const url = this.resourceApiService.getURL('fieldsMapping');
-        const url2 = this.resourceApiService.getURL('field');
-        return this.webApiService.httpGet$(url, { name: activityName }).pipe(switchMap((fieldMapping) => {
-            // console.log('fieldMapping: ', fieldMapping);
-            return this.webApiService.httpGet$(url2, { id: fieldMapping.FieldElementMasterId });
+        const debuggerGroup = this.debug;
+        const fieldsMappingUrl = this.resourceApiService.getURL('fieldsMapping');
+        const fieldUrl = this.resourceApiService.getURL('field');
+        return this.webApiService.httpGet$(fieldsMappingUrl, { name: activityName }).pipe(switchMap((fieldMapping) => {
+            // Fetch field data based on FieldElementMasterId
+            return this.webApiService.httpGet$(fieldUrl, { id: fieldMapping.FieldElementMasterId });
         }), tap((respData) => {
-            Object.assign(d.zModel, respData);
-            d.form.patchValue(d.zModel);
-            d.form.markAsPristine();
-            const fields = JSON.parse(d.zModel.Code);
-            Object.assign(d, {
-                treeModel: ZComponentHelper.convertTreeModel(fields)
-            });
+            // Update debuggerGroup with field data
+            Object.assign(debuggerGroup.zModel, respData);
+            debuggerGroup.form.patchValue(debuggerGroup.zModel);
+            debuggerGroup.form.markAsPristine();
+            // Parse and convert Code to treeModel
+            try {
+                const fields = JSON.parse(debuggerGroup.zModel.Code);
+                Object.assign(debuggerGroup, {
+                    treeModel: ZComponentHelper.convertTreeModel(fields)
+                });
+            }
+            catch (error) {
+                console.error('Error parsing JSON:', error);
+            }
         }));
     }
     subjectEvent(event, group, me) {
@@ -247,7 +253,7 @@ class ZComponentDebugService {
             // ZComponentHelper.getGroupValue(event.Target, group);
         }
         catch (error) {
-            console.warn("Error when getGroupValue: ", event.target, " > Error: ", error);
+            console.warn(`Error in getGroupValue. Event target: ${event.target}. Error: ${error}`);
         }
         // callFunc(event);
         if (typeof callFunc === "function") {
@@ -261,15 +267,7 @@ class ZComponentDebugService {
                 return;
             }
             if (event.type === "zgrid-cellClick") {
-                // (callFunc.startsWith('edit')) {  zgrid-cellClick
                 const cName = callFunc.slice(4);
-                // debugger;
-                // const modalGroupParam: ModalPageParams = {};
-                // modalGroupParam.controllerName = cName;
-                // modalGroupParam.referId = event.data.Id;
-                // modalGroupParam.colFields$ = event.columnFields$;
-                // modalGroupParam.parentGroup = me.group;
-                // this.openModalForm(modalGroupParam);
                 this.showzModal({
                     fieldElementName: cName,
                     fieldElementObservable$: event.columnFields$,
@@ -287,14 +285,7 @@ class ZComponentDebugService {
                     this.router.navigate([url]);
                     return;
                 }
-                // const modalGroupParam: ModalPageParams = {};
-                // modalGroupParam.controllerName = callFunc.ctrlName;
-                // modalGroupParam.referId = event.data.Id;
-                // modalGroupParam.colFields$ = event.columnFields$;
-                // modalGroupParam.parentGroup = me.group;
-                // modalGroupParam.formHeader = callFunc.formHeader;
                 if (callFunc.formHeader) {
-                    // this.openModalForm(modalGroupParam);
                     this.showzModal({
                         fieldElementName: callFunc.ctrlName,
                         fieldElementObservable$: event.columnFields$,
@@ -305,12 +296,11 @@ class ZComponentDebugService {
                     }).subscribe();
                     return;
                 }
-                console.warn("Invalid callFunc type: ", callFunc, " event.Target: ", event.target);
+                console.warn(`Invalid callFunc type: ${callFunc}. Event target: ${event.target}`);
             }
-            // this.openModalFormByComponent(callFunc.type, event.Data.Id);
         }
         else {
-            console.warn("Function not defined in group for: ", event.target, ", Event: ", event);
+            console.warn(`Function not defined in group. Target: ${event.target}. Event details: `, event);
         }
     }
     gridActivityLogOnItemClick(event) {
@@ -602,7 +592,7 @@ class ZComponentDebugService {
         const debug = this.debug;
         const fg = this.debug.form;
         if (!fg.dirty) {
-            console.warn("Debug Form is not dirty hence record is not save.");
+            console.warn("The debug form is not dirty, so the record is not saved.");
             return;
         }
         if (!fg.valid) {
@@ -621,7 +611,7 @@ class ZComponentDebugService {
             return this.webApiService.httpPut$(debug.resourceURL + "/" + debug.zModel.Id, debug.zModel)
                 .pipe(map(res => this.handleSuccess(res, "Record is updated successfully.")), map(res => this.signalrService.sendToClientGroup(this.groupsToSend, this.eventName, debug.zModel)));
         }), switchMap((zmodel) => {
-            console.log("After Debug Form updated, zModel:", zmodel);
+            console.log("After updating Debug Form, zModel:", zmodel);
             if (zmodel && zmodel.Data) {
                 Object.assign(debug.zModel, zmodel.Data);
                 fg.patchValue(zmodel.Data);
@@ -833,8 +823,8 @@ class MainService {
     getResourceServerData() {
         return this.resourceApiService.loadData();
     }
-    getGroupFields(ctrlName, formType, group, propertyName) {
-        return this.fieldService.getFormFieldCode(ctrlName, formType, group, propertyName);
+    getGroupFields(fieldElementName, formType, group, propertyName) {
+        return this.fieldService.getFormFieldCode(fieldElementName, formType, group, propertyName);
     }
     initializeGroup(group, ctrlName, pageName, me) {
         if (me.subscription) {
@@ -1835,7 +1825,9 @@ 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.reloadDataAndWorkflowButton(resp);
+                    this.webApiService.httpGet$(`${this.group.resourceURL}/${formId}`, null).subscribe(resp => {
+                        this.reloadDataAndWorkflowButton(resp);
+                    });
                 }
             }
             else {
@@ -3958,9 +3950,11 @@ class UipageComponent {
                 console.warn("routeParam is undefined.");
             }
         }), switchMap(() => {
-            const formType = isListForm ? FieldType.listField : FieldType.formField;
-            const formFieldName = this.group.fieldName ? this.group.fieldName : ctrlName;
-            this.group.fieldName = formFieldName;
+            const formType = isListForm ? FormType.listField : FormType.formField;
+            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");
             //let formFieldName = this.group.fieldName ? this.group.fieldName : ctrlName;
             //this.group.fieldName = formFieldName;
             //if(UipageComponent.signalrEventSubscription){
@@ -3985,7 +3979,6 @@ class UipageComponent {
             //   this.mainService.clearFormListFields()
             //  })
             //).subscribe();
-            return this.mainService.getGroupFields(formFieldName, formType, this.group, "fields");
         }), switchMap((fields) => {
             return this.mainService.beforePageInitialise(this.group);
         }), switchMap((fields) => {
@@ -3997,7 +3990,6 @@ class UipageComponent {
                 return of(fields);
             }
         }), switchMap(() => {
-            // console.log('CtrName: ' + ctrlName + ' field Element: ', fields);
             if (this.group.referenceId && this.group.referenceId !== "0") {
                 this.mainService.joinProjectSignalR();
                 if (this.group.subscribeToModificationAlert) {
@@ -4454,7 +4446,7 @@ class UiactionbuttonComponent extends ButtonFieldBase {
         }
         else {
             // handle as zButton
-            const field$ = this.fieldService.getFormFieldCode(this.data.Value, FieldType.formField, null, null);
+            const field$ = this.fieldService.getFormFieldCode(this.data.Value, FormType.formField, null, null);
             field$.subscribe((data) => {
                 this.actionBtnList = data;
                 this.reloadButtonList();
@@ -7883,31 +7875,35 @@ class ZnumericComponent extends InputFieldBase {
     addMinAndMaxValidator() {
         // Setup form validator for ionic components only (Kendo component will be auto setup)
         if (this.isMobileScreen()) {
-            const control = this.form.controls[this.data.Value];
-            if (this.minValue != undefined) {
-                this.minValidator = Validators.min(Number(this.minValue));
-                control.addValidators(this.minValidator);
-            }
-            if (this.maxValue != undefined) {
-                this.maxValidator = Validators.max(Number(this.maxValue));
-                control.addValidators(this.maxValidator);
+            const control = this.form?.controls[this.data.Value];
+            if (control) {
+                if (this.minValue != undefined) {
+                    this.minValidator = Validators.min(Number(this.minValue));
+                    control.addValidators(this.minValidator);
+                }
+                if (this.maxValue != undefined) {
+                    this.maxValidator = Validators.max(Number(this.maxValue));
+                    control.addValidators(this.maxValidator);
+                }
+                control.updateValueAndValidity();
             }
-            control.updateValueAndValidity();
         }
     }
     removeMinAndMaxValidator() {
         this.minValue = null;
         this.maxValue = null;
-        const control = this.form.controls[this.data.Value];
-        if (this.isMobileScreen()) {
-            if (control.hasValidator(this.minValidator)) {
-                control.removeValidators(this.minValidator);
-            }
-            if (control.hasValidator(this.maxValidator)) {
-                control.removeValidators(this.maxValidator);
+        const control = this.form?.controls[this.data.Value];
+        if (control) {
+            if (this.isMobileScreen()) {
+                if (control.hasValidator(this.minValidator)) {
+                    control.removeValidators(this.minValidator);
+                }
+                if (control.hasValidator(this.maxValidator)) {
+                    control.removeValidators(this.maxValidator);
+                }
             }
+            control.updateValueAndValidity();
         }
-        control.updateValueAndValidity();
     }
 }
 ZnumericComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: ZnumericComponent, deps: [{ token: ZComponentService }], target: i0.ɵɵFactoryTarget.Component });