@synerise/ds-condition 0.20.50 → 0.20.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,22 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [0.20.52](https://github.com/Synerise/synerise-design/compare/@synerise/ds-condition@0.20.51...@synerise/ds-condition@0.20.52) (2023-09-21)
7
+
8
+ **Note:** Version bump only for package @synerise/ds-condition
9
+
10
+
11
+
12
+
13
+
14
+ ## [0.20.51](https://github.com/Synerise/synerise-design/compare/@synerise/ds-condition@0.20.50...@synerise/ds-condition@0.20.51) (2023-09-19)
15
+
16
+ **Note:** Version bump only for package @synerise/ds-condition
17
+
18
+
19
+
20
+
21
+
6
22
  ## [0.20.50](https://github.com/Synerise/synerise-design/compare/@synerise/ds-condition@0.20.49...@synerise/ds-condition@0.20.50) (2023-09-18)
7
23
 
8
24
  **Note:** Version bump only for package @synerise/ds-condition
@@ -39,19 +39,22 @@ export var ConditionRow = function ConditionRow(_ref) {
39
39
  readOnly = _ref$readOnly === void 0 ? false : _ref$readOnly;
40
40
  var conditionFactorErrorText = conditionFactor == null ? void 0 : conditionFactor.errorText;
41
41
  var conditionParameterErrorText = conditionParameter == null ? void 0 : conditionParameter.errorText;
42
+ var conditionOperatorErrorText = conditionOperator == null ? void 0 : conditionOperator.errorText;
42
43
  var conditionParameterValue = conditionParameter == null ? void 0 : conditionParameter.value;
43
- var rowHasError = !!(conditionParameterErrorText || conditionFactorErrorText && conditionParameterValue);
44
+ var rowHasError = !!(conditionParameterErrorText || conditionOperatorErrorText && conditionParameterValue || conditionFactorErrorText && conditionParameterValue);
44
45
  var conditionErrorMessage = React.useMemo(function () {
45
46
  var errorText;
46
47
 
47
48
  if (conditionParameterErrorText) {
48
49
  errorText = conditionParameterErrorText;
50
+ } else if (conditionOperatorErrorText && conditionParameterValue) {
51
+ errorText = conditionOperatorErrorText;
49
52
  } else if (conditionFactorErrorText && conditionParameterValue) {
50
53
  errorText = conditionFactorErrorText;
51
54
  }
52
55
 
53
56
  return errorText ? /*#__PURE__*/React.createElement(S.ErrorWrapper, null, errorText) : /*#__PURE__*/React.createElement(React.Fragment, null);
54
- }, [conditionFactorErrorText, conditionParameterErrorText, conditionParameterValue]);
57
+ }, [conditionOperatorErrorText, conditionFactorErrorText, conditionParameterErrorText, conditionParameterValue]);
55
58
  return /*#__PURE__*/React.createElement(S.ConditionRow, {
56
59
  stepType: stepType,
57
60
  style: hasPriority ? {
@@ -87,7 +90,8 @@ export var ConditionRow = function ConditionRow(_ref) {
87
90
  return selectOperator(stepId, conditionId, value);
88
91
  },
89
92
  opened: hasPriority && stepId === currentStepId && conditionId === currentConditionId && currentField === OPERATOR,
90
- readOnly: readOnly
93
+ readOnly: readOnly,
94
+ errorText: conditionOperator.errorText
91
95
  }))), conditionFactor !== undefined && (conditionOperator == null ? void 0 : conditionOperator.value) && (conditionFactor == null ? void 0 : conditionFactor.availableFactorTypes) !== null && /*#__PURE__*/React.createElement(S.ConditionWrapper, {
92
96
  fullWidth: true
93
97
  }, (conditionFactor == null ? void 0 : conditionFactor.withCustomFactor) || /*#__PURE__*/React.createElement(Factors, _extends({}, conditionFactor, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@synerise/ds-condition",
3
- "version": "0.20.50",
3
+ "version": "0.20.52",
4
4
  "description": "Condition UI Component for the Synerise Design System",
5
5
  "license": "ISC",
6
6
  "repository": "Synerise/synerise-design",
@@ -33,14 +33,14 @@
33
33
  "types": "dist/index.d.ts",
34
34
  "dependencies": {
35
35
  "@synerise/ds-button": "^0.18.1",
36
- "@synerise/ds-context-selector": "^0.19.7",
36
+ "@synerise/ds-context-selector": "^0.19.9",
37
37
  "@synerise/ds-core": "^0.40.1",
38
38
  "@synerise/ds-cruds": "^0.3.33",
39
- "@synerise/ds-factors": "^0.20.0",
39
+ "@synerise/ds-factors": "^0.20.2",
40
40
  "@synerise/ds-icon": "^0.58.1",
41
- "@synerise/ds-inline-edit": "^0.6.77",
42
- "@synerise/ds-operators": "^0.10.36",
43
- "@synerise/ds-subject": "^0.9.64",
41
+ "@synerise/ds-inline-edit": "^0.6.79",
42
+ "@synerise/ds-operators": "^0.10.38",
43
+ "@synerise/ds-subject": "^0.9.66",
44
44
  "@synerise/ds-tooltip": "^0.14.3",
45
45
  "@synerise/ds-utils": "^0.24.15",
46
46
  "lodash": "^4.17.19",
@@ -57,5 +57,5 @@
57
57
  "@testing-library/react": "10.0.1",
58
58
  "uuid": "^8.3.2"
59
59
  },
60
- "gitHead": "ef59143e0ab93cee5b9a738fa1fa9c60748ddffc"
60
+ "gitHead": "7df57233258ec34b90c3c92dbe1696788abd6ec6"
61
61
  }