iguazio.dashboard-react-controls 0.0.19 → 0.0.21

package/dist/components/FormChipCell/FormChip/FormChip.js

@@ -11,14 +11,10 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
 var _NewChipForm = _interopRequireDefault(require("../NewChipForm/NewChipForm"));
 
 var _types = require("../../../types");
 
-var _close = require("../../../images/close.svg");
-
 require("./formChip.scss");
 
 var _jsxRuntime = require("react/jsx-runtime");
@@ -36,30 +32,24 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var FormChip = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
-  var _chip$delimiter;
-
   var chip = _ref.chip,
-      chipClassNames = _ref.chipClassNames,
       chipIndex = _ref.chipIndex,
       chipOptions = _ref.chipOptions,
-      className = _ref.className,
       editConfig = _ref.editConfig,
       handleEditChip = _ref.handleEditChip,
-      handleIsEdit = _ref.handleIsEdit,
       handleRemoveChip = _ref.handleRemoveChip,
+      handleToEditMode = _ref.handleToEditMode,
       isDeleteMode = _ref.isDeleteMode,
       isEditMode = _ref.isEditMode,
       keyName = _ref.keyName,
-      onClick = _ref.onClick,
+      meta = _ref.meta,
       setChipsSizes = _ref.setChipsSizes,
       setEditConfig = _ref.setEditConfig,
-      textOverflowEllipsis = _ref.textOverflowEllipsis,
+      validationRules = _ref.validationRules,
       valueName = _ref.valueName;
 
   var chipRef = _react.default.useRef();
 
-  var chipLabelClassNames = (0, _classnames.default)('chip__label', (textOverflowEllipsis || isEditMode) && 'data-ellipsis');
-  var chipValueClassNames = (0, _classnames.default)('chip__value', (textOverflowEllipsis || isEditMode) && 'data-ellipsis', chipOptions.boldValue && 'chip-value_bold');
   (0, _react.useEffect)(function () {
     if (chipRef.current && setChipsSizes) {
       setChipsSizes(function (state) {
@@ -67,40 +57,27 @@ var FormChip = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
       });
     }
   }, [chipIndex, setChipsSizes]);
-  return isEditMode && chipIndex === editConfig.chipIndex ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_NewChipForm.default, {
-    chip: chip,
-    chipOptions: chipOptions,
-    className: "input-label-key",
-    editConfig: editConfig,
-    keyName: keyName,
-    onChange: handleEditChip,
-    ref: ref,
-    setEditConfig: setEditConfig,
-    valueName: valueName
-  }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    className: chipClassNames,
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     onClick: function onClick(event) {
-      return handleIsEdit(event, chipIndex);
+      return handleToEditMode(event, chipIndex);
     },
     ref: chipRef,
-    children: [chip.key && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: chipLabelClassNames,
-      children: chip.key
-    }), chip.value && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "chip__delimiter",
-        children: (_chip$delimiter = chip.delimiter) !== null && _chip$delimiter !== void 0 ? _chip$delimiter : ':'
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: chipValueClassNames,
-        children: chip.value
-      })]
-    }), (isEditMode || isDeleteMode) && /*#__PURE__*/(0, _jsxRuntime.jsx)("button", {
-      className: "item-icon-close",
-      onClick: function onClick(event) {
-        return handleRemoveChip(event, chipIndex);
-      },
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_close.ReactComponent, {})
-    })]
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_NewChipForm.default, {
+      chip: chip,
+      chipIndex: chipIndex,
+      chipOptions: chipOptions,
+      className: "input-label-key",
+      editConfig: editConfig,
+      handleRemoveChip: handleRemoveChip,
+      isEditMode: isEditMode,
+      keyName: keyName,
+      meta: meta,
+      onChange: handleEditChip,
+      ref: ref,
+      setEditConfig: setEditConfig,
+      validationRules: validationRules,
+      valueName: valueName
+    })
   });
 });
 
@@ -116,27 +93,24 @@ FormChip.defaultProps = {
   isDeleteMode: false,
   isEditMode: false,
   keyName: '',
-  onClick: function onClick() {},
-  textOverflowEllipsis: false,
+  validationRules: {},
   valueName: ''
 };
 FormChip.propTypes = {
   chip: _propTypes.default.object.isRequired,
-  chipClassNames: _propTypes.default.string.isRequired,
   chipIndex: _propTypes.default.number.isRequired,
   chipOptions: _types.CHIP_OPTIONS,
-  className: _propTypes.default.string,
   editConfig: _propTypes.default.object.isRequired,
   handleEditChip: _propTypes.default.func.isRequired,
-  handleIsEdit: _propTypes.default.func.isRequired,
   handleRemoveChip: _propTypes.default.func.isRequired,
+  handleToEditMode: _propTypes.default.func.isRequired,
   isDeleteMode: _propTypes.default.bool,
   isEditMode: _propTypes.default.bool,
   keyName: _propTypes.default.string,
-  onClick: _propTypes.default.func,
+  meta: _propTypes.default.object.isRequired,
   setChipsSizes: _propTypes.default.func.isRequired,
   setEditConfig: _propTypes.default.func.isRequired,
-  textOverflowEllipsis: _propTypes.default.bool,
+  validationRules: _propTypes.default.object,
   valueName: _propTypes.default.string
 };
 var _default = FormChip;

package/dist/components/FormChipCell/FormChip/formChip.scss

@@ -39,18 +39,6 @@
     padding: 8px 7px;
   }
 
-  .item-icon-close {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-left: 5px;
-    padding: 0;
-
-    svg {
-      transform: scale(0.7);
-    }
-  }
-
   &-background {
     @include chipBackground(false);
   }

package/dist/components/FormChipCell/FormChipCell.js

@@ -9,9 +9,9 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _lodash = _interopRequireWildcard(require("lodash"));
 
-var _lodash = require("lodash");
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _FormChipCellView = _interopRequireDefault(require("./FormChipCellView"));
 
@@ -19,10 +19,16 @@ var _common = require("../../utils/common.util");
 
 var _generateChipsList = require("../../utils/generateChipsList.util");
 
+var _validation = require("../../utils/validation.util");
+
+var _formChipCell = require("./formChipCell.util");
+
 var _types = require("../../types");
 
 var _constants = require("../../constants");
 
+require("./formChipCell.scss");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -31,6 +37,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -45,14 +57,16 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var FormChipCell = function FormChipCell(_ref) {
   var chipOptions = _ref.chipOptions,
-      className = _ref.className,
       delimiter = _ref.delimiter,
       formState = _ref.formState,
       initialValues = _ref.initialValues,
       isEditMode = _ref.isEditMode,
+      label = _ref.label,
       name = _ref.name,
       onClick = _ref.onClick,
       shortChips = _ref.shortChips,
+      validationRules = _ref.validationRules,
+      validator = _ref.validator,
       visibleChipsMaxLength = _ref.visibleChipsMaxLength;
 
   var _useState = (0, _react.useState)({}),
@@ -68,7 +82,7 @@ var FormChipCell = function FormChipCell(_ref) {
   var _useState5 = (0, _react.useState)({
     chipIndex: null,
     isEdit: false,
-    isKeyFocused: true,
+    isKeyFocused: false,
     isValueFocused: false,
     isNewChip: false
   }),
@@ -97,9 +111,10 @@ var FormChipCell = function FormChipCell(_ref) {
   }, [isEditMode, visibleChipsMaxLength]);
   var chips = (0, _react.useMemo)(function () {
     return isEditMode || visibleChipsMaxLength === 'all' ? {
-      visibleChips: formState.values[name]
-    } : (0, _generateChipsList.generateChipsList)(formState.values[name], visibleChipsMaxLength ? visibleChipsMaxLength : visibleChipsCount, delimiter);
-  }, [visibleChipsMaxLength, isEditMode, formState.values, name, visibleChipsCount, delimiter]);
+      visibleChips: (0, _lodash.get)(formState.values, name),
+      hiddenChips: []
+    } : (0, _generateChipsList.generateChipsList)((0, _lodash.get)(formState.values, name), visibleChipsMaxLength ? visibleChipsMaxLength : visibleChipsCount, delimiter);
+  }, [visibleChipsMaxLength, isEditMode, visibleChipsCount, delimiter, formState.values, name]);
   var handleResize = (0, _react.useCallback)(function () {
     if (!isEditMode && !(0, _common.isEveryObjectValueEmpty)(chipsSizes)) {
       var _chipsCellRef$current;
@@ -152,8 +167,8 @@ var FormChipCell = function FormChipCell(_ref) {
     }
   }, [showHiddenChips, handleShowElements]);
   var checkChipsList = (0, _react.useCallback)(function (currentChipsList) {
-    if ((0, _lodash.isEqual)(initialValues[name], currentChipsList)) {
-      formState.initialValues[name] = currentChipsList;
+    if ((0, _common.areArraysEqual)((0, _lodash.get)(initialValues, name), currentChipsList, ['id'])) {
+      (0, _lodash.set)(formState.initialValues, name, currentChipsList);
     }
 
     formState.form.mutators.setFieldState(name, {
@@ -166,6 +181,7 @@ var FormChipCell = function FormChipCell(_ref) {
   var handleAddNewChip = (0, _react.useCallback)(function (event, fields) {
     if (!editConfig.isEdit && !editConfig.chipIndex) {
       formState.form.mutators.push(name, {
+        id: fields.value.length + new Date(),
         key: '',
         value: '',
         delimiter: delimiter
@@ -176,7 +192,6 @@ var FormChipCell = function FormChipCell(_ref) {
       setShowHiddenChips(false);
     }
 
-    event && event.preventDefault();
     setEditConfig({
       chipIndex: fields.value.length,
       isEdit: true,
@@ -184,32 +199,35 @@ var FormChipCell = function FormChipCell(_ref) {
       isValueFocused: false,
       isNewChip: true
     });
+    event && event.preventDefault();
   }, [editConfig.isEdit, editConfig.chipIndex, showHiddenChips, formState, name, delimiter]);
   var handleRemoveChip = (0, _react.useCallback)(function (event, fields, chipIndex) {
-    checkChipsList(formState.values[name].filter(function (_, index) {
+    checkChipsList(_lodash.default.chain(formState).get(['values', name]).filter(function (_, index) {
       return index !== chipIndex;
-    }));
+    }).value());
     fields.remove(chipIndex);
     event && event.stopPropagation();
-  }, [checkChipsList, formState.values, name]);
+  }, [checkChipsList, formState, name]);
   var handleEditChip = (0, _react.useCallback)(function (event, fields, nameEvent) {
-    var chip = formState.values[name][editConfig.chipIndex];
-    var isChipNotEmpty = !!(chip.key && chip.value);
+    var _fields$value$editCon = fields.value[editConfig.chipIndex],
+        key = _fields$value$editCon.key,
+        value = _fields$value$editCon.value;
+    var isChipNotEmpty = !!(key !== null && key !== void 0 && key.trim() && value !== null && value !== void 0 && value.trim());
 
     if (nameEvent === _constants.CLICK) {
-      if (editConfig.isNewChip && !isChipNotEmpty) {
+      if (!isChipNotEmpty) {
         handleRemoveChip(event, fields, editConfig.chipIndex);
       }
 
       setEditConfig({
         chipIndex: null,
         isEdit: false,
-        isKeyFocused: true,
+        isKeyFocused: false,
         isValueFocused: false,
         isNewChip: false
       });
     } else if (nameEvent === _constants.TAB) {
-      if (editConfig.isNewChip && !isChipNotEmpty) {
+      if (!isChipNotEmpty) {
         handleRemoveChip(event, fields, editConfig.chipIndex);
       }
 
@@ -224,7 +242,7 @@ var FormChipCell = function FormChipCell(_ref) {
         };
       });
     } else if (nameEvent === _constants.TAB_SHIFT) {
-      if (editConfig.isNewChip && !isChipNotEmpty) {
+      if (!isChipNotEmpty) {
         handleRemoveChip(event, fields, editConfig.chipIndex);
       }
 
@@ -240,43 +258,141 @@ var FormChipCell = function FormChipCell(_ref) {
       });
     }
 
+    checkChipsList((0, _lodash.get)(formState.values, name));
     event && event.preventDefault();
-    checkChipsList(formState.values[name]);
-  }, [editConfig.chipIndex, editConfig.isNewChip, handleRemoveChip, name, formState, checkChipsList]);
-  var handleIsEdit = (0, _react.useCallback)(function (event, index) {
+  }, [editConfig.chipIndex, handleRemoveChip, checkChipsList, formState.values, name]);
+  var handleToEditMode = (0, _react.useCallback)(function (event, index) {
     if (isEditMode) {
       event.stopPropagation();
-      setEditConfig({
-        chipIndex: index,
-        isEdit: true,
-        isKeyFocused: true,
-        isValueFocused: false
+      setEditConfig(function (preState) {
+        return _objectSpread(_objectSpread({}, preState), {}, {
+          chipIndex: index,
+          isEdit: true,
+          isKeyFocused: true,
+          isValueFocused: false
+        });
       });
     }
 
     onClick && onClick();
   }, [isEditMode, onClick]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormChipCellView.default, {
-    chipOptions: chipOptions,
-    chips: chips,
-    className: className,
-    editConfig: editConfig,
-    handleAddNewChip: handleAddNewChip,
-    handleEditChip: handleEditChip,
-    handleIsEdit: handleIsEdit,
-    handleRemoveChip: handleRemoveChip,
-    handleShowElements: handleShowElements,
-    isEditMode: isEditMode,
-    name: name,
-    ref: {
-      chipsCellRef: chipsCellRef,
-      chipsWrapperRef: chipsWrapperRef
-    },
-    setChipsSizes: setChipsSizes,
-    setEditConfig: setEditConfig,
-    shortChips: shortChips,
-    showChips: showChips,
-    showHiddenChips: showHiddenChips
+
+  var validateFields = function validateFields(fieldsArray) {
+    var uniquenessValidator = function uniquenessValidator(newValue, idx) {
+      return !fieldsArray.some(function (_ref2, index) {
+        var key = _ref2.key;
+        return newValue === key && index !== idx;
+      });
+    };
+
+    var errorData = [];
+    if (!fieldsArray) return [];
+
+    if (!(0, _lodash.isEmpty)(validationRules)) {
+      errorData = fieldsArray.map(function (chip) {
+        var _validateChip = validateChip(chip),
+            _validateChip2 = _slicedToArray(_validateChip, 2),
+            keyValidation = _validateChip2[0],
+            valueValidation = _validateChip2[1];
+
+        if (keyValidation && valueValidation) return {
+          key: keyValidation,
+          value: valueValidation
+        };
+        if (keyValidation) return {
+          key: keyValidation
+        };
+        if (valueValidation) return {
+          value: valueValidation
+        };
+        return null;
+      });
+    } // uniqueness
+
+
+    fieldsArray.forEach(function (chip, index) {
+      var isUnique = uniquenessValidator(chip.key, index);
+
+      if (!isUnique) {
+        if ((0, _lodash.get)(errorData, [index, 'key'], false)) {
+          errorData.at(index).key.push(_formChipCell.uniquenessError);
+        } else {
+          (0, _lodash.set)(errorData, [index, 'key'], [_formChipCell.uniquenessError]);
+        }
+      }
+    });
+
+    if (!errorData && validator) {
+      errorData = validator(fieldsArray);
+    }
+
+    if (errorData.every(function (label) {
+      return (0, _lodash.isNil)(label);
+    })) {
+      return [];
+    }
+
+    return errorData;
+  };
+
+  var validateChip = function validateChip(_ref3) {
+    var key = _ref3.key,
+        value = _ref3.value;
+
+    var validateField = function validateField(value, field) {
+      var _checkPatternsValidit = (0, _validation.checkPatternsValidity)(validationRules[field].filter(function (rule) {
+        return rule.pattern;
+      }), value),
+          _checkPatternsValidit2 = _slicedToArray(_checkPatternsValidit, 2),
+          newRules = _checkPatternsValidit2[0],
+          isValidField = _checkPatternsValidit2[1];
+
+      if (isValidField) return null;
+      var invalidRules = newRules.filter(function (rule) {
+        return !rule.isValid;
+      });
+      return invalidRules.map(function (rule) {
+        return {
+          name: rule.name,
+          label: rule.label
+        };
+      });
+    };
+
+    return [validateField(key, 'key'), validateField(value, 'value')];
+  };
+
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: "chips",
+    children: [label && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "chips__label",
+      children: label
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: label ? 'chips__wrapper' : '',
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormChipCellView.default, {
+        chipOptions: chipOptions,
+        chips: chips,
+        editConfig: editConfig,
+        handleAddNewChip: handleAddNewChip,
+        handleEditChip: handleEditChip,
+        handleRemoveChip: handleRemoveChip,
+        handleShowElements: handleShowElements,
+        handleToEditMode: handleToEditMode,
+        isEditMode: isEditMode,
+        name: name,
+        ref: {
+          chipsCellRef: chipsCellRef,
+          chipsWrapperRef: chipsWrapperRef
+        },
+        setChipsSizes: setChipsSizes,
+        setEditConfig: setEditConfig,
+        shortChips: shortChips,
+        showChips: showChips,
+        showHiddenChips: showHiddenChips,
+        validateFields: validateFields,
+        validationRules: validationRules
+      })
+    })]
   });
 };
 
@@ -290,21 +406,26 @@ FormChipCell.defaultProps = {
     font: 'purple'
   },
   delimiter: null,
+  isEditMode: false,
+  label: null,
   onClick: function onClick() {},
   shortChips: false,
-  isEditMode: false,
+  validationRules: {},
+  validator: function validator() {},
   visibleChipsMaxLength: 'all'
 };
 FormChipCell.propTypes = {
   chipOptions: _types.CHIP_OPTIONS,
-  className: _propTypes.default.string,
   delimiter: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.element]),
-  onClick: _propTypes.default.func,
-  shortChips: _propTypes.default.bool,
-  name: _propTypes.default.string.isRequired,
   formState: _propTypes.default.shape({}).isRequired,
   initialValues: _propTypes.default.object.isRequired,
   isEditMode: _propTypes.default.bool,
+  label: _propTypes.default.string,
+  name: _propTypes.default.string.isRequired,
+  onClick: _propTypes.default.func,
+  shortChips: _propTypes.default.bool,
+  validationRules: _propTypes.default.object,
+  validator: _propTypes.default.func,
   visibleChipsMaxLength: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number])
 };