@truedat/dd 7.4.3 → 7.4.5
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 +6 -6
- package/src/components/SystemForm.js +10 -7
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@truedat/dd",
|
|
3
|
-
"version": "7.4.
|
|
3
|
+
"version": "7.4.5",
|
|
4
4
|
"description": "Truedat Web Data Dictionary",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"jsnext:main": "src/index.js",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"@testing-library/jest-dom": "^5.16.5",
|
|
35
35
|
"@testing-library/react": "^12.0.0",
|
|
36
36
|
"@testing-library/user-event": "^13.2.1",
|
|
37
|
-
"@truedat/test": "7.4.
|
|
37
|
+
"@truedat/test": "7.4.5",
|
|
38
38
|
"babel-jest": "^28.1.0",
|
|
39
39
|
"babel-plugin-dynamic-import-node": "^2.3.3",
|
|
40
40
|
"babel-plugin-lodash": "^3.3.4",
|
|
@@ -88,9 +88,9 @@
|
|
|
88
88
|
},
|
|
89
89
|
"dependencies": {
|
|
90
90
|
"@apollo/client": "^3.7.1",
|
|
91
|
-
"@truedat/auth": "7.4.
|
|
92
|
-
"@truedat/core": "7.4.
|
|
93
|
-
"@truedat/df": "7.4.
|
|
91
|
+
"@truedat/auth": "7.4.5",
|
|
92
|
+
"@truedat/core": "7.4.5",
|
|
93
|
+
"@truedat/df": "7.4.5",
|
|
94
94
|
"lodash": "^4.17.21",
|
|
95
95
|
"moment": "^2.29.4",
|
|
96
96
|
"path-to-regexp": "^1.7.0",
|
|
@@ -115,5 +115,5 @@
|
|
|
115
115
|
"react-dom": ">= 16.8.6 < 17",
|
|
116
116
|
"semantic-ui-react": ">= 2.0.3 < 2.2"
|
|
117
117
|
},
|
|
118
|
-
"gitHead": "
|
|
118
|
+
"gitHead": "2deeffe70bf878df0ea47917f1c8258d7e476914"
|
|
119
119
|
}
|
|
@@ -39,22 +39,25 @@ export const SystemForm = ({
|
|
|
39
39
|
const isValid = _.conforms({
|
|
40
40
|
name: isNonEmpty,
|
|
41
41
|
external_id: isNonEmpty,
|
|
42
|
-
...(template ? {
|
|
42
|
+
...(template ? { dynamic_content: isValidContent } : {}),
|
|
43
43
|
})(system);
|
|
44
44
|
|
|
45
|
-
const { name, external_id,
|
|
45
|
+
const { name, external_id, dynamic_content } = system;
|
|
46
46
|
|
|
47
47
|
const handleChange = (_e, { name, value }) =>
|
|
48
48
|
setSystem((system) => ({ ...system, [name]: value }));
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
49
|
+
|
|
50
|
+
const handleContentChange = (dynamic_content) =>
|
|
51
|
+
setSystem((system) => ({ ...system, dynamic_content }));
|
|
52
|
+
|
|
52
53
|
const handleSubmit = () => {
|
|
53
54
|
const actionFunction = _.has("id")(system) ? updateSystem : createSystem;
|
|
54
55
|
actionFunction({
|
|
55
56
|
system: {
|
|
56
57
|
...system,
|
|
57
|
-
df_content: template
|
|
58
|
+
df_content: template
|
|
59
|
+
? applyTemplate(template)(dynamic_content)
|
|
60
|
+
: dynamic_content,
|
|
58
61
|
},
|
|
59
62
|
});
|
|
60
63
|
};
|
|
@@ -103,7 +106,7 @@ export const SystemForm = ({
|
|
|
103
106
|
<DynamicForm
|
|
104
107
|
template={template}
|
|
105
108
|
onChange={handleContentChange}
|
|
106
|
-
content={
|
|
109
|
+
content={dynamic_content || {}}
|
|
107
110
|
/>
|
|
108
111
|
)}
|
|
109
112
|
<div className="actions">
|