mmhglobal-dynamicform 2.5.1 → 2.5.2

package/fesm2015/mmhglobal-dynamicform.mjs

@@ -6,7 +6,7 @@ import { NavigationStart, NavigationEnd, NavigationError, RouterModule } from '@
 import { of, switchMap, forkJoin, tap, Subject, BehaviorSubject, 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, ZGroup, MESSAGETYPE, ZSelectPostApiParams, UploadMetaData, DefaultPageSettingParams, ZCoreModule } from 'mmhglobal-zcore';
+import { ZComponentHelper, ZComponentProperties, 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 i4 from 'mmhglobal-zmodal';
@@ -2775,8 +2775,8 @@ class MainService {
     isFormDirtyAndValid(fg, group, isSkipDirty = false, event) {
         if (!isSkipDirty && !fg.dirty) {
             console.warn("Form is not dirty hence record is not save.");
-            const message = event && event.data && event.data[`FormNotDirtyMessage`] ? event.data[`FormNotDirtyMessage`] : "Data has not been changed since it was last saved.";
-            this.alertService.showOkay("Nothing to update", message);
+            const message = event && event.data && event.data[`FormNotDirtyMessage`] ? event.data[`FormNotDirtyMessage`] : DefaultMessage.notDirtyMessage;
+            this.alertService.showOkay(DefaultDialogTitle.nothingToUpdate, message, ["col-5"]);
             return false;
         }
         if (!fg.valid) {
@@ -2796,7 +2796,7 @@ class MainService {
     }
     beforeDeleteModel(group) {
         if (!group.beforeDeleteModel) {
-            console.warn("group.beforeUpdateModel is undefined");
+            console.warn("group.beforeDeleteModel is undefined");
             return of({});
         }
         return group.beforeDeleteModel(group);
@@ -2810,7 +2810,7 @@ class MainService {
     }
     beforeCreateModel(group) {
         if (!group.beforeCreateModel) {
-            console.warn("group.beforeUpdateModel is undefined");
+            console.warn("group.beforeCreateModel is undefined");
             return of({});
         }
         return group.beforeCreateModel(group);
@@ -3145,37 +3145,44 @@ class ZGridBindingDirective extends DataBindingDirective {
     }
     generateGridColumns() {
         const columnFields$ = ZComponentHelper.getGroupValue(this.field.ColumnFields, this.grp);
-        columnFields$.pipe(tap$1((data) => {
-            const gridSetting = this.getGridSettings();
-            ZComponentHelper.getGridColumns(data, this.gridColumns, this.zgridbinding.group, gridSetting, this.usableColumns);
-            this.getFilterParamsColumns();
-            this.getFilter();
-            this.getFilterParams();
-            this.getSorting();
-            this.getGrantType();
-            this.setHiddenColumn(gridSetting);
-            this.params.referId = this.getFieldReferenceId() || this.grp.referenceId || null;
-            // }),
-            // switchMap(() => {
-            //   //Get Session
-            //   return this.getGridSessionFilter(this.grp, this);
-            // }),
-            // switchMap(() => {
-            //    //Before get grid data
-            //   return this.beforeGridGetData(this.grp, this);
-            // }),
-            // switchMap(() => {
-            //   //Set grid data
-            //   return this.setGridSessionFilter(this.grp, this);
-        })).subscribe(() => {
-            if (this.field['SkipLoadResourceURLData']) {
-                this.grid.loading = false;
-                this.gridSubject.next(this);
-            }
-            else {
-                this.getDataBinding();
-            }
-        });
+        if (columnFields$) {
+            columnFields$.pipe(tap$1((data) => {
+                const gridSetting = this.getGridSettings();
+                ZComponentHelper.getGridColumns(data, this.gridColumns, this.zgridbinding.group, gridSetting, this.usableColumns);
+                this.getFilterParamsColumns();
+                this.getFilter();
+                this.getFilterParams();
+                this.getSorting();
+                this.getGrantType();
+                this.setHiddenColumn(gridSetting);
+                this.params.referId = this.getFieldReferenceId() || this.grp.referenceId || null;
+                // }),
+                // switchMap(() => {
+                //   //Get Session
+                //   return this.getGridSessionFilter(this.grp, this);
+                // }),
+                // switchMap(() => {
+                //    //Before get grid data
+                //   return this.beforeGridGetData(this.grp, this);
+                // }),
+                // switchMap(() => {
+                //   //Set grid data
+                //   return this.setGridSessionFilter(this.grp, this);
+            })).subscribe(() => {
+                if (this.field['SkipLoadResourceURLData']) {
+                    this.grid.loading = false;
+                    this.gridSubject.next(this);
+                }
+                else {
+                    this.getDataBinding();
+                }
+            });
+        }
+        else {
+            console.log('Fail to generate grid column fields.');
+            console.log(this.field.ColumnFields);
+            console.log(this.grp);
+        }
     }
     setSkipLoadResourceURLData(settingValue) {
         this.field['SkipLoadResourceURLData'] = !settingValue;
@@ -8229,6 +8236,11 @@ class ZgridComponent extends DataListingFieldBase {
         if (!this.data.ColumnFields) {
             console.warn('Invalid/Empty grid(' + this.data.Name + ') columnField');
         }
+        if (!columnFields$) {
+            console.log('Fail to generate grid column fields.');
+            console.log(this.data.ColumnFields);
+            console.log(this.group);
+        }
         return columnFields$.pipe(tap$1(data => {
             if (!data) {
                 console.warn('Invalid/Empty grid(' + this.data.Name + ') data to generate column');