@synerise/ds-condition 0.16.0 → 0.17.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.17.0](https://github.com/Synerise/synerise-design/compare/@synerise/ds-condition@0.16.0...@synerise/ds-condition@0.17.0) (2022-05-28)
+
+
+### Features
+
+* **condition:** validation condition ([b8d9e62](https://github.com/Synerise/synerise-design/commit/b8d9e627f2d62113abc4716d4049c2e27ad49718))
+
+
+
+
+
 # [0.16.0](https://github.com/Synerise/synerise-design/compare/@synerise/ds-condition@0.15.1...@synerise/ds-condition@0.16.0) (2022-05-13)
 
 

package/dist/Condition.js

@@ -86,6 +86,10 @@ var Condition = function Condition(props) {
       currentField = _React$useState3[0],
       setCurrentField = _React$useState3[1];
 
+  var _React$useState4 = React.useState(''),
+      errorId = _React$useState4[0],
+      setErrorId = _React$useState4[1];
+
   var prevSteps = usePrevious(steps);
   React.useEffect(function () {
     if (autoOpenedComponent && steps.length && steps[0].conditions[0].operator && steps[0].conditions[0].operator.value === undefined) {
@@ -212,13 +216,32 @@ var Condition = function Condition(props) {
       setCurrentField(SUBJECT);
     }
   }, [addStep]);
+  var returnLast = React.useCallback(function (arr) {
+    return arr[arr.length - 1];
+  }, []);
+  var testPrevValueElement = React.useCallback(function () {
+    return steps == null ? void 0 : steps.map(function (step) {
+      var _returnLast;
+
+      return !((_returnLast = returnLast(step.conditions)) != null && _returnLast.factor.value) && setErrorId(returnLast(step.conditions).id);
+    });
+  }, [steps, returnLast]);
   var handleAddCondition = React.useMemo(function () {
+    var lastStep = returnLast(steps);
+    var lastCondition = returnLast(lastStep.conditions);
+
     if (!addCondition) {
       return undefined;
     }
 
     return function (stepId) {
-      var newConditionId = addCondition ? addCondition(stepId) : undefined;
+      var newConditionId;
+
+      if (addCondition && lastCondition != null && lastCondition.factor.value || (lastStep == null ? void 0 : lastStep.conditions.length) === 0) {
+        newConditionId = addCondition(stepId);
+      }
+
+      testPrevValueElement();
 
       if (newConditionId) {
         setCurrentConditionId(newConditionId);
@@ -226,7 +249,7 @@ var Condition = function Condition(props) {
         setCurrentField(PARAMETER);
       }
     };
-  }, [addCondition]);
+  }, [addCondition, steps, testPrevValueElement, returnLast]);
   var handleClearActiveCondition = React.useCallback(function () {
     setCurrentConditionId(DEFAULT_CONDITION);
     setCurrentStepId(DEFAULT_STEP);
@@ -269,7 +292,8 @@ var Condition = function Condition(props) {
         setCurrentStep: setCurrentStepId,
         onDeactivate: handleClearActiveCondition,
         showSuffix: showSuffix,
-        hoverDisabled: hoverDisabled || currentStepId !== step.id && currentStepId !== undefined
+        hoverDisabled: hoverDisabled || currentStepId !== step.id && currentStepId !== undefined,
+        errorId: errorId
       });
     })), addStep && /*#__PURE__*/React.createElement(S.AddStepButton, null, /*#__PURE__*/React.createElement(Button, {
       type: "ghost",
@@ -278,7 +302,7 @@ var Condition = function Condition(props) {
     }, /*#__PURE__*/React.createElement(Icon, {
       component: /*#__PURE__*/React.createElement(Add3M, null)
     }), text.addStep)), renderAddStep && /*#__PURE__*/React.createElement(S.AddStepButton, null, renderAddStep()));
-  }, [steps, onChangeOrder, addStep, handleAddStep, text, renderAddStep, currentStepId, getPopupContainerOverride, draggableEnabled, selectOperator, selectParameter, selectContext, selectSubject, onUpdateStepName, duplicateStep, removeStep, minConditionsLength, maxConditionsLength, setStepConditionFactorType, setStepConditionFactorValue, currentConditionId, currentField, removeCondition, handleAddCondition, handleClearActiveCondition, showSuffix, hoverDisabled]);
+  }, [steps, onChangeOrder, addStep, handleAddStep, text, renderAddStep, currentStepId, getPopupContainerOverride, draggableEnabled, selectOperator, selectParameter, selectContext, selectSubject, onUpdateStepName, duplicateStep, removeStep, minConditionsLength, maxConditionsLength, setStepConditionFactorType, setStepConditionFactorValue, currentConditionId, currentField, removeCondition, handleAddCondition, handleClearActiveCondition, showSuffix, hoverDisabled, errorId]);
 };
 
 export default Condition;

package/dist/ConditionStep/ConditionRow/ConditionRow.js

@@ -33,7 +33,8 @@ export var ConditionRow = function ConditionRow(_ref) {
       hasPriority = _ref.hasPriority,
       texts = _ref.texts,
       stepType = _ref.stepType,
-      onDeactivate = _ref.onDeactivate;
+      onDeactivate = _ref.onDeactivate,
+      error = _ref.error;
   return /*#__PURE__*/React.createElement(S.ConditionRow, {
     stepType: stepType,
     style: hasPriority ? {
@@ -79,6 +80,7 @@ export var ConditionRow = function ConditionRow(_ref) {
       return setStepConditionFactorValue(stepId, conditionId, value);
     },
     factorKey: conditionId,
+    error: error,
     opened: hasPriority && stepId === currentStepId && conditionId === currentConditionId && currentField === FACTOR
   })))), removeCondition && conditionsNumber > minConditionLength && /*#__PURE__*/React.createElement(S.RemoveIconWrapper, {
     onClick: function onClick() {

package/dist/ConditionStep/ConditionRow/ConditionRow.types.d.ts

@@ -4,6 +4,7 @@ import { OperatorsProps } from '@synerise/ds-operators/dist/Operator.types';
 import { ConditionProps, ConditionTexts } from '../../Condition.types';
 export declare type ConditionRowProps = {
     index: number;
+    error?: boolean;
     hasPriority?: boolean;
     onActivate?: (fieldType: string) => void;
     onDeactivate?: () => void;

package/dist/ConditionStep/ConditionStep.js

@@ -48,7 +48,8 @@ export var ConditionStep = function ConditionStep(_ref) {
       setCurrentStep = _ref.setCurrentStep,
       onDeactivate = _ref.onDeactivate,
       showSuffix = _ref.showSuffix,
-      hoverDisabled = _ref.hoverDisabled;
+      hoverDisabled = _ref.hoverDisabled,
+      errorId = _ref.errorId;
 
   var _useIntl = useIntl(),
       formatMessage = _useIntl.formatMessage;
@@ -167,9 +168,10 @@ export var ConditionStep = function ConditionStep(_ref) {
       setStepConditionFactorValue: setStepConditionFactorValue,
       texts: text,
       stepType: (_step$context2 = step.context) == null ? void 0 : _step$context2.type,
-      onDeactivate: onDeactivate
+      onDeactivate: onDeactivate,
+      error: errorId === condition.id && !condition.factor.value && true
     });
-  }, [step.id, step.conditions.length, step.context, hasPriority, currentConditionId, addCondition, removeCondition, minConditionsLength, maxConditionsLength, currentStepId, currentField, selectParameter, selectOperator, getPopupContainerOverride, setStepConditionFactorType, setStepConditionFactorValue, text, onDeactivate, onActivate, setCurrentField, setCurrentCondition, setCurrentStep]);
+  }, [step.id, step.conditions.length, step.context, hasPriority, currentConditionId, addCondition, removeCondition, minConditionsLength, maxConditionsLength, currentStepId, currentField, selectParameter, selectOperator, getPopupContainerOverride, setStepConditionFactorType, setStepConditionFactorValue, text, onDeactivate, onActivate, setCurrentField, setCurrentCondition, setCurrentStep, errorId]);
   return /*#__PURE__*/React.createElement(S.Step, {
     key: step.id,
     id: "condition-step-" + step.id,

package/dist/ConditionStep/ConditionStep.types.d.ts

@@ -7,6 +7,7 @@ import { ConditionStep, ConditionTexts, ConditionProps } from '../Condition.type
 export declare type ConditionStepProps = {
     index: number;
     step: ConditionStep;
+    errorId?: string;
     hasPriority?: boolean;
     onStepActivate?: (stepid: React.ReactText) => void;
     getPopupContainerOverride?: ConditionProps['getPopupContainerOverride'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synerise/ds-condition",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "Condition UI Component for the Synerise Design System",
   "license": "ISC",
   "repository": "Synerise/synerise-design",
@@ -36,7 +36,7 @@
     "@synerise/ds-context-selector": "^0.12.1",
     "@synerise/ds-core": "^0.34.0",
     "@synerise/ds-cruds": "^0.3.9",
-    "@synerise/ds-factors": "^0.13.2",
+    "@synerise/ds-factors": "^0.14.0",
     "@synerise/ds-icon": "^0.49.0",
     "@synerise/ds-inline-edit": "^0.6.12",
     "@synerise/ds-operators": "^0.9.0",
@@ -49,5 +49,5 @@
     "@synerise/ds-core": "*",
     "react": ">=16.9.0 < 17.0.0"
   },
-  "gitHead": "25e5737ebe9d4319de963b369bc281651872887c"
+  "gitHead": "db2ce8aa0a0fd56511ded2f0e21c597fffd3d158"
 }