@truedat/df 8.6.7 → 8.7.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/package.json +4 -4
- package/src/components/DynamicFormViewer.js +3 -3
- package/src/components/DynamicFormWithTranslations.js +4 -4
- package/src/components/FieldGroupDetail.js +1 -1
- package/src/components/FieldGroupWithTranslations.js +1 -1
- package/src/components/SelectDynamicFormWithTranslations.js +14 -15
- package/src/components/SelectableDynamicForm.js +1 -1
- package/src/components/__tests__/DynamicFieldValue.spec.js +2 -2
- package/src/components/__tests__/DynamicFormViewer.spec.js +7 -7
- package/src/components/__tests__/EditableDynamicFieldValue.spec.js +1 -1
- package/src/components/__tests__/FieldViewerValue.spec.js +12 -12
- package/src/components/__tests__/SelectDynamicFormWithTranslations.spec.js +1 -1
- package/src/components/__tests__/SelectableDynamicForm.spec.js +16 -12
- package/src/components/hierarchies/HierarchyView.js +9 -9
- package/src/components/hierarchies/__tests__/HierarchyRoutes.spec.js +1 -1
- package/src/components/widgets/DropdownDataLoader.js +1 -1
- package/src/components/widgets/DynamicField.js +5 -5
- package/src/components/widgets/DynamicTableField.js +129 -125
- package/src/components/widgets/GroupPreview.js +2 -2
- package/src/components/widgets/HierarchyPreview.js +1 -1
- package/src/components/widgets/ImageField.js +2 -3
- package/src/components/widgets/MarkdownField.js +0 -1
- package/src/components/widgets/StandardDropdown.js +5 -5
- package/src/components/widgets/StringField.js +1 -4
- package/src/components/widgets/TableField.js +1 -1
- package/src/components/widgets/UserGroupPreview.js +1 -1
- package/src/components/widgets/__tests__/CheckboxField.spec.js +2 -2
- package/src/components/widgets/__tests__/DropdownField.spec.js +2 -2
- package/src/components/widgets/__tests__/DynamicField.spec.js +11 -3
- package/src/components/widgets/__tests__/DynamicTableField.spec.js +237 -237
- package/src/components/widgets/__tests__/GroupPreview.spec.js +11 -11
- package/src/components/widgets/__tests__/HierarchyDropdown.spec.js +3 -3
- package/src/components/widgets/__tests__/NumberField.spec.js +1 -1
- package/src/components/widgets/__tests__/PairListField.spec.js +3 -3
- package/src/components/widgets/__tests__/StandardDropdown.spec.js +1 -1
- package/src/components/widgets/__tests__/UserGroupPreview.spec.js +14 -10
- package/src/messages/index.js +1 -1
- package/src/reducers/__tests__/dfMessage.spec.js +5 -5
- package/src/reducers/__tests__/selectedDomain.spec.js +2 -2
- package/src/reducers/__tests__/selectedDomains.spec.js +2 -2
- package/src/reducers/dfMessage.js +4 -4
- package/src/selectors/getOptions.js +2 -2
- package/src/selectors/templates.js +2 -2
- package/src/templates/components/Template.js +2 -2
- package/src/templates/components/TemplateFilters.js +1 -1
- package/src/templates/components/TemplateLoader.js +1 -1
- package/src/templates/components/TemplateRoutes.js +1 -1
- package/src/templates/components/Templates.js +1 -6
- package/src/templates/components/TemplatesContext.js +3 -3
- package/src/templates/components/TemplatesTable.js +1 -1
- package/src/templates/components/__tests__/TemplateLoader.spec.js +2 -2
- package/src/templates/components/__tests__/TemplateRoutes.spec.js +1 -1
- package/src/templates/components/__tests__/TemplatesTable.spec.js +1 -1
- package/src/templates/components/templateForm/ActiveGroupForm.js +3 -3
- package/src/templates/components/templateForm/ConditionalFieldForm.js +3 -3
- package/src/templates/components/templateForm/DependentDomain.js +3 -3
- package/src/templates/components/templateForm/FieldDefinition.js +126 -129
- package/src/templates/components/templateForm/HierarchiesList.js +1 -1
- package/src/templates/components/templateForm/MandatoryConditional.js +2 -2
- package/src/templates/components/templateForm/TemplateForm.js +46 -41
- package/src/templates/components/templateForm/ValuesConfiguration.js +69 -56
- package/src/templates/components/templateForm/ValuesField.js +43 -43
- package/src/templates/components/templateForm/__tests__/DefaultValue.spec.js +35 -35
- package/src/templates/components/templateForm/__tests__/DependentDomain.spec.js +1 -1
- package/src/templates/components/templateForm/__tests__/FieldDefinition.spec.js +227 -201
- package/src/templates/components/templateForm/__tests__/FieldForm.spec.js +12 -10
- package/src/templates/components/templateForm/__tests__/MandatoryConditional.spec.js +3 -3
- package/src/templates/components/templateForm/__tests__/SwitchListForm.spec.js +5 -5
- package/src/templates/components/templateForm/__tests__/SwitchSegment.spec.js +8 -8
- package/src/templates/components/templateForm/__tests__/TableValuesForm.spec.js +207 -189
- package/src/templates/components/templateForm/__tests__/TemplateForm.spec.js +42 -13
- package/src/templates/components/templateForm/__tests__/TemplateFormActions.spec.js +1 -1
- package/src/templates/components/templateForm/__tests__/TemplateRelationsForm.spec.js +3 -1
- package/src/templates/components/templateForm/__tests__/ValuesField.spec.js +6 -6
- package/src/templates/components/templateForm/__tests__/ValuesListForm.spec.js +4 -4
- package/src/templates/components/templateForm/__tests__/ValuesSelector.spec.js +3 -3
- package/src/templates/components/templateForm/widgetDefinitions.js +2 -0
- package/src/templates/reducers/__tests__/allTemplates.spec.js +4 -4
- package/src/templates/reducers/__tests__/selectedTemplate.spec.js +2 -2
- package/src/templates/reducers/__tests__/template.spec.js +4 -4
- package/src/templates/reducers/__tests__/templateDeleting.spec.js +2 -2
- package/src/templates/reducers/__tests__/templateLoading.spec.js +2 -2
- package/src/templates/reducers/__tests__/templates.spec.js +3 -3
- package/src/templates/reducers/__tests__/templatesLoading.spec.js +2 -2
- package/src/templates/sagas/__tests__/createTemplate.spec.js +3 -3
- package/src/templates/sagas/__tests__/fetchTemplates.spec.js +1 -1
- package/src/templates/sagas/index.js +2 -2
- package/src/templates/utils/__tests__/applyDefaults.spec.js +4 -4
- package/src/templates/utils/__tests__/filterDomains.spec.js +15 -15
- package/src/templates/utils/__tests__/filterFields.spec.js +2 -2
- package/src/templates/utils/__tests__/filterSwitches.spec.js +5 -5
- package/src/templates/utils/__tests__/filterValues.spec.js +4 -4
- package/src/templates/utils/__tests__/formatLegacyContent.spec.js +7 -7
- package/src/templates/utils/applyTemplate.js +66 -53
- package/src/templates/utils/filterDepends.js +1 -1
- package/src/templates/utils/filterSwitches.js +3 -3
- package/src/templates/utils/filterValues.js +4 -5
- package/src/templates/utils/flattenFields.js +2 -2
- package/src/templates/utils/formatLegacyContent.js +2 -1
- package/src/templates/utils/parseFieldOptions.js +15 -14
- package/src/templates/utils/parseGroups.js +43 -43
- package/src/templates/utils/validateContent.js +4 -4
|
@@ -38,6 +38,7 @@ const buildGroupNameMap = (groups = []) =>
|
|
|
38
38
|
groups.reduce((acc, group) => {
|
|
39
39
|
const canonicalName = groupCanonicalName(group);
|
|
40
40
|
groupNameCandidates(group).forEach((candidate) => {
|
|
41
|
+
// eslint-disable-next-line fp/no-mutation
|
|
41
42
|
acc[candidate] = canonicalName;
|
|
42
43
|
});
|
|
43
44
|
return acc;
|
|
@@ -108,8 +109,8 @@ const doParseFieldOptions = (formatMessage, content, selectedDomain, field) => {
|
|
|
108
109
|
const tableColumns = _.flow(
|
|
109
110
|
_.propOr([], "values.table_columns"),
|
|
110
111
|
_.map((field) =>
|
|
111
|
-
doParseFieldOptions(formatMessage, content, selectedDomain, field)
|
|
112
|
-
)
|
|
112
|
+
doParseFieldOptions(formatMessage, content, selectedDomain, field),
|
|
113
|
+
),
|
|
113
114
|
)(field);
|
|
114
115
|
return {
|
|
115
116
|
...field,
|
|
@@ -119,12 +120,12 @@ const doParseFieldOptions = (formatMessage, content, selectedDomain, field) => {
|
|
|
119
120
|
}
|
|
120
121
|
const translateValues = _.flow(
|
|
121
122
|
makeOptions(formatMessage, field?.label),
|
|
122
|
-
_.sortBy(accentInsensitivePathOrder("text"))
|
|
123
|
+
_.sortBy(accentInsensitivePathOrder("text")),
|
|
123
124
|
);
|
|
124
125
|
const parseSwitch = (values) => {
|
|
125
126
|
const switchOn = _.prop("switch.on")(values);
|
|
126
127
|
const switchedValues = _.prop(`switch.values.${content[switchOn].value}`)(
|
|
127
|
-
values
|
|
128
|
+
values,
|
|
128
129
|
);
|
|
129
130
|
return translateValues(switchedValues);
|
|
130
131
|
};
|
|
@@ -135,7 +136,7 @@ const doParseFieldOptions = (formatMessage, content, selectedDomain, field) => {
|
|
|
135
136
|
[_.isArray, _.identity],
|
|
136
137
|
[_.stubTrue, _.constant([])],
|
|
137
138
|
]),
|
|
138
|
-
translateValues
|
|
139
|
+
translateValues,
|
|
139
140
|
);
|
|
140
141
|
const parseRoleGroups = (values) => {
|
|
141
142
|
const isGroupOnly = field?.type === "group";
|
|
@@ -148,7 +149,7 @@ const doParseFieldOptions = (formatMessage, content, selectedDomain, field) => {
|
|
|
148
149
|
text: groupDisplayName(group),
|
|
149
150
|
icon: "group",
|
|
150
151
|
};
|
|
151
|
-
})
|
|
152
|
+
}),
|
|
152
153
|
)(values);
|
|
153
154
|
if (isGroupOnly) return groups;
|
|
154
155
|
|
|
@@ -158,7 +159,7 @@ const doParseFieldOptions = (formatMessage, content, selectedDomain, field) => {
|
|
|
158
159
|
value: `user:${name}`,
|
|
159
160
|
text: name,
|
|
160
161
|
icon: "user",
|
|
161
|
-
}))
|
|
162
|
+
})),
|
|
162
163
|
)(values);
|
|
163
164
|
|
|
164
165
|
return _.concat(users, groups);
|
|
@@ -178,7 +179,7 @@ const doParseFieldOptions = (formatMessage, content, selectedDomain, field) => {
|
|
|
178
179
|
}) || [];
|
|
179
180
|
return _.uniq(allValues);
|
|
180
181
|
},
|
|
181
|
-
translateValues
|
|
182
|
+
translateValues,
|
|
182
183
|
);
|
|
183
184
|
|
|
184
185
|
const parsedValues = _.flow(
|
|
@@ -190,7 +191,7 @@ const doParseFieldOptions = (formatMessage, content, selectedDomain, field) => {
|
|
|
190
191
|
[_.has("role_users"), parseRoleUsers],
|
|
191
192
|
[_.has("role_groups"), parseRoleGroups],
|
|
192
193
|
[_.has("domain"), parseDomain],
|
|
193
|
-
])
|
|
194
|
+
]),
|
|
194
195
|
)(field);
|
|
195
196
|
const normalizedValue = _.flow(
|
|
196
197
|
_.get("values"),
|
|
@@ -201,8 +202,8 @@ const doParseFieldOptions = (formatMessage, content, selectedDomain, field) => {
|
|
|
201
202
|
normalizeFieldValue(value, (rawValue) =>
|
|
202
203
|
normalizeRoleUsersValue(
|
|
203
204
|
rawValue,
|
|
204
|
-
_.getOr([], "values.processed_users")(field)
|
|
205
|
-
)
|
|
205
|
+
_.getOr([], "values.processed_users")(field),
|
|
206
|
+
),
|
|
206
207
|
),
|
|
207
208
|
],
|
|
208
209
|
[
|
|
@@ -212,12 +213,12 @@ const doParseFieldOptions = (formatMessage, content, selectedDomain, field) => {
|
|
|
212
213
|
normalizeRoleGroupsValue(
|
|
213
214
|
rawValue,
|
|
214
215
|
field?.type,
|
|
215
|
-
_.get("values")(field)
|
|
216
|
-
)
|
|
216
|
+
_.get("values")(field),
|
|
217
|
+
),
|
|
217
218
|
),
|
|
218
219
|
],
|
|
219
220
|
[_.stubTrue, () => value],
|
|
220
|
-
])
|
|
221
|
+
]),
|
|
221
222
|
)(field);
|
|
222
223
|
|
|
223
224
|
return { ...field, value: normalizedValue, parsedValues };
|
|
@@ -31,7 +31,7 @@ export const parseGroups =
|
|
|
31
31
|
(hasDependentKeys(field) && checkDependency(field, content))) &&
|
|
32
32
|
(!(field.values && "switch" in field.values) ||
|
|
33
33
|
_.prop(`${_.prop("values.switch.on")(field)}.value`)(content) in
|
|
34
|
-
|
|
34
|
+
_.prop("values.switch.values")(field)),
|
|
35
35
|
),
|
|
36
36
|
_.map(parseFieldOptions(formatMessage)(content, selectedDomain)),
|
|
37
37
|
_.map(enrichRequired(content)),
|
|
@@ -44,47 +44,47 @@ export const parseGroups =
|
|
|
44
44
|
|
|
45
45
|
export const parseGroupsWithLangs =
|
|
46
46
|
(formatMessage) =>
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
47
|
+
(template, i18nContent, fieldsToOmit, selectedDomain, requiredLangs = []) => {
|
|
48
|
+
return _.flow(
|
|
49
|
+
_.getOr([], "content"),
|
|
50
|
+
_.map((group) => {
|
|
51
|
+
const langs = _.flow(
|
|
52
|
+
_.toPairs,
|
|
53
|
+
_.map(([lang, langContent]) => {
|
|
54
|
+
const fields = _.flow(
|
|
55
|
+
_.get("fields"),
|
|
56
|
+
_.reject((field) => _.includes(fieldsToOmit)(field?.name)),
|
|
57
|
+
_.filter((field) => {
|
|
58
|
+
return (
|
|
59
|
+
(!("depends" in field) ||
|
|
60
|
+
(hasDependentKeys(field) &&
|
|
61
|
+
checkDependency(field, langContent))) &&
|
|
62
|
+
(!(field.values && "switch" in field.values) ||
|
|
63
|
+
_.prop(`${_.prop("values.switch.on")(field)}.value`)(
|
|
64
|
+
langContent,
|
|
65
|
+
) in _.prop("values.switch.values")(field))
|
|
66
|
+
);
|
|
67
|
+
}),
|
|
68
|
+
_.map(
|
|
69
|
+
_.flow(
|
|
70
|
+
parseFieldOptions(formatMessage)(langContent, selectedDomain),
|
|
71
|
+
(field) =>
|
|
72
|
+
requiredLangs.includes(lang)
|
|
72
73
|
? enrichRequired(langContent)(field)
|
|
73
|
-
: { ...field, required: false }
|
|
74
|
-
|
|
75
|
-
enrichIsSecret(_.get("is_secret")(group)),
|
|
76
|
-
),
|
|
74
|
+
: { ...field, required: false },
|
|
75
|
+
enrichIsSecret(_.get("is_secret")(group)),
|
|
77
76
|
),
|
|
78
|
-
)
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
)(
|
|
90
|
-
|
|
77
|
+
),
|
|
78
|
+
)(group);
|
|
79
|
+
return [lang, fields];
|
|
80
|
+
}),
|
|
81
|
+
_.fromPairs,
|
|
82
|
+
)(i18nContent);
|
|
83
|
+
return {
|
|
84
|
+
name: group.name,
|
|
85
|
+
langs,
|
|
86
|
+
};
|
|
87
|
+
}),
|
|
88
|
+
_.filter(({ langs }) => _.some((fields) => !_.isEmpty(fields))(langs)),
|
|
89
|
+
)(template);
|
|
90
|
+
};
|
|
@@ -20,7 +20,7 @@ const isTableRequired = (field, content) => {
|
|
|
20
20
|
|
|
21
21
|
return _.flow(
|
|
22
22
|
_.pathOr([], "values.table_columns"),
|
|
23
|
-
_.any((nestedField) => _.includes(nestedField?.cardinality)(["1", "+"]))
|
|
23
|
+
_.any((nestedField) => _.includes(nestedField?.cardinality)(["1", "+"])),
|
|
24
24
|
)(field);
|
|
25
25
|
}
|
|
26
26
|
|
|
@@ -50,7 +50,7 @@ const isEmptyField = (field, content) => {
|
|
|
50
50
|
|
|
51
51
|
const requiredErrors = _.flow(
|
|
52
52
|
_.map((row) => _.flow(validateRequired(tableColumns), _.head)([[], row])),
|
|
53
|
-
_.flatten
|
|
53
|
+
_.flatten,
|
|
54
54
|
)(rowValues);
|
|
55
55
|
|
|
56
56
|
return !_.isEmpty(requiredErrors);
|
|
@@ -93,12 +93,12 @@ export const enrichRequired = (content) => (field) => {
|
|
|
93
93
|
if (field?.type === "dynamic_table" && _.has("values.table_columns")(field)) {
|
|
94
94
|
const tableColumns = _.flow(
|
|
95
95
|
_.propOr([], "values.table_columns"),
|
|
96
|
-
_.map((field) => enrichRequired({})(field))
|
|
96
|
+
_.map((field) => enrichRequired({})(field)),
|
|
97
97
|
)(field);
|
|
98
98
|
|
|
99
99
|
return _.flow(
|
|
100
100
|
_.set("values.table_columns", tableColumns),
|
|
101
|
-
_.set("required", required)
|
|
101
|
+
_.set("required", required),
|
|
102
102
|
)(field);
|
|
103
103
|
}
|
|
104
104
|
|