Skip to content

Commit 407f3c1

Browse files
committed
* fix tests:switch to useIntl instead of FormattedMessage in AgreementCreateRoute and AgreementEditRoute
1 parent a1500c8 commit 407f3c1

File tree

2 files changed

+12
-33
lines changed

2 files changed

+12
-33
lines changed

src/routes/AgreementCreateRoute/AgreementCreateRoute.js

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import PropTypes from 'prop-types';
22

33
import { omit } from 'lodash';
4-
import { FormattedMessage } from 'react-intl';
4+
import { useIntl } from 'react-intl';
55

66
import { useMutation, useQueryClient } from 'react-query';
77

@@ -55,6 +55,7 @@ const AgreementCreateRoute = ({
5555
}) => {
5656
const { authority, referenceId } = queryString.parse(location?.search);
5757

58+
const intl = useIntl();
5859
const callout = useCallout();
5960
const stripes = useStripes();
6061
const ky = useOkapiKy();
@@ -121,25 +122,15 @@ const AgreementCreateRoute = ({
121122
.then(() => {
122123
callout.sendCallout({
123124
type: 'success',
124-
message: (
125-
<FormattedMessage
126-
id="ui-agreements.agreements.claimPolicies.update.callout"
127-
values={{ name }}
128-
/>
129-
)
125+
message: intl.formatMessage({ id: 'ui-agreements.agreements.claimPolicies.update.callout' }, { name })
130126
});
131127
})
132128
.catch(async (claimError) => {
133129
const errorMessage = await parseErrorResponse(claimError.response)?.message;
134130

135131
callout.sendCallout({
136132
type: 'error',
137-
message: (
138-
<FormattedMessage
139-
id="ui-agreements.agreements.claimPolicies.update.error.callout"
140-
values={{ name, error: errorMessage }}
141-
/>
142-
),
133+
message: intl.formatMessage({ id: 'ui-agreements.agreements.claimPolicies.update.error.callout' }, { name, error: errorMessage }),
143134
timeout: 0,
144135
});
145136
});
@@ -164,12 +155,7 @@ const AgreementCreateRoute = ({
164155

165156
callout.sendCallout({
166157
type: 'success',
167-
message: (
168-
<FormattedMessage
169-
id="ui-agreements.agreements.create.callout"
170-
values={{ name }}
171-
/>
172-
)
158+
message: intl.formatMessage({ id: 'ui-agreements.agreements.create.callout' }, { name })
173159
});
174160

175161
handleClose(id);
@@ -179,15 +165,7 @@ const AgreementCreateRoute = ({
179165
// Agreement failed to create, send callout
180166
callout.sendCallout({
181167
type: 'error',
182-
message: (
183-
<FormattedMessage
184-
id="ui-agreements.agreements.error.callout"
185-
values={{
186-
name: payload?.name ?? 'unknown',
187-
error: agreementError.message
188-
}}
189-
/>
190-
),
168+
message: intl.formatMessage({ id: 'ui-agreements.agreements.error.callout' }, { name: payload?.name ?? 'unknown', error: agreementError.message }),
191169
timeout: 0,
192170
});
193171
})

src/routes/AgreementEditRoute/AgreementEditRoute.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useCallback, useMemo } from 'react';
22
import PropTypes from 'prop-types';
33

4-
import { FormattedMessage } from 'react-intl';
4+
import { useIntl } from 'react-intl';
55
import { useMutation, useQueryClient, useQuery } from 'react-query';
66

77
import { cloneDeep, omit } from 'lodash';
@@ -65,6 +65,7 @@ const AgreementEditRoute = ({
6565
location,
6666
match: { params: { id: agreementId } },
6767
}) => {
68+
const intl = useIntl();
6869
const ky = useOkapiKy();
6970
const queryClient = useQueryClient();
7071

@@ -151,13 +152,13 @@ const AgreementEditRoute = ({
151152
.then(() => {
152153
callout.sendCallout({
153154
type: 'success',
154-
message: <FormattedMessage id="ui-agreements.agreements.claimPolicies.update.callout" values={{ name }} />,
155+
message: intl.formatMessage({ id: 'ui-agreements.agreements.claimPolicies.update.callout' }, { name })
155156
});
156157
})
157158
.catch((claimError) => {
158159
callout.sendCallout({
159160
type: 'error',
160-
message: <FormattedMessage id="ui-agreements.agreements.claimPolicies.update.error.callout" values={{ name, error: claimError.message }} />,
161+
message: intl.formatMessage({ id: 'ui-agreements.agreements.claimPolicies.update.error.callout' }, { name, error: claimError.message }),
161162
timeout: 0,
162163
});
163164
});
@@ -181,7 +182,7 @@ const AgreementEditRoute = ({
181182

182183
callout.sendCallout({
183184
type: 'success',
184-
message: <FormattedMessage id="ui-agreements.agreements.update.callout" values={{ name }} />
185+
message: intl.formatMessage({ id: 'ui-agreements.agreements.update.callout' }, { name })
185186
});
186187

187188
history.push(`${urls.agreementView(agreementId)}${location.search}`);
@@ -191,7 +192,7 @@ const AgreementEditRoute = ({
191192
.catch((agreementError) => {
192193
callout.sendCallout({
193194
type: 'error',
194-
message: <FormattedMessage id="ui-agreements.agreements.update.error.callout" values={{ name: payload?.name ?? '', error: agreementError.message }} />,
195+
message: intl.formatMessage({ id: 'ui-agreements.agreements.update.error.callout' }, { name: payload?.name ?? '', error: agreementError.message }),
195196
timeout: 0,
196197
});
197198
throw agreementError;

0 commit comments

Comments
 (0)