carbon-addons-iot-react 2.149.1-next.2 → 2.150.0-next.2

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.150.0-next.2](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.150.0-next.1...v2.150.0-next.2) (2022-06-03)
+
+
+### Bug Fixes
+
+* **piechartcard:** removed testID proptype that is in cardproptypes ([9f642a0](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/9f642a089a303a94e8b0e9d3167b2d8792c26788))
+* **tablehead:** update default value for tableID to prevent warning ([0d61ca0](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/0d61ca01ab5fe8b3419cc7c483c65b08ea415b28))
+
+
+
+
+
+# [2.150.0-next.1](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.150.0-next.0...v2.150.0-next.1) (2022-06-03)
+
+
+### Features
+
+* **tableheader:** hide toolbar if no bactch actions and supply count ([039feb3](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/039feb3156675b934d560bf0d36af6a83af79f9e))
+* **tabletoolbar:** change check to be prop based for backwards compat ([69cf408](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/69cf4081fd1c36e590f3747622ad5eb8196f7968))
+
+
+
+
+
+# [2.150.0-next.0](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.149.1-next.2...v2.150.0-next.0) (2022-06-02)
+
+
+### Features
+
+* **SuiteHeader:** Including workspaceId in the `GET /uiresources` API call to make sure that the app data returned by the api matches the selected workspace. ([d1e2d3b](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/d1e2d3bc60f0878f8364c3292804689bc56565e3))
+
+
+
+
+
 ## [2.149.1-next.2](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.149.1-next.1...v2.149.1-next.2) (2022-05-31)
 
 

package/es/components/SuiteHeader/hooks/useUiResources.js

@@ -10,6 +10,8 @@ var useUiResources = function useUiResources(_ref) {
       lang = _ref$lang === void 0 ? 'en' : _ref$lang,
       _ref$surveyId = _ref.surveyId,
       surveyId = _ref$surveyId === void 0 ? null : _ref$surveyId,
+      _ref$workspaceId = _ref.workspaceId,
+      workspaceId = _ref$workspaceId === void 0 ? null : _ref$workspaceId,
       _ref$fetchApi = _ref.fetchApi,
       fetchApi = _ref$fetchApi === void 0 ? defaultFetchApi : _ref$fetchApi,
       _ref$isTest = _ref.isTest,
@@ -51,6 +53,7 @@ var useUiResources = function useUiResources(_ref) {
               baseApiUrl: baseApiUrl,
               lang: lang,
               surveyId: surveyId,
+              workspaceId: workspaceId,
               fetchApi: fetchApi,
               isTest: isTest
             });
@@ -77,7 +80,7 @@ var useUiResources = function useUiResources(_ref) {
         }
       }
     }, _callee, null, [[0, 8, 11, 14]]);
-  })), [baseApiUrl, lang, surveyId, isTest, setIsLoading]); // eslint-disable-line react-hooks/exhaustive-deps
+  })), [baseApiUrl, lang, surveyId, workspaceId, isTest, setIsLoading]); // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(function () {
     // load actual data

package/es/components/SuiteHeader/util/uiresources.js

@@ -46,13 +46,13 @@ var defaultFetchApi = /*#__PURE__*/function () {
 
 var getUiResourcesData = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref2) {
-    var baseApiUrl, _ref2$lang, lang, _ref2$surveyId, surveyId, _ref2$fetchApi, fetchApi, _ref2$isTest, isTest, api, langParam, surveyIdParam;
+    var baseApiUrl, _ref2$lang, lang, _ref2$surveyId, surveyId, _ref2$workspaceId, workspaceId, _ref2$fetchApi, fetchApi, _ref2$isTest, isTest, api, langParam, surveyIdParam, workspaceIdParam;
 
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            baseApiUrl = _ref2.baseApiUrl, _ref2$lang = _ref2.lang, lang = _ref2$lang === void 0 ? 'en' : _ref2$lang, _ref2$surveyId = _ref2.surveyId, surveyId = _ref2$surveyId === void 0 ? null : _ref2$surveyId, _ref2$fetchApi = _ref2.fetchApi, fetchApi = _ref2$fetchApi === void 0 ? defaultFetchApi : _ref2$fetchApi, _ref2$isTest = _ref2.isTest, isTest = _ref2$isTest === void 0 ? false : _ref2$isTest;
+            baseApiUrl = _ref2.baseApiUrl, _ref2$lang = _ref2.lang, lang = _ref2$lang === void 0 ? 'en' : _ref2$lang, _ref2$surveyId = _ref2.surveyId, surveyId = _ref2$surveyId === void 0 ? null : _ref2$surveyId, _ref2$workspaceId = _ref2.workspaceId, workspaceId = _ref2$workspaceId === void 0 ? null : _ref2$workspaceId, _ref2$fetchApi = _ref2.fetchApi, fetchApi = _ref2$fetchApi === void 0 ? defaultFetchApi : _ref2$fetchApi, _ref2$isTest = _ref2.isTest, isTest = _ref2$isTest === void 0 ? false : _ref2$isTest;
 
             api = function api(method, path, body, headers) {
               return fetchApi(method, "".concat(baseApiUrl).concat(path), body, headers, isTest ? fixture[path.split('?')[0]] : null);
@@ -60,9 +60,10 @@ var getUiResourcesData = /*#__PURE__*/function () {
 
             langParam = "&lang=".concat(lang);
             surveyIdParam = surveyId ? "&surveyId=".concat(surveyId) : '';
-            return _context2.abrupt("return", api('GET', "/uiresources?id=masthead".concat(langParam).concat(surveyIdParam)));
+            workspaceIdParam = workspaceId ? "&workspaceId=".concat(workspaceId) : '';
+            return _context2.abrupt("return", api('GET', "/uiresources?id=masthead".concat(langParam).concat(surveyIdParam).concat(workspaceIdParam)));
 
-          case 5:
+          case 6:
           case "end":
             return _context2.stop();
         }

package/es/components/Table/Table.js

@@ -96,6 +96,11 @@ var propTypes = {
     hasPagination: PropTypes.bool,
     hasRowSelection: PropTypes.oneOf(['multi', 'single', false]),
 
+    /** @TODO: Remove in major release and just show action bar when no actions are defined */
+
+    /* option to hide batch action toolbar */
+    hasBatchActionToolbar: PropTypes.bool,
+
     /** True if the rows should be expandable */
     hasRowExpansion: PropTypes.oneOfType([PropTypes.bool, PropTypes.shape({
       /** True if any previously expanded rows should be collapsed when a new row is expanded */
@@ -418,6 +423,7 @@ var defaultProps = function defaultProps(baseProps) {
       hasPagination: false,
       hasRowSelection: false,
       hasRowExpansion: false,
+      hasBatchActionToolbar: true,
       hasRowActions: false,
       hasRowNesting: false,
       hasRowEdit: false,
@@ -874,7 +880,7 @@ var Table = function Table(props) {
         }
       }
     }),
-    options: _objectSpread(_objectSpread({}, pick(options, 'hasAggregations', 'hasColumnSelection', 'hasFastSearch', 'hasSearch', 'hasRowSelection', 'hasRowCountInHeader', 'hasRowEdit', 'hasUserViewManagement')), {}, {
+    options: _objectSpread(_objectSpread({}, pick(options, 'hasAggregations', 'hasColumnSelection', 'hasFastSearch', 'hasSearch', 'hasRowSelection', 'hasRowCountInHeader', 'hasRowEdit', 'hasUserViewManagement', 'hasBatchActionToolbar')), {}, {
       hasFilter: Boolean(options === null || options === void 0 ? void 0 : options.hasFilter),
       hasAdvancedFilter: Boolean(options === null || options === void 0 ? void 0 : options.hasAdvancedFilter)
     }),
@@ -1174,6 +1180,11 @@ Table.__docgenInfo = {
             }],
             "required": false
           },
+          "hasBatchActionToolbar": {
+            "name": "bool",
+            "description": "@TODO: Remove in major release and just show action bar when no actions are defined",
+            "required": false
+          },
           "hasRowExpansion": {
             "name": "union",
             "value": [{

package/es/components/Table/TableHead/TableHead.js

@@ -150,7 +150,6 @@ var defaultProps = {
   closeMenuText: 'Close menu',
   i18n: _objectSpread({}, defaultI18NPropTypes),
   hasFastFilter: true,
-  testID: '',
   testId: '',
   showExpanderColumn: false,
   size: undefined
@@ -837,18 +836,6 @@ TableHead.__docgenInfo = {
       "required": false,
       "description": "should we filter on each keypress"
     },
-    "testID": {
-      "defaultValue": {
-        "value": "''",
-        "computed": false
-      },
-      "type": {
-        "name": "custom",
-        "raw": "deprecate(\n  PropTypes.string,\n  `The 'testID' prop has been deprecated. Please use 'testId' instead.`\n)"
-      },
-      "required": false,
-      "description": ""
-    },
     "testId": {
       "defaultValue": {
         "value": "''",
@@ -1020,6 +1007,14 @@ TableHead.__docgenInfo = {
       },
       "required": true,
       "description": ""
+    },
+    "testID": {
+      "type": {
+        "name": "custom",
+        "raw": "deprecate(\n  PropTypes.string,\n  `The 'testID' prop has been deprecated. Please use 'testId' instead.`\n)"
+      },
+      "required": false,
+      "description": ""
     }
   }
 };

package/es/components/Table/TableToolbar/TableToolbar.js

@@ -48,6 +48,9 @@ var propTypes = {
     hasAdvancedFilter: PropTypes.bool,
     hasAggregations: PropTypes.bool,
 
+    /* option to hide batch action toolbar */
+    hasBatchActionToolbar: PropTypes.bool,
+
     /** If true, search is applied as typed. If false, only after 'Enter' is pressed */
     hasFastSearch: PropTypes.bool,
     hasFilter: PropTypes.bool,
@@ -195,6 +198,7 @@ var TableToolbar = function TableToolbar(_ref) {
       hasRowCountInHeader = _ref$options.hasRowCountInHeader,
       hasRowEdit = _ref$options.hasRowEdit,
       hasUserViewManagement = _ref$options.hasUserViewManagement,
+      hasBatchActionToolbar = _ref$options.hasBatchActionToolbar,
       _ref$actions = _ref.actions,
       onCancelBatchAction = _ref$actions.onCancelBatchAction,
       onApplyBatchAction = _ref$actions.onApplyBatchAction,
@@ -266,13 +270,30 @@ var TableToolbar = function TableToolbar(_ref) {
   var visibleOverflowBatchActions = batchActions.filter(function (action) {
     return action.isOverflow && action.hidden !== true;
   });
+  var hasVisibleBatchActions = visibleBatchActions.length > 0;
   var hasVisibleOverflowBatchActions = visibleOverflowBatchActions.length > 0;
+  var totalSelectedText = useMemo(function () {
+    if (totalSelected > 1) {
+      if (typeof i18n.itemsSelected === 'function') {
+        return i18n.itemsSelected(totalSelected);
+      }
+
+      return "".concat(totalSelected, " ").concat(i18n.itemsSelected);
+    }
+
+    if (typeof i18n.itemSelected === 'function') {
+      return i18n.itemSelected(totalSelected);
+    }
+
+    return "".concat(totalSelected, " ").concat(i18n.itemSelected);
+    /* eslint-disable-next-line react-hooks/exhaustive-deps */
+  }, [i18n.itemSelected, i18n.itemsSelected, totalSelected]);
   return /*#__PURE__*/React__default.createElement(TableToolbar$1 // TODO: remove deprecated 'testID' in v3
   , {
     "data-testid": testID || testId,
     className: classnames("".concat(iotPrefix, "--table-toolbar"), className),
     "aria-label": i18n.toolbarLabelAria
-  }, /*#__PURE__*/React__default.createElement(TableBatchActions // TODO: remove deprecated 'testID' in v3
+  }, hasBatchActionToolbar ? /*#__PURE__*/React__default.createElement(TableBatchActions // TODO: remove deprecated 'testID' in v3
   , {
     "data-testid": "".concat(testID || testId, "-batch-actions"),
     className: "".concat(iotPrefix, "--table-batch-actions"),
@@ -286,7 +307,7 @@ var TableToolbar = function TableToolbar(_ref) {
 
       return tableTranslateWithId.apply(void 0, [i18n].concat(args));
     }
-  }, visibleBatchActions.map(function (_ref3) {
+  }, hasVisibleBatchActions && visibleBatchActions.map(function (_ref3) {
     var id = _ref3.id,
         labelText = _ref3.labelText,
         disabled = _ref3.disabled,
@@ -339,12 +360,17 @@ var TableToolbar = function TableToolbar(_ref) {
       isDelete: isDelete,
       "aria-label": labelText
     });
-  })) : null), secondaryTitle ?
+  })) : null) : null, secondaryTitle ?
   /*#__PURE__*/
   // eslint-disable-next-line jsx-a11y/label-has-associated-control, jsx-a11y/label-has-for
   React__default.createElement("label", {
     className: "".concat(iotPrefix, "--table-toolbar-secondary-title")
-  }, secondaryTitle) : null, // Deprecated in favor of secondaryTitle for a more general use-case
+  }, secondaryTitle) : !hasBatchActionToolbar && shouldShowBatchActions ?
+  /*#__PURE__*/
+  // eslint-disable-next-line jsx-a11y/label-has-associated-control, jsx-a11y/label-has-for
+  React__default.createElement("label", {
+    className: "".concat(iotPrefix, "--table-toolbar-secondary-title")
+  }, totalSelectedText) : null, // Deprecated in favor of secondaryTitle for a more general use-case
   hasRowCountInHeader ?
   /*#__PURE__*/
   // eslint-disable-next-line jsx-a11y/label-has-associated-control, jsx-a11y/label-has-for
@@ -671,6 +697,10 @@ TableToolbar.__docgenInfo = {
             "name": "bool",
             "required": false
           },
+          "hasBatchActionToolbar": {
+            "name": "bool",
+            "required": false
+          },
           "hasFastSearch": {
             "name": "bool",
             "description": "If true, search is applied as typed. If false, only after 'Enter' is pressed",

package/es/constants/CardPropTypes.js

@@ -378,7 +378,6 @@ var PieCardPropTypes = {
     pieChart: OverridePropTypes,
     table: OverridePropTypes
   }),
-  testID: PropTypes.string,
 
   /**
    * array of data objects from the backend for instance [{group: 'Group A', value: 50}, {group: 'Group B', value: 50}, ...]

package/lib/components/SuiteHeader/hooks/useUiResources.js

@@ -18,6 +18,8 @@ var useUiResources = function useUiResources(_ref) {
       lang = _ref$lang === void 0 ? 'en' : _ref$lang,
       _ref$surveyId = _ref.surveyId,
       surveyId = _ref$surveyId === void 0 ? null : _ref$surveyId,
+      _ref$workspaceId = _ref.workspaceId,
+      workspaceId = _ref$workspaceId === void 0 ? null : _ref$workspaceId,
       _ref$fetchApi = _ref.fetchApi,
       fetchApi = _ref$fetchApi === void 0 ? uiresources.defaultFetchApi : _ref$fetchApi,
       _ref$isTest = _ref.isTest,
@@ -59,6 +61,7 @@ var useUiResources = function useUiResources(_ref) {
               baseApiUrl: baseApiUrl,
               lang: lang,
               surveyId: surveyId,
+              workspaceId: workspaceId,
               fetchApi: fetchApi,
               isTest: isTest
             });
@@ -85,7 +88,7 @@ var useUiResources = function useUiResources(_ref) {
         }
       }
     }, _callee, null, [[0, 8, 11, 14]]);
-  })), [baseApiUrl, lang, surveyId, isTest, setIsLoading]); // eslint-disable-line react-hooks/exhaustive-deps
+  })), [baseApiUrl, lang, surveyId, workspaceId, isTest, setIsLoading]); // eslint-disable-line react-hooks/exhaustive-deps
 
   React.useEffect(function () {
     // load actual data

package/lib/components/SuiteHeader/util/uiresources.js

@@ -55,13 +55,13 @@ var defaultFetchApi = /*#__PURE__*/function () {
 
 var getUiResourcesData = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(_ref2) {
-    var baseApiUrl, _ref2$lang, lang, _ref2$surveyId, surveyId, _ref2$fetchApi, fetchApi, _ref2$isTest, isTest, api, langParam, surveyIdParam;
+    var baseApiUrl, _ref2$lang, lang, _ref2$surveyId, surveyId, _ref2$workspaceId, workspaceId, _ref2$fetchApi, fetchApi, _ref2$isTest, isTest, api, langParam, surveyIdParam, workspaceIdParam;
 
     return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            baseApiUrl = _ref2.baseApiUrl, _ref2$lang = _ref2.lang, lang = _ref2$lang === void 0 ? 'en' : _ref2$lang, _ref2$surveyId = _ref2.surveyId, surveyId = _ref2$surveyId === void 0 ? null : _ref2$surveyId, _ref2$fetchApi = _ref2.fetchApi, fetchApi = _ref2$fetchApi === void 0 ? defaultFetchApi : _ref2$fetchApi, _ref2$isTest = _ref2.isTest, isTest = _ref2$isTest === void 0 ? false : _ref2$isTest;
+            baseApiUrl = _ref2.baseApiUrl, _ref2$lang = _ref2.lang, lang = _ref2$lang === void 0 ? 'en' : _ref2$lang, _ref2$surveyId = _ref2.surveyId, surveyId = _ref2$surveyId === void 0 ? null : _ref2$surveyId, _ref2$workspaceId = _ref2.workspaceId, workspaceId = _ref2$workspaceId === void 0 ? null : _ref2$workspaceId, _ref2$fetchApi = _ref2.fetchApi, fetchApi = _ref2$fetchApi === void 0 ? defaultFetchApi : _ref2$fetchApi, _ref2$isTest = _ref2.isTest, isTest = _ref2$isTest === void 0 ? false : _ref2$isTest;
 
             api = function api(method, path, body, headers) {
               return fetchApi(method, "".concat(baseApiUrl).concat(path), body, headers, isTest ? uiresources_fixture[path.split('?')[0]] : null);
@@ -69,9 +69,10 @@ var getUiResourcesData = /*#__PURE__*/function () {
 
             langParam = "&lang=".concat(lang);
             surveyIdParam = surveyId ? "&surveyId=".concat(surveyId) : '';
-            return _context2.abrupt("return", api('GET', "/uiresources?id=masthead".concat(langParam).concat(surveyIdParam)));
+            workspaceIdParam = workspaceId ? "&workspaceId=".concat(workspaceId) : '';
+            return _context2.abrupt("return", api('GET', "/uiresources?id=masthead".concat(langParam).concat(surveyIdParam).concat(workspaceIdParam)));
 
-          case 5:
+          case 6:
           case "end":
             return _context2.stop();
         }

package/lib/components/Table/Table.js

@@ -113,6 +113,11 @@ var propTypes = {
     hasPagination: PropTypes__default['default'].bool,
     hasRowSelection: PropTypes__default['default'].oneOf(['multi', 'single', false]),
 
+    /** @TODO: Remove in major release and just show action bar when no actions are defined */
+
+    /* option to hide batch action toolbar */
+    hasBatchActionToolbar: PropTypes__default['default'].bool,
+
     /** True if the rows should be expandable */
     hasRowExpansion: PropTypes__default['default'].oneOfType([PropTypes__default['default'].bool, PropTypes__default['default'].shape({
       /** True if any previously expanded rows should be collapsed when a new row is expanded */
@@ -435,6 +440,7 @@ var defaultProps = function defaultProps(baseProps) {
       hasPagination: false,
       hasRowSelection: false,
       hasRowExpansion: false,
+      hasBatchActionToolbar: true,
       hasRowActions: false,
       hasRowNesting: false,
       hasRowEdit: false,
@@ -891,7 +897,7 @@ var Table = function Table(props) {
         }
       }
     }),
-    options: _objectSpread(_objectSpread({}, pick(options, 'hasAggregations', 'hasColumnSelection', 'hasFastSearch', 'hasSearch', 'hasRowSelection', 'hasRowCountInHeader', 'hasRowEdit', 'hasUserViewManagement')), {}, {
+    options: _objectSpread(_objectSpread({}, pick(options, 'hasAggregations', 'hasColumnSelection', 'hasFastSearch', 'hasSearch', 'hasRowSelection', 'hasRowCountInHeader', 'hasRowEdit', 'hasUserViewManagement', 'hasBatchActionToolbar')), {}, {
       hasFilter: Boolean(options === null || options === void 0 ? void 0 : options.hasFilter),
       hasAdvancedFilter: Boolean(options === null || options === void 0 ? void 0 : options.hasAdvancedFilter)
     }),
@@ -1191,6 +1197,11 @@ Table.__docgenInfo = {
             }],
             "required": false
           },
+          "hasBatchActionToolbar": {
+            "name": "bool",
+            "description": "@TODO: Remove in major release and just show action bar when no actions are defined",
+            "required": false
+          },
           "hasRowExpansion": {
             "name": "union",
             "value": [{

package/lib/components/Table/TableHead/TableHead.js

@@ -161,7 +161,6 @@ var defaultProps = {
   closeMenuText: 'Close menu',
   i18n: _objectSpread({}, TablePropTypes.defaultI18NPropTypes),
   hasFastFilter: true,
-  testID: '',
   testId: '',
   showExpanderColumn: false,
   size: undefined
@@ -848,18 +847,6 @@ TableHead.__docgenInfo = {
       "required": false,
       "description": "should we filter on each keypress"
     },
-    "testID": {
-      "defaultValue": {
-        "value": "''",
-        "computed": false
-      },
-      "type": {
-        "name": "custom",
-        "raw": "deprecate(\n  PropTypes.string,\n  `The 'testID' prop has been deprecated. Please use 'testId' instead.`\n)"
-      },
-      "required": false,
-      "description": ""
-    },
     "testId": {
       "defaultValue": {
         "value": "''",
@@ -1031,6 +1018,14 @@ TableHead.__docgenInfo = {
       },
       "required": true,
       "description": ""
+    },
+    "testID": {
+      "type": {
+        "name": "custom",
+        "raw": "deprecate(\n  PropTypes.string,\n  `The 'testID' prop has been deprecated. Please use 'testId' instead.`\n)"
+      },
+      "required": false,
+      "description": ""
     }
   }
 };

package/lib/components/Table/TableToolbar/TableToolbar.js

@@ -60,6 +60,9 @@ var propTypes = {
     hasAdvancedFilter: PropTypes__default['default'].bool,
     hasAggregations: PropTypes__default['default'].bool,
 
+    /* option to hide batch action toolbar */
+    hasBatchActionToolbar: PropTypes__default['default'].bool,
+
     /** If true, search is applied as typed. If false, only after 'Enter' is pressed */
     hasFastSearch: PropTypes__default['default'].bool,
     hasFilter: PropTypes__default['default'].bool,
@@ -207,6 +210,7 @@ var TableToolbar = function TableToolbar(_ref) {
       hasRowCountInHeader = _ref$options.hasRowCountInHeader,
       hasRowEdit = _ref$options.hasRowEdit,
       hasUserViewManagement = _ref$options.hasUserViewManagement,
+      hasBatchActionToolbar = _ref$options.hasBatchActionToolbar,
       _ref$actions = _ref.actions,
       onCancelBatchAction = _ref$actions.onCancelBatchAction,
       onApplyBatchAction = _ref$actions.onApplyBatchAction,
@@ -278,13 +282,30 @@ var TableToolbar = function TableToolbar(_ref) {
   var visibleOverflowBatchActions = batchActions.filter(function (action) {
     return action.isOverflow && action.hidden !== true;
   });
+  var hasVisibleBatchActions = visibleBatchActions.length > 0;
   var hasVisibleOverflowBatchActions = visibleOverflowBatchActions.length > 0;
+  var totalSelectedText = React.useMemo(function () {
+    if (totalSelected > 1) {
+      if (typeof i18n.itemsSelected === 'function') {
+        return i18n.itemsSelected(totalSelected);
+      }
+
+      return "".concat(totalSelected, " ").concat(i18n.itemsSelected);
+    }
+
+    if (typeof i18n.itemSelected === 'function') {
+      return i18n.itemSelected(totalSelected);
+    }
+
+    return "".concat(totalSelected, " ").concat(i18n.itemSelected);
+    /* eslint-disable-next-line react-hooks/exhaustive-deps */
+  }, [i18n.itemSelected, i18n.itemsSelected, totalSelected]);
   return /*#__PURE__*/React__default['default'].createElement(carbonComponentsReact.TableToolbar // TODO: remove deprecated 'testID' in v3
   , {
     "data-testid": testID || testId,
     className: classnames__default['default']("".concat(iotPrefix, "--table-toolbar"), className),
     "aria-label": i18n.toolbarLabelAria
-  }, /*#__PURE__*/React__default['default'].createElement(carbonComponentsReact.TableBatchActions // TODO: remove deprecated 'testID' in v3
+  }, hasBatchActionToolbar ? /*#__PURE__*/React__default['default'].createElement(carbonComponentsReact.TableBatchActions // TODO: remove deprecated 'testID' in v3
   , {
     "data-testid": "".concat(testID || testId, "-batch-actions"),
     className: "".concat(iotPrefix, "--table-batch-actions"),
@@ -298,7 +319,7 @@ var TableToolbar = function TableToolbar(_ref) {
 
       return componentUtilityFunctions.tableTranslateWithId.apply(void 0, [i18n].concat(args));
     }
-  }, visibleBatchActions.map(function (_ref3) {
+  }, hasVisibleBatchActions && visibleBatchActions.map(function (_ref3) {
     var id = _ref3.id,
         labelText = _ref3.labelText,
         disabled = _ref3.disabled,
@@ -351,12 +372,17 @@ var TableToolbar = function TableToolbar(_ref) {
       isDelete: isDelete,
       "aria-label": labelText
     });
-  })) : null), secondaryTitle ?
+  })) : null) : null, secondaryTitle ?
   /*#__PURE__*/
   // eslint-disable-next-line jsx-a11y/label-has-associated-control, jsx-a11y/label-has-for
   React__default['default'].createElement("label", {
     className: "".concat(iotPrefix, "--table-toolbar-secondary-title")
-  }, secondaryTitle) : null, // Deprecated in favor of secondaryTitle for a more general use-case
+  }, secondaryTitle) : !hasBatchActionToolbar && shouldShowBatchActions ?
+  /*#__PURE__*/
+  // eslint-disable-next-line jsx-a11y/label-has-associated-control, jsx-a11y/label-has-for
+  React__default['default'].createElement("label", {
+    className: "".concat(iotPrefix, "--table-toolbar-secondary-title")
+  }, totalSelectedText) : null, // Deprecated in favor of secondaryTitle for a more general use-case
   hasRowCountInHeader ?
   /*#__PURE__*/
   // eslint-disable-next-line jsx-a11y/label-has-associated-control, jsx-a11y/label-has-for
@@ -683,6 +709,10 @@ TableToolbar.__docgenInfo = {
             "name": "bool",
             "required": false
           },
+          "hasBatchActionToolbar": {
+            "name": "bool",
+            "required": false
+          },
           "hasFastSearch": {
             "name": "bool",
             "description": "If true, search is applied as typed. If false, only after 'Enter' is pressed",

package/lib/constants/CardPropTypes.js

@@ -387,7 +387,6 @@ var PieCardPropTypes = {
     pieChart: SharedPropTypes.OverridePropTypes,
     table: SharedPropTypes.OverridePropTypes
   }),
-  testID: PropTypes__default['default'].string,
 
   /**
    * array of data objects from the backend for instance [{group: 'Group A', value: 50}, {group: 'Group B', value: 50}, ...]

package/package.json

@@ -340,10 +340,10 @@
     "whatwg-fetch": "^3.0.0"
   },
   "sideEffects": false,
-  "version": "2.149.1-next.2",
+  "version": "2.150.0-next.2",
   "resolutions": {
     "chokidar": "3.3.1",
     "react-grid-layout": "1.2.2"
   },
-  "gitHead": "6373f5a17b3eeb8a1ac8e69e74bbddd6955f6c0a"
+  "gitHead": "8d88ec637eb1ac95a37b0395e5b8a13a9830ffa7"
 }

package/umd/carbon-addons-iot-react.js

@@ -33525,7 +33525,6 @@
 	  closeMenuText: 'Close menu',
 	  i18n: _objectSpread$1Z({}, defaultI18NPropTypes),
 	  hasFastFilter: true,
-	  testID: '',
 	  testId: '',
 	  showExpanderColumn: false,
 	  size: undefined
@@ -34212,18 +34211,6 @@
 	      "required": false,
 	      "description": "should we filter on each keypress"
 	    },
-	    "testID": {
-	      "defaultValue": {
-	        "value": "''",
-	        "computed": false
-	      },
-	      "type": {
-	        "name": "custom",
-	        "raw": "deprecate(\n  PropTypes.string,\n  `The 'testID' prop has been deprecated. Please use 'testId' instead.`\n)"
-	      },
-	      "required": false,
-	      "description": ""
-	    },
 	    "testId": {
 	      "defaultValue": {
 	        "value": "''",
@@ -34395,6 +34382,14 @@
 	      },
 	      "required": true,
 	      "description": ""
+	    },
+	    "testID": {
+	      "type": {
+	        "name": "custom",
+	        "raw": "deprecate(\n  PropTypes.string,\n  `The 'testID' prop has been deprecated. Please use 'testId' instead.`\n)"
+	      },
+	      "required": false,
+	      "description": ""
 	    }
 	  }
 	};
@@ -36363,6 +36358,9 @@
 	    hasAdvancedFilter: PropTypes__default['default'].bool,
 	    hasAggregations: PropTypes__default['default'].bool,
 
+	    /* option to hide batch action toolbar */
+	    hasBatchActionToolbar: PropTypes__default['default'].bool,
+
 	    /** If true, search is applied as typed. If false, only after 'Enter' is pressed */
 	    hasFastSearch: PropTypes__default['default'].bool,
 	    hasFilter: PropTypes__default['default'].bool,
@@ -36510,6 +36508,7 @@
 	      hasRowCountInHeader = _ref$options.hasRowCountInHeader,
 	      hasRowEdit = _ref$options.hasRowEdit,
 	      hasUserViewManagement = _ref$options.hasUserViewManagement,
+	      hasBatchActionToolbar = _ref$options.hasBatchActionToolbar,
 	      _ref$actions = _ref.actions,
 	      onCancelBatchAction = _ref$actions.onCancelBatchAction,
 	      onApplyBatchAction = _ref$actions.onApplyBatchAction,
@@ -36581,13 +36580,30 @@
 	  var visibleOverflowBatchActions = batchActions.filter(function (action) {
 	    return action.isOverflow && action.hidden !== true;
 	  });
+	  var hasVisibleBatchActions = visibleBatchActions.length > 0;
 	  var hasVisibleOverflowBatchActions = visibleOverflowBatchActions.length > 0;
+	  var totalSelectedText = React$1.useMemo(function () {
+	    if (totalSelected > 1) {
+	      if (typeof i18n.itemsSelected === 'function') {
+	        return i18n.itemsSelected(totalSelected);
+	      }
+
+	      return "".concat(totalSelected, " ").concat(i18n.itemsSelected);
+	    }
+
+	    if (typeof i18n.itemSelected === 'function') {
+	      return i18n.itemSelected(totalSelected);
+	    }
+
+	    return "".concat(totalSelected, " ").concat(i18n.itemSelected);
+	    /* eslint-disable-next-line react-hooks/exhaustive-deps */
+	  }, [i18n.itemSelected, i18n.itemsSelected, totalSelected]);
 	  return /*#__PURE__*/React__default['default'].createElement(carbonComponentsReact.TableToolbar // TODO: remove deprecated 'testID' in v3
 	  , {
 	    "data-testid": testID || testId,
 	    className: classnames$1("".concat(iotPrefix$20, "--table-toolbar"), className),
 	    "aria-label": i18n.toolbarLabelAria
-	  }, /*#__PURE__*/React__default['default'].createElement(carbonComponentsReact.TableBatchActions // TODO: remove deprecated 'testID' in v3
+	  }, hasBatchActionToolbar ? /*#__PURE__*/React__default['default'].createElement(carbonComponentsReact.TableBatchActions // TODO: remove deprecated 'testID' in v3
 	  , {
 	    "data-testid": "".concat(testID || testId, "-batch-actions"),
 	    className: "".concat(iotPrefix$20, "--table-batch-actions"),
@@ -36601,7 +36617,7 @@
 
 	      return tableTranslateWithId.apply(void 0, [i18n].concat(args));
 	    }
-	  }, visibleBatchActions.map(function (_ref3) {
+	  }, hasVisibleBatchActions && visibleBatchActions.map(function (_ref3) {
 	    var id = _ref3.id,
 	        labelText = _ref3.labelText,
 	        disabled = _ref3.disabled,
@@ -36654,12 +36670,17 @@
 	      isDelete: isDelete,
 	      "aria-label": labelText
 	    });
-	  })) : null), secondaryTitle ?
+	  })) : null) : null, secondaryTitle ?
+	  /*#__PURE__*/
+	  // eslint-disable-next-line jsx-a11y/label-has-associated-control, jsx-a11y/label-has-for
+	  React__default['default'].createElement("label", {
+	    className: "".concat(iotPrefix$20, "--table-toolbar-secondary-title")
+	  }, secondaryTitle) : !hasBatchActionToolbar && shouldShowBatchActions ?
 	  /*#__PURE__*/
 	  // eslint-disable-next-line jsx-a11y/label-has-associated-control, jsx-a11y/label-has-for
 	  React__default['default'].createElement("label", {
 	    className: "".concat(iotPrefix$20, "--table-toolbar-secondary-title")
-	  }, secondaryTitle) : null, // Deprecated in favor of secondaryTitle for a more general use-case
+	  }, totalSelectedText) : null, // Deprecated in favor of secondaryTitle for a more general use-case
 	  hasRowCountInHeader ?
 	  /*#__PURE__*/
 	  // eslint-disable-next-line jsx-a11y/label-has-associated-control, jsx-a11y/label-has-for
@@ -36986,6 +37007,10 @@
 	            "name": "bool",
 	            "required": false
 	          },
+	          "hasBatchActionToolbar": {
+	            "name": "bool",
+	            "required": false
+	          },
 	          "hasFastSearch": {
 	            "name": "bool",
 	            "description": "If true, search is applied as typed. If false, only after 'Enter' is pressed",
@@ -43668,6 +43693,11 @@
 	    hasPagination: PropTypes__default['default'].bool,
 	    hasRowSelection: PropTypes__default['default'].oneOf(['multi', 'single', false]),
 
+	    /** @TODO: Remove in major release and just show action bar when no actions are defined */
+
+	    /* option to hide batch action toolbar */
+	    hasBatchActionToolbar: PropTypes__default['default'].bool,
+
 	    /** True if the rows should be expandable */
 	    hasRowExpansion: PropTypes__default['default'].oneOfType([PropTypes__default['default'].bool, PropTypes__default['default'].shape({
 	      /** True if any previously expanded rows should be collapsed when a new row is expanded */
@@ -43990,6 +44020,7 @@
 	      hasPagination: false,
 	      hasRowSelection: false,
 	      hasRowExpansion: false,
+	      hasBatchActionToolbar: true,
 	      hasRowActions: false,
 	      hasRowNesting: false,
 	      hasRowEdit: false,
@@ -44446,7 +44477,7 @@
 	        }
 	      }
 	    }),
-	    options: _objectSpread$1R(_objectSpread$1R({}, pick(options, 'hasAggregations', 'hasColumnSelection', 'hasFastSearch', 'hasSearch', 'hasRowSelection', 'hasRowCountInHeader', 'hasRowEdit', 'hasUserViewManagement')), {}, {
+	    options: _objectSpread$1R(_objectSpread$1R({}, pick(options, 'hasAggregations', 'hasColumnSelection', 'hasFastSearch', 'hasSearch', 'hasRowSelection', 'hasRowCountInHeader', 'hasRowEdit', 'hasUserViewManagement', 'hasBatchActionToolbar')), {}, {
 	      hasFilter: Boolean(options === null || options === void 0 ? void 0 : options.hasFilter),
 	      hasAdvancedFilter: Boolean(options === null || options === void 0 ? void 0 : options.hasAdvancedFilter)
 	    }),
@@ -44746,6 +44777,11 @@
 	            }],
 	            "required": false
 	          },
+	          "hasBatchActionToolbar": {
+	            "name": "bool",
+	            "description": "@TODO: Remove in major release and just show action bar when no actions are defined",
+	            "required": false
+	          },
 	          "hasRowExpansion": {
 	            "name": "union",
 	            "value": [{
@@ -103093,7 +103129,6 @@
 	    pieChart: OverridePropTypes,
 	    table: OverridePropTypes
 	  }),
-	  testID: PropTypes__default['default'].string,
 
 	  /**
 	   * array of data objects from the backend for instance [{group: 'Group A', value: 50}, {group: 'Group B', value: 50}, ...]
@@ -122058,13 +122093,13 @@
 
 	var getUiResourcesData = /*#__PURE__*/function () {
 	  var _ref3 = asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2(_ref2) {
-	    var baseApiUrl, _ref2$lang, lang, _ref2$surveyId, surveyId, _ref2$fetchApi, fetchApi, _ref2$isTest, isTest, api, langParam, surveyIdParam;
+	    var baseApiUrl, _ref2$lang, lang, _ref2$surveyId, surveyId, _ref2$workspaceId, workspaceId, _ref2$fetchApi, fetchApi, _ref2$isTest, isTest, api, langParam, surveyIdParam, workspaceIdParam;
 
 	    return regenerator.wrap(function _callee2$(_context2) {
 	      while (1) {
 	        switch (_context2.prev = _context2.next) {
 	          case 0:
-	            baseApiUrl = _ref2.baseApiUrl, _ref2$lang = _ref2.lang, lang = _ref2$lang === void 0 ? 'en' : _ref2$lang, _ref2$surveyId = _ref2.surveyId, surveyId = _ref2$surveyId === void 0 ? null : _ref2$surveyId, _ref2$fetchApi = _ref2.fetchApi, fetchApi = _ref2$fetchApi === void 0 ? defaultFetchApi : _ref2$fetchApi, _ref2$isTest = _ref2.isTest, isTest = _ref2$isTest === void 0 ? false : _ref2$isTest;
+	            baseApiUrl = _ref2.baseApiUrl, _ref2$lang = _ref2.lang, lang = _ref2$lang === void 0 ? 'en' : _ref2$lang, _ref2$surveyId = _ref2.surveyId, surveyId = _ref2$surveyId === void 0 ? null : _ref2$surveyId, _ref2$workspaceId = _ref2.workspaceId, workspaceId = _ref2$workspaceId === void 0 ? null : _ref2$workspaceId, _ref2$fetchApi = _ref2.fetchApi, fetchApi = _ref2$fetchApi === void 0 ? defaultFetchApi : _ref2$fetchApi, _ref2$isTest = _ref2.isTest, isTest = _ref2$isTest === void 0 ? false : _ref2$isTest;
 
 	            api = function api(method, path, body, headers) {
 	              return fetchApi(method, "".concat(baseApiUrl).concat(path), body, headers, isTest ? fixture[path.split('?')[0]] : null);
@@ -122072,9 +122107,10 @@
 
 	            langParam = "&lang=".concat(lang);
 	            surveyIdParam = surveyId ? "&surveyId=".concat(surveyId) : '';
-	            return _context2.abrupt("return", api('GET', "/uiresources?id=masthead".concat(langParam).concat(surveyIdParam)));
+	            workspaceIdParam = workspaceId ? "&workspaceId=".concat(workspaceId) : '';
+	            return _context2.abrupt("return", api('GET', "/uiresources?id=masthead".concat(langParam).concat(surveyIdParam).concat(workspaceIdParam)));
 
-	          case 5:
+	          case 6:
 	          case "end":
 	            return _context2.stop();
 	        }
@@ -122093,6 +122129,8 @@
 	      lang = _ref$lang === void 0 ? 'en' : _ref$lang,
 	      _ref$surveyId = _ref.surveyId,
 	      surveyId = _ref$surveyId === void 0 ? null : _ref$surveyId,
+	      _ref$workspaceId = _ref.workspaceId,
+	      workspaceId = _ref$workspaceId === void 0 ? null : _ref$workspaceId,
 	      _ref$fetchApi = _ref.fetchApi,
 	      fetchApi = _ref$fetchApi === void 0 ? defaultFetchApi : _ref$fetchApi,
 	      _ref$isTest = _ref.isTest,
@@ -122134,6 +122172,7 @@
 	              baseApiUrl: baseApiUrl,
 	              lang: lang,
 	              surveyId: surveyId,
+	              workspaceId: workspaceId,
 	              fetchApi: fetchApi,
 	              isTest: isTest
 	            });
@@ -122160,7 +122199,7 @@
 	        }
 	      }
 	    }, _callee, null, [[0, 8, 11, 14]]);
-	  })), [baseApiUrl, lang, surveyId, isTest, setIsLoading]); // eslint-disable-line react-hooks/exhaustive-deps
+	  })), [baseApiUrl, lang, surveyId, workspaceId, isTest, setIsLoading]); // eslint-disable-line react-hooks/exhaustive-deps
 
 	  React$1.useEffect(function () {
 	    // load actual data