Merge branch 'next' into 1536-icon-switch-style-updates

carbon-design-system · Sep 14, 2021 · 7518289 · 7518289
2 parents 1586401 + 2246e68
commit 7518289
Show file tree

Hide file tree

Showing 32 changed files with 126,200 additions and 130,313 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.146.0-next.183](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.146.0-next.182...v2.146.0-next.183) (2021-09-13)
+
+
+### Bug Fixes
+
+* **table:** fix crash if hasMultisort:true without sortable columns ([ea72ce2](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/ea72ce252e96eec01e9a202c47021dcdb3b40678))
+* **table:** remove padding from checkbox at small sizes ([94837bf](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/94837bfee982519dc3f68c2ea17d32fed1167b45))
+
+
+### Features
+
+* **table:** enable size prop to be used in header/footer ([83672b2](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/83672b2c68a482a6e60c3efbd1bd46986a0f043a))
+
+
+
+
+
+# [2.146.0-next.182](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.146.0-next.181...v2.146.0-next.182) (2021-09-10)
+
+
+### Bug Fixes
+
+* **combocharthelpers:** removed non functional zoom code ([db8e581](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/db8e581de230501144cf447746df5fa743b571fc))
+
+
+
+
+
 # [2.146.0-next.181](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.146.0-next.180...v2.146.0-next.181) (2021-09-08)
 
 

diff --git a/lerna.json b/lerna.json
@@ -3,6 +3,6 @@
     "packages/*"
   ],
   "useWorkspaces": true,
-  "version": "2.146.0-next.181",
+  "version": "2.146.0-next.183",
   "npmClient": "yarn"
 }
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.146.0-next.183](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.146.0-next.182...v2.146.0-next.183) (2021-09-13)
+
+
+### Bug Fixes
+
+* **table:** fix crash if hasMultisort:true without sortable columns ([ea72ce2](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/ea72ce252e96eec01e9a202c47021dcdb3b40678))
+* **table:** remove padding from checkbox at small sizes ([94837bf](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/94837bfee982519dc3f68c2ea17d32fed1167b45))
+
+
+### Features
+
+* **table:** enable size prop to be used in header/footer ([83672b2](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/83672b2c68a482a6e60c3efbd1bd46986a0f043a))
+
+
+
+
+
+# [2.146.0-next.182](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.146.0-next.181...v2.146.0-next.182) (2021-09-10)
+
+
+### Bug Fixes
+
+* **combocharthelpers:** removed non functional zoom code ([db8e581](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/db8e581de230501144cf447746df5fa743b571fc))
+
+
+
+
+
 # [2.146.0-next.181](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.146.0-next.180...v2.146.0-next.181) (2021-09-08)
 
 

diff --git a/packages/react/jest.config.js b/packages/react/jest.config.js
@@ -72,6 +72,7 @@ module.exports = {
     './src/components/TileCatalog/CatalogContent.jsx': all90Covered,
     './src/components/CardEditor/CardEditForm/CardEditFormItems/ThresholdsFormItem.jsx': all90Covered,
     './src/components/ImageCard/ImageUploader.jsx': all90Covered,
+    './src/components/ComboChartCard/comboChartHelpers.js': all90Covered,
     './src/components/DashboardEditor/DashboardEditor.jsx': { branches: 65, functions: 71 },
     './src/components/BarChartCard/BarChartCard.jsx': {
       // TODO: Add tests for tooltip interaction and formatting when below issue is solved

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -154,7 +154,6 @@
       "src/components/Dashboard/CardRenderer.jsx",
       "src/components/MapCard/storyFiles/*.jsx",
       "src/components/BarChartCard/barChartUtils.js",
-      "src/components/ComboChartCard/comboChartHelpers.js",
       "src/components/Table/Table.test.helpers.js",
       "src/components/Table/TablePropTypes.js"
     ],
@@ -341,7 +340,7 @@
     "whatwg-fetch": "^3.0.0"
   },
   "sideEffects": false,
-  "version": "2.146.0-next.181",
+  "version": "2.146.0-next.183",
   "resolutions": {
     "chokidar": "3.3.1",
     "react-grid-layout": "1.2.2",

diff --git a/packages/react/src/components/ComboChartCard/comboChartHelpers.js b/packages/react/src/components/ComboChartCard/comboChartHelpers.js
@@ -13,11 +13,7 @@ import {
 } from '../../utils/cardUtilityFunctions';
 import { CHART_COLORS } from '../../constants/CardPropTypes';
 import { formatGraphTick } from '../TimeSeriesCard/timeSeriesUtils';
-import {
-  CARD_SIZES,
-  TIME_SERIES_TYPES,
-  ZOOM_BAR_ENABLED_CARD_SIZES,
-} from '../../constants/LayoutConstants';
+import { CARD_SIZES, TIME_SERIES_TYPES } from '../../constants/LayoutConstants';
 import dayjs from '../../utils/dayjs';
 
 /**
@@ -65,7 +61,7 @@ const configureAxes = (content) => {
   /** *
    * timestamp of current value
    * index of current value
-   * ticks: array of current ticks
+   * ticks: array of current ticks or a single string with part of the date, e.g. month or year & month
    */
   const formatTick = (timestamp, index, ticks) => {
     const previousTimestamp = previousTick.current;
@@ -190,7 +186,6 @@ export const useChartOptions = (content) => {
       decimalPrecision,
       i18n,
       isEditable,
-      isExpanded,
       isLoading,
       locale,
       series,
@@ -200,7 +195,6 @@ export const useChartOptions = (content) => {
       tooltipDateFormatPattern,
       unit,
       values,
-      zoomBar,
     } = content;
 
     const options = {
@@ -228,20 +222,6 @@ export const useChartOptions = (content) => {
         groupLabel: i18n.tooltipGroupLabel,
         totalLabel: i18n.tooltipTotalLabel,
       },
-      // zoomBar should only be enabled for time-based charts
-      ...(zoomBar?.enabled &&
-      timeDataSourceId &&
-      (ZOOM_BAR_ENABLED_CARD_SIZES.includes(size) || isExpanded)
-        ? {
-            zoomBar: {
-              top: {
-                enabled: zoomBar.enabled,
-                initialZoomDomain: zoomBar.initialZoomDomain,
-                type: zoomBar.view || 'slider_view', // default to slider view
-              },
-            },
-          }
-        : {}),
       toolbar: {
         enabled: false,
       },