@gravity-ui/dynamic-forms 4.0.0 → 4.0.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/build/cjs/lib/core/components/Form/Controller/Controller.js +2 -2
- package/build/cjs/lib/core/components/Form/Controller/utils.js +45 -34
- package/build/cjs/lib/core/components/Form/DynamicField.js +6 -4
- package/build/cjs/lib/core/components/Form/hooks/useCreateContext.js +2 -2
- package/build/cjs/lib/core/components/Form/hooks/useCreateSearchContext.js +2 -2
- package/build/cjs/lib/core/components/Form/hooks/useIntegrationFF.js +6 -4
- package/build/cjs/lib/core/components/Form/hooks/useMutators.js +11 -7
- package/build/cjs/lib/core/components/Form/hooks/useSearchStore.js +4 -3
- package/build/cjs/lib/core/components/Form/hooks/useStore.js +15 -11
- package/build/cjs/lib/core/components/Form/utils/common.js +14 -11
- package/build/cjs/lib/core/components/View/helpers.js +5 -5
- package/build/cjs/lib/core/components/View/hooks/useComponents.js +2 -2
- package/build/cjs/lib/core/components/View/hooks/useCreateContext.js +2 -2
- package/build/cjs/lib/core/components/View/hooks/useRender.js +4 -3
- package/build/cjs/lib/core/helpers.js +5 -4
- package/build/cjs/lib/kit/components/AccordeonCard/AccordeonCard.js +2 -2
- package/build/cjs/lib/kit/components/Card/Card.js +2 -2
- package/build/cjs/lib/kit/components/GenerateRandomValueButton/GenerateRandomValueButton.js +2 -2
- package/build/cjs/lib/kit/components/Inputs/ArrayBase/ArrayBase.js +2 -2
- package/build/cjs/lib/kit/components/Inputs/CardOneOf/CardOneOf.js +2 -2
- package/build/cjs/lib/kit/components/Inputs/MultiOneOf/MultiOneOf.js +4 -3
- package/build/cjs/lib/kit/components/Inputs/ObjectBase/ObjectBase.js +4 -3
- package/build/cjs/lib/kit/components/Inputs/ObjectValueInput/ObjectValueInput.js +4 -3
- package/build/cjs/lib/kit/components/Inputs/OneOf/OneOf.js +2 -2
- package/build/cjs/lib/kit/components/Inputs/Secret/Secret.js +4 -3
- package/build/cjs/lib/kit/components/Inputs/TableArrayInput/TableArrayInput.js +4 -3
- package/build/cjs/lib/kit/components/Inputs/Text/Text.js +2 -2
- package/build/cjs/lib/kit/components/Inputs/TextContent/TextContent.js +2 -2
- package/build/cjs/lib/kit/components/Inputs/TextLink/TextLink.js +4 -3
- package/build/cjs/lib/kit/components/LazyLoader/LazyLoader.js +2 -2
- package/build/cjs/lib/kit/components/ViewLayouts/ViewAccordeon/ViewAccordeon.js +2 -2
- package/build/cjs/lib/kit/components/ViewLayouts/ViewAccordeonCard/ViewAccordeonCard.js +2 -2
- package/build/cjs/lib/kit/components/ViewLayouts/ViewCardAccordeon.js +2 -2
- package/build/cjs/lib/kit/components/Views/ArrayBaseView/ArrayBaseView.js +2 -2
- package/build/cjs/lib/kit/components/Views/BaseView/BaseView.js +2 -2
- package/build/cjs/lib/kit/components/Views/CardOneOfView.js +2 -2
- package/build/cjs/lib/kit/components/Views/MultiOneOfView/MultiOneOfView.js +2 -2
- package/build/cjs/lib/kit/components/Views/ObjectBaseView/ObjectBaseView.js +2 -2
- package/build/cjs/lib/kit/components/Views/ObjectValueInputView/ObjectValueInputView.js +2 -2
- package/build/cjs/lib/kit/components/Views/OneOfView/OneOfView.js +2 -2
- package/build/cjs/lib/kit/components/Views/TextLinkView/TextLinkView.js +2 -2
- package/build/cjs/lib/kit/hooks/useOneOf/useOneOf.js +5 -4
- package/build/cjs/lib/kit/utils/common.js +30 -25
- package/build/cjs/lib/kit/validators/validators.js +9 -7
- package/build/esm/lib/core/components/Form/Controller/Controller.js +2 -2
- package/build/esm/lib/core/components/Form/Controller/utils.js +45 -34
- package/build/esm/lib/core/components/Form/DynamicField.js +6 -4
- package/build/esm/lib/core/components/Form/hooks/useCreateContext.js +2 -2
- package/build/esm/lib/core/components/Form/hooks/useCreateSearchContext.js +2 -2
- package/build/esm/lib/core/components/Form/hooks/useIntegrationFF.js +6 -4
- package/build/esm/lib/core/components/Form/hooks/useMutators.js +11 -7
- package/build/esm/lib/core/components/Form/hooks/useSearchStore.js +4 -3
- package/build/esm/lib/core/components/Form/hooks/useStore.js +15 -11
- package/build/esm/lib/core/components/Form/utils/common.js +14 -11
- package/build/esm/lib/core/components/View/helpers.js +5 -5
- package/build/esm/lib/core/components/View/hooks/useComponents.js +2 -2
- package/build/esm/lib/core/components/View/hooks/useCreateContext.js +2 -2
- package/build/esm/lib/core/components/View/hooks/useRender.js +4 -3
- package/build/esm/lib/core/helpers.js +5 -4
- package/build/esm/lib/kit/components/AccordeonCard/AccordeonCard.js +2 -2
- package/build/esm/lib/kit/components/Card/Card.js +2 -2
- package/build/esm/lib/kit/components/GenerateRandomValueButton/GenerateRandomValueButton.js +2 -2
- package/build/esm/lib/kit/components/Inputs/ArrayBase/ArrayBase.js +2 -2
- package/build/esm/lib/kit/components/Inputs/CardOneOf/CardOneOf.js +2 -2
- package/build/esm/lib/kit/components/Inputs/MultiOneOf/MultiOneOf.js +4 -3
- package/build/esm/lib/kit/components/Inputs/ObjectBase/ObjectBase.js +4 -3
- package/build/esm/lib/kit/components/Inputs/ObjectValueInput/ObjectValueInput.js +4 -3
- package/build/esm/lib/kit/components/Inputs/OneOf/OneOf.js +2 -2
- package/build/esm/lib/kit/components/Inputs/Secret/Secret.js +4 -3
- package/build/esm/lib/kit/components/Inputs/TableArrayInput/TableArrayInput.js +4 -3
- package/build/esm/lib/kit/components/Inputs/Text/Text.js +2 -2
- package/build/esm/lib/kit/components/Inputs/TextContent/TextContent.js +2 -2
- package/build/esm/lib/kit/components/Inputs/TextLink/TextLink.js +4 -3
- package/build/esm/lib/kit/components/LazyLoader/LazyLoader.js +2 -2
- package/build/esm/lib/kit/components/ViewLayouts/ViewAccordeon/ViewAccordeon.js +2 -2
- package/build/esm/lib/kit/components/ViewLayouts/ViewAccordeonCard/ViewAccordeonCard.js +2 -2
- package/build/esm/lib/kit/components/ViewLayouts/ViewCardAccordeon.js +2 -2
- package/build/esm/lib/kit/components/Views/ArrayBaseView/ArrayBaseView.js +2 -2
- package/build/esm/lib/kit/components/Views/BaseView/BaseView.js +2 -2
- package/build/esm/lib/kit/components/Views/CardOneOfView.js +2 -2
- package/build/esm/lib/kit/components/Views/MultiOneOfView/MultiOneOfView.js +2 -2
- package/build/esm/lib/kit/components/Views/ObjectBaseView/ObjectBaseView.js +2 -2
- package/build/esm/lib/kit/components/Views/ObjectValueInputView/ObjectValueInputView.js +2 -2
- package/build/esm/lib/kit/components/Views/OneOfView/OneOfView.js +2 -2
- package/build/esm/lib/kit/components/Views/TextLinkView/TextLinkView.js +2 -2
- package/build/esm/lib/kit/hooks/useOneOf/useOneOf.js +5 -4
- package/build/esm/lib/kit/utils/common.js +30 -25
- package/build/esm/lib/kit/validators/validators.js +9 -7
- package/package.json +1 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { RadioButton, Select } from '@gravity-ui/uikit';
|
|
3
|
-
import
|
|
3
|
+
import isObjectLike from 'lodash/isObjectLike';
|
|
4
|
+
import some from 'lodash/some';
|
|
4
5
|
import { TogglerCard } from '../../components';
|
|
5
6
|
import { block } from '../../utils';
|
|
6
7
|
import './useOneOf.css';
|
|
@@ -9,10 +10,10 @@ const MAX_TAB_TITLE_LENGTH = 20;
|
|
|
9
10
|
export const useOneOf = ({ props, onTogglerChange }) => {
|
|
10
11
|
var _a;
|
|
11
12
|
const { name, input, spec, Layout } = props;
|
|
12
|
-
const specProperties = React.useMemo(() => (
|
|
13
|
+
const specProperties = React.useMemo(() => (isObjectLike(spec.properties) ? spec.properties : {}), [spec.properties]);
|
|
13
14
|
const [oneOfValue, setOneOfValue] = React.useState(() => {
|
|
14
15
|
let valueKeys;
|
|
15
|
-
if (
|
|
16
|
+
if (isObjectLike(input.value)) {
|
|
16
17
|
const keys = Object.keys(input.value);
|
|
17
18
|
if (keys.length) {
|
|
18
19
|
valueKeys = keys;
|
|
@@ -47,7 +48,7 @@ export const useOneOf = ({ props, onTogglerChange }) => {
|
|
|
47
48
|
if (((_b = spec.viewSpec.oneOfParams) === null || _b === void 0 ? void 0 : _b.toggler) !== 'radio' &&
|
|
48
49
|
(((_c = spec.viewSpec.oneOfParams) === null || _c === void 0 ? void 0 : _c.toggler) === 'select' ||
|
|
49
50
|
options.length > 3 ||
|
|
50
|
-
|
|
51
|
+
some(options, ({ title }) => title.length > MAX_TAB_TITLE_LENGTH))) {
|
|
51
52
|
return 'select';
|
|
52
53
|
}
|
|
53
54
|
return 'radio';
|
|
@@ -1,13 +1,18 @@
|
|
|
1
|
-
import
|
|
1
|
+
import cloneDeep from 'lodash/cloneDeep';
|
|
2
|
+
import isArray from 'lodash/isArray';
|
|
3
|
+
import isNil from 'lodash/isNil';
|
|
4
|
+
import isObject from 'lodash/isObject';
|
|
5
|
+
import isObjectLike from 'lodash/isObjectLike';
|
|
6
|
+
import isString from 'lodash/isString';
|
|
2
7
|
import { SpecTypes, isArraySpec, isObjectSpec, isStringSpec, } from '../../core';
|
|
3
8
|
import { isFloat } from '../validators/helpers';
|
|
4
9
|
import { divide } from './bigIntMath';
|
|
5
10
|
export const isNotEmptyValue = (value, spec) => {
|
|
6
11
|
var _a;
|
|
7
|
-
if (
|
|
12
|
+
if (isNil(value)) {
|
|
8
13
|
return false;
|
|
9
14
|
}
|
|
10
|
-
if (
|
|
15
|
+
if (isString(value)) {
|
|
11
16
|
if (!value) {
|
|
12
17
|
return false;
|
|
13
18
|
}
|
|
@@ -15,7 +20,7 @@ export const isNotEmptyValue = (value, spec) => {
|
|
|
15
20
|
return false;
|
|
16
21
|
}
|
|
17
22
|
}
|
|
18
|
-
if (
|
|
23
|
+
if (isObject(value) && isObjectSpec(spec)) {
|
|
19
24
|
const keys = Object.keys(value);
|
|
20
25
|
// the only case when an empty object is considered a non-empty value is when it is a stub for oneof
|
|
21
26
|
if (!keys.filter((key) => { var _a; return isNotEmptyValue(value[key], (_a = spec.properties) === null || _a === void 0 ? void 0 : _a[key]); }).length &&
|
|
@@ -23,7 +28,7 @@ export const isNotEmptyValue = (value, spec) => {
|
|
|
23
28
|
return false;
|
|
24
29
|
}
|
|
25
30
|
}
|
|
26
|
-
if (
|
|
31
|
+
if (isArray(value) &&
|
|
27
32
|
isArraySpec(spec) &&
|
|
28
33
|
!value.filter((item) => isNotEmptyValue(item, spec.items)).length) {
|
|
29
34
|
return false;
|
|
@@ -32,12 +37,12 @@ export const isNotEmptyValue = (value, spec) => {
|
|
|
32
37
|
};
|
|
33
38
|
export const prepareSpec = (spec, parseJsonDefaultValue) => {
|
|
34
39
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
35
|
-
if (
|
|
36
|
-
const result =
|
|
37
|
-
if (
|
|
40
|
+
if (isObjectLike(spec)) {
|
|
41
|
+
const result = cloneDeep(spec);
|
|
42
|
+
if (isString(result.type)) {
|
|
38
43
|
result.type = result.type.toLowerCase();
|
|
39
44
|
}
|
|
40
|
-
if (!
|
|
45
|
+
if (!isNil(result.defaultValue)) {
|
|
41
46
|
let _defaultValue = result.defaultValue;
|
|
42
47
|
if (parseJsonDefaultValue) {
|
|
43
48
|
try {
|
|
@@ -48,33 +53,33 @@ export const prepareSpec = (spec, parseJsonDefaultValue) => {
|
|
|
48
53
|
}
|
|
49
54
|
}
|
|
50
55
|
if (typeof _defaultValue === result.type ||
|
|
51
|
-
(
|
|
56
|
+
(isArray(_defaultValue) && result.type === SpecTypes.Array)) {
|
|
52
57
|
result.defaultValue = _defaultValue;
|
|
53
58
|
}
|
|
54
59
|
else {
|
|
55
60
|
result.defaultValue = undefined;
|
|
56
61
|
}
|
|
57
62
|
}
|
|
58
|
-
if (
|
|
63
|
+
if (isString((_a = result.viewSpec) === null || _a === void 0 ? void 0 : _a.type)) {
|
|
59
64
|
result.viewSpec.type = result.viewSpec.type.toLowerCase();
|
|
60
65
|
}
|
|
61
|
-
if (
|
|
66
|
+
if (isString((_b = result.viewSpec) === null || _b === void 0 ? void 0 : _b.layout)) {
|
|
62
67
|
result.viewSpec.layout = result.viewSpec.layout.toLowerCase();
|
|
63
68
|
}
|
|
64
|
-
if (
|
|
69
|
+
if (isString((_c = result.viewSpec) === null || _c === void 0 ? void 0 : _c.addButtonPosition)) {
|
|
65
70
|
result.viewSpec.addButtonPosition = result.viewSpec.addButtonPosition.toLowerCase();
|
|
66
71
|
}
|
|
67
|
-
if (
|
|
72
|
+
if (isString((_d = result.viewSpec) === null || _d === void 0 ? void 0 : _d.themeLabel)) {
|
|
68
73
|
result.viewSpec.textContentParams = Object.assign(Object.assign({}, result.viewSpec.textContentParams), { themeLabel: result.viewSpec.themeLabel.toLowerCase() });
|
|
69
74
|
}
|
|
70
|
-
if (
|
|
75
|
+
if (isString((_f = (_e = result.viewSpec) === null || _e === void 0 ? void 0 : _e.oneOfParams) === null || _f === void 0 ? void 0 : _f.toggler)) {
|
|
71
76
|
result.viewSpec.oneOfParams.toggler = result.viewSpec.oneOfParams.toggler.toLowerCase();
|
|
72
77
|
}
|
|
73
|
-
if (
|
|
78
|
+
if (isString((_h = (_g = result.viewSpec) === null || _g === void 0 ? void 0 : _g.textContentParams) === null || _h === void 0 ? void 0 : _h.themeLabel)) {
|
|
74
79
|
result.viewSpec.textContentParams.themeLabel =
|
|
75
80
|
result.viewSpec.textContentParams.themeLabel.toLowerCase();
|
|
76
81
|
}
|
|
77
|
-
if (
|
|
82
|
+
if (isString(result.validator)) {
|
|
78
83
|
result.validator = result.validator.toLowerCase();
|
|
79
84
|
}
|
|
80
85
|
if (result.maxLength === '0' &&
|
|
@@ -83,10 +88,10 @@ export const prepareSpec = (spec, parseJsonDefaultValue) => {
|
|
|
83
88
|
result.minLength = undefined;
|
|
84
89
|
}
|
|
85
90
|
else {
|
|
86
|
-
if (!
|
|
91
|
+
if (!isNil(result.maxLength) && isFloat(`${result.maxLength}`)) {
|
|
87
92
|
result.maxLength = BigInt(result.maxLength);
|
|
88
93
|
}
|
|
89
|
-
if (!
|
|
94
|
+
if (!isNil(result.minLength) && isFloat(`${result.minLength}`)) {
|
|
90
95
|
result.minLength = BigInt(result.minLength);
|
|
91
96
|
}
|
|
92
97
|
}
|
|
@@ -98,17 +103,17 @@ export const prepareSpec = (spec, parseJsonDefaultValue) => {
|
|
|
98
103
|
result.minimum = undefined;
|
|
99
104
|
}
|
|
100
105
|
else {
|
|
101
|
-
if (!
|
|
106
|
+
if (!isNil(result.maximum) && isFloat(`${result.maximum}`)) {
|
|
102
107
|
result.maximum = Number(result.maximum);
|
|
103
108
|
}
|
|
104
|
-
if (!
|
|
109
|
+
if (!isNil(result.minimum) && isFloat(`${result.minimum}`)) {
|
|
105
110
|
result.minimum = Number(result.minimum);
|
|
106
111
|
}
|
|
107
112
|
}
|
|
108
|
-
if (
|
|
113
|
+
if (isString(result.format)) {
|
|
109
114
|
result.format = result.format.toLowerCase();
|
|
110
115
|
}
|
|
111
|
-
if (
|
|
116
|
+
if (isObjectLike(result.properties)) {
|
|
112
117
|
Object.keys(result.properties).forEach((key) => {
|
|
113
118
|
result.properties[key] = prepareSpec(result.properties[key], parseJsonDefaultValue);
|
|
114
119
|
});
|
|
@@ -120,8 +125,8 @@ export const prepareSpec = (spec, parseJsonDefaultValue) => {
|
|
|
120
125
|
export const isCorrectSizeParams = (spec) => {
|
|
121
126
|
const { sizeParams } = spec.viewSpec;
|
|
122
127
|
if (!sizeParams ||
|
|
123
|
-
!
|
|
124
|
-
!
|
|
128
|
+
!isString(sizeParams.defaultType) ||
|
|
129
|
+
!isObject(sizeParams.scale) ||
|
|
125
130
|
!sizeParams.scale[sizeParams.defaultType] ||
|
|
126
131
|
Object.values(sizeParams.scale).some(({ factor }) => !divide(factor, factor))) {
|
|
127
132
|
return false;
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import
|
|
1
|
+
import isArray from 'lodash/isArray';
|
|
2
|
+
import isNumber from 'lodash/isNumber';
|
|
3
|
+
import isString from 'lodash/isString';
|
|
2
4
|
import { ErrorMessages } from '../validators';
|
|
3
5
|
import { isFloat, isInt } from './helpers';
|
|
4
6
|
export const getArrayValidator = (params = {}) => {
|
|
@@ -6,7 +8,7 @@ export const getArrayValidator = (params = {}) => {
|
|
|
6
8
|
return (spec, value) => {
|
|
7
9
|
const errorMessages = Object.assign(Object.assign({}, ErrorMessages), customErrorMessages);
|
|
8
10
|
const valueLength = (value === null || value === void 0 ? void 0 : value.length) || 0;
|
|
9
|
-
if (!ignoreRequiredCheck && spec.required && !
|
|
11
|
+
if (!ignoreRequiredCheck && spec.required && !isArray(value)) {
|
|
10
12
|
return errorMessages.REQUIRED;
|
|
11
13
|
}
|
|
12
14
|
if (!ignoreMaxLengthCheck &&
|
|
@@ -63,18 +65,18 @@ export const getNumberValidator = (params = {}) => {
|
|
|
63
65
|
}
|
|
64
66
|
}
|
|
65
67
|
if (!ignoreMaximumCheck &&
|
|
66
|
-
|
|
68
|
+
isNumber(spec.maximum) &&
|
|
67
69
|
stringValue.length &&
|
|
68
70
|
Number(stringValue) > spec.maximum) {
|
|
69
71
|
return errorMessages.maxNumber(spec.maximum);
|
|
70
72
|
}
|
|
71
73
|
if (!ignoreMinimumCheck &&
|
|
72
|
-
|
|
74
|
+
isNumber(spec.minimum) &&
|
|
73
75
|
stringValue.length &&
|
|
74
76
|
spec.minimum > Number(stringValue)) {
|
|
75
77
|
return errorMessages.minNumber(spec.minimum);
|
|
76
78
|
}
|
|
77
|
-
if (
|
|
79
|
+
if (isString(spec.format) && stringValue.length) {
|
|
78
80
|
if (!ignoreIntCheck && spec.format === 'int64' && !isInt(stringValue)) {
|
|
79
81
|
return errorMessages.INT;
|
|
80
82
|
}
|
|
@@ -119,10 +121,10 @@ export const getStringValidator = (params = {}) => {
|
|
|
119
121
|
valueLength < spec.minLength) {
|
|
120
122
|
return errorMessages.minLength(spec.minLength);
|
|
121
123
|
}
|
|
122
|
-
if (
|
|
124
|
+
if (isString(spec.pattern) && spec.pattern.length) {
|
|
123
125
|
const regex = new RegExp(spec.pattern);
|
|
124
126
|
if (!ignoreRegExpCheck && !regex.test(value)) {
|
|
125
|
-
return
|
|
127
|
+
return isString(spec.patternError) && spec.patternError.length
|
|
126
128
|
? spec.patternError
|
|
127
129
|
: errorMessages.INVALID;
|
|
128
130
|
}
|