@desynova-digital/components 8.19.30 → 8.19.32

package/molecules/table/table.js

@@ -1094,28 +1094,53 @@ var Table = function (_Component) {
   }, {
     key: "returnTableStatus",
     value: function returnTableStatus() {
-      if (this.props.tableLoading) {
+      if (this.props.tableLoading && !this.props.tableLoadingAction) {
         return _react2.default.createElement(
           "div",
           { style: { padding: "10px" } },
           this.tableLoadingFirst()
         );
       } else {
-        return _react2.default.createElement(
-          "div",
-          null,
-          _react2.default.createElement(
-            Table.Element,
-            this.props,
-            _react2.default.createElement(Table.Header, {
-              theme: this.props.theme,
-              columns: this.defaultShowColumns,
-              selectedColumns: this.state.showColumnArr,
-              onSort: this.props.onSort
-            })
-          ),
-          _react2.default.createElement(_TableErrorScreen2.default, null)
-        );
+        if (this.state.items.length == 0) {
+          if (this.props.tableLoading === false) {
+            return _react2.default.createElement(
+              "div",
+              null,
+              _react2.default.createElement(
+                Table.Element,
+                this.props,
+                _react2.default.createElement(Table.Header, {
+                  theme: this.props.theme,
+                  columns: this.defaultShowColumns,
+                  selectedColumns: this.state.showColumnArr,
+                  onSort: this.props.onSort
+                })
+              ),
+              _react2.default.createElement(_TableErrorScreen2.default, null)
+            );
+          } else {
+            return _react2.default.createElement(
+              "div",
+              null,
+              _react2.default.createElement(
+                Table.Element,
+                this.props,
+                _react2.default.createElement(Table.Header, {
+                  theme: this.props.theme,
+                  columns: this.defaultShowColumns,
+                  selectedColumns: this.state.showColumnArr,
+                  onSort: this.props.onSort
+                })
+              ),
+              _react2.default.createElement(
+                "div",
+                { style: { padding: "10px" } },
+                this.tableLoadingFirst()
+              ),
+              ";"
+            );
+          }
+        }
       }
     }
   }, {
@@ -1134,7 +1159,8 @@ var Table = function (_Component) {
           getTableData = _props2.getTableData,
           downloadAvailable = _props2.downloadAvailable,
           tableLoading = _props2.tableLoading,
-          tableLoadingAction = _props2.tableLoadingAction;
+          tableLoadingAction = _props2.tableLoadingAction,
+          filtersStructure = _props2.filtersStructure;
       var _state2 = this.state,
           nestedTable = _state2.nestedTable,
           searchedText = _state2.searchedText,
@@ -1372,7 +1398,7 @@ var Table = function (_Component) {
                   })
                 ) || _react2.default.createElement(_Shimmer2.default, { height: "24px", width: "30px" })
               ),
-              this.props.filtersStructure && this.props.filtersStructure.length && !tableLoading || tableLoadingAction ? _react2.default.createElement(_filter2.default, {
+              this.props.filtersStructure && this.props.filtersStructure.length && !tableLoading || tableLoadingAction && filtersStructure.length ? _react2.default.createElement(_filter2.default, {
                 ref: this._filterRef,
                 initialFilters: this.props.initialFilters,
                 filtersStructure: this.props.filtersStructure,
@@ -1382,7 +1408,7 @@ var Table = function (_Component) {
                 filterMessage: this.props.filterMessage,
                 handleUserIdFilterChange: this.props.handleUserIdFilterChange,
                 userIdsList: this.props.userIdsList
-              }) : tableLoading ? _react2.default.createElement(_Shimmer2.default, { height: "24px", width: "30px" }) : null,
+              }) : tableLoading && filtersStructure.length ? _react2.default.createElement(_Shimmer2.default, { height: "24px", width: "30px" }) : null,
               downloadAvailable && (!tableLoading || tableLoading && tableLoadingAction) && _react2.default.createElement(
                 "div",
                 { className: "refresh-section" },

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@desynova-digital/components",
-  "version": "8.19.30",
+  "version": "8.19.32",
   "description": "Components for Desynova Digital",
   "main": "index.js",
   "author": "desynova-digital",
   "license": "MIT",
   "repository": "desynova-digital",
   "dependencies": {
-    "@desynova-digital/tokens": "8.19.30",
+    "@desynova-digital/tokens": "8.19.32",
     "prop-types": "^15.7.2",
     "styled-components": "^4.3.2"
   },