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

Merge branch 'master' of github.com:mirumee/saleor-dashboard into refactor-zip-codes-to-postal-codes

Browse source
This commit is contained in:
Tomasz Szymanski 2021-01-07 13:26:06 +01:00
commit afbdf0a500
36 changed files with 2516 additions and 939 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
.github/workflows/deploy-staging.yaml vendored Normal file
View file

@ -0,0 +1,42 @@
name: Deploy to staging
on:
push:
branches:
- master
jobs:
build:
runs-on: ubuntu-20.04
env:
API_URI: https://master.staging.saleor.cloud/graphql
APP_MOUNT_URI: /dashboard/
STATIC_URL: /dashboard/static/
steps:
- uses: actions/checkout@v2
- name: Package
run: |
npm ci
npm run build
- uses: actions/upload-artifact@v2
with:
name: build
path: build
deploy:
needs:
- build
runs-on: ubuntu-20.04
steps:
- uses: actions/download-artifact@v2
with:
name: build
path: build
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_STAGING_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_STAGING_SECRET_ACCESS_KEY }}
aws-region: us-east-1
- name: Deploy
run: |
aws s3 sync build/dashboard s3://${{ secrets.AWS_STAGING_DEPLOYMENT_BUCKET }}/saleor-master-staging/static/
aws s3 cp build/dashboard/index.html s3://${{ secrets.AWS_STAGING_DEPLOYMENT_BUCKET }}/saleor-master-staging/
aws cloudfront create-invalidation --distribution-id ${{ secrets.AWS_STAGING_CF_DIST_ID }} --paths "/dashboard*"

95
locale/defaultMessages.json
View file

@ -2200,40 +2200,48 @@
"context": "dialog title",
"string": "Add Address"
},
"src_dot_customers_dot_components_dot_CustomerAddressListPage_dot_1090326769": {
"context": "customer's address book, header",
"string": "{fullName}'s Address Book"
},
"src_dot_customers_dot_components_dot_CustomerAddressListPage_dot_1428369222": {
"string": "This customer doesn’t have any adresses added to his address book. You can add address using the button below."
},
"src_dot_customers_dot_components_dot_CustomerAddressListPage_dot_1484733755": {
"string": "There is no address to show for this customer"
},
"src_dot_customers_dot_components_dot_CustomerAddressListPage_dot_3623935073": {
"src_dot_customers_dot_components_dot_CustomerAddressListPage_dot_addAddress": {
"context": "button",
"string": "Add address"
},
"src_dot_customers_dot_components_dot_CustomerAddressListPage_dot_489918044": {
"src_dot_customers_dot_components_dot_CustomerAddressListPage_dot_doesntHaveAddresses": {
"string": "This customer doesn’t have any adresses added to his address book. You can add address using the button below."
},
"src_dot_customers_dot_components_dot_CustomerAddressListPage_dot_fullNameAddress": {
"context": "customer's address book, header",
"string": "{fullName}'s Address Book"
},
"src_dot_customers_dot_components_dot_CustomerAddressListPage_dot_fullNameDetail": {
"context": "customer details, header",
"string": "{fullName} Details"
},
"src_dot_customers_dot_components_dot_CustomerAddress_dot_1224809208": {
"src_dot_customers_dot_components_dot_CustomerAddressListPage_dot_noAddressToShow": {
"string": "There is no address to show for this customer"
},
"src_dot_customers_dot_components_dot_CustomerAddress_dot_defaultAddress": {
"string": "Default Address"
},
"src_dot_customers_dot_components_dot_CustomerAddress_dot_1578192486": {
"src_dot_customers_dot_components_dot_CustomerAddress_dot_defaultBillingAddress": {
"string": "Default Billing Address"
},
"src_dot_customers_dot_components_dot_CustomerAddress_dot_2131178753": {
"context": "button",
"string": "Set as default shipping address"
"src_dot_customers_dot_components_dot_CustomerAddress_dot_defaultShippingAddress": {
"string": "Default Shipping Address"
},
"src_dot_customers_dot_components_dot_CustomerAddress_dot_3096438859": {
"src_dot_customers_dot_components_dot_CustomerAddress_dot_deleteAddress": {
"context": "button",
"string": "Delete Address"
},
"src_dot_customers_dot_components_dot_CustomerAddress_dot_editAddress": {
"context": "button",
"string": "Edit Address"
},
"src_dot_customers_dot_components_dot_CustomerAddress_dot_setDefaultBilling": {
"context": "button",
"string": "Set as default billing address"
},
"src_dot_customers_dot_components_dot_CustomerAddress_dot_4109348993": {
"string": "Default Shipping Address"
"src_dot_customers_dot_components_dot_CustomerAddress_dot_setDefaultShipping": {
"context": "button",
"string": "Set as default shipping address"
},
"src_dot_customers_dot_components_dot_CustomerAddresses_dot_1967111456": {
"context": "header",
@ -5380,6 +5388,9 @@
"src_dot_shipping_dot_components_dot_ShippingMethodProducts_dot_4190792473": {
"string": "Actions"
},
"src_dot_shipping_dot_components_dot_ShippingRateInfo_dot_579967655": {
"string": "Shipping rate name"
},
"src_dot_shipping_dot_components_dot_ShippingRateZipCodeRangeRemoveDialog_dot_3640694505": {
"string": "Are you sure you want to remove this postal code rule?"
},
@ -5430,33 +5441,47 @@
"src_dot_shipping_dot_components_dot_ShippingZoneCountriesAssignDialog_dot_3510295703": {
"string": "Search Countries"
},
"src_dot_shipping_dot_components_dot_ShippingZoneCreatePage_dot_2364051773": {
"string": "Currently, there are no countries assigned to this shipping zone"
},
"src_dot_shipping_dot_components_dot_ShippingZoneCreatePage_dot_3109712047": {
"src_dot_shipping_dot_components_dot_ShippingZoneCreatePage_dot_countries": {
"context": "country list header",
"string": "Countries"
},
"src_dot_shipping_dot_components_dot_ShippingZoneCreatePage_dot_4049462680": {
"context": "header",
"src_dot_shipping_dot_components_dot_ShippingZoneCreatePage_dot_createZone": {
"context": "section header",
"string": "Create New Shipping Zone"
},
"src_dot_shipping_dot_components_dot_ShippingZoneCreatePage_dot_4270729636": {
"src_dot_shipping_dot_components_dot_ShippingZoneCreatePage_dot_defaultZone": {
"string": "This is default shipping zone, which means that it covers all of the countries which are not assigned to other shipping zones"
},
"src_dot_shipping_dot_components_dot_ShippingZoneDetailsPage_dot_1325966144": {
"string": "Shipping"
},
"src_dot_shipping_dot_components_dot_ShippingZoneDetailsPage_dot_2364051773": {
"src_dot_shipping_dot_components_dot_ShippingZoneCreatePage_dot_noCountriesAssigned": {
"string": "Currently, there are no countries assigned to this shipping zone"
},
"src_dot_shipping_dot_components_dot_ShippingZoneDetailsPage_dot_3109712047": {
"src_dot_shipping_dot_components_dot_ShippingZoneDetailsPage_dot_countries": {
"context": "country list header",
"string": "Countries"
},
"src_dot_shipping_dot_components_dot_ShippingZoneDetailsPage_dot_4270729636": {
"src_dot_shipping_dot_components_dot_ShippingZoneDetailsPage_dot_defaultZone": {
"string": "This is default shipping zone, which means that it covers all of the countries which are not assigned to other shipping zones"
},
"src_dot_shipping_dot_components_dot_ShippingZoneInfo_dot_579967655": {
"string": "Shipping rate name"
"src_dot_shipping_dot_components_dot_ShippingZoneDetailsPage_dot_noCountriesAssigned": {
"string": "Currently, there are no countries assigned to this shipping zone"
},
"src_dot_shipping_dot_components_dot_ShippingZoneDetailsPage_dot_shipping": {
"context": "shipping section header",
"string": "Shipping"
},
"src_dot_shipping_dot_components_dot_ShippingZoneInfo_dot_1470703814": {
"context": "field placeholder",
"string": "Description of a shipping zone."
},
"src_dot_shipping_dot_components_dot_ShippingZoneInfo_dot_1560416099": {
"string": "Shipping zone name"
},
"src_dot_shipping_dot_components_dot_ShippingZoneInfo_dot_3374163063": {
"string": "Description"
},
"src_dot_shipping_dot_components_dot_ShippingZoneInfo_dot_3877274856": {
"context": "character limit",
"string": "{numberOfCharacters} of {maxCharacters} characters"
},
"src_dot_shipping_dot_components_dot_ShippingZoneRatesCreatePage_dot_1161979494": {
"context": "page title",

3
schema.graphql
View file

@ -4782,6 +4782,7 @@ type ShippingZone implements Node & ObjectWithMetadata {
countries: [CountryDisplay]
shippingMethods: [ShippingMethod]
warehouses: [Warehouse]
description: String
}
type ShippingZoneBulkDelete {
@ -4809,6 +4810,7 @@ type ShippingZoneCreate {
input ShippingZoneCreateInput {
name: String
description: String
countries: [String]
default: Boolean
addWarehouses: [ID]
@ -4828,6 +4830,7 @@ type ShippingZoneUpdate {
input ShippingZoneUpdateInput {
name: String
description: String
countries: [String]
default: Boolean
addWarehouses: [ID]

1
src/components/AddressFormatter/AddressFormatter.tsx
View file

@ -21,6 +21,7 @@ const AddressFormatter: React.FC<AddressFormatterProps> = ({ address }) => {
<Typography component="p">
{address.firstName} {address.lastName}
</Typography>
<Typography component="p">{address.phone}</Typography>
{address.companyName && (
<Typography component="p">{address.companyName}</Typography>
)}

73
src/customers/components/CustomerAddress/CustomerAddress.tsx
View file

@ -1,15 +1,12 @@
import Button from "@material-ui/core/Button";
import Card from "@material-ui/core/Card";
import CardActions from "@material-ui/core/CardActions";
import CardContent from "@material-ui/core/CardContent";
import { makeStyles } from "@material-ui/core/styles";
import AddressFormatter from "@saleor/components/AddressFormatter";
import CardMenu from "@saleor/components/CardMenu";
import CardTitle from "@saleor/components/CardTitle";
import Skeleton from "@saleor/components/Skeleton";
import { buttonMessages } from "@saleor/intl";
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { defineMessages, useIntl } from "react-intl";
import { AddressTypeEnum } from "../../../types/globalTypes";
import { CustomerAddresses_user_addresses } from "../../types/CustomerAddresses";
@ -25,6 +22,34 @@ export interface CustomerAddressProps {
onSetAsDefault: (type: AddressTypeEnum) => void;
}
const messages = defineMessages({
defaultAddress: {
defaultMessage: "Default Address"
},
defaultShippingAddress: {
defaultMessage: "Default Shipping Address"
},
defaultBillingAddress: {
defaultMessage: "Default Billing Address"
},
setDefaultShipping: {
defaultMessage: "Set as default shipping address",
description: "button"
},
setDefaultBilling: {
defaultMessage: "Set as default billing address",
description: "button"
},
editAddress: {
defaultMessage: "Edit Address",
description: "button"
},
deleteAddress: {
defaultMessage: "Delete Address",
description: "button"
}
});
const useStyles = makeStyles(
{
actions: {
@ -64,17 +89,11 @@ const CustomerAddress: React.FC<CustomerAddressProps> = props => {
address ? (
<>
{isDefaultBillingAddress && isDefaultShippingAddress
? intl.formatMessage({
defaultMessage: "Default Address"
})
? intl.formatMessage(messages.defaultAddress)
: isDefaultShippingAddress
? intl.formatMessage({
defaultMessage: "Default Shipping Address"
})
? intl.formatMessage(messages.defaultShippingAddress)
: isDefaultBillingAddress
? intl.formatMessage({
defaultMessage: "Default Billing Address"
})
? intl.formatMessage(messages.defaultBillingAddress)
: null}
</>
) : (
@ -87,18 +106,20 @@ const CustomerAddress: React.FC<CustomerAddressProps> = props => {
disabled={disabled}
menuItems={[
{
label: intl.formatMessage({
defaultMessage: "Set as default shipping address",
description: "button"
}),
label: intl.formatMessage(messages.setDefaultShipping),
onSelect: () => onSetAsDefault(AddressTypeEnum.SHIPPING)
},
{
label: intl.formatMessage({
defaultMessage: "Set as default billing address",
description: "button"
}),
label: intl.formatMessage(messages.setDefaultBilling),
onSelect: () => onSetAsDefault(AddressTypeEnum.BILLING)
},
{
label: intl.formatMessage(messages.editAddress),
onSelect: () => onEdit()
},
{
label: intl.formatMessage(messages.deleteAddress),
onSelect: () => onRemove()
}
]}
/>
@ -107,16 +128,6 @@ const CustomerAddress: React.FC<CustomerAddressProps> = props => {
<CardContent>
<AddressFormatter address={address} />
</CardContent>
<div className={classes.actionsContainer}>
<CardActions className={classes.actions}>
<Button color="primary" disabled={disabled} onClick={onEdit}>
<FormattedMessage {...buttonMessages.edit} />
</Button>
<Button color="primary" disabled={disabled} onClick={onRemove}>
<FormattedMessage {...buttonMessages.delete} />
</Button>
</CardActions>
</div>
</Card>
);
};

38
src/customers/components/CustomerAddressDialog/CustomerAddressDialog.tsx
View file

@ -14,7 +14,6 @@ import useAddressValidation from "@saleor/hooks/useAddressValidation";
import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors";
import useStateFromProps from "@saleor/hooks/useStateFromProps";
import { buttonMessages } from "@saleor/intl";
import { maybe } from "@saleor/misc";
import { AddressInput } from "@saleor/types/globalTypes";
import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler";
import React from "react";
@ -59,7 +58,7 @@ const CustomerAddressDialog = withStyles(
onConfirm
}: CustomerAddressDialogProps & WithStyles<typeof styles>) => {
const [countryDisplayName, setCountryDisplayName] = useStateFromProps(
maybe(() => address.country.country, "")
address?.country.country || ""
);
const {
errors: validationErrors,
@ -71,27 +70,24 @@ const CustomerAddressDialog = withStyles(
);
const initialForm: AddressTypeInput = {
city: maybe(() => address.city, ""),
cityArea: maybe(() => address.cityArea, ""),
companyName: maybe(() => address.companyName, ""),
country: maybe(() => address.country.code, ""),
countryArea: maybe(() => address.countryArea, ""),
firstName: maybe(() => address.firstName, ""),
lastName: maybe(() => address.lastName, ""),
phone: maybe(() => address.phone, ""),
postalCode: maybe(() => address.postalCode, ""),
streetAddress1: maybe(() => address.streetAddress1, ""),
streetAddress2: maybe(() => address.streetAddress2, "")
city: address?.city || "",
cityArea: address?.cityArea || "",
companyName: address?.companyName || "",
country: address?.country.code || "",
countryArea: address?.countryArea || "",
firstName: address?.firstName || "",
lastName: address?.lastName || "",
phone: address?.phone || "",
postalCode: address?.postalCode || "",
streetAddress1: address?.streetAddress1 || "",
streetAddress2: address?.streetAddress2 || ""
};
const countryChoices = maybe(
() =>
countries.map(country => ({
label: country.label,
value: country.code
})),
[]
);
const countryChoices =
countries?.map(country => ({
label: country.label,
value: country.code
})) || [];
return (
<Dialog

113
src/customers/components/CustomerAddressListPage/CustomerAddressListPage.tsx
View file

@ -4,10 +4,10 @@ import Typography from "@material-ui/core/Typography";
import AppHeader from "@saleor/components/AppHeader";
import Container from "@saleor/components/Container";
import PageHeader from "@saleor/components/PageHeader";
import { renderCollection } from "@saleor/misc";
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { defineMessages, useIntl } from "react-intl";
import { maybe, renderCollection } from "../../../misc";
import { AddressTypeEnum } from "../../../types/globalTypes";
import { CustomerAddresses_user } from "../../types/CustomerAddresses";
import CustomerAddress from "../CustomerAddress/CustomerAddress";
@ -22,6 +22,28 @@ export interface CustomerAddressListPageProps {
onSetAsDefault: (id: string, type: AddressTypeEnum) => void;
}
const messages = defineMessages({
fullNameAddress: {
defaultMessage: "{fullName}'s Address Book",
description: "customer's address book, header"
},
fullNameDetail: {
defaultMessage: "{fullName} Details",
description: "customer details, header"
},
addAddress: {
defaultMessage: "Add address",
description: "button"
},
noAddressToShow: {
defaultMessage: "There is no address to show for this customer"
},
doesntHaveAddresses: {
defaultMessage:
"This customer doesn’t have any adresses added to his address book. You can add address using the button below."
}
});
const useStyles = makeStyles(
theme => ({
addButton: {
@ -36,10 +58,15 @@ const useStyles = makeStyles(
width: 600
},
root: {
columnGap: theme.spacing(3),
display: "grid",
gap: `${theme.spacing(3)}px`,
gridTemplateColumns: "repeat(3, 1fr)",
rowGap: theme.spacing(3)
[theme.breakpoints.down("md")]: {
gridTemplateColumns: "repeat(2, 1fr)"
},
[theme.breakpoints.down("sm")]: {
gridTemplateColumns: "repeat(1, 1fr)"
}
}
}),
{ name: "CustomerAddressListPage" }
@ -59,50 +86,30 @@ const CustomerAddressListPage: React.FC<CustomerAddressListPageProps> = props =>
const intl = useIntl();
const isEmpty = maybe(() => customer.addresses.length) === 0;
const fullName = maybe(
() => [customer.firstName, customer.lastName].join(" "),
"..."
);
const isEmpty = customer?.addresses?.length === 0;
const fullName = [customer?.firstName, customer?.lastName].join(" ") || "...";
return (
<Container>
<AppHeader onBack={onBack}>
<FormattedMessage
defaultMessage="{fullName} Details"
description="customer details, header"
values={{
fullName
}}
/>
{intl.formatMessage(messages.fullNameDetail, { fullName })}
</AppHeader>
{!isEmpty && (
<PageHeader
title={intl.formatMessage(
{
defaultMessage: "{fullName}'s Address Book",
description: "customer's address book, header"
},
{
fullName
}
)}
title={intl.formatMessage(messages.fullNameAddress, { fullName })}
>
<Button color="primary" variant="contained" onClick={onAdd}>
<FormattedMessage
defaultMessage="Add address"
description="button"
/>
{intl.formatMessage(messages.addAddress)}
</Button>
</PageHeader>
)}
{isEmpty ? (
<div className={classes.empty}>
<Typography variant="h5">
<FormattedMessage defaultMessage="There is no address to show for this customer" />
{intl.formatMessage(messages.noAddressToShow)}
</Typography>
<Typography className={classes.description}>
<FormattedMessage defaultMessage="This customer doesn’t have any adresses added to his address book. You can add address using the button below." />
{intl.formatMessage(messages.doesntHaveAddresses)}
</Typography>
<Button
className={classes.addButton}
@ -110,36 +117,28 @@ const CustomerAddressListPage: React.FC<CustomerAddressListPageProps> = props =>
variant="contained"
onClick={onAdd}
>
<FormattedMessage
defaultMessage="Add address"
description="button"
/>
{intl.formatMessage(messages.addAddress)}
</Button>
</div>
) : (
<div className={classes.root}>
{renderCollection(
maybe(() => customer.addresses),
(address, addressNumber) => (
<CustomerAddress
address={address}
addressNumber={addressNumber + 1}
disabled={disabled}
isDefaultBillingAddress={
maybe(() => customer.defaultBillingAddress.id) ===
maybe(() => address.id)
}
isDefaultShippingAddress={
maybe(() => customer.defaultShippingAddress.id) ===
maybe(() => address.id)
}
onEdit={() => onEdit(address.id)}
onRemove={() => onRemove(address.id)}
onSetAsDefault={type => onSetAsDefault(address.id, type)}
key={maybe(() => address.id, "skeleton")}
/>
)
)}
{renderCollection(customer?.addresses, (address, addressNumber) => (
<CustomerAddress
address={address}
addressNumber={addressNumber + 1}
disabled={disabled}
isDefaultBillingAddress={
customer?.defaultBillingAddress?.id === address?.id
}
isDefaultShippingAddress={
customer?.defaultShippingAddress?.id === address?.id
}
onEdit={() => onEdit(address.id)}
onRemove={() => onRemove(address.id)}
onSetAsDefault={type => onSetAsDefault(address.id, type)}
key={address?.id || "skeleton"}
/>
))}
</div>
)}
</Container>

136
src/customers/components/CustomerDetailsPage/CustomerDetailsPage.tsx
View file

@ -4,11 +4,15 @@ import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton";
import Container from "@saleor/components/Container";
import Form from "@saleor/components/Form";
import Grid from "@saleor/components/Grid";
import Metadata from "@saleor/components/Metadata/Metadata";
import { MetadataFormData } from "@saleor/components/Metadata/types";
import PageHeader from "@saleor/components/PageHeader";
import SaveButtonBar from "@saleor/components/SaveButtonBar";
import { AccountErrorFragment } from "@saleor/fragments/types/AccountErrorFragment";
import { SubmitPromise } from "@saleor/hooks/useForm";
import { sectionNames } from "@saleor/intl";
import { mapMetadataItemToInput } from "@saleor/utils/maps";
import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger";
import React from "react";
import { useIntl } from "react-intl";
@ -20,7 +24,7 @@ import CustomerInfo from "../CustomerInfo";
import CustomerOrders from "../CustomerOrders";
import CustomerStats from "../CustomerStats";
export interface CustomerDetailsPageFormData {
export interface CustomerDetailsPageFormData extends MetadataFormData {
firstName: string;
lastName: string;
email: string;
@ -55,68 +59,78 @@ const CustomerDetailsPage: React.FC<CustomerDetailsPageProps> = ({
}: CustomerDetailsPageProps) => {
const intl = useIntl();
const initialForm: CustomerDetailsPageFormData = {
email: customer?.email || "",
firstName: customer?.firstName || "",
isActive: customer?.isActive || false,
lastName: customer?.lastName || "",
note: customer?.note || "",
metadata: customer?.metadata.map(mapMetadataItemToInput),
privateMetadata: customer?.privateMetadata.map(mapMetadataItemToInput)
};
const {
makeChangeHandler: makeMetadataChangeHandler
} = useMetadataChangeTrigger();
return (
<Form
initial={{
email: maybe(() => customer.email, ""),
firstName: maybe(() => customer.firstName, ""),
isActive: maybe(() => customer.isActive, false),
lastName: maybe(() => customer.lastName, ""),
note: maybe(() => customer.note, "")
<Form initial={initialForm} onSubmit={onSubmit} confirmLeave>
{({ change, data, hasChanged, submit }) => {
const changeMetadata = makeMetadataChangeHandler(change);
return (
<Container>
<AppHeader onBack={onBack}>
{intl.formatMessage(sectionNames.customers)}
</AppHeader>
<PageHeader title={getUserName(customer, true)} />
<Grid>
<div>
<CustomerDetails
customer={customer}
data={data}
disabled={disabled}
errors={errors}
onChange={change}
/>
<CardSpacer />
<CustomerInfo
data={data}
disabled={disabled}
errors={errors}
onChange={change}
/>
<CardSpacer />
<CustomerOrders
orders={maybe(() =>
customer.orders.edges.map(edge => edge.node)
)}
onViewAllOrdersClick={onViewAllOrdersClick}
onRowClick={onRowClick}
/>
<CardSpacer />
<Metadata data={data} onChange={changeMetadata} />
</div>
<div>
<CustomerAddresses
customer={customer}
disabled={disabled}
onAddressManageClick={onAddressManageClick}
/>
<CardSpacer />
<CustomerStats customer={customer} />
</div>
</Grid>
<SaveButtonBar
disabled={disabled || !hasChanged}
state={saveButtonBar}
onSave={submit}
onCancel={onBack}
onDelete={onDelete}
/>
</Container>
);
}}
onSubmit={onSubmit}
confirmLeave
>
{({ change, data, hasChanged, submit }) => (
<Container>
<AppHeader onBack={onBack}>
{intl.formatMessage(sectionNames.customers)}
</AppHeader>
<PageHeader title={getUserName(customer, true)} />
<Grid>
<div>
<CustomerDetails
customer={customer}
data={data}
disabled={disabled}
errors={errors}
onChange={change}
/>
<CardSpacer />
<CustomerInfo
data={data}
disabled={disabled}
errors={errors}
onChange={change}
/>
<CardSpacer />
<CustomerOrders
orders={maybe(() =>
customer.orders.edges.map(edge => edge.node)
)}
onViewAllOrdersClick={onViewAllOrdersClick}
onRowClick={onRowClick}
/>
</div>
<div>
<CustomerAddresses
customer={customer}
disabled={disabled}
onAddressManageClick={onAddressManageClick}
/>
<CardSpacer />
<CustomerStats customer={customer} />
</div>
</Grid>
<SaveButtonBar
disabled={disabled || !hasChanged}
state={saveButtonBar}
onSave={submit}
onCancel={onBack}
onDelete={onDelete}
/>
</Container>
)}
</Form>
);
};

2
src/customers/fixtures.ts
View file

@ -946,6 +946,8 @@ export const customerList: ListCustomers_customers_edges_node[] = [
];
export const customer: CustomerDetails_user & CustomerAddresses_user = {
__typename: "User",
metadata: [],
privateMetadata: [],
addresses: [
{
__typename: "Address",

14
src/customers/types/CustomerDetails.ts
View file

@ -8,6 +8,18 @@ import { PaymentChargeStatusEnum } from "./../../types/globalTypes";
// GraphQL query operation: CustomerDetails
// ====================================================
export interface CustomerDetails_user_metadata {
__typename: "MetadataItem";
key: string;
value: string;
}
export interface CustomerDetails_user_privateMetadata {
__typename: "MetadataItem";
key: string;
value: string;
}
export interface CustomerDetails_user_defaultShippingAddress_country {
__typename: "CountryDisplay";
code: string;
@ -104,6 +116,8 @@ export interface CustomerDetails_user {
email: string;
firstName: string;
lastName: string;
metadata: (CustomerDetails_user_metadata | null)[];
privateMetadata: (CustomerDetails_user_privateMetadata | null)[];
dateJoined: any;
lastLogin: any | null;
defaultShippingAddress: CustomerDetails_user_defaultShippingAddress | null;

14
src/customers/types/UpdateCustomer.ts
View file

@ -14,6 +14,18 @@ export interface UpdateCustomer_customerUpdate_errors {
field: string | null;
}
export interface UpdateCustomer_customerUpdate_user_metadata {
__typename: "MetadataItem";
key: string;
value: string;
}
export interface UpdateCustomer_customerUpdate_user_privateMetadata {
__typename: "MetadataItem";
key: string;
value: string;
}
export interface UpdateCustomer_customerUpdate_user_defaultShippingAddress_country {
__typename: "CountryDisplay";
code: string;
@ -64,6 +76,8 @@ export interface UpdateCustomer_customerUpdate_user {
email: string;
firstName: string;
lastName: string;
metadata: (UpdateCustomer_customerUpdate_user_metadata | null)[];
privateMetadata: (UpdateCustomer_customerUpdate_user_privateMetadata | null)[];
dateJoined: any;
lastLogin: any | null;
defaultShippingAddress: UpdateCustomer_customerUpdate_user_defaultShippingAddress | null;

46
src/customers/views/CustomerAddresses.tsx
View file

@ -9,7 +9,6 @@ import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandl
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { maybe } from "../../misc";
import CustomerAddressDialog from "../components/CustomerAddressDialog";
import CustomerAddressListPage from "../components/CustomerAddressListPage";
import {
@ -102,23 +101,20 @@ const CustomerAddresses: React.FC<CustomerAddressesProps> = ({
{(removeCustomerAddress, removeCustomerAddressOpts) => (
<TypedCustomerAddressesQuery variables={{ id }}>
{customerData => {
const countryChoices = maybe(
() =>
shop.countries.map(country => ({
code: country.code,
label: country.country
})),
[]
);
const countryChoices =
shop?.countries?.map(country => ({
code: country.code,
label: country.country
})) || [];
return (
<>
<WindowTitle
title={maybe(() => customerData.data.user.email)}
title={customerData?.data?.user.email}
/>
<CustomerAddressListPage
customer={maybe(() => customerData.data.user)}
disabled={customerData.loading}
customer={customerData?.data?.user}
disabled={customerData?.loading}
onAdd={() => openModal("add")}
onBack={() => navigate(customerUrl(id))}
onEdit={id =>
@ -143,12 +139,10 @@ const CustomerAddresses: React.FC<CustomerAddressesProps> = ({
createCustomerAddressOpts.status
}
countries={countryChoices}
errors={maybe(
() =>
createCustomerAddressOpts.data.addressCreate
.errors,
[]
)}
errors={
createCustomerAddressOpts?.data?.addressCreate
.errors || []
}
open={params.action === "add"}
variant="create"
onClose={closeModal}
@ -162,21 +156,17 @@ const CustomerAddresses: React.FC<CustomerAddressesProps> = ({
}
/>
<CustomerAddressDialog
address={maybe(() =>
customerData.data.user.addresses.find(
addr => addr.id === params.id
)
address={customerData?.data?.user.addresses.find(
addr => addr.id === params.id
)}
confirmButtonState={
updateCustomerAddressOpts.status
}
countries={countryChoices}
errors={maybe(
() =>
updateCustomerAddressOpts.data.addressUpdate
.errors,
[]
)}
errors={
updateCustomerAddressOpts?.data?.addressUpdate
.errors || []
}
open={params.action === "edit"}
variant="edit"
onClose={closeModal}

17
src/customers/views/CustomerDetails.tsx
View file

@ -5,6 +5,11 @@ import { WindowTitle } from "@saleor/components/WindowTitle";
import useNavigator from "@saleor/hooks/useNavigator";
import useNotifier from "@saleor/hooks/useNotifier";
import { commonMessages } from "@saleor/intl";
import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler";
import {
useMetadataUpdate,
usePrivateMetadataUpdate
} from "@saleor/utils/metadata/updateMetadata";
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";
@ -78,7 +83,10 @@ export const CustomerDetailsView: React.FC<CustomerDetailsViewProps> = ({
return <NotFoundPage onBack={handleBack} />;
}
const handleSubmit = async (
const [updateMetadata] = useMetadataUpdate({});
const [updatePrivateMetadata] = usePrivateMetadataUpdate({});
const updateData = async (
data: CustomerDetailsPageFormData
) => {
const result = await updateCustomer({
@ -97,6 +105,13 @@ export const CustomerDetailsView: React.FC<CustomerDetailsViewProps> = ({
return result.data.customerUpdate.errors;
};
const handleSubmit = createMetadataUpdateHandler(
user,
updateData,
variables => updateMetadata({ variables }),
variables => updatePrivateMetadata({ variables })
);
return (
<>
<WindowTitle

3
src/fragments/customers.ts
View file

@ -1,6 +1,7 @@
import gql from "graphql-tag";
import { fragmentAddress } from "./address";
import { metadataFragment } from "./metadata";
export const customerFragment = gql`
fragment CustomerFragment on User {
@ -12,10 +13,12 @@ export const customerFragment = gql`
`;
export const customerDetailsFragment = gql`
${metadataFragment}
${customerFragment}
${fragmentAddress}
fragment CustomerDetailsFragment on User {
...CustomerFragment
...MetadataFragment
dateJoined
lastLogin
defaultShippingAddress {

1
src/fragments/shipping.ts
View file

@ -13,6 +13,7 @@ export const shippingZoneFragment = gql`
country
}
name
description
}
`;

14
src/fragments/types/CustomerDetailsFragment.ts
View file

@ -6,6 +6,18 @@
// GraphQL fragment: CustomerDetailsFragment
// ====================================================
export interface CustomerDetailsFragment_metadata {
__typename: "MetadataItem";
key: string;
value: string;
}
export interface CustomerDetailsFragment_privateMetadata {
__typename: "MetadataItem";
key: string;
value: string;
}
export interface CustomerDetailsFragment_defaultShippingAddress_country {
__typename: "CountryDisplay";
code: string;
@ -56,6 +68,8 @@ export interface CustomerDetailsFragment {
email: string;
firstName: string;
lastName: string;
metadata: (CustomerDetailsFragment_metadata | null)[];
privateMetadata: (CustomerDetailsFragment_privateMetadata | null)[];
dateJoined: any;
lastLogin: any | null;
defaultShippingAddress: CustomerDetailsFragment_defaultShippingAddress | null;

1
src/fragments/types/ShippingZoneDetailsFragment.ts
View file

@ -117,6 +117,7 @@ export interface ShippingZoneDetailsFragment {
id: string;
countries: (ShippingZoneDetailsFragment_countries | null)[] | null;
name: string;
description: string | null;
default: boolean;
shippingMethods: (ShippingZoneDetailsFragment_shippingMethods | null)[] | null;
warehouses: (ShippingZoneDetailsFragment_warehouses | null)[] | null;

1
src/fragments/types/ShippingZoneFragment.ts
View file

@ -31,4 +31,5 @@ export interface ShippingZoneFragment {
id: string;
countries: (ShippingZoneFragment_countries | null)[] | null;
name: string;
description: string | null;
}

22
src/misc.ts
View file

@ -197,17 +197,17 @@ export const transformOrderStatus = (
};
export const transformAddressToForm = (data: AddressType) => ({
city: maybe(() => data.city, ""),
cityArea: maybe(() => data.cityArea, ""),
companyName: maybe(() => data.companyName, ""),
country: maybe(() => data.country.code, ""),
countryArea: maybe(() => data.countryArea, ""),
firstName: maybe(() => data.firstName, ""),
lastName: maybe(() => data.lastName, ""),
phone: maybe(() => data.phone, ""),
postalCode: maybe(() => data.postalCode, ""),
streetAddress1: maybe(() => data.streetAddress1, ""),
streetAddress2: maybe(() => data.streetAddress2, "")
city: data?.city || "",
cityArea: data?.cityArea || "",
companyName: data?.companyName || "",
country: data?.country?.code || "",
countryArea: data?.countryArea || "",
firstName: data?.firstName || "",
lastName: data?.lastName || "",
phone: data?.phone || "",
postalCode: data?.postalCode || "",
streetAddress1: data?.streetAddress1 || "",
streetAddress2: data?.streetAddress2 || ""
});
export function maybe<T>(exp: () => T): T | undefined;

52
src/shipping/components/ShippingRateInfo/ShippingRateInfo.tsx Normal file
View file

@ -0,0 +1,52 @@
import Card from "@material-ui/core/Card";
import CardContent from "@material-ui/core/CardContent";
import TextField from "@material-ui/core/TextField";
import CardTitle from "@saleor/components/CardTitle";
import { ShippingErrorFragment } from "@saleor/fragments/types/ShippingErrorFragment";
import { commonMessages } from "@saleor/intl";
import { getFormErrors } from "@saleor/utils/errors";
import getShippingErrorMessage from "@saleor/utils/errors/shipping";
import React from "react";
import { useIntl } from "react-intl";
export interface ShippingRateInfoProps {
data: Record<"name", string>;
disabled: boolean;
errors: ShippingErrorFragment[];
onChange: (event: React.ChangeEvent<any>) => void;
}
const ShippingRateInfo: React.FC<ShippingRateInfoProps> = ({
data,
disabled,
errors,
onChange
}) => {
const intl = useIntl();
const formErrors = getFormErrors(["name"], errors);
return (
<Card>
<CardTitle
title={intl.formatMessage(commonMessages.generalInformations)}
/>
<CardContent>
<TextField
disabled={disabled}
error={!!formErrors.name}
fullWidth
helperText={getShippingErrorMessage(formErrors.name, intl)}
label={intl.formatMessage({
defaultMessage: "Shipping rate name"
})}
name="name"
value={data.name}
onChange={onChange}
/>
</CardContent>
</Card>
);
};
ShippingRateInfo.displayName = "ShippingRateInfo";
export default ShippingRateInfo;

2
src/shipping/components/ShippingRateInfo/index.ts Normal file
View file

@ -0,0 +1,2 @@
export { default } from "./ShippingRateInfo";
export * from "./ShippingRateInfo";

44
src/shipping/components/ShippingZoneCreatePage/ShippingZoneCreatePage.tsx
View file

@ -11,7 +11,7 @@ import { CountryFragment } from "@saleor/fragments/types/CountryFragment";
import { ShippingErrorFragment } from "@saleor/fragments/types/ShippingErrorFragment";
import { sectionNames } from "@saleor/intl";
import React from "react";
import { useIntl } from "react-intl";
import { defineMessages, useIntl } from "react-intl";
import ShippingZoneCountriesAssignDialog from "../ShippingZoneCountriesAssignDialog";
import ShippingZoneInfo from "../ShippingZoneInfo";
@ -19,9 +19,29 @@ import ShippingZoneInfo from "../ShippingZoneInfo";
export interface FormData {
countries: string[];
default: boolean;
description: string;
name: string;
}
const messages = defineMessages({
countries: {
defaultMessage: "Countries",
description: "country list header"
},
createZone: {
defaultMessage: "Create New Shipping Zone",
description: "section header"
},
defaultZone: {
defaultMessage:
"This is default shipping zone, which means that it covers all of the countries which are not assigned to other shipping zones"
},
noCountriesAssigned: {
defaultMessage:
"Currently, there are no countries assigned to this shipping zone"
}
});
export interface ShippingZoneCreatePageProps {
countries: CountryFragment[];
disabled: boolean;
@ -46,6 +66,7 @@ const ShippingZoneCreatePage: React.FC<ShippingZoneCreatePageProps> = ({
const initialForm: FormData = {
countries: [],
default: false,
description: "",
name: ""
};
@ -57,12 +78,7 @@ const ShippingZoneCreatePage: React.FC<ShippingZoneCreatePageProps> = ({
<AppHeader onBack={onBack}>
{intl.formatMessage(sectionNames.shipping)}
</AppHeader>
<PageHeader
title={intl.formatMessage({
defaultMessage: "Create New Shipping Zone",
description: "header"
})}
/>
<PageHeader title={intl.formatMessage(messages.createZone)} />
<Grid>
<div>
<ShippingZoneInfo
@ -79,14 +95,8 @@ const ShippingZoneCreatePage: React.FC<ShippingZoneCreatePageProps> = ({
disabled={disabled}
emptyText={
data.default
? intl.formatMessage({
defaultMessage:
"This is default shipping zone, which means that it covers all of the countries which are not assigned to other shipping zones"
})
: intl.formatMessage({
defaultMessage:
"Currently, there are no countries assigned to this shipping zone"
})
? intl.formatMessage(messages.defaultZone)
: intl.formatMessage(messages.noCountriesAssigned)
}
onCountryAssign={toggleModal}
onCountryUnassign={countryCode =>
@ -99,9 +109,7 @@ const ShippingZoneCreatePage: React.FC<ShippingZoneCreatePageProps> = ({
}
} as any)
}
title={intl.formatMessage({
defaultMessage: "Countries"
})}
title={intl.formatMessage(messages.countries)}
/>
</div>
</Grid>

39
src/shipping/components/ShippingZoneDetailsPage/ShippingZoneDetailsPage.tsx
View file

@ -22,7 +22,7 @@ import createMultiAutocompleteSelectHandler from "@saleor/utils/handlers/multiAu
import { mapMetadataItemToInput } from "@saleor/utils/maps";
import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger";
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { defineMessages, FormattedMessage, useIntl } from "react-intl";
import { getStringOrPlaceholder } from "../../../misc";
import { ChannelProps, FetchMoreProps, SearchProps } from "../../../types";
@ -33,9 +33,29 @@ import ShippingZoneWarehouses from "../ShippingZoneWarehouses";
export interface FormData extends MetadataFormData {
name: string;
description: string;
warehouses: string[];
}
const messages = defineMessages({
countries: {
defaultMessage: "Countries",
description: "country list header"
},
defaultZone: {
defaultMessage:
"This is default shipping zone, which means that it covers all of the countries which are not assigned to other shipping zones"
},
noCountriesAssigned: {
defaultMessage:
"Currently, there are no countries assigned to this shipping zone"
},
shipping: {
defaultMessage: "Shipping",
description: "shipping section header"
}
});
export interface ShippingZoneDetailsPageProps
extends FetchMoreProps,
SearchProps,
@ -93,6 +113,7 @@ const ShippingZoneDetailsPage: React.FC<ShippingZoneDetailsPageProps> = ({
const intl = useIntl();
const initialForm: FormData = {
description: shippingZone?.description || "",
metadata: shippingZone?.metadata.map(mapMetadataItemToInput),
name: shippingZone?.name || "",
privateMetadata: shippingZone?.privateMetadata.map(mapMetadataItemToInput),
@ -128,7 +149,7 @@ const ShippingZoneDetailsPage: React.FC<ShippingZoneDetailsPageProps> = ({
return (
<Container>
<AppHeader onBack={onBack}>
<FormattedMessage defaultMessage="Shipping" />
<FormattedMessage {...messages.shipping} />
</AppHeader>
<PageHeader title={shippingZone?.name} />
<Grid>
@ -147,20 +168,12 @@ const ShippingZoneDetailsPage: React.FC<ShippingZoneDetailsPageProps> = ({
shippingZone?.default === undefined
? undefined
: shippingZone.default
? intl.formatMessage({
defaultMessage:
"This is default shipping zone, which means that it covers all of the countries which are not assigned to other shipping zones"
})
: intl.formatMessage({
defaultMessage:
"Currently, there are no countries assigned to this shipping zone"
})
? intl.formatMessage(messages.defaultZone)
: intl.formatMessage(messages.noCountriesAssigned)
)}
onCountryAssign={onCountryAdd}
onCountryUnassign={onCountryRemove}
title={intl.formatMessage({
defaultMessage: "Countries"
})}
title={intl.formatMessage(messages.countries)}
/>
<CardSpacer />
<ShippingZoneRates

65
src/shipping/components/ShippingZoneInfo/ShippingZoneInfo.tsx
View file

@ -1,21 +1,40 @@
import Card from "@material-ui/core/Card";
import CardContent from "@material-ui/core/CardContent";
import makeStyles from "@material-ui/core/styles/makeStyles";
import TextField from "@material-ui/core/TextField";
import CardSpacer from "@saleor/components/CardSpacer";
import CardTitle from "@saleor/components/CardTitle";
import { ShippingErrorFragment } from "@saleor/fragments/types/ShippingErrorFragment";
import { commonMessages } from "@saleor/intl";
import { getFormErrors } from "@saleor/utils/errors";
import getShippingErrorMessage from "@saleor/utils/errors/shipping";
import React from "react";
import { useIntl } from "react-intl";
import { FormattedMessage, useIntl } from "react-intl";
export interface ShippingZoneInfoProps {
data: Record<"name", string>;
data: Record<"name" | "description", string>;
disabled: boolean;
errors: ShippingErrorFragment[];
onChange: (event: React.ChangeEvent<any>) => void;
}
const useStyles = makeStyles(
{
label: {
flex: 1
},
labelContainer: {
"& span": {
paddingRight: 30
},
display: "flex"
}
},
{ name: "ShippingZoneCreatePage" }
);
const MAX_DESCRIPTION_LENGTH = 300;
const ShippingZoneInfo: React.FC<ShippingZoneInfoProps> = ({
data,
disabled,
@ -23,6 +42,7 @@ const ShippingZoneInfo: React.FC<ShippingZoneInfoProps> = ({
onChange
}) => {
const intl = useIntl();
const classes = useStyles({});
const formErrors = getFormErrors(["name"], errors);
@ -38,12 +58,51 @@ const ShippingZoneInfo: React.FC<ShippingZoneInfoProps> = ({
fullWidth
helperText={getShippingErrorMessage(formErrors.name, intl)}
label={intl.formatMessage({
defaultMessage: "Shipping rate name"
defaultMessage: "Shipping zone name"
})}
name="name"
value={data.name}
onChange={onChange}
/>
<CardSpacer />
<TextField
error={data.description.length > MAX_DESCRIPTION_LENGTH}
name={"description"}
label={
<div className={classes.labelContainer}>
<div className={classes.label}>
<FormattedMessage defaultMessage="Description" />
</div>
{data.description?.length > 0 && (
<span>
<FormattedMessage
defaultMessage="{numberOfCharacters} of {maxCharacters} characters"
description="character limit"
values={{
maxCharacters: MAX_DESCRIPTION_LENGTH,
numberOfCharacters: data.description.length
}}
/>
</span>
)}
</div>
}
InputProps={{
inputProps: {
maxLength: MAX_DESCRIPTION_LENGTH
}
}}
value={data.description}
onChange={onChange}
disabled={disabled}
fullWidth
multiline
placeholder={intl.formatMessage({
defaultMessage: "Description of a shipping zone.",
description: "field placeholder"
})}
rows={10}
/>
</CardContent>
</Card>
);

8
src/shipping/components/ShippingZoneRates/ShippingZoneRates.tsx
View file

@ -37,15 +37,15 @@ const useStyles = makeStyles(
paddingRight: 24,
width: ICONBUTTON_SIZE + theme.spacing(0.5)
},
buttonColumn: {
padding: "4px 0",
width: "62px"
},
nameColumn: {
width: "auto"
},
valueColumn: {
width: "auto"
},
buttonColumn: {
width: "62px",
padding: "4px 0"
}
}),
{ name: "ShippingZoneRates" }

4
src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.tsx
View file

@ -15,7 +15,7 @@ import { validatePrice } from "@saleor/products/utils/validation";
import OrderValue from "@saleor/shipping/components/OrderValue";
import OrderWeight from "@saleor/shipping/components/OrderWeight";
import PricingCard from "@saleor/shipping/components/PricingCard";
import ShippingZoneInfo from "@saleor/shipping/components/ShippingZoneInfo";
import ShippingRateInfo from "@saleor/shipping/components/ShippingRateInfo";
import { createChannelsChangeHandler } from "@saleor/shipping/handlers";
import { ShippingMethodTypeEnum } from "@saleor/types/globalTypes";
import React from "react";
@ -116,7 +116,7 @@ export const ShippingZoneRatesCreatePage: React.FC<ShippingZoneRatesCreatePagePr
/>
<Grid>
<div>
<ShippingZoneInfo
<ShippingRateInfo
data={data}
disabled={disabled}
errors={errors}

4
src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx
View file

@ -17,7 +17,7 @@ import OrderValue from "@saleor/shipping/components/OrderValue";
import OrderWeight from "@saleor/shipping/components/OrderWeight";
import PricingCard from "@saleor/shipping/components/PricingCard";
import ShippingMethodProducts from "@saleor/shipping/components/ShippingMethodProducts";
import ShippingZoneInfo from "@saleor/shipping/components/ShippingZoneInfo";
import ShippingRateInfo from "@saleor/shipping/components/ShippingRateInfo";
import { createChannelsChangeHandler } from "@saleor/shipping/handlers";
import { ShippingZone_shippingZone_shippingMethods } from "@saleor/shipping/types/ShippingZone";
import { ListActions, ListProps } from "@saleor/types";
@ -124,7 +124,7 @@ export const ShippingZoneRatesPage: React.FC<ShippingZoneRatesPageProps> = ({
<PageHeader title={rate?.name} />
<Grid>
<div>
<ShippingZoneInfo
<ShippingRateInfo
data={data}
disabled={disabled}
errors={errors}

6
src/shipping/components/ShippingZoneZipCodes/ShippingZoneZipCodes.tsx
View file

@ -102,10 +102,9 @@ const ShippingZoneZipCodes: React.FC<ShippingZoneZipCodesProps> = ({
alignTop
choices={[
{
disabled: true,
label: (
<div className={classes.option}>
<Typography color="textSecondary" variant="body1">
<Typography variant="body1">
<FormattedMessage
defaultMessage="Exclude postal codes"
description="action"
@ -119,9 +118,10 @@ const ShippingZoneZipCodes: React.FC<ShippingZoneZipCodesProps> = ({
value: ZipCodeInclusion.Exclude
},
{
disabled: true,
label: (
<div className={classes.option}>
<Typography variant="body1">
<Typography color="textSecondary" variant="body1">
<FormattedMessage
defaultMessage="Include postal codes"
description="action"

9
src/shipping/fixtures.ts
View file

@ -264,6 +264,7 @@ export const shippingZones: ShippingZoneFragment[] = [
country: "Wielka Brytania"
}
],
description: "Shipping zone description",
id: "U2hpcHBpbmdab25lOjE=",
metadata: [],
name: "Europe",
@ -418,6 +419,7 @@ export const shippingZones: ShippingZoneFragment[] = [
country: "Wallis i Futuna"
}
],
description: "Shipping zone description",
id: "U2hpcHBpbmdab25lOjI=",
metadata: [],
name: "Oceania",
@ -425,7 +427,6 @@ export const shippingZones: ShippingZoneFragment[] = [
},
{
__typename: "ShippingZone",
countries: [
{
__typename: "CountryDisplay",
@ -683,6 +684,7 @@ export const shippingZones: ShippingZoneFragment[] = [
country: "Jemen"
}
],
description: "Shipping zone description",
id: "U2hpcHBpbmdab25lOjM=",
metadata: [],
name: "Asia",
@ -690,7 +692,6 @@ export const shippingZones: ShippingZoneFragment[] = [
},
{
__typename: "ShippingZone",
countries: [
{
__typename: "CountryDisplay",
@ -978,6 +979,7 @@ export const shippingZones: ShippingZoneFragment[] = [
country: "Wyspy Dziewicze Stanów Zjednoczonych"
}
],
description: "Shipping zone description",
id: "U2hpcHBpbmdab25lOjQ=",
metadata: [],
name: "Americas",
@ -985,7 +987,6 @@ export const shippingZones: ShippingZoneFragment[] = [
},
{
__typename: "ShippingZone",
countries: [
{
__typename: "CountryDisplay",
@ -1289,6 +1290,7 @@ export const shippingZones: ShippingZoneFragment[] = [
country: "Zimbabwe"
}
],
description: "Shipping zone description",
id: "U2hpcHBpbmdab25lOjU=",
metadata: [],
name: "Africa",
@ -1556,6 +1558,7 @@ export const shippingZone: ShippingZone_shippingZone = {
}
],
default: false,
description: "Shipping zone description",
id: "U2hpcHBpbmdab25lOjE=",
metadata: [],
name: "Europe",

1
src/shipping/types/CreateShippingRate.ts
View file

@ -123,6 +123,7 @@ export interface CreateShippingRate_shippingPriceCreate_shippingZone {
id: string;
countries: (CreateShippingRate_shippingPriceCreate_shippingZone_countries | null)[] | null;
name: string;
description: string | null;
default: boolean;
shippingMethods: (CreateShippingRate_shippingPriceCreate_shippingZone_shippingMethods | null)[] | null;
warehouses: (CreateShippingRate_shippingPriceCreate_shippingZone_warehouses | null)[] | null;

1
src/shipping/types/DeleteShippingRate.ts
View file

@ -123,6 +123,7 @@ export interface DeleteShippingRate_shippingPriceDelete_shippingZone {
id: string;
countries: (DeleteShippingRate_shippingPriceDelete_shippingZone_countries | null)[] | null;
name: string;
description: string | null;
default: boolean;
shippingMethods: (DeleteShippingRate_shippingPriceDelete_shippingZone_shippingMethods | null)[] | null;
warehouses: (DeleteShippingRate_shippingPriceDelete_shippingZone_warehouses | null)[] | null;

1
src/shipping/types/ShippingZone.ts
View file

@ -149,6 +149,7 @@ export interface ShippingZone_shippingZone {
id: string;
countries: (ShippingZone_shippingZone_countries | null)[] | null;
name: string;
description: string | null;
default: boolean;
shippingMethods: (ShippingZone_shippingZone_shippingMethods | null)[] | null;
warehouses: (ShippingZone_shippingZone_warehouses | null)[] | null;

1
src/shipping/types/ShippingZones.ts
View file

@ -31,6 +31,7 @@ export interface ShippingZones_shippingZones_edges_node {
id: string;
countries: (ShippingZones_shippingZones_edges_node_countries | null)[] | null;
name: string;
description: string | null;
}
export interface ShippingZones_shippingZones_edges {

1
src/shipping/views/ShippingZoneDetails/index.tsx
View file

@ -144,6 +144,7 @@ const ShippingZoneDetails: React.FC<ShippingZoneDetailsProps> = ({
id,
input: {
addWarehouses: warehouseDiff.added,
description: submitData.description,
name: submitData.name,
removeWarehouses: warehouseDiff.removed
}

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

File diff suppressed because it is too large Load diff

2
src/types/globalTypes.ts
View file

@ -1710,6 +1710,7 @@ export interface ShippingZipCodeRulesCreateInputRange {
export interface ShippingZoneCreateInput {
name?: string | null;
description?: string | null;
countries?: (string | null)[] | null;
default?: boolean | null;
addWarehouses?: (string | null)[] | null;
@ -1717,6 +1718,7 @@ export interface ShippingZoneCreateInput {
export interface ShippingZoneUpdateInput {
name?: string | null;
description?: string | null;
countries?: (string | null)[] | null;
default?: boolean | null;
addWarehouses?: (string | null)[] | null;