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

Fix types

Browse source
This commit is contained in:
dominik-zeglen 2019-10-21 13:11:05 +02:00
parent cc32a2fda5
commit 4623164b21
2 changed files with 38 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/siteSettings/components/SiteSettingsMailing/SiteSettingsMailing.tsx
View file

@ -11,11 +11,17 @@ import CardTitle from "@saleor/components/CardTitle";
import FormSpacer from "@saleor/components/FormSpacer"; import FormSpacer from "@saleor/components/FormSpacer";
import Hr from "@saleor/components/Hr"; import Hr from "@saleor/components/Hr";
import { FormErrors } from "@saleor/types"; import { FormErrors } from "@saleor/types";
import { SiteSettingsPageFormData } from "../SiteSettingsPage";
export interface SiteSettingsMailingFormData {
defaultMailSenderName: string;
defaultMailSenderAddress: string;
passwordResetUrl: string;
}
interface SiteSettingsMailingProps { interface SiteSettingsMailingProps {
data: SiteSettingsPageFormData; data: SiteSettingsMailingFormData;
errors: FormErrors<"email" | "passwordResetUrl">; errors: FormErrors<
"defaultMailSenderAddress" | "defaultMailSenderName" | "passwordResetUrl"
>;
disabled: boolean; disabled: boolean;
onChange: (event: React.ChangeEvent<any>) => void; onChange: (event: React.ChangeEvent<any>) => void;
} }
@ -61,14 +67,33 @@ const SiteSettingsMailing: React.FC<SiteSettingsMailingProps> = props => {
</Typography> </Typography>
<TextField <TextField
disabled={disabled} disabled={disabled}
error={!!errors.email} error={!!errors.defaultMailSenderAddress}
fullWidth fullWidth
name="email" name="defaultMailSenderAddress"
label={intl.formatMessage({ label={intl.formatMessage({
defaultMessage: "Mailing email address" defaultMessage: "Mailing email address"
})} })}
helperText={errors.email} helperText={errors.defaultMailSenderAddress}
value={data.name} value={data.defaultMailSenderAddress}
onChange={onChange}
/>
<FormSpacer />
<TextField
disabled={disabled}
error={!!errors.defaultMailSenderName}
fullWidth
name="defaultMailSenderAddress"
label={intl.formatMessage({
defaultMessage: "Mailing email sender"
})}
helperText={
errors.defaultMailSenderName ||
intl.formatMessage({
defaultMessage: 'This will be visible as "from" name',
description: "email sender"
})
}
value={data.defaultMailSenderAddress}
onChange={onChange} onChange={onChange}
/> />
<FormSpacer /> <FormSpacer />
@ -89,7 +114,7 @@ const SiteSettingsMailing: React.FC<SiteSettingsMailingProps> = props => {
"This URL will be used as a main URL for password resets. It will be sent via email." "This URL will be used as a main URL for password resets. It will be sent via email."
}) })
} }
value={data.domain} value={data.passwordResetUrl}
onChange={onChange} onChange={onChange}
/> />
</CardContent> </CardContent>

9
src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx
View file

@ -23,7 +23,9 @@ import { SiteSettings_shop } from "../../types/SiteSettings";
import SiteSettingsAddress from "../SiteSettingsAddress/SiteSettingsAddress"; import SiteSettingsAddress from "../SiteSettingsAddress/SiteSettingsAddress";
import SiteSettingsDetails from "../SiteSettingsDetails/SiteSettingsDetails"; import SiteSettingsDetails from "../SiteSettingsDetails/SiteSettingsDetails";
import SiteSettingsKeys from "../SiteSettingsKeys/SiteSettingsKeys"; import SiteSettingsKeys from "../SiteSettingsKeys/SiteSettingsKeys";
import SiteSettingsMailing from "../SiteSettingsMailing"; import SiteSettingsMailing, {
SiteSettingsMailingFormData
} from "../SiteSettingsMailing";
export interface SiteSettingsPageAddressFormData { export interface SiteSettingsPageAddressFormData {
city: string; city: string;
@ -37,12 +39,11 @@ export interface SiteSettingsPageAddressFormData {
} }
export interface SiteSettingsPageFormData export interface SiteSettingsPageFormData
extends SiteSettingsPageAddressFormData { extends SiteSettingsPageAddressFormData,
SiteSettingsMailingFormData {
description: string; description: string;
domain: string; domain: string;
email: string;
name: string; name: string;
passwordResetUrl: string;
} }
export interface SiteSettingsPageProps { export interface SiteSettingsPageProps {