tnx-shared 5.1.422 → 5.1.423

package/bundles/tnx-shared.umd.js

@@ -829,6 +829,13 @@
             this.function = new CrudListCustomFunction();
             this.popupHeader = '';
             this.popupSize = new PopupSize();
+            /**
+             * Auto generate gridInfo.fields using setting.cols + dataList.addtionalFields
+             * @date 11/4/2022 - 2:04:31 PM
+             *
+             * @type {?boolean}
+             */
+            this.autoGenerateSelectFields = false;
             this.modifyRowDataForTask = function (rowData) { return ({}); };
             this.modifyItemTask = function (modelTask, rowData) { return ({}); };
             this.getCustomDataTrinhKy = function (rowData) { return ({}); };
@@ -1914,6 +1921,20 @@
             _this.asyncPipe = true;
             _this.sort = true;
             _this.extendData = {};
+            /**
+             * Is this column ref a ref column generated by base
+             * @date 11/4/2022 - 2:05:55 PM
+             *
+             * @type {?boolean}
+             */
+            _this.isRefField = false;
+            /**
+             * should include this col in the gridInfo.fields
+             * @date 11/4/2022 - 2:06:16 PM
+             *
+             * @type {?boolean}
+             */
+            _this.includeSelect = true;
             _this.hasOperatorCanBo = false;
             _this.minimizeFilter = false;
             for (var key in init) {
@@ -2450,6 +2471,7 @@
             var _this = this;
             this.cleanupSessionStorage();
             this.cleanupLocalStorage();
+            // this.clearLocalToken();
             // save the current page before redirect to issuer
             if (!localStorage.getItem('currentUrl')) {
                 localStorage.setItem('currentUrl', top.location.href);
@@ -2493,6 +2515,9 @@
         AuthenService.prototype.getAccessToken = function () {
             return this._oauthService.getAccessToken();
         };
+        AuthenService.prototype.clearLocalToken = function () {
+            localStorage.removeItem('access_token');
+        };
         AuthenService.prototype.cleanupSessionStorage = function () {
             Object.keys(sessionStorage).filter(function (item) { return /^AUTHORIZATION/.test(item) || /^V4_AUTHORIZATION/.test(item); }).forEach(function (item) {
                 sessionStorage.removeItem(item);
@@ -20832,6 +20857,7 @@
             _this.sourceIcon = {};
             _this.stopCalculatingFunctionColumnWidth = false;
             _this.FileUploadMode = exports.FileUploadMode;
+            _this.Operator = exports.Operator;
             _this._unSubscribeAll = new rxjs.Subject();
             _this.handleSelectRow = function (evt, data) {
                 if (_this.setting.hasCustomHandleClickRow) {
@@ -21345,7 +21371,7 @@
                             if (element.displayField == null) {
                                 element.displayField = 'ten';
                             }
-                            tmpCol = new ColumnSchemaBase(Object.assign(Object.assign({}, element), { rawColumn: element, controlType: exports.ControlType.dropdown, dataType: element.dataTypeRefField, field: 'str' + element.field, allowFilter: element.allowFilter, sort: false, visible: true }));
+                            tmpCol = new ColumnSchemaBase(Object.assign(Object.assign({}, element), { isRefField: true, rawColumn: element, controlType: exports.ControlType.dropdown, dataType: element.dataTypeRefField, field: 'str' + element.field, allowFilter: element.allowFilter, sort: false, visible: true }));
                             var configRefField = this_1.setting.columnSetting.details.find(function (p) { return p.columnCode == tmpCol.field; });
                             if (configRefField && configRefField.visible != null) {
                                 tmpCol.visible = configRefField.visible;
@@ -21361,7 +21387,7 @@
                         element.controlType = exports.ControlType.dropdown;
                         if (!element.rawColumn) {
                             this_1.setting.fieldNeedGetRef.push(Object.assign({}, element));
-                            tmpCol = new ColumnSchemaBase(Object.assign(Object.assign({}, element), { rawColumn: element, controlType: exports.ControlType.dropdown, dataType: element.dataTypeRefField, baseService: null, field: 'str' + element.field, allowFilter: element.allowFilter, sort: false, visible: true }));
+                            tmpCol = new ColumnSchemaBase(Object.assign(Object.assign({}, element), { isRefField: true, rawColumn: element, controlType: exports.ControlType.dropdown, dataType: element.dataTypeRefField, baseService: null, field: 'str' + element.field, allowFilter: element.allowFilter, sort: false, visible: true }));
                             var configRefField = this_1.setting.columnSetting.details.find(function (p) { return p.columnCode == tmpCol.field; });
                             if (configRefField && configRefField.visible != null) {
                                 tmpCol.visible = configRefField.visible;
@@ -22749,7 +22775,25 @@
                     case exports.DataType.intWithoutMask:
                     case exports.DataType.decimal:
                     case exports.DataType.currency:
-                        templateFilter.push.apply(templateFilter, __spread(_this.getRangeFilter(col)));
+                        if (col.operator === exports.Operator.equal) {
+                            templateFilter.push(new Filter({
+                                field: _this.getFieldFilter(col),
+                                operator: exports.Operator.equal,
+                                sourceField: col.field,
+                                funcGetValue: function (item) {
+                                    if (col.max && item > col.max) {
+                                        return col.max;
+                                    }
+                                    if (col.min && item < col.min) {
+                                        return col.min;
+                                    }
+                                    return item;
+                                }
+                            }));
+                        }
+                        else {
+                            templateFilter.push.apply(templateFilter, __spread(_this.getRangeFilter(col)));
+                        }
                         break;
                     case exports.DataType.date:
                         templateFilter.push.apply(templateFilter, __spread(_this.getDateRangeFilter(col, function (date) { return new Date(date.getFullYear(), date.getMonth(), date.getDate()); }, function (date) { return new Date(date.getFullYear(), date.getMonth(), date.getDate() + 1, 0, 0, -1); })));
@@ -24269,6 +24313,13 @@
             _this.customGetData = false;
             _this.readyToTrinhKy = false;
             _this.plusUrl = '';
+            /**
+             * Addtional fields to add to gridInfo.fields when using setting.autoGenerateSelectFields
+             * @date 11/4/2022 - 2:03:19 PM
+             *
+             * @type {string[]}
+             */
+            _this.additionalFields = [];
             var moduleConfigService = _injector.get(ModuleConfigService);
             _this.environment = moduleConfigService.getConfig().environment;
             _this._notifierService = _this._injector.get(NotifierService);
@@ -24501,10 +24552,11 @@
         };
         ListBase.prototype.getData = function (gridInfo) {
             return __awaiter(this, void 0, void 0, function () {
-                var resultModify;
+                var cols, fields, cols_1, cols_1_1, col, resultModify;
+                var e_1, _a;
                 var _this = this;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             if (!(this.setting.baseService && this.model.ready && !this.model.loading)) return [3 /*break*/, 2];
                             this._markLoading();
@@ -24536,9 +24588,31 @@
                                     }
                                 }
                             });
+                            if (this.setting.autoGenerateSelectFields === true && this.setting.cols && this.setting.cols.length > 0) {
+                                cols = this.setting.cols;
+                                fields = ['id'];
+                                try {
+                                    for (cols_1 = __values(cols), cols_1_1 = cols_1.next(); !cols_1_1.done; cols_1_1 = cols_1.next()) {
+                                        col = cols_1_1.value;
+                                        if (col.isRefField || col.includeSelect === false || col.field == null || col.field == '') {
+                                            continue;
+                                        }
+                                        fields.push(col.field);
+                                    }
+                                }
+                                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                                finally {
+                                    try {
+                                        if (cols_1_1 && !cols_1_1.done && (_a = cols_1.return)) _a.call(cols_1);
+                                    }
+                                    finally { if (e_1) throw e_1.error; }
+                                }
+                                fields.push.apply(fields, __spread(this.additionalFields));
+                                gridInfo.fields = fields.join(',');
+                            }
                             return [4 /*yield*/, this.modifyGridInfo(gridInfo)];
                         case 1:
-                            resultModify = _a.sent();
+                            resultModify = _b.sent();
                             if (gridInfo.sorts.length == 0) {
                                 gridInfo.sorts.unshift(this.newSort('created', -1));
                             }
@@ -24734,7 +24808,7 @@
          * @param refFields
          */
         ListBase.prototype.addRefFields = function (refFields) {
-            var e_1, _a;
+            var e_2, _a;
             if (this.setting.fieldNeedGetRef == null || this.setting.fieldNeedGetRef.length === 0) {
                 this.setting.fieldNeedGetRef = __spread(refFields);
                 return;
@@ -24754,12 +24828,12 @@
                     _loop_1(refField);
                 }
             }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
                     if (refFields_1_1 && !refFields_1_1.done && (_a = refFields_1.return)) _a.call(refFields_1);
                 }
-                finally { if (e_1) throw e_1.error; }
+                finally { if (e_2) throw e_2.error; }
             }
         };
         ListBase.prototype.groupInClient = function (dataSource) {
@@ -25142,8 +25216,8 @@
         };
         ListBase.prototype._copyLinkMultiple = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var paths, _a, _b, item, _c, _d, e_2_1;
-                var e_2, _e;
+                var paths, _a, _b, item, _c, _d, e_3_1;
+                var e_3, _e;
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -25166,14 +25240,14 @@
                             return [3 /*break*/, 2];
                         case 5: return [3 /*break*/, 8];
                         case 6:
-                            e_2_1 = _f.sent();
-                            e_2 = { error: e_2_1 };
+                            e_3_1 = _f.sent();
+                            e_3 = { error: e_3_1 };
                             return [3 /*break*/, 8];
                         case 7:
                             try {
                                 if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                             }
-                            finally { if (e_2) throw e_2.error; }
+                            finally { if (e_3) throw e_3.error; }
                             return [7 /*endfinally*/];
                         case 8:
                             this._commonService.copyByStorage(paths.join('\r\n'));
@@ -31860,6 +31934,7 @@
                     // cleanup storage
                     _this._authenService.cleanupLocalStorage();
                     _this._authenService.cleanupSessionStorage();
+                    _this._authenService.clearLocalToken();
                     _this._storageUpdatedService.cleanupStorageService();
                     _this._oauthService.revokeTokenAndLogout(null, true)
                         .then(function (res) {