mmhglobal-dynamicform 2.6.5 → 2.7.1

package/fesm2020/mmhglobal-dynamicform.mjs

@@ -1,13 +1,14 @@
 import * as i0 from '@angular/core';
 import { Injectable, Component, Input, Directive, ViewChild, Inject, HostListener, Pipe, ViewContainerRef, TemplateRef, EventEmitter, Output, NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { HttpParams, HttpEventType } from '@angular/common/http';
 import * as i2$2 from '@angular/router';
 import { NavigationStart, NavigationEnd, NavigationError, RouterModule } from '@angular/router';
 import { of, switchMap, forkJoin, tap, BehaviorSubject, Subject, map as map$1, isObservable, interval, takeWhile, from, delay as delay$1, filter as filter$1, first } from 'rxjs';
 import { map, tap as tap$1, switchMap as switchMap$1, delay, take, filter, concatMap, ignoreElements } from 'rxjs/operators';
-import * as i2 from 'mmhglobal-zcore';
-import { ZComponentHelper, ZComponentProperties, FieldType, ComponentType as ComponentType$1, ZGroup, MESSAGETYPE, DefaultMessage, DefaultDialogTitle, ZSelectPostApiParams, UploadMetaData, DefaultPageSettingParams, ZCoreModule } from 'mmhglobal-zcore';
 import * as i1$1 from '@progress/kendo-angular-dialog';
 import { DialogContentBase } from '@progress/kendo-angular-dialog';
+import * as i2 from 'mmhglobal-zcore';
+import { ZComponentHelper, ZComponentProperties, FieldType, ComponentType as ComponentType$1, ZGroup, MESSAGETYPE, DefaultMessage, DefaultDialogTitle, ZSelectPostApiParams, UploadMetaData, DefaultPageSettingParams, ZCoreModule } from 'mmhglobal-zcore';
 import * as i4 from 'mmhglobal-zmodal';
 import { ZmodalHelper, MmhglobalZmodalModule, ModalService } from 'mmhglobal-zmodal';
 import * as i2$1 from '@ionic/angular';
@@ -19,7 +20,6 @@ import { Validators, FormGroup, FormControl, FormsModule, ReactiveFormsModule }
 import * as i1 from 'mmhglobal-middleware';
 import * as i5$1 from '@angular/common';
 import { formatDate, CommonModule } from '@angular/common';
-import { HttpParams, HttpEventType } from '@angular/common/http';
 import * as i7 from '@angular/flex-layout/extended';
 import * as i7$1 from '@progress/kendo-angular-grid';
 import { DataBindingDirective, GridComponent, BaseFilterCellComponent, ExcelModule, GridModule } from '@progress/kendo-angular-grid';
@@ -1611,7 +1611,7 @@ class ZformComponent {
             console.error('Field Name Duplication: ' + field.Name + ';  ', field);
         }
     }
-    getFormControls(fieldArray, formControls) {
+    getFormControls(fieldArray, formControls, containerIsVisible = true) {
         fieldArray.forEach(field => {
             if (!field.SubType) {
                 this.addToFieldIndex(field);
@@ -1623,13 +1623,17 @@ class ZformComponent {
                 }
                 else {
                     if (Array.isArray(field.Value)) {
-                        this.getFormControls(field.Value, formControls);
+                        const containerIsVisible = ZComponentHelper.isVisibleFormControl(this, field);
+                        this.getFormControls(field.Value, formControls, containerIsVisible);
                     }
                     else {
-                        this.fieldService.incrementComponentCounter(field.FieldElementName);
                         const isFormControl = ZComponentHelper.isFormControl(field);
                         const isVisible = ZComponentHelper.isVisibleFormControl(this, field);
                         const isRequired = ZComponentHelper.isRequiredFormControl(this, field);
+                        // if container || control visible == false, dont increase the counter.
+                        if (isVisible && containerIsVisible) {
+                            this.fieldService.incrementComponentCounter(field.FieldElementName);
+                        }
                         if (isFormControl === true) {
                             const validators = ZComponentHelper.getValidators(field, isVisible, isRequired);
                             formControls[field.Value] = new FormControl(this.group.zModel[field.Value], validators);
@@ -1931,11 +1935,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
             }] } });
 
 /********** Angular **********/
+// import { ModalService } from '../zmodal/modal.service';
 // import { ZmodalPage } from '../zmodal/zmodal.page';
 // 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, componentErrorHandler, webApiService, zcoreService, modalService, storageService, debugService, translationService) {
+    constructor(router, activatedRoute, modalCtrl, navController, alertService, cacheService, fieldService, resourceApiService, componentErrorHandler, webApiService, zcoreService, modalService, storageService, debugService, translationService, signalr, dialogService, oauth2Service) {
         this.router = router;
         this.activatedRoute = activatedRoute;
         this.modalCtrl = modalCtrl;
@@ -1951,6 +1956,9 @@ class MainService {
         this.storageService = storageService;
         this.debugService = debugService;
         this.translationService = translationService;
+        this.signalr = signalr;
+        this.dialogService = dialogService;
+        this.oauth2Service = oauth2Service;
         this.backNavigationPath = [];
         this.routeParam = [];
         this.NAVIGATION_PARAMS_STORAGE_KEY = 'routeParam';
@@ -1959,6 +1967,16 @@ class MainService {
         this.NAVIGATED_RELOAD_GRID_STORAGE_KEY = 'navigatedReloadGrid';
         this.CLONE_NEW_MODEL_CACHE_KEY = 'cloneNewModel';
         this.secretKey = 'my-secret-key';
+        //#region for signalR alert
+        this.getListFieldName = (fieldName) => {
+            const params = new HttpParams().set("name", fieldName);
+            return this.oauth2Service.httpGet$(this.fieldService.downloadListFieldUrl, params).pipe(map(res => res.FieldElementMasterId), switchMap$1(id => this.oauth2Service.httpGet$(this.fieldService.downloadFormFieldUrl, { id })), map(res => res.Name));
+        };
+        this.clearFormListFields = () => {
+            this.fieldService.dataFormFields = {};
+            this.fieldService.dataListFields = {};
+            this.fieldService.dataListFieldItems = {};
+        };
         console.log('MainService constructor');
         this.environment = this.zcoreService.getEnvironment();
         this.oauthEnvironmentUrl = this.environment.e1OauthUrl + '/';
@@ -1968,10 +1986,7 @@ class MainService {
                 console.log(event);
                 // Reset the routeParam,backNavigationPath and related sessionStorage current page is startup page
                 if (this.getStartupPage() === event.url) {
-                    this.routeParam = [];
-                    this.backNavigationPath = [];
-                    this.storageService.set(this.NAVIGATION_PARAMS_STORAGE_KEY, JSON.stringify(this.routeParam));
-                    this.storageService.set(this.BACK_NAVIGATION_PATH_STORAGE_KEY, JSON.stringify(this.backNavigationPath));
+                    this.resetRouteParam();
                 }
             }
             if (event instanceof NavigationEnd) {
@@ -1986,6 +2001,13 @@ class MainService {
             }
         });
     }
+    signalrGetEvent() {
+        return this.signalr.getEvent();
+    }
+    dialogOpen(options) {
+        return this.dialogService.open(options);
+    }
+    //#endregion
     startUp() {
         console.log('At main.service (StartUp) ...');
     }
@@ -2287,6 +2309,19 @@ class MainService {
         }
         return false;
     }
+    navigateFromMenu(pageName) {
+        const { startUpPage } = this.environment;
+        this.setRouteParam([`${startUpPage}`]);
+        this.backNavigationPath.push(this.getStartupPage());
+        this.storageService.set(this.BACK_NAVIGATION_PATH_STORAGE_KEY, JSON.stringify([this.getStartupPage()]));
+        this.router.navigate([pageName], { replaceUrl: true });
+    }
+    resetRouteParam() {
+        this.routeParam = [];
+        this.backNavigationPath = [];
+        this.storageService.set(this.NAVIGATION_PARAMS_STORAGE_KEY, JSON.stringify(this.routeParam));
+        this.storageService.set(this.BACK_NAVIGATION_PATH_STORAGE_KEY, JSON.stringify(this.backNavigationPath));
+    }
     getNavigationParams() {
         this.routeParam = this.routeParam || [];
         if (this.routeParam.length === 0) {
@@ -2388,6 +2423,16 @@ class MainService {
         this.tryUpdateGroupTrigger(false);
         const backNavigationPath = JSON.parse(sessionStorage.getItem(this.BACK_NAVIGATION_PATH_STORAGE_KEY));
         const backNavigationURL = group.backNavigationPage || backNavigationPath[backNavigationPath.length - 1];
+        //const backNavigationPathLastValue = backNavigationPath && backNavigationPath.length > 0 ? backNavigationPath[backNavigationPath.length - 1] : null;
+        // if navated by external(prefixed url) when close, direct go to menu/startu page
+        //const invalidSubstrings = ['?l=', '?f=', '?r=', '#'];
+        //const containsAny = (str, substrings) => {
+        //  return substrings.some(substring => str.includes(substring));
+        //};
+        //if (containsAny(backNavigationPathLastValue, invalidSubstrings)) {
+        //  await this.router.navigateByUrl(this.getStartupPage(), { replaceUrl: true });
+        //}
+        //else {
         if (!backNavigationURL) {
             console.error("Error navigating back to previous page: backNavigationURL is not set.");
             //throw new Error("BackNavigationPath not set.");
@@ -2413,6 +2458,7 @@ class MainService {
             console.error(`Error navigating back to previous page: ${error.message}`);
             //throw error;
         }
+        //}
     }
     getStartupPage() {
         const { startUpPage } = this.environment;
@@ -2469,8 +2515,7 @@ class MainService {
         group.isTriggered = false;
     }
     newModel(event, group) {
-        of([])
-            .pipe(switchMap$1((zmodel) => {
+        of([]).pipe(switchMap$1((zmodel) => {
             console.log("Before new, zModel:", zmodel);
             return this.beforeNewModel(group);
         }), tap$1(() => {
@@ -2535,8 +2580,7 @@ class MainService {
                     this.afterNewModel(group);
                 }
             }
-        }))
-            .subscribe();
+        })).subscribe();
     }
     createModel(event, group) {
         const fg = group.form;
@@ -2550,8 +2594,7 @@ class MainService {
             this.componentErrorHandler.showFormGroupErrorMessage(group, fg);
             return;
         }
-        of(group.zModel)
-            .pipe(switchMap$1((zmodel) => {
+        of(group.zModel).pipe(switchMap$1((zmodel) => {
             console.log("Before create, zModel:", zmodel);
             return this.beforeCreateModel(group);
         }), tap$1(() => {
@@ -2561,9 +2604,7 @@ class MainService {
         }), switchMap$1(() => {
             const newModel = Object.assign({}, group.zModel);
             ZComponentHelper.removeNullFields(newModel);
-            return this.webApiService
-                .httpPost$(group.resourceURL, newModel)
-                .pipe(tap$1((resp) => {
+            return this.webApiService.httpPost$(group.resourceURL, newModel).pipe(tap$1((resp) => {
                 createModelres = resp;
                 return resp;
             }), tap$1((res) => {
@@ -2594,8 +2635,7 @@ class MainService {
             }
             // console.log("Done updateModel updated zModel:", fg.value);
             // this.toastService.show("Record is created successfully.");
-        }))
-            .subscribe();
+        })).subscribe();
     }
     updateModel(event, group) {
         this.updateModelObservable(event, group).subscribe();
@@ -2610,14 +2650,12 @@ class MainService {
             }
             return of(false);
         }
-        updateAPIObservable = updateAPIObservable || this.webApiService.httpPut$(group.resourceURL + "/" + group.zModel.Id, group.zModel)
-            .pipe(tap$1((res) => {
+        updateAPIObservable = updateAPIObservable || this.webApiService.httpPut$(group.resourceURL + "/" + group.zModel.Id, group.zModel, false).pipe(tap$1((res) => {
             this.handleSuccess(res, resMessage);
         }
         //this.handleSuccess(res, "Record is updated successfully.")
         ));
-        return of(group.zModel)
-            .pipe(switchMap$1((zmodel) => {
+        return of(group.zModel).pipe(switchMap$1((zmodel) => {
             console.log("Before update, zModel:", zmodel);
             return this.beforeUpdateModel(group);
         }), tap$1(() => {
@@ -3002,14 +3040,14 @@ class MainService {
         }
     }
 }
-MainService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: MainService, deps: [{ token: i2$2.Router }, { token: i2$2.ActivatedRoute }, { token: i2$1.ModalController }, { token: i2$1.NavController }, { token: i2.AlertService }, { token: i2.CacheService }, { token: i2.FieldService }, { token: i2.ResourceApiService }, { token: ComponentErrorHandlerService }, { token: i2.WebApiService }, { token: i2.ZCoreService }, { token: i4.ModalService }, { token: i2.StorageSessionService }, { token: ZComponentDebugService }, { token: i2.TranslationService }], target: i0.ɵɵFactoryTarget.Injectable });
+MainService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: MainService, deps: [{ token: i2$2.Router }, { token: i2$2.ActivatedRoute }, { token: i2$1.ModalController }, { token: i2$1.NavController }, { token: i2.AlertService }, { token: i2.CacheService }, { token: i2.FieldService }, { token: i2.ResourceApiService }, { token: ComponentErrorHandlerService }, { token: i2.WebApiService }, { token: i2.ZCoreService }, { token: i4.ModalService }, { token: i2.StorageSessionService }, { token: ZComponentDebugService }, { token: i2.TranslationService }, { token: i2.SignalrService }, { token: i1$1.DialogService }, { token: i2.OAuth2Service }], 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: i2$2.Router }, { type: i2$2.ActivatedRoute }, { type: i2$1.ModalController }, { type: i2$1.NavController }, { type: i2.AlertService }, { type: i2.CacheService }, { type: i2.FieldService }, { type: i2.ResourceApiService }, { type: ComponentErrorHandlerService }, { type: i2.WebApiService }, { type: i2.ZCoreService }, { type: i4.ModalService }, { type: i2.StorageSessionService }, { type: ZComponentDebugService }, { type: i2.TranslationService }]; } });
+        }], ctorParameters: function () { return [{ type: i2$2.Router }, { type: i2$2.ActivatedRoute }, { type: i2$1.ModalController }, { type: i2$1.NavController }, { type: i2.AlertService }, { type: i2.CacheService }, { type: i2.FieldService }, { type: i2.ResourceApiService }, { type: ComponentErrorHandlerService }, { type: i2.WebApiService }, { type: i2.ZCoreService }, { type: i4.ModalService }, { type: i2.StorageSessionService }, { type: ZComponentDebugService }, { type: i2.TranslationService }, { type: i2.SignalrService }, { type: i1$1.DialogService }, { type: i2.OAuth2Service }]; } });
 function refreshGrid(group) {
     const zgridControl = group["gridOptions"];
     if (zgridControl) {
@@ -11713,6 +11751,11 @@ class ZudfComponent extends ContainerFieldBase {
             this.isLoading = false;
         })).subscribe();
     }
+    ngOnDestroy() {
+        if (this.subscription) {
+            this.subscription.unsubscribe();
+        }
+    }
     /**
      * Renders the field element and sets up the form.
      */