carbon-addons-iot-react 2.151.0-next.2 → 2.151.0-next.5

package/es/components/CardEditor/CardEditForm/CardEditFormItems/DataSeriesFormItemModal.js

@@ -73,11 +73,6 @@ var propTypes = {
       text: PropTypes.string
     })),
     aggregationMethod: PropTypes.string,
-    downSampleMethods: PropTypes.arrayOf(PropTypes.shape({
-      id: PropTypes.string,
-      text: PropTypes.string
-    })),
-    downSampleMethod: PropTypes.string,
     grain: PropTypes.string,
     label: PropTypes.string,
     dataItemId: PropTypes.string,
@@ -163,9 +158,7 @@ var defaultProps = {
     dataItemSource: 'Data item source',
     primaryButtonLabelText: 'Save',
     secondaryButtonLabelText: 'Cancel',
-    decimalPlacesLabel: 'Decimal places',
-    downSampleMethod: 'Downsample method',
-    downSampleMethodHelperText: 'Select an aggregation to be used to reduce the sampling rate of a large time-series data.'
+    decimalPlacesLabel: 'Decimal places'
   },
   editDataSeries: [],
   showEditor: false,
@@ -218,7 +211,7 @@ var DATAITEM_COLORS_OPTIONS = [{
 }];
 
 var DataSeriesFormItemModal = function DataSeriesFormItemModal(_ref) {
-  var _content$columns, _validDataItems$find, _validDataItems$find2, _validDataItems$find3;
+  var _content$columns, _validDataItems$find, _validDataItems$find2;
 
   var cardConfig = _ref.cardConfig,
       isSummaryDashboard = _ref.isSummaryDashboard,
@@ -293,19 +286,15 @@ var DataSeriesFormItemModal = function DataSeriesFormItemModal(_ref) {
     var dataSourceId = _ref2.dataSourceId;
     return dataSourceId === editDataItem.dataSourceId;
   })) === null || _validDataItems$find === void 0 ? void 0 : _validDataItems$find.aggregationMethod;
-  var initialDownSample = validDataItems === null || validDataItems === void 0 ? void 0 : (_validDataItems$find2 = validDataItems.find(function (_ref3) {
+  var initialGrain = validDataItems === null || validDataItems === void 0 ? void 0 : (_validDataItems$find2 = validDataItems.find(function (_ref3) {
     var dataSourceId = _ref3.dataSourceId;
     return dataSourceId === editDataItem.dataSourceId;
-  })) === null || _validDataItems$find2 === void 0 ? void 0 : _validDataItems$find2.downSampleMethod;
-  var initialGrain = validDataItems === null || validDataItems === void 0 ? void 0 : (_validDataItems$find3 = validDataItems.find(function (_ref4) {
-    var dataSourceId = _ref4.dataSourceId;
-    return dataSourceId === editDataItem.dataSourceId;
-  })) === null || _validDataItems$find3 === void 0 ? void 0 : _validDataItems$find3.grain;
+  })) === null || _validDataItems$find2 === void 0 ? void 0 : _validDataItems$find2.grain;
   var selectedDimensionFilter = editDataItem.dataFilter ? Object.keys(editDataItem.dataFilter)[0] : '';
   var DataEditorContent = useMemo(function () {
-    var _editDataItem$aggrega, _editDataItem$aggrega2, _editDataItem$precisi, _editDataItem$precisi2, _classnames, _availableDimensions$, _editDataItem$downSam, _editDataItem$downSam2;
+    var _editDataItem$aggrega, _editDataItem$aggrega2, _editDataItem$precisi, _editDataItem$precisi2, _classnames, _availableDimensions$;
 
-    return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, (editDataItem === null || editDataItem === void 0 ? void 0 : editDataItem.type) !== 'DIMENSION' && (editDataItem === null || editDataItem === void 0 ? void 0 : editDataItem.type) !== 'TIMESTAMP' && !(editDataItem !== null && editDataItem !== void 0 && editDataItem.hasStreamingMetricEnabled) && /*#__PURE__*/React__default.createElement("div", {
+    return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, (editDataItem === null || editDataItem === void 0 ? void 0 : editDataItem.type) !== 'DIMENSION' && (editDataItem === null || editDataItem === void 0 ? void 0 : editDataItem.type) !== 'TIMESTAMP' && /*#__PURE__*/React__default.createElement("div", {
       className: "".concat(baseClassName, "--input-group")
     }, !initialAggregation || !isSummaryDashboard ?
     /*#__PURE__*/
@@ -328,10 +317,10 @@ var DataSeriesFormItemModal = function DataSeriesFormItemModal(_ref) {
       },
       titleText: mergedI18n.aggregationMethod,
       light: true,
-      onChange: function onChange(_ref5) {
+      onChange: function onChange(_ref4) {
         var _availableGrains$;
 
-        var selectedItem = _ref5.selectedItem;
+        var selectedItem = _ref4.selectedItem;
         setEditDataItem(omit.apply(void 0, [_objectSpread(_objectSpread({}, editDataItem), {}, {
           aggregationMethod: selectedItem.id
         }, isTimeBasedCard && selectedItem.id !== 'none' && !editDataItem.grain ? {
@@ -344,7 +333,7 @@ var DataSeriesFormItemModal = function DataSeriesFormItemModal(_ref) {
       className: "".concat(baseClassName, "--input-group--item-half-label")
     }, mergedI18n.aggregationMethod), /*#__PURE__*/React__default.createElement("span", {
       className: "".concat(baseClassName, "--input-group--item-half-content")
-    }, "".concat(editDataItem.aggregationMethod ? editDataItem.aggregationMethod[0].toUpperCase() : '').concat(((_editDataItem$aggrega2 = editDataItem.aggregationMethod) === null || _editDataItem$aggrega2 === void 0 ? void 0 : _editDataItem$aggrega2.slice(1)) || ''))), isTimeBasedCard && editDataItem.aggregationMethod && editDataItem.aggregationMethod !== 'none' && /*#__PURE__*/React__default.createElement("div", {
+    }, "".concat(editDataItem.aggregationMethod ? editDataItem.aggregationMethod[0].toUpperCase() : '').concat(((_editDataItem$aggrega2 = editDataItem.aggregationMethod) === null || _editDataItem$aggrega2 === void 0 ? void 0 : _editDataItem$aggrega2.slice(1)) || ''))), isTimeBasedCard && editDataItem.aggregationMethod && editDataItem.aggregationMethod !== 'none' && !(editDataItem !== null && editDataItem !== void 0 && editDataItem.hasStreamingMetricEnabled) && /*#__PURE__*/React__default.createElement("div", {
       className: "".concat(baseClassName, "--input-group--item-half")
     }, /*#__PURE__*/React__default.createElement(Dropdown, {
       id: "".concat(id, "_grain-selector"),
@@ -362,8 +351,8 @@ var DataSeriesFormItemModal = function DataSeriesFormItemModal(_ref) {
       }) || availableGrains[0],
       titleText: mergedI18n.grain,
       light: true,
-      onChange: function onChange(_ref6) {
-        var selectedItem = _ref6.selectedItem;
+      onChange: function onChange(_ref5) {
+        var selectedItem = _ref5.selectedItem;
         setEditDataItem(_objectSpread(_objectSpread({}, editDataItem), {}, {
           grain: selectedItem.id
         }));
@@ -392,12 +381,12 @@ var DataSeriesFormItemModal = function DataSeriesFormItemModal(_ref) {
       id: "".concat(id, "_color-dropdown"),
       label: "",
       titleText: type === CARD_TYPES.TIMESERIES ? mergedI18n.dataItemEditorLineColor : mergedI18n.dataItemEditorBarColor,
-      selectedColor: DATAITEM_COLORS_OPTIONS.find(function (_ref7) {
-        var carbonColor = _ref7.carbonColor;
+      selectedColor: DATAITEM_COLORS_OPTIONS.find(function (_ref6) {
+        var carbonColor = _ref6.carbonColor;
         return carbonColor === editDataItem.color;
       }),
-      onChange: function onChange(_ref8) {
-        var color = _ref8.color;
+      onChange: function onChange(_ref7) {
+        var color = _ref7.color;
         return setEditDataItem(_objectSpread(_objectSpread({}, editDataItem), {}, {
           color: color.carbonColor
         }));
@@ -427,8 +416,8 @@ var DataSeriesFormItemModal = function DataSeriesFormItemModal(_ref) {
       items: [mergedI18n.notSet, '0', '1', '2', '3', '4'],
       light: true,
       selectedItem: ((_editDataItem$precisi = editDataItem.precision) === null || _editDataItem$precisi === void 0 ? void 0 : _editDataItem$precisi.toString()) || mergedI18n.notSet,
-      onChange: function onChange(_ref9) {
-        var selectedItem = _ref9.selectedItem;
+      onChange: function onChange(_ref8) {
+        var selectedItem = _ref8.selectedItem;
         var isSet = selectedItem !== mergedI18n.notSet;
 
         if (isSet) {
@@ -464,8 +453,8 @@ var DataSeriesFormItemModal = function DataSeriesFormItemModal(_ref) {
       items: [mergedI18n.notSet, '0', '1', '2', '3', '4'],
       light: true,
       selectedItem: ((_editDataItem$precisi2 = editDataItem.precision) === null || _editDataItem$precisi2 === void 0 ? void 0 : _editDataItem$precisi2.toString()) || mergedI18n.notSet,
-      onChange: function onChange(_ref10) {
-        var selectedItem = _ref10.selectedItem;
+      onChange: function onChange(_ref9) {
+        var selectedItem = _ref9.selectedItem;
         var isSet = selectedItem !== mergedI18n.notSet;
 
         if (isSet) {
@@ -491,8 +480,8 @@ var DataSeriesFormItemModal = function DataSeriesFormItemModal(_ref) {
       items: [mergedI18n.none].concat(_toConsumableArray(Object.keys(availableDimensions))),
       light: true,
       selectedItem: selectedDimensionFilter || mergedI18n.none,
-      onChange: function onChange(_ref11) {
-        var selectedItem = _ref11.selectedItem;
+      onChange: function onChange(_ref10) {
+        var selectedItem = _ref10.selectedItem;
 
         if (selectedItem !== mergedI18n.none) {
           var dataFilter = _defineProperty({}, selectedItem, availableDimensions[selectedItem].sort()[0]);
@@ -517,8 +506,8 @@ var DataSeriesFormItemModal = function DataSeriesFormItemModal(_ref) {
         return item === null || item === void 0 ? void 0 : item.toString();
       },
       selectedItem: editDataItem.dataFilter ? editDataItem.dataFilter[selectedDimensionFilter] : undefined,
-      onChange: function onChange(_ref12) {
-        var selectedItem = _ref12.selectedItem;
+      onChange: function onChange(_ref11) {
+        var selectedItem = _ref11.selectedItem;
 
         var dataFilter = _defineProperty({}, selectedDimensionFilter, selectedItem);
 
@@ -546,47 +535,8 @@ var DataSeriesFormItemModal = function DataSeriesFormItemModal(_ref) {
           thresholds: thresholds
         }));
       }
-    }), (editDataItem === null || editDataItem === void 0 ? void 0 : editDataItem.type) !== 'DIMENSION' && (editDataItem === null || editDataItem === void 0 ? void 0 : editDataItem.type) !== 'TIMESTAMP' && (editDataItem === null || editDataItem === void 0 ? void 0 : editDataItem.hasStreamingMetricEnabled) && type === CARD_TYPES.TIMESERIES &&
-    /*#__PURE__*/
-    // Downsample methods are only alowed on Timeseries card.
-    React__default.createElement("div", {
-      className: "".concat(baseClassName, "--input-group")
-    }, !initialDownSample || !isSummaryDashboard ?
-    /*#__PURE__*/
-    // selector should only be use-able in an instance dash or if there is no initial aggregation
-    React__default.createElement("div", {
-      className: "".concat(baseClassName, "--input-group--item-half")
-    }, /*#__PURE__*/React__default.createElement(Dropdown, {
-      id: "".concat(id, "_downSample-method"),
-      label: "",
-      direction: "bottom",
-      itemToString: function itemToString(item) {
-        return item.text;
-      },
-      items: editDataItem.downSampleMethods || [],
-      selectedItem: ((_editDataItem$downSam = editDataItem.downSampleMethods) === null || _editDataItem$downSam === void 0 ? void 0 : _editDataItem$downSam.find(function (method) {
-        return method.id === editDataItem.downSampleMethod;
-      })) || {
-        id: 'none',
-        text: mergedI18n.none
-      },
-      titleText: mergedI18n.downSampleMethod,
-      helperText: mergedI18n.downSampleMethodHelperText,
-      light: true,
-      onChange: function onChange(_ref13) {
-        var selectedItem = _ref13.selectedItem;
-        setEditDataItem(_objectSpread(_objectSpread({}, editDataItem), {}, {
-          downSampleMethod: selectedItem.id
-        }));
-      }
-    })) : /*#__PURE__*/React__default.createElement("div", {
-      className: "".concat(baseClassName, "--input-group--item-half")
-    }, /*#__PURE__*/React__default.createElement(FormLabel, {
-      className: "".concat(baseClassName, "--input-group--item-half-label")
-    }, mergedI18n.downSampleMethod), /*#__PURE__*/React__default.createElement("span", {
-      className: "".concat(baseClassName, "--input-group--item-half-content")
-    }, "".concat(editDataItem.downSampleMethod ? editDataItem.downSampleMethod[0].toUpperCase() : '').concat(((_editDataItem$downSam2 = editDataItem.downSampleMethod) === null || _editDataItem$downSam2 === void 0 ? void 0 : _editDataItem$downSam2.slice(1)) || '')))));
-  }, [availableDimensions, availableGrains, baseClassName, cardConfig, editDataItem, handleTranslation, id, initialAggregation, initialGrain, isSummaryDashboard, isTimeBasedCard, mergedI18n, selectedDimensionFilter, setEditDataItem, type, initialDownSample]);
+    }));
+  }, [availableDimensions, availableGrains, baseClassName, cardConfig, editDataItem, handleTranslation, id, initialAggregation, initialGrain, isSummaryDashboard, isTimeBasedCard, mergedI18n, selectedDimensionFilter, setEditDataItem, type]);
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, showEditor && /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(baseClassName, "--modal-wrapper")
   }, /*#__PURE__*/React__default.createElement(ComposedModal, {
@@ -736,7 +686,7 @@ DataSeriesFormItemModal.__docgenInfo = {
     },
     "i18n": {
       "defaultValue": {
-        "value": "{\n  dataItemEditorDataSeriesTitle: 'Customize data series',\n  dataItemEditorValueCardTitle: 'Edit data',\n  dataItemEditorDataItemLabel: 'Label',\n  dataItemEditorLegendColor: 'Legend color',\n  dataItemEditorSectionTitle: 'Data series',\n  selectDataItems: 'Select data items',\n  dataItem: 'Data item',\n  edit: 'Edit',\n  example: 'Example',\n  notSet: 'Not set',\n  none: 'None',\n  dataItemEditorDataItemCustomLabel: 'Custom label',\n  dataItemEditorDataItemHelperText: (dataItemSource, dataItemId) =>\n    `${dataItemSource}: ${dataItemId}`,\n  dataItemEditorDataItemUnit: 'Unit',\n  dataItemEditorDataItemFilter: 'Data filter',\n  dataItemEditorDataItemThresholds: 'Thresholds',\n  dataItemEditorDataItemAddThreshold: 'Add threshold',\n  dataItemEditorBarColor: 'Bar color',\n  dataItemEditorLineColor: 'Line color',\n  source: 'Source data item',\n  aggregationMethod: 'Aggregation method',\n  grain: 'Grain',\n  hourlyLabel: 'Hourly',\n  dailyLabel: 'Daily',\n  weeklyLabel: 'Weekly',\n  monthlyLabel: 'Monthly',\n  yearlyLabel: 'Yearly',\n  dataItemSource: 'Data item source',\n  primaryButtonLabelText: 'Save',\n  secondaryButtonLabelText: 'Cancel',\n  decimalPlacesLabel: 'Decimal places',\n  downSampleMethod: 'Downsample method',\n  downSampleMethodHelperText:\n    'Select an aggregation to be used to reduce the sampling rate of a large time-series data.',\n}",
+        "value": "{\n  dataItemEditorDataSeriesTitle: 'Customize data series',\n  dataItemEditorValueCardTitle: 'Edit data',\n  dataItemEditorDataItemLabel: 'Label',\n  dataItemEditorLegendColor: 'Legend color',\n  dataItemEditorSectionTitle: 'Data series',\n  selectDataItems: 'Select data items',\n  dataItem: 'Data item',\n  edit: 'Edit',\n  example: 'Example',\n  notSet: 'Not set',\n  none: 'None',\n  dataItemEditorDataItemCustomLabel: 'Custom label',\n  dataItemEditorDataItemHelperText: (dataItemSource, dataItemId) =>\n    `${dataItemSource}: ${dataItemId}`,\n  dataItemEditorDataItemUnit: 'Unit',\n  dataItemEditorDataItemFilter: 'Data filter',\n  dataItemEditorDataItemThresholds: 'Thresholds',\n  dataItemEditorDataItemAddThreshold: 'Add threshold',\n  dataItemEditorBarColor: 'Bar color',\n  dataItemEditorLineColor: 'Line color',\n  source: 'Source data item',\n  aggregationMethod: 'Aggregation method',\n  grain: 'Grain',\n  hourlyLabel: 'Hourly',\n  dailyLabel: 'Daily',\n  weeklyLabel: 'Weekly',\n  monthlyLabel: 'Monthly',\n  yearlyLabel: 'Yearly',\n  dataItemSource: 'Data item source',\n  primaryButtonLabelText: 'Save',\n  secondaryButtonLabelText: 'Cancel',\n  decimalPlacesLabel: 'Decimal places',\n}",
         "computed": false
       },
       "type": {
@@ -922,27 +872,6 @@ DataSeriesFormItemModal.__docgenInfo = {
             "name": "string",
             "required": false
           },
-          "downSampleMethods": {
-            "name": "arrayOf",
-            "value": {
-              "name": "shape",
-              "value": {
-                "id": {
-                  "name": "string",
-                  "required": false
-                },
-                "text": {
-                  "name": "string",
-                  "required": false
-                }
-              }
-            },
-            "required": false
-          },
-          "downSampleMethod": {
-            "name": "string",
-            "required": false
-          },
           "grain": {
             "name": "string",
             "required": false

package/es/components/CardEditor/CardEditForm/CardEditFormItems/DataSeriesFormItems/DataSeriesFormContent.js

@@ -309,7 +309,7 @@ var DataSeriesFormItem = function DataSeriesFormItem(_ref2) {
   }, [cardConfig, dataSection, _onChange, setSelectedDataItems, validDataItems]);
   var handleEditButton = useCallback( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(dataItem, i) {
-      var dataItemWithMetaData, colorIndex, downSampleMethods;
+      var dataItemWithMetaData, colorIndex, aggregationMethods;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -329,10 +329,10 @@ var DataSeriesFormItem = function DataSeriesFormItem(_ref2) {
               return onEditDataItem(cardConfig, dataItem, dataItemWithMetaData);
 
             case 5:
-              downSampleMethods = _context.sent;
+              aggregationMethods = _context.sent;
 
-              if (!isEmpty(downSampleMethods)) {
-                dataItemWithMetaData.downSampleMethods = downSampleMethods;
+              if (!isEmpty(aggregationMethods)) {
+                dataItemWithMetaData.aggregationMethods = aggregationMethods;
               }
 
             case 7:

package/es/components/CardEditor/CardEditForm/CardEditFormItems/TableCardFormItems/TableCardFormContent.js

@@ -302,7 +302,7 @@ var TableCardFormContent = function TableCardFormContent(_ref) {
   }, [cardConfig, dataSection, _onChange, removedDataItems, setSelectedDataItems]);
   var handleEditButton = useCallback( /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(dataItem) {
-      var dataItemWithMetaData, downSampleMethods;
+      var dataItemWithMetaData, aggregationMethods;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -321,10 +321,10 @@ var TableCardFormContent = function TableCardFormContent(_ref) {
               return onEditDataItem(cardConfig, dataItem, dataItemWithMetaData);
 
             case 4:
-              downSampleMethods = _context.sent;
+              aggregationMethods = _context.sent;
 
-              if (!isEmpty(downSampleMethods)) {
-                dataItemWithMetaData.downSampleMethods = downSampleMethods;
+              if (!isEmpty(aggregationMethods)) {
+                dataItemWithMetaData.aggregationMethods = aggregationMethods;
               }
 
             case 6:

package/es/components/CardEditor/CardEditForm/CommonCardEditFormFields.js

@@ -3,6 +3,7 @@ import 'core-js/modules/es.object.get-own-property-descriptor.js';
 import 'core-js/modules/web.dom-collections.for-each.js';
 import 'core-js/modules/es.object.get-own-property-descriptors.js';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import isEmpty from '../../../node_modules/lodash-es/isEmpty.js';
 import 'core-js/modules/es.array.concat.js';
 import 'core-js/modules/es.symbol.js';
 import 'core-js/modules/es.symbol.description.js';
@@ -209,7 +210,7 @@ var CommonCardEditFormFields = function CommonCardEditFormFields(_ref) {
       }));
     },
     titleText: mergedI18n.size
-  })), /*#__PURE__*/React__default.createElement("div", {
+  })), isEmpty(validTimeRangeOptions) ? null : /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(baseClassName, "--input")
   }, /*#__PURE__*/React__default.createElement(Dropdown, {
     key: "card_".concat(id),

package/es/components/CardEditor/CardEditor.js

@@ -25,7 +25,6 @@ import { DASHBOARD_EDITOR_CARD_TYPES, CARD_TYPES } from '../../constants/LayoutC
 import CardCodeEditor from '../CardCodeEditor/CardCodeEditor.js';
 import Button from '../Button/Button.js';
 import { settings } from '../../constants/Settings.js';
-import deprecate from '../../internal/deprecate.js';
 import CardGalleryList from './CardGalleryList/CardGalleryList.js';
 import CardEditForm from './CardEditForm/CardEditForm.js';
 
@@ -152,9 +151,6 @@ var propTypes = {
   }),
   currentBreakpoint: PropTypes.string,
   isSummaryDashboard: PropTypes.bool,
-  // TODO: remove deprecated testID in v3
-  // eslint-disable-next-line react/require-default-props
-  testID: deprecate(PropTypes.string, "The 'testID' prop has been deprecated. Please use 'testId' instead."),
 
   /** Id that can be used for testing */
   testId: PropTypes.string,
@@ -243,19 +239,19 @@ var hideCardPropertiesForEditor = function hideCardPropertiesForEditor(card) {
 
   if ((_card$content = card.content) !== null && _card$content !== void 0 && _card$content.attributes) {
     attributes = card.content.attributes.map(function (attribute) {
-      return omit(attribute, ['aggregationMethods', 'grain', 'downSampleMethods']);
+      return omit(attribute, ['aggregationMethods', 'grain']);
     });
   }
 
   if ((_card$content2 = card.content) !== null && _card$content2 !== void 0 && _card$content2.series) {
     series = card.content.series.map(function (attribute) {
-      return omit(attribute, ['aggregationMethods', 'grain', 'downSampleMethods']);
+      return omit(attribute, ['aggregationMethods', 'grain']);
     });
   }
 
   if ((_card$content3 = card.content) !== null && _card$content3 !== void 0 && _card$content3.columns) {
     columns = card.content.columns.map(function (column) {
-      return omit(column, ['aggregationMethods', 'grain', 'downSampleMethods']);
+      return omit(column, ['aggregationMethods', 'grain']);
     });
   } // Need to exclued content for custom cards because the card's JSX element lives on it in this case
 
@@ -347,7 +343,6 @@ var CardEditor = function CardEditor(_ref) {
       icons = _ref.icons,
       i18n = _ref.i18n,
       currentBreakpoint = _ref.currentBreakpoint,
-      testID = _ref.testID,
       testId = _ref.testId,
       dataSeriesItemLinks = _ref.dataSeriesItemLinks,
       onFetchDynamicDemoHotspots = _ref.onFetchDynamicDemoHotspots,
@@ -382,9 +377,8 @@ var CardEditor = function CardEditor(_ref) {
     return onRenderCardEditForm && cardConfig ? onRenderCardEditForm(cardConfig) : cardConfig;
   }, [cardConfig, onRenderCardEditForm]);
   return /*#__PURE__*/React__default.createElement("div", {
-    className: baseClassName // TODO: remove deprecated testID in v3
-    ,
-    "data-testid": testID || testId
+    className: baseClassName,
+    "data-testid": testId
   }, showGallery ? /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(baseClassName, "--header")
   }, /*#__PURE__*/React__default.createElement("h2", {
@@ -395,9 +389,8 @@ var CardEditor = function CardEditor(_ref) {
     icons: icons,
     onAddCard: onAddCard,
     supportedCardTypes: supportedCardTypes,
-    i18n: mergedI18n // TODO: remove deprecated testID in v3
-    ,
-    testId: "".concat(testID || testId, "-card-gallery-list")
+    i18n: mergedI18n,
+    testId: "".concat(testId, "-card-gallery-list")
   }) : /*#__PURE__*/React__default.createElement(React__default.Fragment, null, showJsonEditor ? /*#__PURE__*/React__default.createElement(CardCodeEditor, {
     onSubmit: function onSubmit(card, setError) {
       return handleSubmit(card, cardConfig.id, setError, onValidateCardJson, onChange, setShowJsonEditor);
@@ -423,7 +416,7 @@ var CardEditor = function CardEditor(_ref) {
   }))), showGallery ? null : /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(baseClassName, "--footer")
   }, /*#__PURE__*/React__default.createElement(Button, {
-    testId: "".concat(testID || testId, "-open-editor-button"),
+    testId: "".concat(testId, "-open-editor-button"),
     kind: "ghost",
     size: "small",
     renderIcon: Code16,
@@ -438,9 +431,8 @@ var CardEditor = function CardEditor(_ref) {
     kind: "ghost",
     size: "small",
     renderIcon: Apps16,
-    onClick: onShowGallery // TODO: remove deprecated testID in v3 and pass testId to overrride defaults
-    // testId={`${testID || testId}-add-card-button`}
-
+    onClick: onShowGallery,
+    testId: "".concat(testId, "-add-card-button")
   }, mergedI18n.addCardButton))), isSummaryDashboard ? /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(baseClassName, "--footer")
   }, /*#__PURE__*/React__default.createElement(Button, {
@@ -449,9 +441,8 @@ var CardEditor = function CardEditor(_ref) {
     size: "small",
     renderIcon: Data_116,
     onClick: onEditDataItems,
-    iconDescription: mergedI18n.editDataItems // TODO: remove deprecated testID in v3
-    // testId={`${testID || testId}-edit-button`}
-
+    iconDescription: mergedI18n.editDataItems,
+    testId: "".concat(testId, "-edit-button")
   }, mergedI18n.editDataItems)) : null);
 };
 
@@ -834,14 +825,6 @@ CardEditor.__docgenInfo = {
       },
       "required": true,
       "description": "Callback function when card is added from list"
-    },
-    "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/DashboardEditor/DashboardEditor.js

@@ -349,6 +349,8 @@ var propTypes = {
   isCardResizable: PropTypes.bool,
   onEditDataItems: PropTypes.func,
   testId: PropTypes.string,
+
+  /** handles V2 dataItem */
   onEditDataItem: PropTypes.func
 };
 var defaultProps = {
@@ -1881,7 +1883,7 @@ DashboardEditor.__docgenInfo = {
         "name": "func"
       },
       "required": false,
-      "description": ""
+      "description": "handles V2 dataItem"
     }
   }
 };

package/es/components/DashboardEditor/editorUtils.js

@@ -63,22 +63,12 @@ var DataItemsPropTypes = PropTypes.arrayOf(PropTypes.shape({
     id: PropTypes.string,
     text: PropTypes.string
   })),
-  downSampleMethod: PropTypes.string,
-  downSampleMethods: PropTypes.arrayOf(PropTypes.shape({
-    id: PropTypes.string,
-    text: PropTypes.string
-  })),
 
   /** Grain is needed in summary dashboard editors */
   grain: PropTypes.string,
   // Used for streming dataItems
   hasStreamingMetricEnabled: PropTypes.bool
-})); // /** Needed to determain if we show downsample methods */
-// export const Version = {
-//   V1: 'V1',
-//   V2: 'V2',
-// };
-
+}));
 /**
  * Returns a duplicate card configuration
  * @param {Object} cardConfig, card JSON configuration
@@ -477,8 +467,7 @@ var formatSeries = function formatSeries(selectedItems, cardConfig) {
     var unEditedLabel = _ref.label,
         dataItemId = _ref.dataItemId,
         dataSourceId = _ref.dataSourceId,
-        aggregationMethod = _ref.aggregationMethod,
-        downSampleMethod = _ref.downSampleMethod;
+        aggregationMethod = _ref.aggregationMethod;
     var colorIndex = (removedItemsCountRef.current + i) % DATAITEM_COLORS_OPTIONS.length;
     var currentItem = cardSeries === null || cardSeries === void 0 ? void 0 : cardSeries.find(function (dataItem) {
       return dataItem.dataSourceId === dataSourceId;
@@ -490,8 +479,7 @@ var formatSeries = function formatSeries(selectedItems, cardConfig) {
       dataSourceId: dataSourceId,
       label: label,
       aggregationMethod: aggregationMethod,
-      color: color,
-      downSampleMethod: downSampleMethod
+      color: color
     });
   });
   return series;
@@ -510,8 +498,7 @@ var formatAttributes = function formatAttributes(selectedItems, cardConfig) {
     var unEditedLabel = _ref2.label,
         dataItemId = _ref2.dataItemId,
         dataSourceId = _ref2.dataSourceId,
-        aggregationMethod = _ref2.aggregationMethod,
-        downSampleMethod = _ref2.downSampleMethod;
+        aggregationMethod = _ref2.aggregationMethod;
     var currentItem = currentCardAttributes === null || currentCardAttributes === void 0 ? void 0 : currentCardAttributes.find(function (dataItem) {
       return dataItem.dataSourceId === dataSourceId;
     }); // Need to default the label to reflect the default aggregator if there isn't one set
@@ -521,8 +508,7 @@ var formatAttributes = function formatAttributes(selectedItems, cardConfig) {
       dataItemId: dataItemId,
       dataSourceId: dataSourceId,
       label: label,
-      aggregationMethod: aggregationMethod,
-      downSampleMethod: downSampleMethod
+      aggregationMethod: aggregationMethod
     });
   });
   return attributes;

package/es/components/HotspotEditorModal/HotspotEditorDataSourceTab/HotspotEditorDataSourceTab.js

@@ -191,7 +191,7 @@ var HotspotEditorDataSourceTab = function HotspotEditorDataSourceTab(_ref2) {
   });
   var handleEditButton = useCallback( /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(dataItem) {
-      var dataItemWithMetaData, downSampleMethods;
+      var dataItemWithMetaData, aggregationMethods;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -210,10 +210,10 @@ var HotspotEditorDataSourceTab = function HotspotEditorDataSourceTab(_ref2) {
               return onEditDataItem(cardConfig, dataItem, dataItemWithMetaData);
 
             case 4:
-              downSampleMethods = _context.sent;
+              aggregationMethods = _context.sent;
 
-              if (!isEmpty(downSampleMethods)) {
-                dataItemWithMetaData.downSampleMethods = downSampleMethods;
+              if (!isEmpty(aggregationMethods)) {
+                dataItemWithMetaData.aggregationMethods = aggregationMethods;
               }
 
             case 6: