@truedat/df 8.7.0 → 8.7.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/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/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
|
@@ -20,7 +20,7 @@ describe("<UserGroupPreview />", () => {
|
|
|
20
20
|
|
|
21
21
|
it("renders users and groups with icons instead of prefixes", () => {
|
|
22
22
|
const rendered = render(
|
|
23
|
-
<UserGroupPreview userGroups={["user:baz qux", "group:foo bar"]}
|
|
23
|
+
<UserGroupPreview userGroups={["user:baz qux", "group:foo bar"]} />,
|
|
24
24
|
);
|
|
25
25
|
|
|
26
26
|
expect(rendered.container.textContent).toBe("baz quxfoo bar");
|
|
@@ -35,13 +35,13 @@ describe("<UserGroupPreview />", () => {
|
|
|
35
35
|
{ name: "user:baz qux" },
|
|
36
36
|
{ id: 123, name: "group:foo bar" },
|
|
37
37
|
]}
|
|
38
|
-
|
|
38
|
+
/>,
|
|
39
39
|
);
|
|
40
40
|
|
|
41
41
|
expect(rendered.getByText(/baz qux/i).closest("a")).toBeNull();
|
|
42
42
|
expect(rendered.getByRole("link", { name: /foo bar/i })).toHaveAttribute(
|
|
43
43
|
"href",
|
|
44
|
-
"/groups/123"
|
|
44
|
+
"/groups/123",
|
|
45
45
|
);
|
|
46
46
|
});
|
|
47
47
|
|
|
@@ -53,7 +53,7 @@ describe("<UserGroupPreview />", () => {
|
|
|
53
53
|
});
|
|
54
54
|
|
|
55
55
|
const rendered = render(
|
|
56
|
-
<UserGroupPreviewLoader userGroupId="group:foo bar"
|
|
56
|
+
<UserGroupPreviewLoader userGroupId="group:foo bar" />,
|
|
57
57
|
);
|
|
58
58
|
|
|
59
59
|
expect(useQuery).toHaveBeenCalledWith(USER_GROUP_PREVIEW_QUERY, {
|
|
@@ -70,7 +70,7 @@ describe("<UserGroupPreview />", () => {
|
|
|
70
70
|
});
|
|
71
71
|
|
|
72
72
|
const rendered = render(
|
|
73
|
-
<UserGroupPreviewLoader userGroupId={["user:baz qux", "bar baz"]}
|
|
73
|
+
<UserGroupPreviewLoader userGroupId={["user:baz qux", "bar baz"]} />,
|
|
74
74
|
);
|
|
75
75
|
|
|
76
76
|
expect(useQuery).toHaveBeenCalledWith(USER_GROUP_PREVIEW_QUERY, {
|
|
@@ -87,7 +87,9 @@ describe("<UserGroupPreview />", () => {
|
|
|
87
87
|
});
|
|
88
88
|
|
|
89
89
|
render(
|
|
90
|
-
<UserGroupPreviewLoader
|
|
90
|
+
<UserGroupPreviewLoader
|
|
91
|
+
userGroupId={["user:baz qux", "group:foo bar"]}
|
|
92
|
+
/>,
|
|
91
93
|
);
|
|
92
94
|
|
|
93
95
|
expect(useQuery).toHaveBeenCalledWith(USER_GROUP_PREVIEW_QUERY, {
|
|
@@ -99,12 +101,12 @@ describe("<UserGroupPreview />", () => {
|
|
|
99
101
|
const rendered = render(
|
|
100
102
|
<UserGroupPreview
|
|
101
103
|
userGroups={[{ id: "9", name: "group:foo bar alias" }]}
|
|
102
|
-
|
|
104
|
+
/>,
|
|
103
105
|
);
|
|
104
106
|
|
|
105
107
|
expect(rendered.getByText(/foo bar alias/i)).toBeInTheDocument();
|
|
106
108
|
expect(
|
|
107
|
-
rendered.getByRole("link", { name: /foo bar alias/i })
|
|
109
|
+
rendered.getByRole("link", { name: /foo bar alias/i }),
|
|
108
110
|
).toHaveAttribute("href", "/groups/9");
|
|
109
111
|
expect(rendered.container.textContent).not.toContain("group:");
|
|
110
112
|
});
|
|
@@ -122,13 +124,15 @@ describe("<UserGroupPreview />", () => {
|
|
|
122
124
|
});
|
|
123
125
|
|
|
124
126
|
const rendered = render(
|
|
125
|
-
<UserGroupPreviewLoader
|
|
127
|
+
<UserGroupPreviewLoader
|
|
128
|
+
userGroupId={["user:baz qux", "group:foo bar"]}
|
|
129
|
+
/>,
|
|
126
130
|
);
|
|
127
131
|
|
|
128
132
|
expect(rendered.getByText(/baz qux/i).closest("a")).toBeNull();
|
|
129
133
|
expect(rendered.getByRole("link", { name: /foo bar/i })).toHaveAttribute(
|
|
130
134
|
"href",
|
|
131
|
-
"/groups/123"
|
|
135
|
+
"/groups/123",
|
|
132
136
|
);
|
|
133
137
|
});
|
|
134
138
|
});
|
package/src/messages/index.js
CHANGED
|
@@ -17,8 +17,8 @@ describe("reducers: dfMessage", () => {
|
|
|
17
17
|
{ header: "alert.fetchTemplates.empty.header" },
|
|
18
18
|
{
|
|
19
19
|
type: clearTemplates.TRIGGER,
|
|
20
|
-
}
|
|
21
|
-
)
|
|
20
|
+
},
|
|
21
|
+
),
|
|
22
22
|
).toEqual(initialState);
|
|
23
23
|
});
|
|
24
24
|
|
|
@@ -31,7 +31,7 @@ describe("reducers: dfMessage", () => {
|
|
|
31
31
|
data: {},
|
|
32
32
|
scope: "bg",
|
|
33
33
|
},
|
|
34
|
-
})
|
|
34
|
+
}),
|
|
35
35
|
).toEqual({
|
|
36
36
|
error: true,
|
|
37
37
|
header: "alert.fetchTemplates.empty.header",
|
|
@@ -51,7 +51,7 @@ describe("reducers: dfMessage", () => {
|
|
|
51
51
|
},
|
|
52
52
|
scope: "bg",
|
|
53
53
|
},
|
|
54
|
-
})
|
|
54
|
+
}),
|
|
55
55
|
).toEqual({
|
|
56
56
|
error: true,
|
|
57
57
|
header: "alert.updateTemplate.failed.header",
|
|
@@ -71,7 +71,7 @@ describe("reducers: dfMessage", () => {
|
|
|
71
71
|
},
|
|
72
72
|
scope: "bg",
|
|
73
73
|
},
|
|
74
|
-
})
|
|
74
|
+
}),
|
|
75
75
|
).toEqual({
|
|
76
76
|
error: true,
|
|
77
77
|
header: "alert.createTemplate.failed.header",
|
|
@@ -12,7 +12,7 @@ describe("reducers: selectedDomain", () => {
|
|
|
12
12
|
|
|
13
13
|
it("should handle the clearSelectedDomain.TRIGGER action", () => {
|
|
14
14
|
expect(
|
|
15
|
-
selectedDomain(fooState, { type: clearSelectedDomain.TRIGGER })
|
|
15
|
+
selectedDomain(fooState, { type: clearSelectedDomain.TRIGGER }),
|
|
16
16
|
).toEqual(initialState);
|
|
17
17
|
});
|
|
18
18
|
|
|
@@ -20,7 +20,7 @@ describe("reducers: selectedDomain", () => {
|
|
|
20
20
|
const id = 1;
|
|
21
21
|
const payload = { id };
|
|
22
22
|
expect(
|
|
23
|
-
selectedDomain(fooState, { type: selectDomain.TRIGGER, payload })
|
|
23
|
+
selectedDomain(fooState, { type: selectDomain.TRIGGER, payload }),
|
|
24
24
|
).toEqual(payload);
|
|
25
25
|
});
|
|
26
26
|
|
|
@@ -12,7 +12,7 @@ describe("reducers: selectedDomains", () => {
|
|
|
12
12
|
|
|
13
13
|
it("should handle the clearSelectedDomains.TRIGGER action", () => {
|
|
14
14
|
expect(
|
|
15
|
-
selectedDomains(fooState, { type: clearSelectedDomains.TRIGGER })
|
|
15
|
+
selectedDomains(fooState, { type: clearSelectedDomains.TRIGGER }),
|
|
16
16
|
).toEqual(initialState);
|
|
17
17
|
});
|
|
18
18
|
|
|
@@ -20,7 +20,7 @@ describe("reducers: selectedDomains", () => {
|
|
|
20
20
|
const id = 1;
|
|
21
21
|
const payload = [{ id }];
|
|
22
22
|
expect(
|
|
23
|
-
selectedDomains(fooState, { type: selectDomains.TRIGGER, payload })
|
|
23
|
+
selectedDomains(fooState, { type: selectDomains.TRIGGER, payload }),
|
|
24
24
|
).toEqual(payload);
|
|
25
25
|
});
|
|
26
26
|
|
|
@@ -30,14 +30,14 @@ export const dfMessage = (state = initialState, { type, message, payload }) => {
|
|
|
30
30
|
state,
|
|
31
31
|
type,
|
|
32
32
|
payload,
|
|
33
|
-
"alert.updateTemplate.failed.header"
|
|
33
|
+
"alert.updateTemplate.failed.header",
|
|
34
34
|
);
|
|
35
35
|
case createTemplate.FAILURE:
|
|
36
36
|
return upsertError(
|
|
37
37
|
state,
|
|
38
38
|
type,
|
|
39
39
|
payload,
|
|
40
|
-
"alert.createTemplate.failed.header"
|
|
40
|
+
"alert.createTemplate.failed.header",
|
|
41
41
|
);
|
|
42
42
|
default:
|
|
43
43
|
return state;
|
|
@@ -55,7 +55,7 @@ const hasError = (errors, error) =>
|
|
|
55
55
|
_.flow(
|
|
56
56
|
_.map("name"),
|
|
57
57
|
_.find((e) => _.includes(error)(e)),
|
|
58
|
-
_.negate(_.isNil)
|
|
58
|
+
_.negate(_.isNil),
|
|
59
59
|
)(errors);
|
|
60
60
|
|
|
61
61
|
const repeatedFieldError = (errors, header) => {
|
|
@@ -91,7 +91,7 @@ const splitErrorType = (errors, type) =>
|
|
|
91
91
|
_.flow(
|
|
92
92
|
_.find(({ name }) => _.includes(type)(name)),
|
|
93
93
|
_.prop("name"),
|
|
94
|
-
_.split(".")
|
|
94
|
+
_.split("."),
|
|
95
95
|
)(errors);
|
|
96
96
|
|
|
97
97
|
const contentFragment = (split, from, to) =>
|
|
@@ -8,13 +8,13 @@ const transformValues = (systems) =>
|
|
|
8
8
|
value: id,
|
|
9
9
|
text: name,
|
|
10
10
|
external_id,
|
|
11
|
-
}))
|
|
11
|
+
})),
|
|
12
12
|
)(systems);
|
|
13
13
|
|
|
14
14
|
export const getDropdownOptions = createSelector(
|
|
15
15
|
({ systems }, { field }) =>
|
|
16
16
|
field?.type === "system" ? transformValues(systems) : field?.parsedValues,
|
|
17
|
-
_.sortBy("text")
|
|
17
|
+
_.sortBy("text"),
|
|
18
18
|
);
|
|
19
19
|
|
|
20
20
|
export const makeGetDropdownOptions = () => getDropdownOptions;
|
|
@@ -12,7 +12,7 @@ const selectTemplate = (propTemplate, stateTemplate) =>
|
|
|
12
12
|
const selectApplyTemplate = (
|
|
13
13
|
propTemplate,
|
|
14
14
|
stateTemplate,
|
|
15
|
-
applyTemplateFromProps
|
|
15
|
+
applyTemplateFromProps,
|
|
16
16
|
) => {
|
|
17
17
|
const template = selectTemplate(propTemplate, stateTemplate);
|
|
18
18
|
return _.defaultTo(applyTemplate)(applyTemplateFromProps)(template);
|
|
@@ -26,5 +26,5 @@ export const makeGetApplyTemplate = () =>
|
|
|
26
26
|
templateFromProps,
|
|
27
27
|
templateFromState,
|
|
28
28
|
applyTemplateFromProps,
|
|
29
|
-
selectApplyTemplate
|
|
29
|
+
selectApplyTemplate,
|
|
30
30
|
);
|
|
@@ -12,8 +12,8 @@ import {
|
|
|
12
12
|
import { connect } from "react-redux";
|
|
13
13
|
import { useNavigate } from "react-router";
|
|
14
14
|
import { ConfirmModal } from "@truedat/core/components";
|
|
15
|
-
import { deleteTemplate, updateTemplate } from "../routines";
|
|
16
15
|
import { TEMPLATES } from "@truedat/core/routes";
|
|
16
|
+
import { deleteTemplate, updateTemplate } from "../routines";
|
|
17
17
|
import TemplateCrumbs from "./TemplateCrumbs";
|
|
18
18
|
import TemplateForm from "./templateForm/TemplateForm";
|
|
19
19
|
|
|
@@ -104,5 +104,5 @@ const mapStateToProps = ({ template, templateDeleting, templateSaving }) => ({
|
|
|
104
104
|
});
|
|
105
105
|
|
|
106
106
|
export default connect(mapStateToProps, { updateTemplate, deleteTemplate })(
|
|
107
|
-
Template
|
|
107
|
+
Template,
|
|
108
108
|
);
|
|
@@ -23,7 +23,7 @@ export function TemplateLoader() {
|
|
|
23
23
|
dispatch(fetchTemplate({ templateId }));
|
|
24
24
|
} else if (selectedTemplateId) {
|
|
25
25
|
dispatch(
|
|
26
|
-
fetchTemplate({ domainId, domainIds, templateId: selectedTemplateId })
|
|
26
|
+
fetchTemplate({ domainId, domainIds, templateId: selectedTemplateId }),
|
|
27
27
|
);
|
|
28
28
|
}
|
|
29
29
|
}, [domainId, domainIds, templateId, selectedTemplateId]);
|
|
@@ -2,10 +2,10 @@ import React from "react";
|
|
|
2
2
|
import { Route, Routes } from "react-router";
|
|
3
3
|
import { TEMPLATE, TEMPLATES, TEMPLATES_NEW } from "@truedat/core/routes";
|
|
4
4
|
import { ProtectedRoute, Loader } from "@truedat/core/router";
|
|
5
|
+
import TemplatesLoader from "@truedat/core/components/TemplatesLoader";
|
|
5
6
|
import NewTemplate from "./NewTemplate";
|
|
6
7
|
import Templates from "./Templates";
|
|
7
8
|
import Template from "./Template";
|
|
8
|
-
import TemplatesLoader from "@truedat/core/components/TemplatesLoader";
|
|
9
9
|
import TemplateLoader from "./TemplateLoader";
|
|
10
10
|
import TemplatesContextProvider from "./TemplatesContext";
|
|
11
11
|
|
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
import { FormattedMessage, useIntl } from "react-intl";
|
|
2
|
-
import {
|
|
3
|
-
Header,
|
|
4
|
-
Icon,
|
|
5
|
-
Segment,
|
|
6
|
-
Button,
|
|
7
|
-
} from "semantic-ui-react";
|
|
2
|
+
import { Header, Icon, Segment, Button } from "semantic-ui-react";
|
|
8
3
|
import { Link } from "react-router";
|
|
9
4
|
import { TEMPLATES_NEW } from "@truedat/core/routes";
|
|
10
5
|
import TemplateFilters from "./TemplateFilters";
|
|
@@ -15,7 +15,7 @@ export default function TemplatesContextProvider(props) {
|
|
|
15
15
|
const initialSortDirection = _.prop("initialSortDirection")(props);
|
|
16
16
|
|
|
17
17
|
const { templates, templatesLoading: loading } = useSelector(
|
|
18
|
-
_.pick(["templates", "templatesLoading"])
|
|
18
|
+
_.pick(["templates", "templatesLoading"]),
|
|
19
19
|
);
|
|
20
20
|
|
|
21
21
|
const [query, setQuery] = useState("");
|
|
@@ -31,13 +31,13 @@ export default function TemplatesContextProvider(props) {
|
|
|
31
31
|
keys: ["name", "label"],
|
|
32
32
|
threshold: matchSorter.rankings.CONTAINS,
|
|
33
33
|
}),
|
|
34
|
-
_.orderBy([sortColumn], [sortDirection == "ascending" ? "asc" : "desc"])
|
|
34
|
+
_.orderBy([sortColumn], [sortDirection == "ascending" ? "asc" : "desc"]),
|
|
35
35
|
)(templates);
|
|
36
36
|
|
|
37
37
|
const scopes = _.flow(
|
|
38
38
|
_.map("scope"),
|
|
39
39
|
_.uniq,
|
|
40
|
-
_.reject(isHiddenScope)
|
|
40
|
+
_.reject(isHiddenScope),
|
|
41
41
|
)(templates);
|
|
42
42
|
|
|
43
43
|
const context = {
|
|
@@ -56,7 +56,7 @@ describe("<TemplateLoader />", () => {
|
|
|
56
56
|
|
|
57
57
|
// Check that fetchTemplate was called with the right params
|
|
58
58
|
expect(mockDispatch).toHaveBeenCalledWith(
|
|
59
|
-
fetchTemplate({ templateId: "1" })
|
|
59
|
+
fetchTemplate({ templateId: "1" }),
|
|
60
60
|
);
|
|
61
61
|
|
|
62
62
|
mockDispatch.mockClear();
|
|
@@ -84,7 +84,7 @@ describe("<TemplateLoader />", () => {
|
|
|
84
84
|
domainId: 5,
|
|
85
85
|
domainIds: [6, 7],
|
|
86
86
|
templateId: 8,
|
|
87
|
-
})
|
|
87
|
+
}),
|
|
88
88
|
);
|
|
89
89
|
});
|
|
90
90
|
});
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { render, waitForLoad } from "@truedat/test/render";
|
|
3
|
-
import { TemplateRoutes } from "../TemplateRoutes";
|
|
4
3
|
import { useAuthorized } from "@truedat/core/hooks/useAuthorized";
|
|
5
4
|
import { TEMPLATE, TEMPLATES, TEMPLATES_NEW } from "@truedat/core/routes";
|
|
5
|
+
import { TemplateRoutes } from "../TemplateRoutes";
|
|
6
6
|
|
|
7
7
|
jest.mock("@truedat/core/hooks/useAuthorized", () => ({
|
|
8
8
|
useAuthorized: jest.fn(() => true),
|
|
@@ -42,7 +42,7 @@ export const ActiveGroupForm = ({
|
|
|
42
42
|
_.reject(_.isNil),
|
|
43
43
|
_.flatten,
|
|
44
44
|
_.reject(({ name }) => _.includes(name)(groupFieldsName)),
|
|
45
|
-
_.negate(_.isEmpty)
|
|
45
|
+
_.negate(_.isEmpty),
|
|
46
46
|
)(groupFieldsName);
|
|
47
47
|
|
|
48
48
|
const moveGroup = (direction) => {
|
|
@@ -155,8 +155,8 @@ export const ActiveGroupForm = ({
|
|
|
155
155
|
{_.isEmpty(_.prop(field.name)(dependencies))
|
|
156
156
|
? null
|
|
157
157
|
: _.map(({ label, name }) => (
|
|
158
|
-
|
|
159
|
-
|
|
158
|
+
<Label key={name}>{label}</Label>
|
|
159
|
+
))(_.prop(field.name)(dependencies))}
|
|
160
160
|
</>
|
|
161
161
|
),
|
|
162
162
|
},
|
|
@@ -9,13 +9,13 @@ const fieldsToOptions = (fields, fieldName) =>
|
|
|
9
9
|
_.flow(
|
|
10
10
|
_.filter(
|
|
11
11
|
(f) =>
|
|
12
|
-
!nilOrEmpty(_.pathOr([], "values.fixed")(f)) && f.name !== fieldName
|
|
12
|
+
!nilOrEmpty(_.pathOr([], "values.fixed")(f)) && f.name !== fieldName,
|
|
13
13
|
),
|
|
14
14
|
_.map.convert({ cap: false })(({ label: text, name: value }, key) => ({
|
|
15
15
|
text,
|
|
16
16
|
value,
|
|
17
17
|
key: key,
|
|
18
|
-
}))
|
|
18
|
+
})),
|
|
19
19
|
)(fields);
|
|
20
20
|
const valuesToOptions = (fields, value) =>
|
|
21
21
|
value !== ""
|
|
@@ -27,7 +27,7 @@ const valuesToOptions = (fields, value) =>
|
|
|
27
27
|
text: v,
|
|
28
28
|
value: v,
|
|
29
29
|
key,
|
|
30
|
-
}))
|
|
30
|
+
})),
|
|
31
31
|
)(fields)
|
|
32
32
|
: [];
|
|
33
33
|
|
|
@@ -28,13 +28,13 @@ export const DependentDomain = ({
|
|
|
28
28
|
const findDomain = (k) =>
|
|
29
29
|
_.flow(
|
|
30
30
|
_.find(({ id }) => k == id),
|
|
31
|
-
_.prop("name")
|
|
31
|
+
_.prop("name"),
|
|
32
32
|
)(domains);
|
|
33
33
|
|
|
34
34
|
const options = _.flow(
|
|
35
35
|
_.reject(({ id }) => _.includes(id)(selectedDomains)),
|
|
36
36
|
_.map(({ id, name }) => ({ text: name, value: id })),
|
|
37
|
-
_.sortBy("text")
|
|
37
|
+
_.sortBy("text"),
|
|
38
38
|
)(domains);
|
|
39
39
|
|
|
40
40
|
const isNullOrEmpty = (value) =>
|
|
@@ -56,7 +56,7 @@ export const DependentDomain = ({
|
|
|
56
56
|
title={findDomain(k)}
|
|
57
57
|
value={v}
|
|
58
58
|
/>
|
|
59
|
-
))
|
|
59
|
+
)),
|
|
60
60
|
)(values)}
|
|
61
61
|
<List.Item>
|
|
62
62
|
<Form.Dropdown
|