intelicoreact 1.1.0 → 1.1.1

package/dist/Atomic/FormElements/ActionAlert/ActionAlert.js

@@ -11,13 +11,12 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _utils = require("../../../Functions/utils");
+var _utils = require("../../../../../JS/Functions/utils");
 
 var _Button = _interopRequireDefault(require("../../UI/Button/Button"));
 
 require("./ActionAlert.scss");
 
-// import moment from 'moment-timezone';
 var ActionAlert = function ActionAlert(_ref) {
   var onClick = _ref.onClick,
       message = _ref.message,
@@ -28,9 +27,11 @@ var ActionAlert = function ActionAlert(_ref) {
       noButton = _ref.noButton,
       children = _ref.children,
       _ref$variant = _ref.variant,
-      variant = _ref$variant === void 0 ? 'default' : _ref$variant;
+      variant = _ref$variant === void 0 ? 'default' : _ref$variant,
+      testId = _ref.testId;
   // const transformedTime = moment(date).format('MM.DD.YYYY HH:mm');
   return /*#__PURE__*/_react.default.createElement("div", {
+    "data-testid": "actionAlert".concat((0, _utils.getCorrectTestId)(testId)),
     className: (0, _classnames.default)("action-alert action-alert--".concat(variant), className)
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "action-alert__message-box"

package/dist/Atomic/FormElements/AdvancedStatus/AdvancedStatus.js

@@ -15,6 +15,8 @@ var _TextSwitcher = _interopRequireDefault(require("../TextSwitcher/TextSwitcher
 
 var _Status = _interopRequireDefault(require("../../UI/Status/Status"));
 
+var _utils = require("../../../../../JS/Functions/utils");
+
 require("./AdvancedStatus.scss");
 
 var AdvancedStatus = function AdvancedStatus(_ref) {
@@ -24,13 +26,16 @@ var AdvancedStatus = function AdvancedStatus(_ref) {
       value = _ref.value,
       disabled = _ref.disabled,
       isPrimary = _ref.isPrimary,
-      primaryStatusText = _ref.primaryStatusText;
+      primaryStatusText = _ref.primaryStatusText,
+      className = _ref.className,
+      testId = _ref.testId;
   var isUndefined = value === undefined || value === null;
   return /*#__PURE__*/_react.default.createElement("div", {
+    "data-testid": "advanced-status".concat((0, _utils.getCorrectTestId)(testId)),
     className: (0, _classnames.default)('advanced-status', {
       'advanced-status_undefined': isUndefined,
       'advanced-status_disabled': disabled
-    })
+    }, className)
   }, /*#__PURE__*/_react.default.createElement(_TextSwitcher.default, {
     onChange: onChange,
     isActive: value,

package/dist/Atomic/FormElements/CheckboxInput/CheckboxInput.js

@@ -15,6 +15,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _utils = require("../../../../../JS/Functions/utils");
+
 require("./CheckboxInput.scss");
 
 var CheckboxInput = function CheckboxInput(_ref) {
@@ -31,7 +33,7 @@ var CheckboxInput = function CheckboxInput(_ref) {
       _ref$testId = _ref.testId,
       testId = _ref$testId === void 0 ? '' : _ref$testId;
   return /*#__PURE__*/_react.default.createElement("label", {
-    "data-testid": "checkbox--label--".concat(testId || id || fieldKey || ''),
+    "data-testid": "checkbox--label-".concat((0, _utils.getCorrectTestId)(testId || id || fieldKey)),
     className: (0, _classnames.default)('checkbox-input', className, (0, _defineProperty2.default)({}, "checkbox-input_disabled", disabled)),
     htmlFor: id
   }, /*#__PURE__*/_react.default.createElement("div", {

package/dist/Atomic/FormElements/NumericInput/NumericInput.js

@@ -31,6 +31,8 @@ var _Spinner = _interopRequireDefault(require("../../Layout/Spinner/Spinner"));
 
 require("./NumericInput.scss");
 
+var _utils = require("../../../../../JS/Functions/utils");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -312,7 +314,7 @@ var NumericInput = function NumericInput(_ref) {
     } : {});
 
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({}, uniProps, {
-      "data-testid": "input--".concat(testId),
+      "data-testid": "input-".concat((0, _utils.getCorrectTestId)(testId || name || fieldKey || id)),
       value: (value === null || value === void 0 ? void 0 : value.length) > 0 ? (0, _fieldValueFormatters.formatToAddBitDepthPoints)((0, _fieldValueFormatters.formatToRemoveComa)(value)) : value,
       ref: inputRef,
       type: "text",

package/dist/Atomic/FormElements/RangeInputs/RangeInputs.js

@@ -49,6 +49,8 @@ var RangeInputs = function RangeInputs(_ref) {
   } : _ref$value,
       _ref$onChange = _ref.onChange,
       onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
+      _ref$validateErrors = _ref.validateErrors,
+      validateErrors = _ref$validateErrors === void 0 ? function () {} : _ref$validateErrors,
       _ref$type = _ref.type,
       type = _ref$type === void 0 ? 'int' : _ref$type,
       setInnerError = _ref.setError,
@@ -101,6 +103,8 @@ var RangeInputs = function RangeInputs(_ref) {
   };
 
   var rangeValidation = function rangeValidation(e, key) {
+    var _validateErrors;
+
     var oppositeKey = key === 'from' ? 'to' : 'from';
 
     if (!withZero && !(valueObj !== null && valueObj !== void 0 && valueObj.from) && !(valueObj !== null && valueObj !== void 0 && valueObj.to)) {
@@ -120,6 +124,9 @@ var RangeInputs = function RangeInputs(_ref) {
         to: 'Invalid range'
       }));
       setInnerError === null || setInnerError === void 0 ? void 0 : setInnerError('Invalid range');
+    } else if ((_validateErrors = validateErrors === null || validateErrors === void 0 ? void 0 : validateErrors(valueObj === null || valueObj === void 0 ? void 0 : valueObj.from, valueObj === null || valueObj === void 0 ? void 0 : valueObj.to)) !== null && _validateErrors !== void 0 ? _validateErrors : false) {
+      //проп validateErrors вернет пустую строку, в случае если ошибок нет
+      setInnerError === null || setInnerError === void 0 ? void 0 : setInnerError(validateErrors(+state.from, +state.to));
     } else {
       setError({
         from: '',

package/dist/Atomic/FormElements/SwitcherRange/SwitcherRange.js

@@ -36,6 +36,9 @@ var SwitcherRange = function SwitcherRange(_ref) {
       value = _ref.value,
       onChange = _ref.onChange,
       isInputsColumn = _ref.isInputsColumn,
+      validateErrors = _ref.validateErrors,
+      withZero = _ref.withZero,
+      isPrice = _ref.isPrice,
       inputsType = _ref.inputsType;
 
   var _useState = (0, _react.useState)(''),
@@ -64,7 +67,10 @@ var SwitcherRange = function SwitcherRange(_ref) {
     onChange: onChange,
     value: value,
     setError: function setError() {},
-    isColumnPosition: isInputsColumn
+    isColumnPosition: isInputsColumn,
+    validateErrors: validateErrors,
+    withZero: withZero,
+    isPrice: isPrice
   }));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intelicoreact",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "",
   "main": "dist/index.js",
   "files": [