mmhglobal-dynamicform 1.1.34 → 1.1.35

package/README.md

@@ -3,6 +3,10 @@
 This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.2.13.
 
 ## Changelog 
+`1.35`<br/>
+Temp disable get grid setting from cookiestore when load.
+Fix and enable back grid session storage.
+
 `1.34`<br/>
 Fix zgrid intermittent display all column.
 Fix zText tooltip issue.

package/bundles/mmhglobal-dynamicform.umd.js

@@ -2127,23 +2127,99 @@
                 _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);
+            }), operators.switchMap(function () {
+                //Get Session
+                return _this.getGridSessionFilter(_this.grp, _this);
+            }), operators.switchMap(function () {
+                //Before get grid data
+                return _this.beforeGridGetData(_this.grp, _this);
+            }), operators.switchMap(function () {
+                //Set grid data
+                return _this.setGridSessionFilter(_this.grp, _this);
             }))
                 .subscribe(function () {
                 _this.getDataBinding();
             });
         };
+        ZGridBindingDirective.prototype.getFilterParamsColumns = function () {
+            var colFields = [];
+            this.gridColumns.forEach(function (field) {
+                if (field.valueExpr) {
+                    colFields.push(field.valueExpr + " as " + field.field);
+                }
+                else {
+                    colFields.push(field.field);
+                }
+            });
+            if (colFields.length > 0) {
+                if (colFields.indexOf("Id") === -1) {
+                    colFields.push("Id");
+                }
+            }
+            var tmpGridColumn = [];
+            tmpGridColumn.push(colFields.join(","));
+            if (this.usableColumns.length > 0) {
+                tmpGridColumn.push(this.usableColumns.join(","));
+            }
+            this.params.columns = tmpGridColumn.join(",");
+        };
+        ZGridBindingDirective.prototype.getFilter = function () {
+            var _this = this;
+            if (this.params.filters && this.field.Filters) {
+                this.params.filters = this.params.filters + " && " + this.field.Filters;
+            }
+            else if (!this.params.filters && this.field.Filters) {
+                this.params.filters = this.field.Filters;
+            }
+            if (this.field.Filters && this.field.Filters.indexOf("group.") !== -1) {
+                var filterKeyValPairs = this.field.Filters.split(" ");
+                var grpValues = filterKeyValPairs.filter(function (element) { return element.trim().indexOf("group.") !== -1; });
+                grpValues.forEach(function (val) {
+                    var actualVal = i3.ZComponentHelper.getGroupValue(val, _this.grp);
+                    _this.params.filters = _this.params.filters.replace(val, actualVal);
+                });
+            }
+        };
+        ZGridBindingDirective.prototype.getFilterParams = function () {
+            if (this.field['FilterParams']) {
+                if (this.field['FilterParams'].indexOf("group.") !== -1) {
+                    this.params.filterParams = i3.ZComponentHelper.getGroupValue(this.field['FilterParams'], this.grp);
+                }
+                else {
+                    this.params.filterParams = this.field['FilterParams'];
+                }
+            }
+        };
+        ZGridBindingDirective.prototype.getSorting = function () {
+            if (this.field.SortOrder) {
+                if (this.field.SortOrder.indexOf("group.") !== -1) {
+                    this.params.sortOrder = i3.ZComponentHelper.getGroupValue(this.field.SortOrder, this.grp);
+                }
+                else {
+                    this.params.sortOrder = this.field.SortOrder;
+                }
+            }
+        };
+        ZGridBindingDirective.prototype.getGrantType = function () {
+            if (this.field.GrantType) {
+                this.params.grantType = i3.ZComponentHelper.getGroupValue(this.field.GrantType.toString(), this.grp);
+            }
+        };
+        ZGridBindingDirective.prototype.setHiddenColumn = function (gridSetting) {
+            var _this = this;
+            if (this.gridColumns && gridSetting) {
+                // filter out hidden == false array.
+                var gridSettingHiddenCol = gridSetting.filter(function (item) {
+                    return item['hidden'] == true;
+                });
+                // find and set the hidden to current column setting.
+                Object.values(gridSettingHiddenCol).forEach(function (value) {
+                    if (_this.gridColumns.find(function (c) { return c.field === value.field; })) {
+                        _this.gridColumns.find(function (c) { return c.field === value.field; })['hidden'] = value['hidden'];
+                    }
+                });
+            }
+        };
         ZGridBindingDirective.prototype.getDataBinding = function () {
             var _this = this;
             this.grid.loading = true;
@@ -2201,38 +2277,6 @@
         ZGridBindingDirective.prototype.clearData = function () {
             this.grid.data = { data: [], total: 0 };
         };
-        ZGridBindingDirective.prototype.getFilterParamsColumns = function () {
-            var colFields = [];
-            this.gridColumns.forEach(function (field) {
-                if (field.valueExpr) {
-                    colFields.push(field.valueExpr + " as " + field.field);
-                }
-                else {
-                    colFields.push(field.field);
-                }
-            });
-            if (colFields.length > 0) {
-                if (colFields.indexOf("Id") === -1) {
-                    colFields.push("Id");
-                }
-            }
-            var tmpGridColumn = [];
-            tmpGridColumn.push(colFields.join(","));
-            if (this.usableColumns.length > 0) {
-                tmpGridColumn.push(this.usableColumns.join(","));
-            }
-            this.params.columns = tmpGridColumn.join(",");
-        };
-        ZGridBindingDirective.prototype.getFilterParams = function () {
-            if (this.field['FilterParams']) {
-                if (this.field['FilterParams'].indexOf("group.") !== -1) {
-                    this.params.filterParams = i3.ZComponentHelper.getGroupValue(this.field['FilterParams'], this.grp);
-                }
-                else {
-                    this.params.filterParams = this.field['FilterParams'];
-                }
-            }
-        };
         ZGridBindingDirective.prototype.aggregateHandling = function (data) {
             var aggregateColumns = this.gridColumns.filter(function (x) { return x.aggregateType; });
             aggregateColumns.forEach(function (col) {
@@ -2273,38 +2317,6 @@
                 col.aggregateValue = 0;
             });
         };
-        ZGridBindingDirective.prototype.getFilter = function () {
-            var _this = this;
-            if (this.params.filters && this.field.Filters) {
-                this.params.filters = this.params.filters + " && " + this.field.Filters;
-            }
-            else if (!this.params.filters && this.field.Filters) {
-                this.params.filters = this.field.Filters;
-            }
-            if (this.field.Filters && this.field.Filters.indexOf("group.") !== -1) {
-                var filterKeyValPairs = this.field.Filters.split(" ");
-                var grpValues = filterKeyValPairs.filter(function (element) { return element.trim().indexOf("group.") !== -1; });
-                grpValues.forEach(function (val) {
-                    var actualVal = i3.ZComponentHelper.getGroupValue(val, _this.grp);
-                    _this.params.filters = _this.params.filters.replace(val, actualVal);
-                });
-            }
-        };
-        ZGridBindingDirective.prototype.getSorting = function () {
-            if (this.field.SortOrder) {
-                if (this.field.SortOrder.indexOf("group.") !== -1) {
-                    this.params.sortOrder = i3.ZComponentHelper.getGroupValue(this.field.SortOrder, this.grp);
-                }
-                else {
-                    this.params.sortOrder = this.field.SortOrder;
-                }
-            }
-        };
-        ZGridBindingDirective.prototype.getGrantType = function () {
-            if (this.field.GrantType) {
-                this.params.grantType = i3.ZComponentHelper.getGroupValue(this.field.GrantType.toString(), this.grp);
-            }
-        };
         ZGridBindingDirective.prototype.pageChange = function (event) {
             this.params.pageNo = event.skip / this.params.pageSize;
             this.state.skip = event.skip;
@@ -2421,21 +2433,6 @@
                 }
             }
         };
-        ZGridBindingDirective.prototype.setHiddenColumn = function (gridSetting) {
-            var _this = this;
-            if (this.gridColumns && gridSetting) {
-                // filter out hidden == false array.
-                var gridSettingHiddenCol = gridSetting.filter(function (item) {
-                    return item['hidden'] == true;
-                });
-                // find and set the hidden to current column setting.
-                Object.values(gridSettingHiddenCol).forEach(function (value) {
-                    if (_this.gridColumns.find(function (c) { return c.field === value.field; })) {
-                        _this.gridColumns.find(function (c) { return c.field === value.field; })['hidden'] = value['hidden'];
-                    }
-                });
-            }
-        };
         ZGridBindingDirective.prototype.beforeGridGetData = function (group, me) {
             console.warn("beforeDataBinding triggered");
             if (!group.beforeGridGetData) {
@@ -2445,61 +2442,49 @@
             return group.beforeGridGetData(group, me);
         };
         ZGridBindingDirective.prototype.getGridSessionFilter = function (group, me) {
-            return __awaiter(this, void 0, void 0, function () {
-                var StorageKey;
-                var _this = this;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            if (!group["GridStorageKey"]) {
-                                return [2 /*return*/, null];
+            var _this = this;
+            if (!group["GridStorageKey"]) {
+                return rxjs.of([]);
+            }
+            var StorageKey = group["GridStorageKey"];
+            if (this.storageService) {
+                var subject_1 = new rxjs.Subject();
+                rxjs.of(true)
+                    .pipe(operators.switchMap(function () {
+                    return _this.storageService.get(StorageKey);
+                }), operators.tap(function (data) {
+                    if (!data || !data.value || data.value === "null") {
+                        subject_1.next();
+                    }
+                    else {
+                        var result = JSON.parse(data.value);
+                        _this.state.filter = JSON.parse(result["StateFilter"]);
+                        _this.params.filterParams = JSON.parse(result["FilterParams"]);
+                        _this.state.filter.filters.forEach(function (d) {
+                            if (d.field.includes('UTC')) {
+                                d.value = new Date(d.value);
                             }
-                            StorageKey = group["GridStorageKey"];
-                            if (!this.storageService) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.storageService.get(StorageKey)
-                                    .then(function (data) {
-                                    if (!data || !data.value || data.value === "null") {
-                                        return null;
-                                    }
-                                    else {
-                                        var result = JSON.parse(data.value);
-                                        _this.state.filter = JSON.parse(result["StateFilter"]);
-                                        _this.params.filterParams = JSON.parse(result["FilterParams"]);
-                                        _this.state.filter.filters.forEach(function (d) {
-                                            if (d.field.includes('UTC')) {
-                                                d.value = new Date(d.value);
-                                            }
-                                        });
-                                        return data;
-                                    }
-                                })];
-                        case 1:
-                            _a.sent();
-                            return [3 /*break*/, 3];
-                        case 2: return [2 /*return*/, null];
-                        case 3: return [2 /*return*/];
+                        });
+                        subject_1.next();
                     }
-                });
-            });
+                })).subscribe();
+                return subject_1.asObservable();
+            }
+            else {
+                return rxjs.of([]);
+            }
         };
         ZGridBindingDirective.prototype.setGridSessionFilter = function (group, me) {
-            return __awaiter(this, void 0, void 0, function () {
-                var StorageKey, lstGridFilter;
-                return __generator(this, function (_a) {
-                    if (!group["GridStorageKey"]) {
-                        return [2 /*return*/, null];
-                    }
-                    StorageKey = group["GridStorageKey"];
-                    lstGridFilter = {};
-                    if (me.state.filter && this.storageService && this.field['SaveFilter']) {
-                        //list of data for StateFilter and FilterParams
-                        lstGridFilter = { "StateFilter": JSON.stringify(me.state.filter), "FilterParams": JSON.stringify(me.params.filterParams) };
-                        //create session storage
-                        this.storageService.set(StorageKey, JSON.stringify(lstGridFilter));
-                    }
-                    return [2 /*return*/];
-                });
-            });
+            if (!group["GridStorageKey"]) {
+                return null;
+            }
+            var StorageKey = group["GridStorageKey"];
+            if (me.state.filter && this.storageService && this.field['SaveFilter']) {
+                //list of data for StateFilter and FilterParams
+                var lstGridFilter = { "StateFilter": JSON.stringify(me.state.filter), "FilterParams": JSON.stringify(me.params.filterParams) };
+                //create session storage
+                this.storageService.set(StorageKey, JSON.stringify(lstGridFilter));
+            }
         };
         return ZGridBindingDirective;
     }(kendoAngularGrid.DataBindingDirective));
@@ -5575,17 +5560,20 @@
             // Grid saved setting key(Used in CookieStore & LocalStorage)
             this.gridStorageKey = 'ionic-field::' + this.authService.e1Token.userName + '::' + this.data.Name + '::' + this.router.url;
             rxjs.of(true)
-                .pipe(operators.concatMap(function () {
-                // try get gridsetting from cookiestore
-                return _this.mainService.cookieStoreGet(_this.gridStorageKey, _this.authService.e1Token.access_token);
-            }), operators.switchMap(function (savedGridCache) {
-                if (savedGridCache) {
-                    // Keep the gridSetting from cookiestore to localStorage
-                    _this.zGridStatePersistingService.set(_this.gridStorageKey, savedGridCache);
-                    return rxjs.of(true);
-                }
-                return rxjs.of(false);
-            }), operators.switchMap(function () {
+                .pipe(
+            //concatMap(() => {
+            //  // try get gridsetting from cookiestore
+            //  return this.mainService.cookieStoreGet(this.gridStorageKey, this.authService.e1Token.access_token);
+            //}),
+            //switchMap(savedGridCache => {
+            //  if (savedGridCache) {  
+            //    // Keep the gridSetting from cookiestore to localStorage
+            //    this.zGridStatePersistingService.set(this.gridStorageKey, savedGridCache);
+            //    return of(true);
+            //  }
+            //  return of(false);
+            //}),
+            operators.switchMap(function () {
                 // Grid default setting
                 _this.columns = [];
                 _this.widthReduce = _this.data.WidthReduce || 60;
@@ -5640,7 +5628,6 @@
                 return rxjs.of(true);
             }), operators.tap(function () {
                 _this.gridCallback(_this.group);
-                return rxjs.of(true);
             })).subscribe();
         };
         ZgridComponent.prototype.ngOnDestroy = function () {