@synerise/ds-condition 0.17.2 → 0.17.5

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.17.5](https://github.com/Synerise/synerise-design/compare/@synerise/ds-condition@0.17.4...@synerise/ds-condition@0.17.5) (2022-06-10)
+
+**Note:** Version bump only for package @synerise/ds-condition
+
+
+
+
+
+## [0.17.4](https://github.com/Synerise/synerise-design/compare/@synerise/ds-condition@0.17.3...@synerise/ds-condition@0.17.4) (2022-06-03)
+
+
+### Bug Fixes
+
+* **condition:** validation value ([3e202bc](https://github.com/Synerise/synerise-design/commit/3e202bcbadd18cafc7463dcbe96a6bb9ca2542f3))
+
+
+
+
+
+## [0.17.3](https://github.com/Synerise/synerise-design/compare/@synerise/ds-condition@0.17.2...@synerise/ds-condition@0.17.3) (2022-05-31)
+
+
+### Bug Fixes
+
+* **condition:** fixes testPrev value for empty conditions array ([35a266a](https://github.com/Synerise/synerise-design/commit/35a266a44ea97556fa0d57090dd16d7f0af1da2e))
+
+
+
+
+
 ## [0.17.2](https://github.com/Synerise/synerise-design/compare/@synerise/ds-condition@0.17.1...@synerise/ds-condition@0.17.2) (2022-05-30)
 
 **Note:** Version bump only for package @synerise/ds-condition

package/dist/Condition.js

@@ -86,10 +86,6 @@ 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) {
@@ -216,32 +212,13 @@ 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;
-
-      if (addCondition && lastCondition != null && lastCondition.factor.value || (lastStep == null ? void 0 : lastStep.conditions.length) === 0) {
-        newConditionId = addCondition(stepId);
-      }
-
-      testPrevValueElement();
+      var newConditionId = addCondition ? addCondition(stepId) : undefined;
 
       if (newConditionId) {
         setCurrentConditionId(newConditionId);
@@ -249,7 +226,7 @@ var Condition = function Condition(props) {
         setCurrentField(PARAMETER);
       }
     };
-  }, [addCondition, steps, testPrevValueElement, returnLast]);
+  }, [addCondition]);
   var handleClearActiveCondition = React.useCallback(function () {
     setCurrentConditionId(DEFAULT_CONDITION);
     setCurrentStepId(DEFAULT_STEP);
@@ -292,8 +269,7 @@ var Condition = function Condition(props) {
         setCurrentStep: setCurrentStepId,
         onDeactivate: handleClearActiveCondition,
         showSuffix: showSuffix,
-        hoverDisabled: hoverDisabled || currentStepId !== step.id && currentStepId !== undefined,
-        errorId: errorId
+        hoverDisabled: hoverDisabled || currentStepId !== step.id && currentStepId !== undefined
       });
     })), addStep && /*#__PURE__*/React.createElement(S.AddStepButton, null, /*#__PURE__*/React.createElement(Button, {
       type: "ghost",
@@ -302,7 +278,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, errorId]);
+  }, [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]);
 };
 
 export default Condition;

package/dist/ConditionStep/ConditionStep.js

@@ -48,8 +48,7 @@ export var ConditionStep = function ConditionStep(_ref) {
       setCurrentStep = _ref.setCurrentStep,
       onDeactivate = _ref.onDeactivate,
       showSuffix = _ref.showSuffix,
-      hoverDisabled = _ref.hoverDisabled,
-      errorId = _ref.errorId;
+      hoverDisabled = _ref.hoverDisabled;
 
   var _useIntl = useIntl(),
       formatMessage = _useIntl.formatMessage;
@@ -168,10 +167,9 @@ export var ConditionStep = function ConditionStep(_ref) {
       setStepConditionFactorValue: setStepConditionFactorValue,
       texts: text,
       stepType: (_step$context2 = step.context) == null ? void 0 : _step$context2.type,
-      onDeactivate: onDeactivate,
-      error: errorId === condition.id && !condition.factor.value && true
+      onDeactivate: onDeactivate
     });
-  }, [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]);
+  }, [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]);
   return /*#__PURE__*/React.createElement(S.Step, {
     key: step.id,
     id: "condition-step-" + step.id,

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

@@ -7,7 +7,6 @@ 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.17.2",
+  "version": "0.17.5",
   "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.14.1",
+    "@synerise/ds-factors": "^0.14.3",
     "@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": "af0851f21909db427794060c4550a60ddd3f4bbd"
+  "gitHead": "116cf109200639a805ef51ce8301e47dc7a8b168"
 }