carbon-addons-iot-react 2.152.4-next.1 → 2.152.4

package/CHANGELOG.md

@@ -3,20 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [2.152.4-next.1](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.152.4-next.0...v2.152.4-next.1) (2023-02-28)
+## [2.152.4](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.152.3...v2.152.4) (2023-03-03)
 
 
 ### Bug Fixes
 
-* **cardutilityfunctions:** add null handler ([6dbd234](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/6dbd23427f7498d27ed3a910df1f5bac4e34a984))
-
-
-
-
-
-## [2.152.4-next.0](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.152.3...v2.152.4-next.0) (2023-02-28)
-
-**Note:** Version bump only for package carbon-addons-iot-react
+* **datetimepickerv2:** fix locale issue ([cc20d6e](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/cc20d6e0cd1ac133b1e78b38e572878ff6c9561b))
+* **datetimepickerv2:** update flaky tests ([1d8a754](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/1d8a754d67bd039744ab1657b79b32bafa808e18))
 
 
 

package/es/components/DateTimePicker/DateTimePickerV2WithTimeSpinner.js

@@ -9,6 +9,8 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import 'core-js/modules/es.regexp.exec.js';
 import 'core-js/modules/es.string.split.js';
+import 'core-js/modules/es.array.includes.js';
+import 'core-js/modules/es.string.includes.js';
 import 'core-js/modules/es.string.replace.js';
 import 'core-js/modules/es.array.concat.js';
 import 'core-js/modules/es.array.filter.js';
@@ -324,7 +326,7 @@ var DateTimePicker = function DateTimePicker(_ref) {
         time = _dateTimeMask$split2[1];
 
     var hoursMask = time === null || time === void 0 ? void 0 : time.split(':')[0];
-    return hoursMask === 'HH';
+    return hoursMask.includes('H');
   }, [dateTimeMask]);
   var isSingleSelect = useMemo(function () {
     return datePickerType === 'single';

package/es/components/DateTimePicker/dateTimePickerUtils.js

@@ -9,6 +9,8 @@ import debounce from '../../node_modules/lodash-es/debounce.js';
 import cloneDeep from '../../node_modules/lodash-es/cloneDeep.js';
 import 'core-js/modules/es.regexp.exec.js';
 import 'core-js/modules/es.string.split.js';
+import 'core-js/modules/es.array.includes.js';
+import 'core-js/modules/es.string.includes.js';
 import 'core-js/modules/es.array.concat.js';
 import 'core-js/modules/es.number.constructor.js';
 import 'core-js/modules/es.number.is-nan.js';
@@ -16,8 +18,6 @@ import 'core-js/modules/es.array.filter.js';
 import 'core-js/modules/es.array.from.js';
 import 'core-js/modules/es.string.iterator.js';
 import 'core-js/modules/es.array.find-index.js';
-import 'core-js/modules/es.array.includes.js';
-import 'core-js/modules/es.string.includes.js';
 import { useCallback, useRef, useState, useEffect } from 'react';
 import customParseFormat from '../../node_modules/dayjs/plugin/customParseFormat.js';
 import { settings } from '../../constants/Settings.js';
@@ -28,12 +28,26 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var iotPrefix = settings.iotPrefix;
+/** check if current time is 24 hours
+ *
+ * @param {string} dateTimeMask like YYYY-MM-DD HH:MM
+ * @returns true or false
+ */
+
+var is24hours = function is24hours(dateTimeMask) {
+  var _dateTimeMask$split = dateTimeMask.split(' '),
+      _dateTimeMask$split2 = _slicedToArray(_dateTimeMask$split, 2),
+      time = _dateTimeMask$split2[1];
+
+  var hoursMask = time === null || time === void 0 ? void 0 : time.split(':')[0];
+  return hoursMask.includes('H');
+};
 /** convert time from 12 hours to 24 hours, if time12hour is 24 hours format, return immediately
- * *
  * @param {Object} object hh:mm A time oject
  * @returns HH:mm time object
  */
 
+
 var format12hourTo24hour = function format12hourTo24hour(time12hour) {
   if (time12hour === '' || !time12hour) {
     return '00:00';
@@ -132,8 +146,7 @@ var parseValue = function parseValue(timeRange, dateTimeMask, toLabel) {
         var _startDate = dayjs((_value$start = value.start) !== null && _value$start !== void 0 ? _value$start : value.startDate);
 
         if (value.startTime) {
-          var is12hour = dayjs(value.startTime, 'hh:mm A', true).isValid();
-          var formatedStartTime = is12hour ? format12hourTo24hour(value.startTime) : value.startTime;
+          var formatedStartTime = is24hours(dateTimeMask) ? value.startTime : format12hourTo24hour(value.startTime);
           _startDate = _startDate.hours(formatedStartTime.split(':')[0]);
           _startDate = _startDate.minutes(formatedStartTime.split(':')[1]);
         }
@@ -151,9 +164,7 @@ var parseValue = function parseValue(timeRange, dateTimeMask, toLabel) {
           var _endDate = dayjs((_value$end2 = value.end) !== null && _value$end2 !== void 0 ? _value$end2 : value.endDate);
 
           if (value.endTime) {
-            var _is12hour = dayjs(value.endTime, 'hh:mm A', true).isValid();
-
-            var formatedEndTime = _is12hour ? format12hourTo24hour(value.endTime) : value.endTime;
+            var formatedEndTime = is24hours(dateTimeMask) ? value.endTime : format12hourTo24hour(value.endTime);
             _endDate = _endDate.hours(formatedEndTime.split(':')[0]);
             _endDate = _endDate.minutes(formatedEndTime.split(':')[1]);
           }
@@ -181,9 +192,7 @@ var parseValue = function parseValue(timeRange, dateTimeMask, toLabel) {
         var _startDate2 = dayjs((_value$start2 = value.start) !== null && _value$start2 !== void 0 ? _value$start2 : value.startDate);
 
         if (value.startTime) {
-          var _is12hour2 = dayjs(value.startTime, 'hh:mm A', true).isValid();
-
-          var _formatedStartTime = _is12hour2 ? format12hourTo24hour(value.startTime) : value.startTime;
+          var _formatedStartTime = is24hours(dateTimeMask) ? value.startTime : format12hourTo24hour(value.startTime);
 
           _startDate2 = _startDate2.hours(_formatedStartTime.split(':')[0]);
           _startDate2 = _startDate2.minutes(_formatedStartTime.split(':')[1]);

package/es/utils/cardUtilityFunctions.js

@@ -491,10 +491,6 @@ var fetchDataURL = function fetchDataURL(url, callback) {
  */
 
 var findMatchingThresholds = function findMatchingThresholds(thresholds, item, columnId) {
-  if (!item) {
-    return [];
-  }
-
   return thresholds.filter(function (t) {
     var comparison = t.comparison,
         value = t.value,

package/lib/components/DateTimePicker/DateTimePickerV2WithTimeSpinner.js

@@ -13,6 +13,8 @@ var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 require('core-js/modules/es.regexp.exec.js');
 require('core-js/modules/es.string.split.js');
+require('core-js/modules/es.array.includes.js');
+require('core-js/modules/es.string.includes.js');
 require('core-js/modules/es.string.replace.js');
 require('core-js/modules/es.array.concat.js');
 require('core-js/modules/es.array.filter.js');
@@ -339,7 +341,7 @@ var DateTimePicker = function DateTimePicker(_ref) {
         time = _dateTimeMask$split2[1];
 
     var hoursMask = time === null || time === void 0 ? void 0 : time.split(':')[0];
-    return hoursMask === 'HH';
+    return hoursMask.includes('H');
   }, [dateTimeMask]);
   var isSingleSelect = React.useMemo(function () {
     return datePickerType === 'single';

package/lib/components/DateTimePicker/dateTimePickerUtils.js

@@ -13,6 +13,8 @@ var debounce = require('../../node_modules/lodash-es/debounce.js');
 var cloneDeep = require('../../node_modules/lodash-es/cloneDeep.js');
 require('core-js/modules/es.regexp.exec.js');
 require('core-js/modules/es.string.split.js');
+require('core-js/modules/es.array.includes.js');
+require('core-js/modules/es.string.includes.js');
 require('core-js/modules/es.array.concat.js');
 require('core-js/modules/es.number.constructor.js');
 require('core-js/modules/es.number.is-nan.js');
@@ -20,8 +22,6 @@ require('core-js/modules/es.array.filter.js');
 require('core-js/modules/es.array.from.js');
 require('core-js/modules/es.string.iterator.js');
 require('core-js/modules/es.array.find-index.js');
-require('core-js/modules/es.array.includes.js');
-require('core-js/modules/es.string.includes.js');
 var React = require('react');
 var customParseFormat = require('../../node_modules/dayjs/plugin/customParseFormat.js');
 var Settings = require('../../constants/Settings.js');
@@ -37,12 +37,26 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var iotPrefix = Settings.settings.iotPrefix;
+/** check if current time is 24 hours
+ *
+ * @param {string} dateTimeMask like YYYY-MM-DD HH:MM
+ * @returns true or false
+ */
+
+var is24hours = function is24hours(dateTimeMask) {
+  var _dateTimeMask$split = dateTimeMask.split(' '),
+      _dateTimeMask$split2 = _slicedToArray__default['default'](_dateTimeMask$split, 2),
+      time = _dateTimeMask$split2[1];
+
+  var hoursMask = time === null || time === void 0 ? void 0 : time.split(':')[0];
+  return hoursMask.includes('H');
+};
 /** convert time from 12 hours to 24 hours, if time12hour is 24 hours format, return immediately
- * *
  * @param {Object} object hh:mm A time oject
  * @returns HH:mm time object
  */
 
+
 var format12hourTo24hour = function format12hourTo24hour(time12hour) {
   if (time12hour === '' || !time12hour) {
     return '00:00';
@@ -141,8 +155,7 @@ var parseValue = function parseValue(timeRange, dateTimeMask, toLabel) {
         var _startDate = dayjs((_value$start = value.start) !== null && _value$start !== void 0 ? _value$start : value.startDate);
 
         if (value.startTime) {
-          var is12hour = dayjs(value.startTime, 'hh:mm A', true).isValid();
-          var formatedStartTime = is12hour ? format12hourTo24hour(value.startTime) : value.startTime;
+          var formatedStartTime = is24hours(dateTimeMask) ? value.startTime : format12hourTo24hour(value.startTime);
           _startDate = _startDate.hours(formatedStartTime.split(':')[0]);
           _startDate = _startDate.minutes(formatedStartTime.split(':')[1]);
         }
@@ -160,9 +173,7 @@ var parseValue = function parseValue(timeRange, dateTimeMask, toLabel) {
           var _endDate = dayjs((_value$end2 = value.end) !== null && _value$end2 !== void 0 ? _value$end2 : value.endDate);
 
           if (value.endTime) {
-            var _is12hour = dayjs(value.endTime, 'hh:mm A', true).isValid();
-
-            var formatedEndTime = _is12hour ? format12hourTo24hour(value.endTime) : value.endTime;
+            var formatedEndTime = is24hours(dateTimeMask) ? value.endTime : format12hourTo24hour(value.endTime);
             _endDate = _endDate.hours(formatedEndTime.split(':')[0]);
             _endDate = _endDate.minutes(formatedEndTime.split(':')[1]);
           }
@@ -190,9 +201,7 @@ var parseValue = function parseValue(timeRange, dateTimeMask, toLabel) {
         var _startDate2 = dayjs((_value$start2 = value.start) !== null && _value$start2 !== void 0 ? _value$start2 : value.startDate);
 
         if (value.startTime) {
-          var _is12hour2 = dayjs(value.startTime, 'hh:mm A', true).isValid();
-
-          var _formatedStartTime = _is12hour2 ? format12hourTo24hour(value.startTime) : value.startTime;
+          var _formatedStartTime = is24hours(dateTimeMask) ? value.startTime : format12hourTo24hour(value.startTime);
 
           _startDate2 = _startDate2.hours(_formatedStartTime.split(':')[0]);
           _startDate2 = _startDate2.minutes(_formatedStartTime.split(':')[1]);

package/lib/utils/cardUtilityFunctions.js

@@ -504,10 +504,6 @@ var fetchDataURL = function fetchDataURL(url, callback) {
  */
 
 var findMatchingThresholds = function findMatchingThresholds(thresholds, item, columnId) {
-  if (!item) {
-    return [];
-  }
-
   return thresholds.filter(function (t) {
     var comparison = t.comparison,
         value = t.value,

package/package.json

@@ -340,11 +340,11 @@
     "whatwg-fetch": "^3.0.0"
   },
   "sideEffects": false,
-  "version": "2.152.4-next.1",
+  "version": "2.152.4",
   "resolutions": {
     "chokidar": "3.3.1",
     "react-grid-layout": "1.2.2",
     "got": "11.8.5"
   },
-  "gitHead": "13b73ec9b6cae3d70370e70fb79a29cf7b5779fc"
+  "gitHead": "369f44bc0ec2aeb602f1a6fb3adecd0ccc2fec3a"
 }

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

@@ -103458,12 +103458,26 @@
 
 	function _objectSpread$1K(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$1K(Object(source), true).forEach(function (key) { defineProperty$d(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$1K(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 	var iotPrefix$1q = settings$1.iotPrefix;
+	/** check if current time is 24 hours
+	 *
+	 * @param {string} dateTimeMask like YYYY-MM-DD HH:MM
+	 * @returns true or false
+	 */
+
+	var is24hours = function is24hours(dateTimeMask) {
+	  var _dateTimeMask$split = dateTimeMask.split(' '),
+	      _dateTimeMask$split2 = slicedToArray$2(_dateTimeMask$split, 2),
+	      time = _dateTimeMask$split2[1];
+
+	  var hoursMask = time === null || time === void 0 ? void 0 : time.split(':')[0];
+	  return hoursMask.includes('H');
+	};
 	/** convert time from 12 hours to 24 hours, if time12hour is 24 hours format, return immediately
-	 * *
 	 * @param {Object} object hh:mm A time oject
 	 * @returns HH:mm time object
 	 */
 
+
 	var format12hourTo24hour = function format12hourTo24hour(time12hour) {
 	  if (time12hour === '' || !time12hour) {
 	    return '00:00';
@@ -103562,8 +103576,7 @@
 	        var _startDate = dayjs((_value$start = value.start) !== null && _value$start !== void 0 ? _value$start : value.startDate);
 
 	        if (value.startTime) {
-	          var is12hour = dayjs(value.startTime, 'hh:mm A', true).isValid();
-	          var formatedStartTime = is12hour ? format12hourTo24hour(value.startTime) : value.startTime;
+	          var formatedStartTime = is24hours(dateTimeMask) ? value.startTime : format12hourTo24hour(value.startTime);
 	          _startDate = _startDate.hours(formatedStartTime.split(':')[0]);
 	          _startDate = _startDate.minutes(formatedStartTime.split(':')[1]);
 	        }
@@ -103581,9 +103594,7 @@
 	          var _endDate = dayjs((_value$end2 = value.end) !== null && _value$end2 !== void 0 ? _value$end2 : value.endDate);
 
 	          if (value.endTime) {
-	            var _is12hour = dayjs(value.endTime, 'hh:mm A', true).isValid();
-
-	            var formatedEndTime = _is12hour ? format12hourTo24hour(value.endTime) : value.endTime;
+	            var formatedEndTime = is24hours(dateTimeMask) ? value.endTime : format12hourTo24hour(value.endTime);
 	            _endDate = _endDate.hours(formatedEndTime.split(':')[0]);
 	            _endDate = _endDate.minutes(formatedEndTime.split(':')[1]);
 	          }
@@ -103611,9 +103622,7 @@
 	        var _startDate2 = dayjs((_value$start2 = value.start) !== null && _value$start2 !== void 0 ? _value$start2 : value.startDate);
 
 	        if (value.startTime) {
-	          var _is12hour2 = dayjs(value.startTime, 'hh:mm A', true).isValid();
-
-	          var _formatedStartTime = _is12hour2 ? format12hourTo24hour(value.startTime) : value.startTime;
+	          var _formatedStartTime = is24hours(dateTimeMask) ? value.startTime : format12hourTo24hour(value.startTime);
 
 	          _startDate2 = _startDate2.hours(_formatedStartTime.split(':')[0]);
 	          _startDate2 = _startDate2.minutes(_formatedStartTime.split(':')[1]);
@@ -109403,10 +109412,6 @@
 	 */
 
 	var findMatchingThresholds = function findMatchingThresholds(thresholds, item, columnId) {
-	  if (!item) {
-	    return [];
-	  }
-
 	  return thresholds.filter(function (t) {
 	    var comparison = t.comparison,
 	        value = t.value,
@@ -116948,7 +116953,7 @@
 	        time = _dateTimeMask$split2[1];
 
 	    var hoursMask = time === null || time === void 0 ? void 0 : time.split(':')[0];
-	    return hoursMask === 'HH';
+	    return hoursMask.includes('H');
 	  }, [dateTimeMask]);
 	  var isSingleSelect = React$1.useMemo(function () {
 	    return datePickerType === 'single';