carbon-addons-iot-react 2.149.0-next.21 → 2.149.0-next.22

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.149.0-next.22](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.149.0-next.21...v2.149.0-next.22) (2022-03-07)
+
+
+### Bug Fixes
+
+* **table:** add onapplytoolbaraction to statefultable ([e8249e1](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/e8249e101b1b8bdbeeb00066d0fa82e991f6b315))
+* **utilityfunctions:** fix generatecsv and update test ([57315d5](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/57315d500aeffab8eb74818a19cf58b467b02ad4)), closes [#3363](https://github.com/carbon-design-system/carbon-addons-iot-react/issues/3363)
+
+
+
+
+
 # [2.149.0-next.21](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.149.0-next.20...v2.149.0-next.21) (2022-03-07)
 
 **Note:** Version bump only for package carbon-addons-iot-react

package/es/components/Table/StatefulTable.js

@@ -128,7 +128,8 @@ var StatefulTable = function StatefulTable(_ref) {
       _onApplyAdvancedFilter = _ref3.onApplyAdvancedFilter,
       _onCancelAdvancedFilter = _ref3.onCancelAdvancedFilter,
       _onCreateAdvancedFilter = _ref3.onCreateAdvancedFilter,
-      _onToggleAggregations = _ref3.onToggleAggregations;
+      _onToggleAggregations = _ref3.onToggleAggregations,
+      _onApplyToolbarAction = _ref3.onApplyToolbarAction;
 
   var _ref4 = table || {},
       _onChangeSort = _ref4.onChangeSort,
@@ -214,6 +215,9 @@ var StatefulTable = function StatefulTable(_ref) {
         dispatch(tableToggleAggregations());
         callbackParent(_onToggleAggregations);
       },
+      onApplyToolbarAction: function onApplyToolbarAction(action) {
+        callbackParent(_onApplyToolbarAction, action);
+      },
       onDownloadCSV: onDownloadCSV
     },
     table: {

package/es/utils/componentUtilityFunctions.js

@@ -1,21 +1,22 @@
 import 'core-js/modules/es.symbol.js';
 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 _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import isNil from '../packages/react/node_modules/lodash-es/isNil.js';
 import delay from '../packages/react/node_modules/lodash-es/delay.js';
-import 'core-js/modules/web.dom-collections.for-each.js';
+import 'core-js/modules/es.object.assign.js';
 import 'core-js/modules/es.array.concat.js';
-import 'core-js/modules/es.object.keys.js';
+import 'core-js/modules/es.array.map.js';
 import 'core-js/modules/es.array.iterator.js';
 import 'core-js/modules/es.object.to-string.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
-import 'core-js/modules/es.set.js';
-import 'core-js/modules/es.string.iterator.js';
+import 'core-js/modules/es.object.keys.js';
 import 'core-js/modules/es.array.join.js';
+import 'core-js/modules/es.array.slice.js';
+import 'core-js/modules/es.array.reduce.js';
 import 'core-js/modules/es.number.constructor.js';
-import 'core-js/modules/es.array.map.js';
 import 'core-js/modules/es.array.fill.js';
 import 'core-js/modules/es.array.filter.js';
 import 'core-js/modules/es.array.find.js';
@@ -24,7 +25,6 @@ import 'core-js/modules/es.string.includes.js';
 import 'core-js/modules/es.regexp.constructor.js';
 import 'core-js/modules/es.regexp.exec.js';
 import 'core-js/modules/es.regexp.to-string.js';
-import 'core-js/modules/es.array.reduce.js';
 import 'core-js/modules/es.number.is-integer.js';
 import { sortStates } from '../node_modules/carbon-components-react/es/components/DataTable/state/sortStates.js';
 import fileDownload from 'js-file-download';
@@ -41,28 +41,25 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * Helper function to generate a CSV from an array of table cell data
  * Retrieve the column headers, then match and join the cell values
  * with each header
- * @param {Array<string | number>} data from table cells
+ * @param {Array<string | number | boolean>} data from table cells
  * @return {string} generated csv
  */
 
 var generateCsv = function generateCsv(data) {
-  var csv = ''; // get all headers available and merge it
-
-  var columnHeaders = [];
-  data.forEach(function (item) {
-    columnHeaders = [].concat(_toConsumableArray(columnHeaders), _toConsumableArray(Object.keys(item.values)));
-  });
-  columnHeaders = _toConsumableArray(new Set(columnHeaders));
-  csv += "".concat(columnHeaders.join(','), "\n");
-  data.forEach(function (item) {
-    columnHeaders.forEach(function (arrayHeader) {
-      // if item is of arrayHeader, add value to csv
-      // isNil will also correct the cases in which the value is 0 or false
-      csv += "".concat(!isNil(item.values[arrayHeader]) ? item.values[arrayHeader] : '', ",");
-    });
-    csv += "\n";
-  });
-  return csv;
+  var allHeadersObj = Object.assign.apply(Object, [{}].concat(_toConsumableArray(data.map(function (row) {
+    return row.values;
+  }))));
+  var columnHeaders = Object.keys(allHeadersObj);
+  var headerRow = "".concat(columnHeaders.join(','), "\n");
+  var lastColumnId = columnHeaders.slice(-1)[0];
+  return data.reduce(function (previousCsv, row) {
+    return columnHeaders.reduce(function (previousNestedCsv, headerId) {
+      var _row$values$headerId;
+
+      var separator = headerId === lastColumnId ? '\n' : ',';
+      return "".concat(previousNestedCsv).concat((_row$values$headerId = row.values[headerId]) !== null && _row$values$headerId !== void 0 ? _row$values$headerId : '').concat(separator);
+    }, previousCsv);
+  }, headerRow);
 };
 /**
  * Helper function to support downloading data as CSV

package/lib/components/Table/StatefulTable.js

@@ -142,7 +142,8 @@ var StatefulTable = function StatefulTable(_ref) {
       _onApplyAdvancedFilter = _ref3.onApplyAdvancedFilter,
       _onCancelAdvancedFilter = _ref3.onCancelAdvancedFilter,
       _onCreateAdvancedFilter = _ref3.onCreateAdvancedFilter,
-      _onToggleAggregations = _ref3.onToggleAggregations;
+      _onToggleAggregations = _ref3.onToggleAggregations,
+      _onApplyToolbarAction = _ref3.onApplyToolbarAction;
 
   var _ref4 = table || {},
       _onChangeSort = _ref4.onChangeSort,
@@ -228,6 +229,9 @@ var StatefulTable = function StatefulTable(_ref) {
         dispatch(tableActionCreators.tableToggleAggregations());
         callbackParent(_onToggleAggregations);
       },
+      onApplyToolbarAction: function onApplyToolbarAction(action) {
+        callbackParent(_onApplyToolbarAction, action);
+      },
       onDownloadCSV: onDownloadCSV
     },
     table: {

package/lib/utils/componentUtilityFunctions.js

@@ -4,22 +4,23 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('core-js/modules/es.symbol.js');
 require('core-js/modules/es.object.get-own-property-descriptor.js');
+require('core-js/modules/web.dom-collections.for-each.js');
 require('core-js/modules/es.object.get-own-property-descriptors.js');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var isNil = require('../packages/react/node_modules/lodash-es/isNil.js');
 var delay = require('../packages/react/node_modules/lodash-es/delay.js');
-require('core-js/modules/web.dom-collections.for-each.js');
+require('core-js/modules/es.object.assign.js');
 require('core-js/modules/es.array.concat.js');
-require('core-js/modules/es.object.keys.js');
+require('core-js/modules/es.array.map.js');
 require('core-js/modules/es.array.iterator.js');
 require('core-js/modules/es.object.to-string.js');
 require('core-js/modules/web.dom-collections.iterator.js');
-require('core-js/modules/es.set.js');
-require('core-js/modules/es.string.iterator.js');
+require('core-js/modules/es.object.keys.js');
 require('core-js/modules/es.array.join.js');
+require('core-js/modules/es.array.slice.js');
+require('core-js/modules/es.array.reduce.js');
 require('core-js/modules/es.number.constructor.js');
-require('core-js/modules/es.array.map.js');
 require('core-js/modules/es.array.fill.js');
 require('core-js/modules/es.array.filter.js');
 require('core-js/modules/es.array.find.js');
@@ -28,7 +29,6 @@ require('core-js/modules/es.string.includes.js');
 require('core-js/modules/es.regexp.constructor.js');
 require('core-js/modules/es.regexp.exec.js');
 require('core-js/modules/es.regexp.to-string.js');
-require('core-js/modules/es.array.reduce.js');
 require('core-js/modules/es.number.is-integer.js');
 var sortStates = require('../node_modules/carbon-components-react/es/components/DataTable/state/sortStates.js');
 var fileDownload = require('js-file-download');
@@ -52,28 +52,25 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * Helper function to generate a CSV from an array of table cell data
  * Retrieve the column headers, then match and join the cell values
  * with each header
- * @param {Array<string | number>} data from table cells
+ * @param {Array<string | number | boolean>} data from table cells
  * @return {string} generated csv
  */
 
 var generateCsv = function generateCsv(data) {
-  var csv = ''; // get all headers available and merge it
-
-  var columnHeaders = [];
-  data.forEach(function (item) {
-    columnHeaders = [].concat(_toConsumableArray__default['default'](columnHeaders), _toConsumableArray__default['default'](Object.keys(item.values)));
-  });
-  columnHeaders = _toConsumableArray__default['default'](new Set(columnHeaders));
-  csv += "".concat(columnHeaders.join(','), "\n");
-  data.forEach(function (item) {
-    columnHeaders.forEach(function (arrayHeader) {
-      // if item is of arrayHeader, add value to csv
-      // isNil will also correct the cases in which the value is 0 or false
-      csv += "".concat(!isNil(item.values[arrayHeader]) ? item.values[arrayHeader] : '', ",");
-    });
-    csv += "\n";
-  });
-  return csv;
+  var allHeadersObj = Object.assign.apply(Object, [{}].concat(_toConsumableArray__default['default'](data.map(function (row) {
+    return row.values;
+  }))));
+  var columnHeaders = Object.keys(allHeadersObj);
+  var headerRow = "".concat(columnHeaders.join(','), "\n");
+  var lastColumnId = columnHeaders.slice(-1)[0];
+  return data.reduce(function (previousCsv, row) {
+    return columnHeaders.reduce(function (previousNestedCsv, headerId) {
+      var _row$values$headerId;
+
+      var separator = headerId === lastColumnId ? '\n' : ',';
+      return "".concat(previousNestedCsv).concat((_row$values$headerId = row.values[headerId]) !== null && _row$values$headerId !== void 0 ? _row$values$headerId : '').concat(separator);
+    }, previousCsv);
+  }, headerRow);
 };
 /**
  * Helper function to support downloading data as CSV

package/package.json

@@ -340,10 +340,10 @@
     "whatwg-fetch": "^3.0.0"
   },
   "sideEffects": false,
-  "version": "2.149.0-next.21",
+  "version": "2.149.0-next.22",
   "resolutions": {
     "chokidar": "3.3.1",
     "react-grid-layout": "1.2.2"
   },
-  "gitHead": "1b3b4aca738b9d517d9c1950a31ba22510e83a95"
+  "gitHead": "398bcdc081337bfbc453133ef145512f86cdb2f1"
 }