@wavemaker/app-ng-runtime 11.4.0-next.28151 → 11.4.0-next.28701

app-ng-runtime/components/data/table/bundles/index.umd.js

@@ -359,6 +359,8 @@
             ['navigationalign', Object.assign({ value: 'left' }, base.PROP_STRING)],
             ['nodatamessage', Object.assign({ value: 'No data found.' }, base.PROP_STRING)],
             ['ondemandmessage', Object.assign({ value: 'Load More' }, base.PROP_STRING)],
+            ['showviewlessbutton', Object.assign({ value: false }, base.PROP_BOOLEAN)],
+            ['viewlessmessage', Object.assign({ value: 'View Less' }, base.PROP_STRING)],
             ['pagesize', base.PROP_NUMBER],
             ['radioselect', base.PROP_BOOLEAN],
             ['rowclass', base.PROP_STRING],
@@ -437,6 +439,7 @@
             _this.columns = {};
             _this.formfields = {};
             _this.enablesort = true;
+            _this.showviewlessbutton = false;
             _this.primaryKey = [];
             _this.selectedItems = [];
             _this.selectedItemChange = new rxjs.Subject();
@@ -457,6 +460,7 @@
             _this.rowDef = {};
             _this.rowInstance = {};
             _this.fullFieldDefs = [];
+            _this.variableInflight = true;
             _this.applyProps = new Map();
             _this.redraw = _.debounce(_this._redraw, 150);
             _this.debouncedHandleLoading = _.debounce(_this.handleLoading, 350);
@@ -480,6 +484,7 @@
                 data: [],
                 colDefs: [],
                 startRowIndex: 1,
+                mode: '',
                 sortInfo: {
                     field: '',
                     direction: ''
@@ -510,6 +515,10 @@
                 isSearchTrigerred: false,
                 isDatasetUpdated: false,
                 isDataUpdatedByUser: false,
+                showviewlessbutton: false,
+                ondemandmessage: '',
+                viewlessmessage: '',
+                loadingdatamsg: '',
                 isNextPageData: undefined,
                 ACTIONS: {
                     'DELETE': 'delete',
@@ -537,6 +546,14 @@
                 getPageSize: function () {
                     return _this.pagesize;
                 },
+                getPageCount: function () {
+                    return _this.dataNavigator.pageCount;
+                },
+                enableNavigation: function () {
+                    _this.dataNavigator.widget.isDisableNext = false;
+                    _this.dataNavigator.widget.isDisableLast = false;
+                    _this.gridOptions.mode = 'viewless';
+                },
                 // set the deleted row index
                 setDeletedRowIndex: function (id) {
                     _this.setDataGridOption('deletedRowIndex', id);
@@ -573,7 +590,9 @@
                         }
                         _this.callDataGridMethod('selectRows', _this.items);
                         _this.selectedItems = _this.callDataGridMethod('getSelectedRows');
-                        _this.selectedItemChange.next(_this.selectedItems);
+                        if (_this.selectedItems.length) {
+                            _this.selectedItemChange.next(_this.selectedItems);
+                        }
                         // On render, apply the filters set for query service variable
                         if (_this._isPageSearch && _this.filterInfo) {
                             _this.searchSortHandler(_this.filterInfo, undefined, 'search');
@@ -583,9 +602,11 @@
                 onRowSelect: function (row, e) {
                     _this.ngZone.run(function () {
                         _this.selectedItems = _this.callDataGridMethod('getSelectedRows');
-                        _this.selectedItemChange.next(_this.selectedItems);
+                        if (_this.selectedItems.length) {
+                            _this.selectedItemChange.next(_this.selectedItems);
+                        }
                         var rowData = _this.addRowIndex(row);
-                        if (rowData.$index && _this.getConfiguredState() !== 'none' && _this.dataNavigator && base.unsupportedStatePersistenceTypes.indexOf(_this.navigation) < 0) {
+                        if (_this.selectedItems.length && rowData.$index && _this.getConfiguredState() !== 'none' && _this.dataNavigator && base.unsupportedStatePersistenceTypes.indexOf(_this.navigation) < 0) {
                             var obj = { page: _this.dataNavigator.dn.currentPage, index: rowData.$index - 1 };
                             var widgetState = _this.statePersistence.getWidgetState(_this);
                             if (_.get(widgetState, 'selectedItem') && _this.multiselect) {
@@ -945,12 +966,17 @@
                 // function to add load more button to table
                 addLoadMoreBtn: function () {
                     _this.callDataGridMethod('addLoadMoreBtn', _this.ondemandmessage, _this.loadingdatamsg, function ($event) {
-                        // set 'isNextPageData' flag to true & 'isDataUpdatedByUser' to false as next page data is being rendered
                         _this.gridOptions.setIsNextPageData(true);
                         _this.gridOptions.setIsDataUpdatedByUser(false);
-                        _this.dataNavigator.navigatePage('next', $event);
-                        _this.isDataLoading = true;
-                    });
+                        if (_this.gridOptions.mode === 'viewless') {
+                            _this.dataNavigator.navigatePage('first', $event, true);
+                            _this.gridOptions.mode = '';
+                        }
+                        else {
+                            _this.dataNavigator.navigatePage('next', $event);
+                            _this.isDataLoading = true;
+                        }
+                    }, _this.infScroll);
                 },
                 // function to bind scroll event
                 bindScrollEvt: function () {
@@ -1135,6 +1161,10 @@
             set: function (newValue) {
                 var _a;
                 this.isDataLoading = false;
+                // Fix for [WMS-24012]: hide no datafound msg when variableInflight is true and dataset is empty
+                if (this.variableInflight && _.isEmpty(newValue)) {
+                    return;
+                }
                 this.variableInflight = false;
                 if (this.gridOptions.isNavTypeScrollOrOndemand()) {
                     // update the _gridData field with the next set of items and modify the current page
@@ -1256,6 +1286,10 @@
             this.gridOptions.securityUtils.pipeTransform = this.trustAsPipe;
             this.gridOptions.navigation = this.navigation;
             this.gridOptions.isdynamictable = this.isdynamictable;
+            this.gridOptions.showviewlessbutton = this.showviewlessbutton;
+            this.gridOptions.ondemandmessage = this.ondemandmessage;
+            this.gridOptions.viewlessmessage = this.viewlessmessage;
+            this.gridOptions.loadingdatamsg = this.loadingdatamsg;
             // When loadondemand property is enabled(deferload="true") and show is true, only the column titles of the datatable are rendered, the data(body of the datatable) is not at all rendered.
             // Because the griddata is setting before the datatable dom is rendered but we are sending empty data to the datatable.
             if (!_.isEmpty(this.gridData)) {
@@ -1279,6 +1313,11 @@
             this.gridOptions.colDefs = this.fieldDefs;
             this.datagridElement.datatable(this.gridOptions);
             this.callDataGridMethod('setStatus', 'loading', this.loadingdatamsg);
+            // if(this.gridOptions.data.length || this.variableInflight) {
+            //     this.callDataGridMethod('setStatus', 'loading', this.loadingdatamsg);
+            // } else {
+            //     this.callDataGridMethod('setStatus', 'nodata', this.nodatamessage);
+            // }
             this.applyProps.forEach(function (args) { return _this.callDataGridMethod.apply(_this, __spreadArray([], __read(args))); });
             if (this.editmode === base.EDIT_MODE.QUICK_EDIT) {
                 this.documentClickBind = this._documentClickBind.bind(this);
@@ -1605,8 +1644,12 @@
         };
         TableComponent.prototype.setGridData = function (serverData) {
             var data = this.filternullrecords ? this.removeEmptyRecords(serverData) : serverData;
+            // fix for [WMS-24012] set variableinflight flag to false for static variables
+            if (_.get(this.datasource, 'category') === 'wm.Variable') {
+                this.variableInflight = false;
+            }
             if (!this.variableInflight) {
-                if (data && data.length === 0) {
+                if (data && (data.length) === 0) {
                     this.callDataGridMethod('setStatus', 'nodata', this.nodatamessage);
                 }
                 else {
@@ -1927,10 +1970,8 @@
                         this.variableInflight = false;
                         this.callDataGridMethod('setStatus', 'nodata', this.nodatamessage);
                     }
-                    if (this.dataset) {
-                        this.watchVariableDataSet(this.dataset);
-                        this.onDataSourceChange();
-                    }
+                    this.watchVariableDataSet(this.dataset);
+                    this.onDataSourceChange();
                     break;
                 case 'dataset':
                     if (this.gridOptions.isNavTypeScrollOrOndemand() && this.gridOptions.getCurrentPage() === 1) {
@@ -2032,6 +2073,10 @@
                     if (nv) {
                         this.$element.find('.on-demand-datagrid > a').text(nv);
                     }
+                    this.gridOptions.ondemandmessage = nv;
+                    break;
+                case 'viewlessmessage':
+                    this.gridOptions.viewlessmessage = nv;
                     break;
                 case 'show':
                     if (nv) {