@wallarm-org/design-system 0.57.0 → 0.57.1-rc-feature-AS-1085.1
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/dist/components/FilterInput/hooks/useFilterInputExpression/useFilterInputExpression.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { useCallback, useEffect, useMemo, useState } from "react";
|
|
2
|
-
import {
|
|
2
|
+
import { SEGMENT_VARIANT } from "../../FilterInputField/FilterInputChip/index.js";
|
|
3
|
+
import { CONNECTOR_ID_PATTERN, chipIdToConditionIndex, hasStaticAllowlist, validateValueForField } from "../../lib/index.js";
|
|
3
4
|
import { buildChips } from "./buildChips.js";
|
|
4
5
|
import { buildExpression, expressionToConditions } from "./expression.js";
|
|
5
6
|
const EMPTY_STATE = {
|
|
@@ -7,6 +8,24 @@ const EMPTY_STATE = {
|
|
|
7
8
|
connectors: []
|
|
8
9
|
};
|
|
9
10
|
const DEFAULT_CONNECTOR = 'and';
|
|
11
|
+
const revalidateConditions = (conditions, fields)=>conditions.map((condition)=>{
|
|
12
|
+
if (condition.disabled) return condition;
|
|
13
|
+
const field = fields.find((f)=>f.name === condition.field);
|
|
14
|
+
if (!field || condition.error === SEGMENT_VARIANT.attribute) return condition;
|
|
15
|
+
if (!field.validate && !hasStaticAllowlist(field)) return condition;
|
|
16
|
+
if (validateValueForField(field, condition.value)) return condition.error === SEGMENT_VARIANT.value ? condition : {
|
|
17
|
+
...condition,
|
|
18
|
+
error: SEGMENT_VARIANT.value
|
|
19
|
+
};
|
|
20
|
+
if (condition.error === SEGMENT_VARIANT.value) {
|
|
21
|
+
const next = {
|
|
22
|
+
...condition
|
|
23
|
+
};
|
|
24
|
+
delete next.error;
|
|
25
|
+
return next;
|
|
26
|
+
}
|
|
27
|
+
return condition;
|
|
28
|
+
});
|
|
10
29
|
const removeConnectorAtConditionIndex = (connectors, idx)=>{
|
|
11
30
|
const updated = [
|
|
12
31
|
...connectors
|
|
@@ -78,12 +97,13 @@ const useFilterInputExpression = ({ fields, value, onChange, error })=>{
|
|
|
78
97
|
if (void 0 !== value) {
|
|
79
98
|
const result = expressionToConditions(value);
|
|
80
99
|
setState({
|
|
81
|
-
conditions: result.conditions,
|
|
100
|
+
conditions: revalidateConditions(result.conditions, fields),
|
|
82
101
|
connectors: result.connectors
|
|
83
102
|
});
|
|
84
103
|
}
|
|
85
104
|
}, [
|
|
86
|
-
value
|
|
105
|
+
value,
|
|
106
|
+
fields
|
|
87
107
|
]);
|
|
88
108
|
const chips = useMemo(()=>buildChips(state.conditions, state.connectors, fields, error), [
|
|
89
109
|
state.conditions,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { FilterInput, type FilterInputProps } from './FilterInput';
|
|
2
2
|
export { FilterInputChip, type FilterInputChipProps } from './FilterInputField';
|
|
3
3
|
export { FilterInputFieldMenu, type FilterInputFieldMenuProps, FilterInputOperatorMenu, type FilterInputOperatorMenuProps, FilterInputValueMenu, type FilterInputValueMenuProps, type ValueOption, } from './FilterInputMenu';
|
|
4
|
-
export { applyFieldValueTransforms, createStatusCodeInputFilter, createStatusCodeNormalizer, createStatusCodeSerializer, createStatusCodeSuggestions, createStatusCodeValidator, type FilterParseError, getKnownFieldSerializer, isFilterParseError, parseExpression, serializeExpression, } from './lib';
|
|
4
|
+
export { applyFieldValueTransforms, createStatusCodeInputFilter, createStatusCodeNormalizer, createStatusCodeSerializer, createStatusCodeSuggestions, createStatusCodeValidator, type FilterParseError, getKnownFieldSerializer, isFilterParseError, parseExpression, serializeExpression, validateValueForField, } from './lib';
|
|
5
5
|
export type { Condition, ExprNode, FieldMetadata, FieldType, FieldValueOption, FilterInputChipData, FilterInputChipVariant, FilterOperator, Group, } from './types';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { FilterInput } from "./FilterInput.js";
|
|
2
2
|
import { FilterInputChip } from "./FilterInputField/index.js";
|
|
3
3
|
import { FilterInputFieldMenu, FilterInputOperatorMenu, FilterInputValueMenu } from "./FilterInputMenu/index.js";
|
|
4
|
-
import { applyFieldValueTransforms, createStatusCodeInputFilter, createStatusCodeNormalizer, createStatusCodeSerializer, createStatusCodeSuggestions, createStatusCodeValidator, getKnownFieldSerializer, isFilterParseError, parseExpression, serializeExpression } from "./lib/index.js";
|
|
5
|
-
export { FilterInput, FilterInputChip, FilterInputFieldMenu, FilterInputOperatorMenu, FilterInputValueMenu, applyFieldValueTransforms, createStatusCodeInputFilter, createStatusCodeNormalizer, createStatusCodeSerializer, createStatusCodeSuggestions, createStatusCodeValidator, getKnownFieldSerializer, isFilterParseError, parseExpression, serializeExpression };
|
|
4
|
+
import { applyFieldValueTransforms, createStatusCodeInputFilter, createStatusCodeNormalizer, createStatusCodeSerializer, createStatusCodeSuggestions, createStatusCodeValidator, getKnownFieldSerializer, isFilterParseError, parseExpression, serializeExpression, validateValueForField } from "./lib/index.js";
|
|
5
|
+
export { FilterInput, FilterInputChip, FilterInputFieldMenu, FilterInputOperatorMenu, FilterInputValueMenu, applyFieldValueTransforms, createStatusCodeInputFilter, createStatusCodeNormalizer, createStatusCodeSerializer, createStatusCodeSuggestions, createStatusCodeValidator, getKnownFieldSerializer, isFilterParseError, parseExpression, serializeExpression, validateValueForField };
|
package/package.json
CHANGED