@wallarm-org/design-system 0.57.0 → 0.57.1-rc-feature-AS-1085.2
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 +23 -3
- package/dist/components/FilterInput/index.d.ts +1 -1
- package/dist/components/FilterInput/index.js +2 -2
- package/dist/components/FilterInput/lib/validation.d.ts +11 -1
- package/dist/components/FilterInput/lib/validation.js +32 -2
- package/dist/metadata/components.json +2 -2
- package/package.json +1 -1
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, 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.getSuggestions && !field.validate) 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 };
|
|
@@ -1,4 +1,14 @@
|
|
|
1
|
-
import type { Condition, FieldMetadata, FieldValueOption } from '../types';
|
|
1
|
+
import type { Condition, FieldMetadata, FieldType, FieldValueOption } from '../types';
|
|
2
|
+
/**
|
|
3
|
+
* Whether a value conforms to a field's data type. Used for freeform fields
|
|
4
|
+
* (no allowlist, no validator) so a value left over from a previous field — e.g.
|
|
5
|
+
* a string carried into an `integer` field after a field change — is caught.
|
|
6
|
+
*
|
|
7
|
+
* `string`, `date` and `enum` are not type-checked here: any string is a valid
|
|
8
|
+
* string; date values include relative presets and ISO forms that are unsafe to
|
|
9
|
+
* validate generically; enum validity comes from its allowlist.
|
|
10
|
+
*/
|
|
11
|
+
export declare const isValueOfType: (value: string | number | boolean, type: FieldType) => boolean;
|
|
2
12
|
/** Find a field value option matching by label or value (case-insensitive) */
|
|
3
13
|
export declare const findMatchingFieldValue: (fieldValues: FieldValueOption[], text: string) => FieldValueOption | undefined;
|
|
4
14
|
/** Check if a single value matches any option in the field's values list */
|
|
@@ -1,4 +1,28 @@
|
|
|
1
1
|
import { getFieldValues, hasStaticAllowlist } from "./fields.js";
|
|
2
|
+
const isValueOfType = (value, type)=>{
|
|
3
|
+
switch(type){
|
|
4
|
+
case 'integer':
|
|
5
|
+
{
|
|
6
|
+
if ('number' == typeof value) return Number.isInteger(value);
|
|
7
|
+
const s = String(value).trim();
|
|
8
|
+
return '' !== s && /^-?\d+$/.test(s);
|
|
9
|
+
}
|
|
10
|
+
case 'float':
|
|
11
|
+
{
|
|
12
|
+
if ('number' == typeof value) return Number.isFinite(value);
|
|
13
|
+
const s = String(value).trim();
|
|
14
|
+
return '' !== s && Number.isFinite(Number(s));
|
|
15
|
+
}
|
|
16
|
+
case 'boolean':
|
|
17
|
+
{
|
|
18
|
+
if ('boolean' == typeof value) return true;
|
|
19
|
+
const s = String(value).trim().toLowerCase();
|
|
20
|
+
return 'true' === s || 'false' === s;
|
|
21
|
+
}
|
|
22
|
+
default:
|
|
23
|
+
return true;
|
|
24
|
+
}
|
|
25
|
+
};
|
|
2
26
|
const findMatchingFieldValue = (fieldValues, text)=>fieldValues.find((v)=>v.label.toLowerCase() === text.toLowerCase() || String(v.value).toLowerCase() === text.toLowerCase());
|
|
3
27
|
const isValidFieldValue = (fieldValues, v)=>fieldValues.some((opt)=>opt.value === v || String(opt.value).toLowerCase() === String(v).toLowerCase());
|
|
4
28
|
const getInvalidValueIndices = (field, values)=>{
|
|
@@ -6,7 +30,13 @@ const getInvalidValueIndices = (field, values)=>{
|
|
|
6
30
|
if (field.validate(v)) acc.push(idx);
|
|
7
31
|
return acc;
|
|
8
32
|
}, []);
|
|
9
|
-
if (!hasStaticAllowlist(field))
|
|
33
|
+
if (!hasStaticAllowlist(field)) {
|
|
34
|
+
if (field.getSuggestions) return [];
|
|
35
|
+
return values.reduce((acc, v, idx)=>{
|
|
36
|
+
if (null != v && !isValueOfType(v, field.type)) acc.push(idx);
|
|
37
|
+
return acc;
|
|
38
|
+
}, []);
|
|
39
|
+
}
|
|
10
40
|
const fv = getFieldValues(field);
|
|
11
41
|
if (0 === fv.length) return [];
|
|
12
42
|
return values.reduce((acc, v, idx)=>{
|
|
@@ -21,4 +51,4 @@ const validateValueForField = (field, value)=>{
|
|
|
21
51
|
];
|
|
22
52
|
return getInvalidValueIndices(field, values).length > 0;
|
|
23
53
|
};
|
|
24
|
-
export { findMatchingFieldValue, getInvalidValueIndices, isValidFieldValue, validateValueForField };
|
|
54
|
+
export { findMatchingFieldValue, getInvalidValueIndices, isValidFieldValue, isValueOfType, validateValueForField };
|
package/package.json
CHANGED