carbon-addons-iot-react 2.152.0-next.13 → 2.152.0-next.15

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

@@ -29,6 +29,7 @@ import { TableColumnsPropTypes, TableColumnGroupPropType, ActiveTableToolbarProp
 import TableCellRenderer from '../TableCellRenderer/TableCellRenderer.js';
 import { tableTranslateWithId } from '../../../utils/componentUtilityFunctions.js';
 import { settings } from '../../../constants/Settings.js';
+import { WrapCellTextPropTypes } from '../../../constants/SharedPropTypes.js';
 import { OverflowMenu } from '../../OverflowMenu/index.js';
 import { usePrevious } from '../../../hooks/usePrevious.js';
 import deprecate from '../../../internal/deprecate.js';
@@ -58,7 +59,7 @@ var propTypes = {
       /** If the hierarchy only has 1 nested level of children */
       hasSingleNestedHierarchy: PropTypes.bool
     })]),
-    wrapCellText: PropTypes.oneOf(['always', 'never', 'auto', 'alwaysTruncate']).isRequired,
+    wrapCellText: WrapCellTextPropTypes.isRequired,
     truncateCellText: PropTypes.bool.isRequired,
     hasMultiSort: PropTypes.bool,
     useAutoTableLayoutForResize: PropTypes.bool,
@@ -699,20 +700,8 @@ TableHead.__docgenInfo = {
             "required": false
           },
           "wrapCellText": {
-            "name": "enum",
-            "value": [{
-              "value": "'always'",
-              "computed": false
-            }, {
-              "value": "'never'",
-              "computed": false
-            }, {
-              "value": "'auto'",
-              "computed": false
-            }, {
-              "value": "'alwaysTruncate'",
-              "computed": false
-            }],
+            "name": "custom",
+            "raw": "WrapCellTextPropTypes.isRequired",
             "required": true
           },
           "truncateCellText": {

package/es/constants/SharedPropTypes.js

@@ -151,5 +151,6 @@ var CarbonIconPropType = PropTypes.oneOfType([PropTypes.func, PropTypes.object])
 var HtmlElementRefProp = PropTypes.oneOfType([PropTypes.func, PropTypes.shape({
   current: PropTypes.oneOfType([PropTypes.object])
 })]);
+var WrapCellTextPropTypes = PropTypes.oneOf(['always', 'never', 'auto', 'alwaysTruncate', 'expand']);
 
-export { ButtonIconPropType, CarbonIconPropType, ColorPropType, HotspotContentPropTypes, HotspotIconPropType, HotspotPropTypes, HtmlElementRefProp, OverridePropTypes, SvgPropType };
+export { ButtonIconPropType, CarbonIconPropType, ColorPropType, HotspotContentPropTypes, HotspotIconPropType, HotspotPropTypes, HtmlElementRefProp, OverridePropTypes, SvgPropType, WrapCellTextPropTypes };

package/es/hooks/usePopoverPositioning.js

@@ -46,6 +46,36 @@ var isOffscreen = function isOffscreen(menuBody, menuDirection, menuButton
   var L = offLeft ? 'left' : '';
   return [T, R, B, L].filter(Boolean).join('-');
 };
+/**
+ * This is used as the callback for menuOffset ONLY on Tooltips. It's needed due to
+ * truncation that might happen on Tooltip trigger, therefore we need to consider
+ * right position of the trigger as well. This function is used as an enhancement for
+ * the isOffscreen method.
+ *
+ * @param {HTMLElement} menuBody The underlying carbon FloatingMenu element
+ * @param {string} menuDirection The direction prop
+ * @param {HTMLElement} menuButton The button triggering the menu
+ * @returns {string} 'start', 'center' or 'end'
+ */
+
+
+var getTooltipAlignment = function getTooltipAlignment(menuBody, menuDirection, menuButton) {
+  var buttonRect = menuButton.getBoundingClientRect();
+  var tooltipRect = menuBody.getBoundingClientRect();
+  var windowWidth = window.innerWidth || document.documentElement.clientWidth;
+  var triggerCenter = (buttonRect.left + buttonRect.right) / 2;
+  var tooltipCenter = tooltipRect.width / 2;
+
+  if (triggerCenter - tooltipCenter < 0) {
+    return 'start';
+  }
+
+  if (triggerCenter + tooltipCenter > windowWidth) {
+    return 'end';
+  }
+
+  return 'center';
+};
 /**
  * Given a subset of props from the Tooltip, OverflowMenu, or FlyoutMenu. This hook returns a decorator
  * function around the original menuOffset function. It determines if the element overflows using that
@@ -63,22 +93,29 @@ var usePopoverPositioning = function usePopoverPositioning(_ref) {
       _ref$isOverflowMenu = _ref.isOverflowMenu,
       isOverflowMenu = _ref$isOverflowMenu === void 0 ? false : _ref$isOverflowMenu,
       _ref$useAutoPositioni = _ref.useAutoPositioning,
-      useAutoPositioning = _ref$useAutoPositioni === void 0 ? true : _ref$useAutoPositioni;
+      useAutoPositioning = _ref$useAutoPositioni === void 0 ? true : _ref$useAutoPositioni,
+      _ref$defaultAlignment = _ref.defaultAlignment,
+      defaultAlignment = _ref$defaultAlignment === void 0 ? 'center' : _ref$defaultAlignment;
 
   var _React$useState = React.useState(),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       adjustedDirection = _React$useState2[0],
       setAdjustedDirection = _React$useState2[1];
 
-  var _React$useState3 = React.useState(),
+  var _React$useState3 = React.useState(defaultAlignment),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
-      adjustedFlipped = _React$useState4[0],
-      setAdjustedFlipped = _React$useState4[1];
+      adjustedAlignment = _React$useState4[0],
+      setAdjustedAlignment = _React$useState4[1];
 
-  var _React$useState5 = React.useState({}),
+  var _React$useState5 = React.useState(),
       _React$useState6 = _slicedToArray(_React$useState5, 2),
-      flyoutAlignment = _React$useState6[0].flyoutAlignment,
-      setDirections = _React$useState6[1];
+      adjustedFlipped = _React$useState6[0],
+      setAdjustedFlipped = _React$useState6[1];
+
+  var _React$useState7 = React.useState({}),
+      _React$useState8 = _slicedToArray(_React$useState7, 2),
+      flyoutAlignment = _React$useState8[0].flyoutAlignment,
+      setDirections = _React$useState8[1];
 
   var previousDirection = React.useRef();
   var langDir = useLangDirection();
@@ -176,10 +213,12 @@ var usePopoverPositioning = function usePopoverPositioning(_ref) {
    * be adjusted to `right-start`.
    */
 
-  var fixOverflow = React.useCallback(function (overflow, menuOffsetArgs) {
+  var fixOverflow = React.useCallback(function (overflow, menuOffsetArgs, alignment) {
     var _menuOffsetArgs = _slicedToArray(menuOffsetArgs, 1),
         tooltipElement = _menuOffsetArgs[0];
 
+    setAdjustedAlignment(alignment);
+
     switch (overflow) {
       case 'top':
         if (flyoutAlignment) {
@@ -306,7 +345,9 @@ var usePopoverPositioning = function usePopoverPositioning(_ref) {
     } // determine if the element is off-screen.
 
 
-    var overflow = isOffscreen.apply(void 0, args.concat([defaultOffset])); // if it's offscreen in a direction we can fix, do so
+    var overflow = isOffscreen.apply(void 0, args.concat([defaultOffset])); // determine if the element has new alignment
+
+    var alignment = getTooltipAlignment.apply(void 0, args); // if it's offscreen in a direction we can fix, do so
     // otherwise leave it be. ie. 'top-left' is fixable, but
     // a large element with 'top-right-left' wouldn't be.
 
@@ -319,7 +360,7 @@ var usePopoverPositioning = function usePopoverPositioning(_ref) {
       case 'right':
       case 'bottom':
       case 'left':
-        return fixOverflow(overflow, [].concat(args));
+        return fixOverflow(overflow, [].concat(args), alignment);
 
       default:
         return defaultOffset;
@@ -333,7 +374,8 @@ var usePopoverPositioning = function usePopoverPositioning(_ref) {
 
   return [calculateMenuOffset, {
     adjustedDirection: adjustedDirection,
-    adjustedFlipped: adjustedFlipped
+    adjustedFlipped: adjustedFlipped,
+    adjustedAlignment: adjustedAlignment
   }];
 };
 

package/lib/components/BarChartCard/barChartUtils.js

@@ -298,7 +298,7 @@ var formatChartData = function formatChartData(seriesArg, values, categoryDataSo
         group.forEach(function (value) {
           series.forEach(function (dataset) {
             // if value is null, don't add it to the formatted chartData
-            if (!isNil(value[dataset.dataSourceId])) {
+            if ((!isNil(value[categoryDataSourceId]) || !isNil(dataset.label)) && (timeDataSourceId && type !== LayoutConstants.BAR_CHART_TYPES.GROUPED ? !isNil(value[timeDataSourceId]) : !isNil(value[categoryDataSourceId]))) {
               data.push(_objectSpread({
                 // if there's a dataset label, use it
                 group: dataset.label ? dataset.label : value[categoryDataSourceId],
@@ -330,7 +330,7 @@ var formatChartData = function formatChartData(seriesArg, values, categoryDataSo
         labeledData.forEach(function (dataset) {
           dataset.forEach(function (value) {
             // if value is null, don't add it to the formatted chartData
-            if (!isNil(value[series[0].dataSourceId])) {
+            if (!isNil(value[series[0].dataSourceId] && value[categoryDataSourceId])) {
               data.push({
                 group: value[categoryDataSourceId],
                 // bar this data belongs to

package/lib/components/Card/CardTitle.js

@@ -83,6 +83,7 @@ var CardTitle = function CardTitle(_ref // eslint-disable-line react/prop-types
 
   var _usePopoverPositionin = usePopoverPositioning.usePopoverPositioning({
     direction: 'bottom',
+    defaultAlignment: 'center',
     menuOffset: index.getTooltipMenuOffset,
     useAutoPositioning: true,
     isOverflowMenu: true // Needed to preserve default direction (bottom)
@@ -90,7 +91,9 @@ var CardTitle = function CardTitle(_ref // eslint-disable-line react/prop-types
   }),
       _usePopoverPositionin2 = _slicedToArray__default['default'](_usePopoverPositionin, 2),
       calculateMenuOffset = _usePopoverPositionin2[0],
-      adjustedDirection = _usePopoverPositionin2[1].adjustedDirection;
+      _usePopoverPositionin3 = _usePopoverPositionin2[1],
+      adjustedDirection = _usePopoverPositionin3.adjustedDirection,
+      adjustedAlignment = _usePopoverPositionin3.adjustedAlignment;
 
   var _useState = React.useState({
     title: false,
@@ -166,7 +169,7 @@ var CardTitle = function CardTitle(_ref // eslint-disable-line react/prop-types
     var _classnames;
 
     return hasTitleTooltipFromTruncation || hasExternalTitleTextTooltip ? /*#__PURE__*/React__default['default'].createElement(carbonComponentsReact.Tooltip, {
-      align: "center",
+      align: adjustedAlignment,
       menuOffset: calculateMenuOffset,
       direction: adjustedDirection,
       "data-testid": "".concat(testId, "-title-tooltip"),
@@ -191,6 +194,9 @@ var CardTitle = function CardTitle(_ref // eslint-disable-line react/prop-types
 
   var renderSubTitle = function renderSubTitle() {
     return !subtitle ? null : hasSubTitleTooltip ? /*#__PURE__*/React__default['default'].createElement(carbonComponentsReact.Tooltip, {
+      align: adjustedAlignment,
+      menuOffset: calculateMenuOffset,
+      direction: adjustedDirection,
       "data-testid": "".concat(testId, "-subtitle"),
       ref: subTitleRef,
       showIcon: false,

package/lib/components/DateTimePicker/DateTimePickerV2WithTimeSpinner.js

@@ -287,7 +287,7 @@ var defaultProps = {
 };
 
 var DateTimePicker = function DateTimePicker(_ref) {
-  var _classnames2, _classnames4, _style$zIndex;
+  var _classnames, _classnames2, _classnames4, _style$zIndex;
 
   var testId = _ref.testId,
       defaultValue = _ref.defaultValue,
@@ -862,7 +862,7 @@ var DateTimePicker = function DateTimePicker(_ref) {
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     "data-testid": testId,
     id: "".concat(id, "-").concat(iotPrefix, "--date-time-pickerv2__wrapper"),
-    className: classnames__default['default']("".concat(iotPrefix, "--date-time-pickerv2__wrapper"), _defineProperty__default['default']({}, "".concat(iotPrefix, "--date-time-pickerv2__wrapper--disabled"), disabled)),
+    className: classnames__default['default']("".concat(iotPrefix, "--date-time-pickerv2__wrapper"), (_classnames = {}, _defineProperty__default['default'](_classnames, "".concat(iotPrefix, "--date-time-pickerv2__wrapper--disabled"), disabled), _defineProperty__default['default'](_classnames, "".concat(iotPrefix, "--date-time-pickerv2__wrapper--invalid"), invalidState), _classnames)),
     style: {
       '--wrapper-width': hasIconOnly ? '3rem' : '20rem'
     },
@@ -884,7 +884,7 @@ var DateTimePicker = function DateTimePicker(_ref) {
     onMouseLeave: toggleTooltip,
     tabIndex: 0
   }, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: classnames__default['default']((_classnames2 = {}, _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--full"), !hasIconOnly), _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--light"), light), _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--invalid"), invalidState), _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--disabled"), disabled), _classnames2))
+    className: classnames__default['default']((_classnames2 = {}, _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--full"), !hasIconOnly), _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--light"), light), _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--disabled"), disabled), _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--invalid"), invalidState), _classnames2))
   }, !hasIconOnly ? /*#__PURE__*/React__default['default'].createElement("div", {
     "data-testid": "".concat(testId, "__field"),
     className: "".concat(iotPrefix, "--date-time-picker__field")

package/lib/components/DateTimePicker/DateTimePickerV2WithoutTimeSpinner.js

@@ -268,7 +268,7 @@ var defaultProps = {
 };
 
 var DateTimePicker = function DateTimePicker(_ref) {
-  var _classnames2, _classnames4;
+  var _classnames, _classnames2, _classnames4;
 
   var testId = _ref.testId,
       defaultValue = _ref.defaultValue,
@@ -721,7 +721,7 @@ var DateTimePicker = function DateTimePicker(_ref) {
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     "data-testid": testId,
     id: "".concat(id, "-").concat(iotPrefix, "--date-time-pickerv2__wrapper"),
-    className: classnames__default['default']("".concat(iotPrefix, "--date-time-pickerv2__wrapper"), _defineProperty__default['default']({}, "".concat(iotPrefix, "--date-time-pickerv2__wrapper--disabled"), disabled)),
+    className: classnames__default['default']("".concat(iotPrefix, "--date-time-pickerv2__wrapper"), (_classnames = {}, _defineProperty__default['default'](_classnames, "".concat(iotPrefix, "--date-time-pickerv2__wrapper--disabled"), disabled), _defineProperty__default['default'](_classnames, "".concat(iotPrefix, "--date-time-pickerv2__wrapper--invalid"), invalidState), _classnames)),
     style: {
       '--wrapper-width': hasIconOnly ? '3rem' : '20rem'
     },
@@ -743,7 +743,7 @@ var DateTimePicker = function DateTimePicker(_ref) {
     onMouseLeave: toggleTooltip,
     tabIndex: 0
   }, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: classnames__default['default']((_classnames2 = {}, _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--full"), !hasIconOnly), _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--light"), light), _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--invalid"), invalidState), _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--disabled"), disabled), _classnames2))
+    className: classnames__default['default']((_classnames2 = {}, _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--full"), !hasIconOnly), _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--light"), light), _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--disabled"), disabled), _defineProperty__default['default'](_classnames2, "".concat(iotPrefix, "--date-time-picker__box--invalid"), invalidState), _classnames2))
   }, !hasIconOnly ? /*#__PURE__*/React__default['default'].createElement("div", {
     "data-testid": "".concat(testId, "__field"),
     className: "".concat(iotPrefix, "--date-time-picker__field")

package/lib/components/SuiteHeader/IdleLogoutConfirmationModal/IdleLogoutConfirmationModal.js

@@ -69,6 +69,9 @@ var IdleLogoutConfirmationModalI18NPropTypes = {
   sessionTimeoutModalStayLoggedInButton: PropTypes__default['default'].string
 };
 var defaultProps = {
+  isAdminView: null,
+  appId: null,
+  workspaceId: null,
   className: null,
   idleTimeoutData: {
     timeout: 1800,
@@ -110,6 +113,15 @@ var defaultProps = {
   }
 };
 var propTypes = {
+  /** If true, include the originIsAdmin query param in the logout URL */
+  isAdminView: PropTypes__default['default'].bool,
+
+  /** Application ID in suite */
+  appId: PropTypes__default['default'].string,
+
+  /** Workspace ID in suite */
+  workspaceId: PropTypes__default['default'].string,
+
   /** Add class name to the rendered Modal component */
   className: PropTypes__default['default'].string,
 
@@ -130,7 +142,10 @@ var propTypes = {
 };
 
 var IdleLogoutConfirmationModal = function IdleLogoutConfirmationModal(_ref) {
-  var className = _ref.className,
+  var isAdminView = _ref.isAdminView,
+      appId = _ref.appId,
+      workspaceId = _ref.workspaceId,
+      className = _ref.className,
       idleTimeoutData = _ref.idleTimeoutData,
       routes = _ref.routes,
       onRouteChange = _ref.onRouteChange,
@@ -147,7 +162,7 @@ var IdleLogoutConfirmationModal = function IdleLogoutConfirmationModal(_ref) {
 
       return acc.replace(key, val);
     }, string);
-  }, []); // Append originHref query parameter to the logout routes
+  }, []); // Append originHref query parameter (and, optionally, originIsAdmin, originWorkspaceId and originAppId) to the logout routes
 
   var logoutRoute = routes === null || routes === void 0 ? void 0 : routes.logout;
 
@@ -156,8 +171,21 @@ var IdleLogoutConfirmationModal = function IdleLogoutConfirmationModal(_ref) {
 
     if (window.location.href) {
       url.searchParams.append('originHref', window.location.href);
-      logoutRoute = url.href;
     }
+
+    if (appId) {
+      url.searchParams.append('originAppId', appId);
+    }
+
+    if (workspaceId) {
+      url.searchParams.append('originWorkspaceId', workspaceId);
+    }
+
+    if (isAdminView) {
+      url.searchParams.append('originIsAdmin', isAdminView);
+    }
+
+    logoutRoute = url.href;
   } catch (e) {
     logoutRoute = routes === null || routes === void 0 ? void 0 : routes.logout;
   }
@@ -169,9 +197,21 @@ var IdleLogoutConfirmationModal = function IdleLogoutConfirmationModal(_ref) {
 
     if (window.location.href) {
       _url.searchParams.append('originHref', window.location.href);
+    }
 
-      logoutInactivityRoute = _url.href;
+    if (appId) {
+      _url.searchParams.append('originAppId', appId);
     }
+
+    if (workspaceId) {
+      _url.searchParams.append('originWorkspaceId', workspaceId);
+    }
+
+    if (isAdminView) {
+      _url.searchParams.append('originIsAdmin', isAdminView);
+    }
+
+    logoutInactivityRoute = _url.href;
   } catch (e) {
     logoutInactivityRoute = routes === null || routes === void 0 ? void 0 : routes.logoutInactivity;
   } // This state is just to force the recreation of the IdleTimer object in the useEffect below
@@ -329,6 +369,39 @@ IdleLogoutConfirmationModal.__docgenInfo = {
   "methods": [],
   "displayName": "IdleLogoutConfirmationModal",
   "props": {
+    "isAdminView": {
+      "defaultValue": {
+        "value": "null",
+        "computed": false
+      },
+      "type": {
+        "name": "bool"
+      },
+      "required": false,
+      "description": "If true, include the originIsAdmin query param in the logout URL"
+    },
+    "appId": {
+      "defaultValue": {
+        "value": "null",
+        "computed": false
+      },
+      "type": {
+        "name": "string"
+      },
+      "required": false,
+      "description": "Application ID in suite"
+    },
+    "workspaceId": {
+      "defaultValue": {
+        "value": "null",
+        "computed": false
+      },
+      "type": {
+        "name": "string"
+      },
+      "required": false,
+      "description": "Workspace ID in suite"
+    },
     "className": {
       "defaultValue": {
         "value": "null",

package/lib/components/SuiteHeader/SuiteHeader.js

@@ -221,6 +221,8 @@ var propTypes = {
 };
 
 var SuiteHeader = function SuiteHeader(_ref) {
+  var _currentWorkspace$app, _currentWorkspace$app2, _currentWorkspace$app3, _applications$find;
+
   var className = _ref.className,
       suiteName = _ref.suiteName,
       appName = _ref.appName,
@@ -280,7 +282,12 @@ var SuiteHeader = function SuiteHeader(_ref) {
   var isMultiWorkspace = (workspaces === null || workspaces === void 0 ? void 0 : workspaces.length) > 0;
   var currentWorkspace = workspaces === null || workspaces === void 0 ? void 0 : workspaces.find(function (wo) {
     return wo.isCurrent;
-  }); // Include the current workspace label only if we are not in an admin page and multi workspace is supported and more than one workspace is available
+  });
+  var appId = (_currentWorkspace$app = currentWorkspace === null || currentWorkspace === void 0 ? void 0 : (_currentWorkspace$app2 = currentWorkspace.applications) === null || _currentWorkspace$app2 === void 0 ? void 0 : (_currentWorkspace$app3 = _currentWorkspace$app2.find(function (a) {
+    return a.isCurrent;
+  })) === null || _currentWorkspace$app3 === void 0 ? void 0 : _currentWorkspace$app3.id) !== null && _currentWorkspace$app !== void 0 ? _currentWorkspace$app : applications === null || applications === void 0 ? void 0 : (_applications$find = applications.find(function (a) {
+    return a.isCurrent;
+  })) === null || _applications$find === void 0 ? void 0 : _applications$find.id; // Include the current workspace label only if we are not in an admin page and multi workspace is supported and more than one workspace is available
 
   var currentWorkspaceComponent = !isAdminView && isMultiWorkspace && (workspaces === null || workspaces === void 0 ? void 0 : workspaces.length) > 1 && currentWorkspace ? /*#__PURE__*/React__default['default'].createElement("span", {
     "data-testid": "".concat(testId, "--current-workspace")
@@ -293,7 +300,7 @@ var SuiteHeader = function SuiteHeader(_ref) {
     className: "".concat(Settings.settings.iotPrefix, "--suite-header-subtitle")
   }, extraContent) : null;
   var navigatorRoute = (currentWorkspace === null || currentWorkspace === void 0 ? void 0 : currentWorkspace.href) || (routes === null || routes === void 0 ? void 0 : routes.navigator) || 'javascript:void(0)';
-  var adminRoute = (routes === null || routes === void 0 ? void 0 : routes.admin) || 'javascript:void(0)'; // Append originHref query parameter to the logout route
+  var adminRoute = (routes === null || routes === void 0 ? void 0 : routes.admin) || 'javascript:void(0)'; // Append originHref query parameter (and, optionally, originIsAdmin, originWorkspaceId and originAppId) to the logout route
 
   var logoutRoute = routes === null || routes === void 0 ? void 0 : routes.logout;
 
@@ -302,8 +309,21 @@ var SuiteHeader = function SuiteHeader(_ref) {
 
     if (window.location.href) {
       url.searchParams.append('originHref', window.location.href);
-      logoutRoute = url.href;
     }
+
+    if (appId) {
+      url.searchParams.append('originAppId', appId);
+    }
+
+    if (currentWorkspace !== null && currentWorkspace !== void 0 && currentWorkspace.id) {
+      url.searchParams.append('originWorkspaceId', currentWorkspace.id);
+    }
+
+    if (isAdminView) {
+      url.searchParams.append('originIsAdmin', isAdminView);
+    }
+
+    logoutRoute = url.href;
   } catch (e) {
     logoutRoute = routes === null || routes === void 0 ? void 0 : routes.logout;
   } // If there are custom help links, include an extra child content entry for the separator
@@ -380,6 +400,9 @@ var SuiteHeader = function SuiteHeader(_ref) {
       return setShowToast(false);
     }
   }) : null, idleTimeoutData && (routes === null || routes === void 0 ? void 0 : routes.domain) !== null && (routes === null || routes === void 0 ? void 0 : routes.domain) !== undefined ? /*#__PURE__*/React__default['default'].createElement(IdleLogoutConfirmationModal['default'], {
+    isAdminView: isAdminView,
+    appId: appId,
+    workspaceId: currentWorkspace === null || currentWorkspace === void 0 ? void 0 : currentWorkspace.id,
     idleTimeoutData: idleTimeoutData,
     routes: routes,
     onRouteChange: onRouteChange,

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$appId = _ref.appId,
+      appId = _ref$appId === void 0 ? null : _ref$appId,
       _ref$workspaceId = _ref.workspaceId,
       workspaceId = _ref$workspaceId === void 0 ? null : _ref$workspaceId,
       _ref$fetchApi = _ref.fetchApi,
@@ -63,6 +65,7 @@ var useUiResources = function useUiResources(_ref) {
               baseApiUrl: baseApiUrl,
               lang: lang,
               surveyId: surveyId,
+              appId: appId,
               workspaceId: workspaceId,
               fetchApi: fetchApi,
               isTest: isTest
@@ -90,7 +93,7 @@ var useUiResources = function useUiResources(_ref) {
         }
       }
     }, _callee, null, [[0, 8, 11, 14]]);
-  })), [baseApiUrl, lang, surveyId, workspaceId, isTest, setIsLoading]); // eslint-disable-line react-hooks/exhaustive-deps
+  })), [baseApiUrl, lang, surveyId, appId, 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$workspaceId, workspaceId, _ref2$fetchApi, fetchApi, _ref2$isTest, isTest, api, langParam, surveyIdParam, workspaceIdParam;
+    var baseApiUrl, _ref2$lang, lang, _ref2$surveyId, surveyId, _ref2$appId, appId, _ref2$workspaceId, workspaceId, _ref2$fetchApi, fetchApi, _ref2$isTest, isTest, api, langParam, surveyIdParam, appIdParam, 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$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;
+            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$appId = _ref2.appId, appId = _ref2$appId === void 0 ? null : _ref2$appId, _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,10 +69,11 @@ var getUiResourcesData = /*#__PURE__*/function () {
 
             langParam = "&lang=".concat(lang);
             surveyIdParam = surveyId ? "&surveyId=".concat(surveyId) : '';
+            appIdParam = appId ? "&appId=".concat(appId) : '';
             workspaceIdParam = workspaceId ? "&workspaceId=".concat(workspaceId) : '';
-            return _context2.abrupt("return", api('GET', "/uiresources?id=masthead".concat(langParam).concat(surveyIdParam).concat(workspaceIdParam)));
+            return _context2.abrupt("return", api('GET', "/uiresources?id=masthead".concat(langParam).concat(surveyIdParam).concat(appIdParam).concat(workspaceIdParam)));
 
-          case 6:
+          case 7:
           case "end":
             return _context2.stop();
         }

package/lib/components/Table/Table.js

@@ -41,6 +41,7 @@ var useLangDirection = require('use-lang-direction');
 var warning = require('warning');
 var componentUtilityFunctions = require('../../utils/componentUtilityFunctions.js');
 var Settings = require('../../constants/Settings.js');
+var SharedPropTypes = require('../../constants/SharedPropTypes.js');
 var FilterTags = require('../FilterTags/FilterTags.js');
 var RuleBuilderPropTypes = require('../RuleBuilder/RuleBuilderPropTypes.js');
 var experimental = require('../../internal/experimental.js');
@@ -175,8 +176,9 @@ var propTypes = {
      * always - Wrap if needed for all table column configurations
      * never - Tables with dynamic columns widths grow larger and tables with fixed or resizable columns truncate.
      * alwaysTruncate - Always truncate if needed for all table column configurations
+     * expand - Expand to fit text width (by horizontal scrollbar) for table with fixed columns
      */
-    wrapCellText: PropTypes__default['default'].oneOf(['always', 'never', 'auto', 'alwaysTruncate']),
+    wrapCellText: SharedPropTypes.WrapCellTextPropTypes,
 
     /** use white-space: pre; css when true */
     preserveCellWhiteSpace: PropTypes__default['default'].bool
@@ -725,7 +727,7 @@ var Table = function Table(props) {
       forceUpdateCellTextWidth = _useState4[1];
 
   var useCellTextTruncate = React.useMemo(function () {
-    return options ? options.wrapCellText === 'alwaysTruncate' || options.wrapCellText !== 'always' && (options.hasResize && !options.useAutoTableLayoutForResize || columns.some(function (col) {
+    return options ? options.wrapCellText === 'alwaysTruncate' || options.wrapCellText !== 'always' && options.wrapCellText !== 'expand' && (options.hasResize && !options.useAutoTableLayoutForResize || columns.some(function (col) {
       return col.hasOwnProperty('width');
     })) : undefined;
   }, [options, columns]);
@@ -1335,21 +1337,9 @@ Table.__docgenInfo = {
             "required": false
           },
           "wrapCellText": {
-            "name": "enum",
-            "value": [{
-              "value": "'always'",
-              "computed": false
-            }, {
-              "value": "'never'",
-              "computed": false
-            }, {
-              "value": "'auto'",
-              "computed": false
-            }, {
-              "value": "'alwaysTruncate'",
-              "computed": false
-            }],
-            "description": "auto - Wrap for tables with dynamic columns widths and truncate for tables with fixed or resizable columns\nalways - Wrap if needed for all table column configurations\nnever - Tables with dynamic columns widths grow larger and tables with fixed or resizable columns truncate.\nalwaysTruncate - Always truncate if needed for all table column configurations",
+            "name": "custom",
+            "raw": "WrapCellTextPropTypes",
+            "description": "auto - Wrap for tables with dynamic columns widths and truncate for tables with fixed or resizable columns\nalways - Wrap if needed for all table column configurations\nnever - Tables with dynamic columns widths grow larger and tables with fixed or resizable columns truncate.\nalwaysTruncate - Always truncate if needed for all table column configurations\nexpand - Expand to fit text width (by horizontal scrollbar) for table with fixed columns",
             "required": false
           },
           "preserveCellWhiteSpace": {

package/lib/components/Table/TableBody/TableBody.js

@@ -24,6 +24,7 @@ var PropTypes = require('prop-types');
 var carbonComponentsReact = require('carbon-components-react');
 var TablePropTypes = require('../TablePropTypes.js');
 var deprecate = require('../../../internal/deprecate.js');
+var SharedPropTypes = require('../../../constants/SharedPropTypes.js');
 var tableUtilities = require('../tableUtilities.js');
 var TableBodyRowRenderer = require('./TableBodyRowRenderer.js');
 
@@ -83,7 +84,7 @@ var propTypes = {
     hasSingleNestedHierarchy: PropTypes__default['default'].bool
   })]),
   hasRowActions: PropTypes__default['default'].bool,
-  wrapCellText: PropTypes__default['default'].oneOf(['always', 'never', 'auto', 'alwaysTruncate']).isRequired,
+  wrapCellText: SharedPropTypes.WrapCellTextPropTypes.isRequired,
   truncateCellText: PropTypes__default['default'].bool.isRequired,
 
   /** the current state of the row actions */
@@ -785,22 +786,10 @@ TableBody.__docgenInfo = {
     },
     "wrapCellText": {
       "type": {
-        "name": "enum",
-        "value": [{
-          "value": "'always'",
-          "computed": false
-        }, {
-          "value": "'never'",
-          "computed": false
-        }, {
-          "value": "'auto'",
-          "computed": false
-        }, {
-          "value": "'alwaysTruncate'",
-          "computed": false
-        }]
+        "name": "custom",
+        "raw": "WrapCellTextPropTypes.isRequired"
       },
-      "required": true,
+      "required": false,
       "description": ""
     },
     "truncateCellText": {