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

app-ng-runtime/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/app-ng-runtime",
-    "version": "11.4.0-next.28151",
+    "version": "11.4.0-next.28701",
     "description": "All modules required for a wavemaker application.",
     "main": "index.js",
     "scripts": {

app-ng-runtime/scripts/datatable/datatable.js

@@ -534,11 +534,18 @@ $.widget('wm.datatable', {
 
     /* Returns the tbody markup. */
     _getGridTemplate: function () {
+
         var self = this, preparedData,$tbody,pageStartIndex = self.getPageStartIndex(),
             startRowIndex = self.options.startRowIndex,
             isScrollorOnDemand = self.options.isNavTypeScrollOrOndemand();
             if(isScrollorOnDemand) {
                 $tbody = this.gridElement;
+                if(this.renderTableOnViewLess) {
+                    $tbody = this.gridElement.empty();
+                    this.hideLoadingIndicator();
+                   // this.addNavigationControls();
+                    this.renderTableOnViewLess = false;
+                }
             } else {
                 $tbody = this.gridElement.empty();
             }
@@ -1101,25 +1108,52 @@ $.widget('wm.datatable', {
     },
 
     /* Inserts a load more button at the end of the table when the pagination selected is on demand */
-    addLoadMoreBtn : function (onDemandMsg, loadingdatamsg, cb) {
+    addLoadMoreBtn : function (onDemandMsg, loadingdatamsg, cb, infScroll) {
         // Show Load more button only if it not the last page
-        if (!this.options.isLastPage) {
+        var $btnEl;
+        if (!this.options.isLastPage || infScroll) {
             var self = this;
             var $parenEl = $('<div class="on-demand-datagrid"><a class="app-button btn btn-block on-demand-load-btn"></a></div>');
-            var $btnEl = $parenEl.find('a');
+            $btnEl = $parenEl.find('a');
             $btnEl.append(onDemandMsg);
             // Adding load more button in case of on demand pagination
             this.element.find('.app-grid-header-inner').append($parenEl);
+            if(infScroll) {
+                if(this.element.find('.on-demand-load-btn').length) {
+                    this.element.find('.on-demand-load-btn').text(this.options.viewlessmessage);
+                }
+            }
+
             // Adding click event to the button
             $btnEl.on('click', function (e) {
-                if (cb && typeof cb === 'function') {
-                    // when the button is clicked, hide the button and show loading indicator
-                    $btnEl.hide();
+                // when the button is clicked, hide the button and show loading indicator
+                var lastPage = (self.options.getCurrentPage() == self.options.getPageCount());
+                if(!lastPage) {
                     self.showLoadingIndicator(loadingdatamsg, false);
+                }
+                if(!self.options.showviewlessbutton){
+                    $btnEl.hide();
+                }
+                if(infScroll) {
+                    if(lastPage) {
+                        self.element.find('.on-demand-datagrid').remove();
+                    }
+                }
+                // Fix for [WMS-23839] refresh data when clicked on View less button
+                if (lastPage && self.options.showviewlessbutton) {
+                         $btnEl.hide();
+                         self.renderTableOnViewLess = true;
+                         self.renderPaginationOnViewLess = true;
+                         self.options.enableNavigation();
+                         self._renderGrid();
+                }
+                if (cb && typeof cb === 'function') {
                     cb(e);
                 }
+
             });
         }
+
     },
 
     /* Shows loading indicator when clicked on load more button or in case of infinite scroll event is triggered */
@@ -1152,10 +1186,19 @@ $.widget('wm.datatable', {
         if (!showLoadBtn && !infScroll) {
             // In case of on demand pagination, when the next page is not disabled hide the individual elements
             this.element.find('.loading-data-msg').hide();
+            this.element.find('.on-demand-load-btn').text(this.options.ondemandmessage);
             this.element.find('.on-demand-load-btn').show();
+        } else if((this.options.getCurrentPage() == this.options.getPageCount()) && this.options.showviewlessbutton) {
+                this.element.find('.on-demand-load-btn').show().text(this.options.viewlessmessage);
+                this.element.find('.loading-data-msg').hide();
+                if(infScroll) {
+                    if(!this.element.find('.on-demand-load-btn').length) {
+                        this.options.addLoadMoreBtn();
+                    }
+                    this.element.find('.loading-data-msg').hide();
+                }
         } else {
-            // In case of infinite scroll or when next page is disable hide the grid element which is the parent. If we don't the parent ele border will be shown
-            this.element.find('.on-demand-datagrid').hide();
+                this.element.find('.on-demand-datagrid').hide();
         }
     },
 
@@ -3085,6 +3128,7 @@ $.widget('wm.datatable', {
                 // initally append tbody to gridElement
                 this.gridElement.append($htm);
             }
+
         } else {
             var templates = this._getGridTemplate();
             $htm = $(templates);
@@ -3096,7 +3140,9 @@ $.widget('wm.datatable', {
         if (this.options.summaryRow) {
             var $summaryRowHtm = $(this._getSummaryRowTemplate());
             this.tableContainer.find('tfoot').remove();
-            this.tableContainer.append($summaryRowHtm);
+            if (this.options.data.length){
+                this.tableContainer.append($summaryRowHtm);
+            }
         }
         // Set proper data status messages after the grid is rendered.
         if (!this.options.data.length && this.dataStatus.state === 'nodata') {
@@ -3107,7 +3153,7 @@ $.widget('wm.datatable', {
             this.setStatus(this.dataStatus.state, this.dataStatus.message, isCreated);
         }
         this.gridBody = this.gridElement.find('tbody');
-        this.gridFooter = this.gridElement.find('tfoot');
+        this.gridFooter = this.tableContainer.find('tfoot');
         this._findAndReplaceCompiledTemplates();
         this.options.clearRowActions();
         // attach event handlers
@@ -3195,13 +3241,16 @@ $.widget('wm.datatable', {
             this._toggleSpacingClasses('condensed');
         }
         this._renderGrid(isCreated);
+        this.addNavigationControls();
+    },
+    addNavigationControls: function() {
         /**
          * bind on demand / scroll events to the table in case of dynamictable in render fn
          * Render is called everytime when there is a change in dataset and the previously binded events are lost
          */
         if (this.options.isdynamictable) {
-           this.element.find('.on-demand-datagrid').remove();
-            if (this.options.navigation === 'On-Demand' && !this.element.find('.on-demand-datagrid').length) {
+            this.element.find('.on-demand-datagrid').remove();
+            if (this.options.navigation === 'On-Demand' && (!this.element.find('.on-demand-datagrid').length)) {
                 this.options.addLoadMoreBtn();
             } else if (this.options.navigation === 'Scroll') {
                 this.options.bindScrollEvt();
@@ -3221,7 +3270,8 @@ $.widget('wm.datatable', {
         if (state === 'ready') {
             this.dataStatusContainer.hide();
         } else {
-            if (this.options.isNavTypeScrollOrOndemand() && (state === 'nodata' || this.options.isLastPage)) {
+            // [WMS-23839] always show load more btn if show view less btn is true
+            if (this.options.isNavTypeScrollOrOndemand() && (state === 'nodata' || ((this.options.getCurrentPage() == this.options.getPageCount())  && !this.options.showviewlessbutton))) {
                 this.element.find('.on-demand-datagrid a').hide();
             }
             this.dataStatusContainer.show();