@truedat/core 8.6.6 → 8.7.0
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/Alert.js +20 -5
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@truedat/core",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.7.0",
|
|
4
4
|
"description": "Truedat Web Core",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"**/*.css",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"@testing-library/jest-dom": "^6.6.3",
|
|
55
55
|
"@testing-library/react": "^16.3.0",
|
|
56
56
|
"@testing-library/user-event": "^14.6.1",
|
|
57
|
-
"@truedat/test": "8.
|
|
57
|
+
"@truedat/test": "8.7.0",
|
|
58
58
|
"identity-obj-proxy": "^3.0.0",
|
|
59
59
|
"jest": "^29.7.0",
|
|
60
60
|
"redux-saga-test-plan": "^4.0.6"
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"react-intl": "^7.1.11",
|
|
87
87
|
"react-moment": "^1.1.3",
|
|
88
88
|
"react-redux": "^9.2.0",
|
|
89
|
-
"react-router": "^7.
|
|
89
|
+
"react-router": "^7.15.0",
|
|
90
90
|
"redux": "^5.0.1",
|
|
91
91
|
"redux-saga": "^1.3.0",
|
|
92
92
|
"redux-saga-routines": "^3.2.3",
|
|
@@ -95,5 +95,5 @@
|
|
|
95
95
|
"swr": "^2.3.3",
|
|
96
96
|
"turndown": "^7.2.2"
|
|
97
97
|
},
|
|
98
|
-
"gitHead": "
|
|
98
|
+
"gitHead": "375298315086154cea326bfaebc504d6e45873ed"
|
|
99
99
|
}
|
package/src/components/Alert.js
CHANGED
|
@@ -10,19 +10,34 @@ import { AlertExporter } from "./AlertExporter";
|
|
|
10
10
|
|
|
11
11
|
const existingList = (list) => list && !_.isEmpty(list);
|
|
12
12
|
|
|
13
|
+
const safeFormat = (formatMessage) => (descriptor, values) => {
|
|
14
|
+
try {
|
|
15
|
+
return formatMessage(descriptor, values);
|
|
16
|
+
} catch {
|
|
17
|
+
return descriptor.defaultMessage ?? descriptor.id;
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
|
|
13
21
|
const formatErrorMessages = (error, formatMessage) => {
|
|
22
|
+
const safe = safeFormat(formatMessage);
|
|
23
|
+
|
|
14
24
|
if (error?.field && error?.message)
|
|
15
|
-
return `${error.field}: ${
|
|
25
|
+
return `${error.field}: ${safe({
|
|
16
26
|
id: `error.${error.message}`,
|
|
17
27
|
defaultMessage: error.message,
|
|
18
28
|
})}`;
|
|
19
29
|
|
|
20
|
-
if (_.isString(error?.message))
|
|
30
|
+
if (_.isString(error?.message)) {
|
|
31
|
+
return safe({
|
|
32
|
+
id: `error.${error?.message}`,
|
|
33
|
+
defaultMessage: error?.message,
|
|
34
|
+
});
|
|
35
|
+
}
|
|
21
36
|
|
|
22
37
|
if (_.every(["name", "code"], _.partial(_.has)(error)))
|
|
23
38
|
return formatMessage(
|
|
24
39
|
{ id: error.name, defaultMessage: error.name },
|
|
25
|
-
{ text: error.code }
|
|
40
|
+
{ text: error.code },
|
|
26
41
|
);
|
|
27
42
|
|
|
28
43
|
if (_.has("name")(error))
|
|
@@ -61,7 +76,7 @@ export const Alert = ({
|
|
|
61
76
|
const { formatMessage } = useIntl();
|
|
62
77
|
const errors = _.map((e) => formatErrorMessages(e, formatMessage))(errorList);
|
|
63
78
|
const formattedMessages = _.map((e) => formatMessages(e, formatMessage))(
|
|
64
|
-
messages
|
|
79
|
+
messages,
|
|
65
80
|
);
|
|
66
81
|
const list = _.isEmpty(errors) ? formattedMessages : errors;
|
|
67
82
|
const [maxListItems, setMaxListItems] = useState(initialMaxListItems);
|
|
@@ -74,7 +89,7 @@ export const Alert = ({
|
|
|
74
89
|
content && !existingList(errors) && !existingList(formattedMessages)
|
|
75
90
|
? formatMessage(
|
|
76
91
|
{ id: content, defaultMessage: content },
|
|
77
|
-
{ text, ...fields }
|
|
92
|
+
{ text, ...fields },
|
|
78
93
|
)
|
|
79
94
|
: undefined;
|
|
80
95
|
return content || header ? (
|