djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix error messages with service account

Browse source
This commit is contained in:
Krzysztof Bialoglowicz 2019-10-18 14:33:05 +02:00
parent c40bd1a2e6
commit 13da934927
3 changed files with 7 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/intl.ts
View file

@ -47,6 +47,9 @@ export const commonMessages = defineMessages({
properties: {
defaultMessage: "Properties"
},
requiredField: {
defaultMessage: "This field is required"
},
savedChanges: {
defaultMessage: "Saved changes"
},

20
src/storybook/__snapshots__/Stories.test.ts.snap
View file

@ -123389,7 +123389,7 @@ exports[`Storyshots Views / Webhooks / Create webhook form errors 1`] = `
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id"
>
Missing token or serviceAccount
This field is required
</p>
</div>
</div>
@ -123479,14 +123479,6 @@ exports[`Storyshots Views / Webhooks / Create webhook form errors 1`] = `
secret key is used to create a hash signature with each payload. *optional field
</p>
</div>
<div
class="FormSpacer-spacer-id"
/>
<p
class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorError-id"
>
Missing token or serviceAccount
</p>
</div>
</div>
</div>
@ -124957,7 +124949,7 @@ exports[`Storyshots Views / Webhooks / Webhook details form errors 1`] = `
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id"
>
Missing token or serviceAccount
This field is required
</p>
</div>
</div>
@ -125047,14 +125039,6 @@ exports[`Storyshots Views / Webhooks / Webhook details form errors 1`] = `
secret key is used to create a hash signature with each payload. *optional field
</p>
</div>
<div
class="FormSpacer-spacer-id"
/>
<p
class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorError-id"
>
Missing token or serviceAccount
</p>
</div>
</div>
</div>

30
src/webhooks/components/WebhookInfo/WebhookInfo.tsx
View file

@ -4,7 +4,7 @@ import TextField from "@material-ui/core/TextField";
import Typography from "@material-ui/core/Typography";
import makeStyles from "@material-ui/styles/makeStyles";
import React from "react";
import { IntlShape, useIntl } from "react-intl";
import { useIntl } from "react-intl";
import CardTitle from "@saleor/components/CardTitle";
import FormSpacer from "@saleor/components/FormSpacer";
@ -15,7 +15,6 @@ import SingleAutocompleteSelectField, {
import { ChangeEvent } from "@saleor/hooks/useForm";
import { commonMessages } from "@saleor/intl";
import { FormErrors } from "@saleor/types";
import { WebhookErrorCode } from "@saleor/types/globalTypes";
import { WebhookCreate_webhookCreate_webhookErrors } from "@saleor/webhooks/types/WebhookCreate";
import { FormData } from "../WebhooksDetailsPage";
@ -55,19 +54,9 @@ const WebhookInfo: React.StatelessComponent<WebhookInfoProps> = ({
}) => {
const classes = useStyles({});
const intl = useIntl();
const translatedErrors = translateErrors(intl);
const serviceAccountsError =
apiErrors.filter(error => error.field === null).length > 0;
function translateErrors(intl: IntlShape) {
return {
[WebhookErrorCode.INVALID]: intl.formatMessage({
defaultMessage: "Missing service account",
description: "webhook service account error"
})
};
}
return (
<Card>
<CardTitle
@ -111,10 +100,7 @@ const WebhookInfo: React.StatelessComponent<WebhookInfoProps> = ({
error={serviceAccountsError}
helperText={
serviceAccountsError &&
intl.formatMessage({
defaultMessage: "Missing service account",
description: "webhook service account error"
})
intl.formatMessage(commonMessages.requiredField)
}
name="serviceAccount"
onChange={serviceOnChange}
@ -160,18 +146,6 @@ const WebhookInfo: React.StatelessComponent<WebhookInfoProps> = ({
value={data.secretKey}
onChange={onChange}
/>
{apiErrors.length > 0 && (
<>
<FormSpacer />
{apiErrors
.filter(error => error.field === null)
.map(error => (
<Typography color="error" key={error.code}>
{translatedErrors[error.code]}
</Typography>
))}
</>
)}
</CardContent>
</Card>
);