Merge branch 'master' into SALEOR-1403-cannot-fulfill-order-when-product-quantity-is-one
This commit is contained in:
Grzegorz Derdak
commit
e14b144636
30 changed files with 1148 additions and 540 deletions
|
|
@ -54,6 +54,7 @@ All notable, unreleased changes to this project will be documented in this file.
|
|||
- Fix order draft back button redirect - #753 by @orzechdev
|
||||
- Add manage product types and attributes permission - #768 by @orzechdev
|
||||
- Fix isPublished and isAvailable behaviour for products, collections and pages - #780 by @mmarkusik
|
||||
- Add metadata editor to page views - #782 by @dominik-zeglen
|
||||
- Fix for fulfilling order when allocated quantity equals total quantity - #788 by @GrzegorzDerdak
|
||||
|
||||
## 2.10.1
|
||||
|
|
|
|||
|
|
@ -2905,39 +2905,6 @@
|
|||
"context": "button",
|
||||
"string": "Add products"
|
||||
},
|
||||
"src_dot_orders_dot_components_dot_OrderDraftFinalizeDialog_dot_115822814": {
|
||||
"string": "No billing address"
|
||||
},
|
||||
"src_dot_orders_dot_components_dot_OrderDraftFinalizeDialog_dot_1161061962": {
|
||||
"context": "dialog header",
|
||||
"string": "Finalize Draft Order"
|
||||
},
|
||||
"src_dot_orders_dot_components_dot_OrderDraftFinalizeDialog_dot_1297434244": {
|
||||
"string": "No user information"
|
||||
},
|
||||
"src_dot_orders_dot_components_dot_OrderDraftFinalizeDialog_dot_1472924390": {
|
||||
"string": "There are missing or incorrect informations about this order:"
|
||||
},
|
||||
"src_dot_orders_dot_components_dot_OrderDraftFinalizeDialog_dot_2430492151": {
|
||||
"string": "No shipping address"
|
||||
},
|
||||
"src_dot_orders_dot_components_dot_OrderDraftFinalizeDialog_dot_2725265632": {
|
||||
"context": "button",
|
||||
"string": "Finalize"
|
||||
},
|
||||
"src_dot_orders_dot_components_dot_OrderDraftFinalizeDialog_dot_2824936338": {
|
||||
"string": "Shipping method provided, but no product requires it"
|
||||
},
|
||||
"src_dot_orders_dot_components_dot_OrderDraftFinalizeDialog_dot_2968256006": {
|
||||
"string": "Some products require shipping, but no method provided"
|
||||
},
|
||||
"src_dot_orders_dot_components_dot_OrderDraftFinalizeDialog_dot_3358029330": {
|
||||
"string": "Are you sure you want to finalize draft #{orderNumber}?"
|
||||
},
|
||||
"src_dot_orders_dot_components_dot_OrderDraftFinalizeDialog_dot_678764806": {
|
||||
"context": "button",
|
||||
"string": "Finalize anyway"
|
||||
},
|
||||
"src_dot_orders_dot_components_dot_OrderDraftListPage_dot_2826235371": {
|
||||
"context": "button",
|
||||
"string": "Create order"
|
||||
|
|
|
|||
|
|
@ -1184,6 +1184,7 @@ enum CollectionSortField {
|
|||
NAME
|
||||
AVAILABILITY
|
||||
PRODUCT_COUNT
|
||||
PUBLICATION_DATE
|
||||
}
|
||||
|
||||
input CollectionSortingInput {
|
||||
|
|
@ -2306,6 +2307,7 @@ type Margin {
|
|||
type Menu implements Node {
|
||||
id: ID!
|
||||
name: String!
|
||||
slug: String!
|
||||
items: [MenuItem]
|
||||
}
|
||||
|
||||
|
|
@ -2334,6 +2336,7 @@ type MenuCreate {
|
|||
|
||||
input MenuCreateInput {
|
||||
name: String!
|
||||
slug: String
|
||||
items: [MenuItemInput]
|
||||
}
|
||||
|
||||
|
|
@ -2363,10 +2366,12 @@ enum MenuErrorCode {
|
|||
|
||||
input MenuFilterInput {
|
||||
search: String
|
||||
slug: [String]
|
||||
}
|
||||
|
||||
input MenuInput {
|
||||
name: String
|
||||
slug: String
|
||||
}
|
||||
|
||||
type MenuItem implements Node {
|
||||
|
|
@ -3229,7 +3234,7 @@ type OrderVoid {
|
|||
orderErrors: [OrderError!]!
|
||||
}
|
||||
|
||||
type Page implements Node {
|
||||
type Page implements Node & ObjectWithMetadata {
|
||||
seoTitle: String
|
||||
seoDescription: String
|
||||
id: ID!
|
||||
|
|
@ -3240,6 +3245,10 @@ type Page implements Node {
|
|||
isPublished: Boolean!
|
||||
slug: String!
|
||||
created: DateTime!
|
||||
privateMetadata: [MetadataItem]!
|
||||
metadata: [MetadataItem]!
|
||||
privateMeta: [MetaStore]! @deprecated(reason: "Use the `privetaMetadata` field. This field will be removed after 2020-07-31.")
|
||||
meta: [MetaStore]! @deprecated(reason: "Use the `metadata` field. This field will be removed after 2020-07-31.")
|
||||
translation(languageCode: LanguageCodeEnum!): PageTranslation
|
||||
}
|
||||
|
||||
|
|
@ -3792,6 +3801,7 @@ input ProductFilterInput {
|
|||
price: PriceRangeInput
|
||||
minimalPrice: PriceRangeInput
|
||||
productTypes: [ID]
|
||||
ids: [ID]
|
||||
}
|
||||
|
||||
type ProductImage implements Node {
|
||||
|
|
@ -3878,6 +3888,7 @@ enum ProductOrderField {
|
|||
DATE
|
||||
TYPE
|
||||
PUBLISHED
|
||||
PUBLICATION_DATE
|
||||
}
|
||||
|
||||
type ProductPricingInfo {
|
||||
|
|
@ -4288,7 +4299,7 @@ type Query {
|
|||
draftOrders(sortBy: OrderSortingInput, filter: OrderDraftFilterInput, created: ReportingPeriod, before: String, after: String, first: Int, last: Int): OrderCountableConnection
|
||||
ordersTotal(period: ReportingPeriod): TaxedMoney
|
||||
orderByToken(token: UUID!): Order
|
||||
menu(id: ID, name: String): Menu
|
||||
menu(id: ID, name: String, slug: String): Menu
|
||||
menus(sortBy: MenuSortingInput, filter: MenuFilterInput, before: String, after: String, first: Int, last: Int): MenuCountableConnection
|
||||
menuItem(id: ID!): MenuItem
|
||||
menuItems(sortBy: MenuItemSortingInput, filter: MenuItemFilterInput, before: String, after: String, first: Int, last: Int): MenuItemCountableConnection
|
||||
|
|
@ -4755,10 +4766,10 @@ type Shop {
|
|||
defaultMailSenderAddress: String
|
||||
description: String
|
||||
domain: Domain!
|
||||
homepageCollection: Collection
|
||||
homepageCollection: Collection @deprecated(reason: "Use the `collection` query with the `slug` parameter. This field will be removed in Saleor 3.0")
|
||||
languages: [LanguageDisplay]!
|
||||
name: String!
|
||||
navigation: Navigation
|
||||
navigation: Navigation @deprecated(reason: "Fetch menus using the `menu` query with `slug` parameter.")
|
||||
permissions: [Permission]!
|
||||
phonePrefixes: [String]!
|
||||
headerText: String
|
||||
|
|
|
|||
|
|
@ -47,6 +47,14 @@ export const CollectionCreate: React.FC = () => {
|
|||
}
|
||||
});
|
||||
|
||||
const getPublicationData = ({
|
||||
publicationDate,
|
||||
isPublished
|
||||
}: CollectionCreatePageFormData) => ({
|
||||
isPublished: !!publicationDate || isPublished,
|
||||
publicationDate: publicationDate || null
|
||||
});
|
||||
|
||||
const handleCreate = async (formData: CollectionCreatePageFormData) => {
|
||||
const result = await createCollection({
|
||||
variables: {
|
||||
|
|
@ -54,18 +62,19 @@ export const CollectionCreate: React.FC = () => {
|
|||
backgroundImage: formData.backgroundImage.value,
|
||||
backgroundImageAlt: formData.backgroundImageAlt,
|
||||
descriptionJson: JSON.stringify(formData.description),
|
||||
isPublished: formData.isPublished,
|
||||
name: formData.name,
|
||||
seo: {
|
||||
description: formData.seoDescription,
|
||||
title: formData.seoTitle
|
||||
}
|
||||
},
|
||||
...getPublicationData(formData)
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
return result.data?.collectionCreate.collection?.id || null;
|
||||
};
|
||||
|
||||
const handleSubmit = createMetadataCreateHandler(
|
||||
handleCreate,
|
||||
updateMetadata,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import { InputProps } from "@material-ui/core/Input";
|
||||
import { makeStyles } from "@material-ui/core/styles";
|
||||
import TextField from "@material-ui/core/TextField";
|
||||
import useStateFromProps from "@saleor/hooks/useStateFromProps";
|
||||
import { FetchMoreProps } from "@saleor/types";
|
||||
import classNames from "classnames";
|
||||
import Downshift, { ControllerStateAndHelpers } from "downshift";
|
||||
|
|
@ -74,8 +73,6 @@ const SingleAutocompleteSelectFieldComponent: React.FC<SingleAutocompleteSelectF
|
|||
} = props;
|
||||
const classes = useStyles(props);
|
||||
|
||||
const [prevDisplayValue] = useStateFromProps(displayValue);
|
||||
|
||||
const handleChange = (
|
||||
item: string,
|
||||
stateAndHelpers: ControllerStateAndHelpers
|
||||
|
|
@ -116,20 +113,46 @@ const SingleAutocompleteSelectFieldComponent: React.FC<SingleAutocompleteSelectF
|
|||
choices && selectedItem
|
||||
? choices.filter(c => c.value === selectedItem).length === 0
|
||||
: false;
|
||||
const hasInputValueChanged = prevDisplayValue !== displayValue;
|
||||
|
||||
if (hasInputValueChanged) {
|
||||
const choiceFromInputValue = choices.find(
|
||||
({ value: choiceId }) => choiceId === inputValue
|
||||
);
|
||||
|
||||
const isValueInValues = !!choiceFromInputValue;
|
||||
|
||||
const isValueInLabels = !!choices.find(
|
||||
choice => choice.label === inputValue
|
||||
);
|
||||
|
||||
const ensureProperValues = (alwaysCheck: boolean = false) => {
|
||||
if ((allowCustomValues || isValueInLabels) && !alwaysCheck) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isValueInValues && !isValueInLabels) {
|
||||
reset({ inputValue: choiceFromInputValue.label });
|
||||
return;
|
||||
}
|
||||
|
||||
reset({ inputValue: displayValue });
|
||||
}
|
||||
};
|
||||
|
||||
const displayCustomValue =
|
||||
const displayCustomValue = !!(
|
||||
inputValue &&
|
||||
inputValue.length > 0 &&
|
||||
allowCustomValues &&
|
||||
!choices.find(
|
||||
choice =>
|
||||
choice.label.toLowerCase() === inputValue.toLowerCase()
|
||||
);
|
||||
!isValueInLabels
|
||||
);
|
||||
|
||||
const handleBlur = () => {
|
||||
ensureProperValues(true);
|
||||
closeMenu();
|
||||
};
|
||||
|
||||
// fix for bug where input value is returned from debounce as id instead of label
|
||||
if (value === inputValue && !!inputValue) {
|
||||
ensureProperValues();
|
||||
}
|
||||
|
||||
return (
|
||||
<div
|
||||
|
|
@ -149,7 +172,7 @@ const SingleAutocompleteSelectFieldComponent: React.FC<SingleAutocompleteSelectF
|
|||
),
|
||||
error,
|
||||
id: undefined,
|
||||
onBlur: closeMenu,
|
||||
onBlur: handleBlur,
|
||||
onClick: toggleMenu
|
||||
}}
|
||||
error={error}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
import gql from "graphql-tag";
|
||||
|
||||
import { metadataFragment } from "./metadata";
|
||||
|
||||
export const pageFragment = gql`
|
||||
fragment PageFragment on Page {
|
||||
id
|
||||
|
|
@ -11,8 +13,10 @@ export const pageFragment = gql`
|
|||
|
||||
export const pageDetailsFragment = gql`
|
||||
${pageFragment}
|
||||
${metadataFragment}
|
||||
fragment PageDetailsFragment on Page {
|
||||
...PageFragment
|
||||
...MetadataFragment
|
||||
contentJson
|
||||
seoTitle
|
||||
seoDescription
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ export interface MetadataFragment_privateMetadata {
|
|||
}
|
||||
|
||||
export interface MetadataFragment {
|
||||
__typename: "ServiceAccount" | "App" | "Product" | "ProductType" | "Attribute" | "Category" | "ProductVariant" | "DigitalContent" | "Collection" | "User" | "Checkout" | "Order" | "Fulfillment" | "Invoice";
|
||||
__typename: "ServiceAccount" | "App" | "Product" | "ProductType" | "Attribute" | "Category" | "ProductVariant" | "DigitalContent" | "Collection" | "Page" | "User" | "Checkout" | "Order" | "Fulfillment" | "Invoice";
|
||||
metadata: (MetadataFragment_metadata | null)[];
|
||||
privateMetadata: (MetadataFragment_privateMetadata | null)[];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,12 +6,26 @@
|
|||
// GraphQL fragment: PageDetailsFragment
|
||||
// ====================================================
|
||||
|
||||
export interface PageDetailsFragment_metadata {
|
||||
__typename: "MetadataItem";
|
||||
key: string;
|
||||
value: string;
|
||||
}
|
||||
|
||||
export interface PageDetailsFragment_privateMetadata {
|
||||
__typename: "MetadataItem";
|
||||
key: string;
|
||||
value: string;
|
||||
}
|
||||
|
||||
export interface PageDetailsFragment {
|
||||
__typename: "Page";
|
||||
id: string;
|
||||
title: string;
|
||||
slug: string;
|
||||
isPublished: boolean;
|
||||
metadata: (PageDetailsFragment_metadata | null)[];
|
||||
privateMetadata: (PageDetailsFragment_privateMetadata | null)[];
|
||||
contentJson: any;
|
||||
seoTitle: string | null;
|
||||
seoDescription: string | null;
|
||||
|
|
|
|||
|
|
@ -49,9 +49,9 @@ const OrderAddressEditDialog: React.FC<OrderAddressEditDialogProps> = props => {
|
|||
address,
|
||||
confirmButtonState,
|
||||
open,
|
||||
errors,
|
||||
errors = [],
|
||||
variant,
|
||||
countries,
|
||||
countries = [],
|
||||
onClose,
|
||||
onConfirm
|
||||
} = props;
|
||||
|
|
|
|||
|
|
@ -1,124 +0,0 @@
|
|||
import DialogContentText from "@material-ui/core/DialogContentText";
|
||||
import ActionDialog from "@saleor/components/ActionDialog";
|
||||
import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton";
|
||||
import FormSpacer from "@saleor/components/FormSpacer";
|
||||
import { OrderErrorFragment } from "@saleor/fragments/types/OrderErrorFragment";
|
||||
import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors";
|
||||
import getOrderErrorMessage from "@saleor/utils/errors/order";
|
||||
import React from "react";
|
||||
import { FormattedMessage, IntlShape, useIntl } from "react-intl";
|
||||
|
||||
export enum OrderDraftFinalizeWarning {
|
||||
NO_SHIPPING,
|
||||
NO_BILLING,
|
||||
NO_USER,
|
||||
NO_SHIPPING_METHOD,
|
||||
UNNECESSARY_SHIPPING_METHOD
|
||||
}
|
||||
|
||||
export interface OrderDraftFinalizeDialogProps {
|
||||
confirmButtonState: ConfirmButtonTransitionState;
|
||||
errors: OrderErrorFragment[];
|
||||
open: boolean;
|
||||
orderNumber: string;
|
||||
warnings: OrderDraftFinalizeWarning[];
|
||||
onClose: () => void;
|
||||
onConfirm: () => void;
|
||||
}
|
||||
|
||||
function translateWarnings(
|
||||
intl: IntlShape
|
||||
): Record<OrderDraftFinalizeWarning, string> {
|
||||
return {
|
||||
[OrderDraftFinalizeWarning.NO_BILLING]: intl.formatMessage({
|
||||
defaultMessage: "No billing address"
|
||||
}),
|
||||
[OrderDraftFinalizeWarning.NO_SHIPPING]: intl.formatMessage({
|
||||
defaultMessage: "No shipping address"
|
||||
}),
|
||||
[OrderDraftFinalizeWarning.NO_SHIPPING_METHOD]: intl.formatMessage({
|
||||
defaultMessage: "Some products require shipping, but no method provided"
|
||||
}),
|
||||
[OrderDraftFinalizeWarning.NO_USER]: intl.formatMessage({
|
||||
defaultMessage: "No user information"
|
||||
}),
|
||||
[OrderDraftFinalizeWarning.UNNECESSARY_SHIPPING_METHOD]: intl.formatMessage(
|
||||
{
|
||||
defaultMessage: "Shipping method provided, but no product requires it"
|
||||
}
|
||||
)
|
||||
};
|
||||
}
|
||||
|
||||
const OrderDraftFinalizeDialog: React.FC<OrderDraftFinalizeDialogProps> = ({
|
||||
confirmButtonState,
|
||||
errors: apiErrors,
|
||||
open,
|
||||
warnings,
|
||||
onClose,
|
||||
onConfirm,
|
||||
orderNumber
|
||||
}) => {
|
||||
const intl = useIntl();
|
||||
const errors = useModalDialogErrors(apiErrors, open);
|
||||
|
||||
const translatedWarnings = translateWarnings(intl);
|
||||
|
||||
return (
|
||||
<ActionDialog
|
||||
onClose={onClose}
|
||||
onConfirm={onConfirm}
|
||||
open={open}
|
||||
title={intl.formatMessage({
|
||||
defaultMessage: "Finalize Draft Order",
|
||||
description: "dialog header"
|
||||
})}
|
||||
confirmButtonLabel={
|
||||
warnings.length > 0
|
||||
? intl.formatMessage({
|
||||
defaultMessage: "Finalize anyway",
|
||||
description: "button"
|
||||
})
|
||||
: intl.formatMessage({
|
||||
defaultMessage: "Finalize",
|
||||
description: "button"
|
||||
})
|
||||
}
|
||||
confirmButtonState={confirmButtonState}
|
||||
variant={warnings.length > 0 ? "delete" : "default"}
|
||||
>
|
||||
<DialogContentText component="div">
|
||||
{warnings.length > 0 && (
|
||||
<>
|
||||
<p>
|
||||
<FormattedMessage defaultMessage="There are missing or incorrect informations about this order:" />
|
||||
</p>
|
||||
<ul>
|
||||
{warnings.map(warning => (
|
||||
<li key={warning}>{translatedWarnings[warning]}</li>
|
||||
))}
|
||||
</ul>
|
||||
</>
|
||||
)}
|
||||
<FormattedMessage
|
||||
defaultMessage="Are you sure you want to finalize draft #{orderNumber}?"
|
||||
values={{
|
||||
orderNumber
|
||||
}}
|
||||
/>
|
||||
{errors.length > 0 && (
|
||||
<>
|
||||
<FormSpacer />
|
||||
{errors.map((err, index) => (
|
||||
<DialogContentText color="error" key={index}>
|
||||
{getOrderErrorMessage(err, intl)}
|
||||
</DialogContentText>
|
||||
))}
|
||||
</>
|
||||
)}
|
||||
</DialogContentText>
|
||||
</ActionDialog>
|
||||
);
|
||||
};
|
||||
OrderDraftFinalizeDialog.displayName = "OrderDraftFinalize";
|
||||
export default OrderDraftFinalizeDialog;
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
export { default } from "./OrderDraftFinalizeDialog";
|
||||
export * from "./OrderDraftFinalizeDialog";
|
||||
|
|
@ -186,13 +186,16 @@ const OrderProductAddDialog: React.FC<OrderProductAddDialogProps> = props => {
|
|||
onClose: () => setVariants([])
|
||||
});
|
||||
|
||||
const selectedVariantsToProductsMap = products
|
||||
? products.map(product =>
|
||||
const productChoices = products.filter(
|
||||
product => product.variants?.length > 0
|
||||
);
|
||||
const selectedVariantsToProductsMap = productChoices
|
||||
? productChoices.map(product =>
|
||||
product.variants.map(variant => isVariantSelected(variant, variants))
|
||||
)
|
||||
: [];
|
||||
const productsWithAllVariantsSelected = products
|
||||
? products.map(product =>
|
||||
const productsWithAllVariantsSelected = productChoices
|
||||
? productChoices.map(product =>
|
||||
hasAllVariantsSelected(product.variants, variants)
|
||||
)
|
||||
: [];
|
||||
|
|
@ -248,7 +251,7 @@ const OrderProductAddDialog: React.FC<OrderProductAddDialogProps> = props => {
|
|||
<ResponsiveTable key="table">
|
||||
<TableBody>
|
||||
{renderCollection(
|
||||
products,
|
||||
productChoices,
|
||||
(product, productIndex) => (
|
||||
<React.Fragment key={product ? product.id : "skeleton"}>
|
||||
<TableRow>
|
||||
|
|
|
|||
90
src/orders/views/OrderDetails/OrderAddressFields.tsx
Normal file
90
src/orders/views/OrderDetails/OrderAddressFields.tsx
Normal file
|
|
@ -0,0 +1,90 @@
|
|||
import { transformAddressToForm } from "@saleor/misc";
|
||||
import OrderAddressEditDialog from "@saleor/orders/components/OrderAddressEditDialog";
|
||||
import { OrderDetails } from "@saleor/orders/types/OrderDetails";
|
||||
import {
|
||||
OrderDraftUpdate,
|
||||
OrderDraftUpdateVariables
|
||||
} from "@saleor/orders/types/OrderDraftUpdate";
|
||||
import {
|
||||
OrderUpdate,
|
||||
OrderUpdateVariables
|
||||
} from "@saleor/orders/types/OrderUpdate";
|
||||
import { PartialMutationProviderOutput } from "@saleor/types";
|
||||
import { AddressInput } from "@saleor/types/globalTypes";
|
||||
import React from "react";
|
||||
|
||||
enum FieldType {
|
||||
shipping = "shippingAddress",
|
||||
billing = "billingAddress"
|
||||
}
|
||||
|
||||
interface Props {
|
||||
action: string;
|
||||
id: string;
|
||||
isDraft: boolean;
|
||||
data: OrderDetails;
|
||||
onClose: () => void;
|
||||
orderUpdate: PartialMutationProviderOutput<OrderUpdate, OrderUpdateVariables>;
|
||||
orderDraftUpdate: PartialMutationProviderOutput<
|
||||
OrderDraftUpdate,
|
||||
OrderDraftUpdateVariables
|
||||
>;
|
||||
}
|
||||
|
||||
const OrderAddressFields = ({
|
||||
action,
|
||||
isDraft,
|
||||
id,
|
||||
onClose,
|
||||
orderUpdate,
|
||||
orderDraftUpdate,
|
||||
data
|
||||
}: Props) => {
|
||||
const order = data?.order;
|
||||
|
||||
const handleConfirm = (type: FieldType) => (value: AddressInput) => {
|
||||
const updateMutation = isDraft ? orderDraftUpdate : orderUpdate;
|
||||
|
||||
updateMutation.mutate({
|
||||
id,
|
||||
input: {
|
||||
[type]: value
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
const addressFieldCommonProps = {
|
||||
confirmButtonState: isDraft
|
||||
? orderDraftUpdate.opts.status
|
||||
: orderUpdate.opts.status,
|
||||
countries: data?.shop?.countries.map(country => ({
|
||||
code: country.code,
|
||||
label: country.country
|
||||
})),
|
||||
errors: isDraft
|
||||
? orderDraftUpdate.opts.data?.draftOrderUpdate.errors
|
||||
: orderUpdate.opts.data?.orderUpdate.errors,
|
||||
onClose
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<OrderAddressEditDialog
|
||||
{...addressFieldCommonProps}
|
||||
address={transformAddressToForm(order?.shippingAddress)}
|
||||
open={action === "edit-shipping-address"}
|
||||
variant="shipping"
|
||||
onConfirm={handleConfirm(FieldType.shipping)}
|
||||
/>
|
||||
<OrderAddressEditDialog
|
||||
{...addressFieldCommonProps}
|
||||
address={transformAddressToForm(order?.billingAddress)}
|
||||
open={action === "edit-billing-address"}
|
||||
variant="billing"
|
||||
onConfirm={handleConfirm(FieldType.billing)}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default OrderAddressFields;
|
||||
|
|
@ -173,6 +173,7 @@ export const OrderDetailsMessages: React.FC<OrderDetailsMessages> = ({
|
|||
})
|
||||
});
|
||||
}
|
||||
closeModal();
|
||||
};
|
||||
const handleShippingMethodUpdate = (data: OrderShippingMethodUpdate) => {
|
||||
const errs = data.orderUpdateShipping?.errors;
|
||||
|
|
@ -255,7 +256,6 @@ export const OrderDetailsMessages: React.FC<OrderDetailsMessages> = ({
|
|||
defaultMessage: "Draft order successfully finalized"
|
||||
})
|
||||
});
|
||||
closeModal();
|
||||
}
|
||||
};
|
||||
const handleInvoiceGeneratePending = (data: InvoiceRequest) => {
|
||||
|
|
|
|||
|
|
@ -23,25 +23,16 @@ import React from "react";
|
|||
import { useIntl } from "react-intl";
|
||||
|
||||
import { customerUrl } from "../../../customers/urls";
|
||||
import {
|
||||
getMutationState,
|
||||
getStringOrPlaceholder,
|
||||
maybe,
|
||||
transformAddressToForm
|
||||
} from "../../../misc";
|
||||
import { getMutationState, getStringOrPlaceholder, maybe } from "../../../misc";
|
||||
import { productUrl } from "../../../products/urls";
|
||||
import {
|
||||
FulfillmentStatus,
|
||||
JobStatusEnum,
|
||||
OrderStatus
|
||||
} from "../../../types/globalTypes";
|
||||
import OrderAddressEditDialog from "../../components/OrderAddressEditDialog";
|
||||
import OrderCancelDialog from "../../components/OrderCancelDialog";
|
||||
import OrderDetailsPage from "../../components/OrderDetailsPage";
|
||||
import OrderDraftCancelDialog from "../../components/OrderDraftCancelDialog/OrderDraftCancelDialog";
|
||||
import OrderDraftFinalizeDialog, {
|
||||
OrderDraftFinalizeWarning
|
||||
} from "../../components/OrderDraftFinalizeDialog";
|
||||
import OrderDraftPage from "../../components/OrderDraftPage";
|
||||
import OrderFulfillmentCancelDialog from "../../components/OrderFulfillmentCancelDialog";
|
||||
import OrderFulfillmentTrackingDialog from "../../components/OrderFulfillmentTrackingDialog";
|
||||
|
|
@ -52,7 +43,6 @@ import OrderProductAddDialog from "../../components/OrderProductAddDialog";
|
|||
import OrderShippingMethodEditDialog from "../../components/OrderShippingMethodEditDialog";
|
||||
import OrderOperations from "../../containers/OrderOperations";
|
||||
import { TypedOrderDetailsQuery, useOrderVariantSearch } from "../../queries";
|
||||
import { OrderDetails_order } from "../../types/OrderDetails";
|
||||
import {
|
||||
orderDraftListUrl,
|
||||
orderFulfillUrl,
|
||||
|
|
@ -61,38 +51,9 @@ import {
|
|||
OrderUrlDialog,
|
||||
OrderUrlQueryParams
|
||||
} from "../../urls";
|
||||
import OrderAddressFields from "./OrderAddressFields";
|
||||
import { OrderDetailsMessages } from "./OrderDetailsMessages";
|
||||
|
||||
const orderDraftFinalizeWarnings = (order: OrderDetails_order) => {
|
||||
const warnings = [] as OrderDraftFinalizeWarning[];
|
||||
if (!(order && order.shippingAddress)) {
|
||||
warnings.push(OrderDraftFinalizeWarning.NO_SHIPPING);
|
||||
}
|
||||
if (!(order && order.billingAddress)) {
|
||||
warnings.push(OrderDraftFinalizeWarning.NO_BILLING);
|
||||
}
|
||||
if (!(order && (order.user || order.userEmail))) {
|
||||
warnings.push(OrderDraftFinalizeWarning.NO_USER);
|
||||
}
|
||||
if (
|
||||
order &&
|
||||
order.lines &&
|
||||
order.lines.filter(line => line.isShippingRequired).length > 0 &&
|
||||
order.shippingMethod === null
|
||||
) {
|
||||
warnings.push(OrderDraftFinalizeWarning.NO_SHIPPING_METHOD);
|
||||
}
|
||||
if (
|
||||
order &&
|
||||
order.lines &&
|
||||
order.lines.filter(line => line.isShippingRequired).length === 0 &&
|
||||
order.shippingMethod !== null
|
||||
) {
|
||||
warnings.push(OrderDraftFinalizeWarning.UNNECESSARY_SHIPPING_METHOD);
|
||||
}
|
||||
return warnings;
|
||||
};
|
||||
|
||||
interface OrderDetailsProps {
|
||||
id: string;
|
||||
params: OrderUrlQueryParams;
|
||||
|
|
@ -513,7 +474,9 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
|
|||
input: data
|
||||
})
|
||||
}
|
||||
onDraftFinalize={() => openModal("finalize")}
|
||||
onDraftFinalize={() =>
|
||||
orderDraftFinalize.mutate({ id })
|
||||
}
|
||||
onDraftRemove={() => openModal("cancel")}
|
||||
onOrderLineAdd={() => openModal("add-order-line")}
|
||||
onBack={() => navigate(orderDraftListUrl())}
|
||||
|
|
@ -561,18 +524,6 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
|
|||
open={params.action === "cancel"}
|
||||
orderNumber={getStringOrPlaceholder(order?.number)}
|
||||
/>
|
||||
<OrderDraftFinalizeDialog
|
||||
confirmButtonState={orderDraftFinalize.opts.status}
|
||||
errors={
|
||||
orderDraftFinalize.opts.data?.draftOrderComplete
|
||||
.errors || []
|
||||
}
|
||||
onClose={closeModal}
|
||||
onConfirm={() => orderDraftFinalize.mutate({ id })}
|
||||
open={params.action === "finalize"}
|
||||
orderNumber={getStringOrPlaceholder(order?.number)}
|
||||
warnings={orderDraftFinalizeWarnings(order)}
|
||||
/>
|
||||
<OrderShippingMethodEditDialog
|
||||
confirmButtonState={
|
||||
orderShippingMethodUpdate.opts.status
|
||||
|
|
@ -623,49 +574,14 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
|
|||
/>
|
||||
</>
|
||||
)}
|
||||
<OrderAddressEditDialog
|
||||
confirmButtonState={orderUpdate.opts.status}
|
||||
address={transformAddressToForm(order?.shippingAddress)}
|
||||
countries={
|
||||
data?.shop?.countries.map(country => ({
|
||||
code: country.code,
|
||||
label: country.country
|
||||
})) || []
|
||||
}
|
||||
errors={orderUpdate.opts.data?.orderUpdate.errors || []}
|
||||
open={params.action === "edit-shipping-address"}
|
||||
variant="shipping"
|
||||
<OrderAddressFields
|
||||
isDraft={order?.status === OrderStatus.DRAFT}
|
||||
orderUpdate={orderUpdate}
|
||||
orderDraftUpdate={orderDraftUpdate}
|
||||
data={data}
|
||||
id={id}
|
||||
onClose={closeModal}
|
||||
onConfirm={shippingAddress =>
|
||||
orderUpdate.mutate({
|
||||
id,
|
||||
input: {
|
||||
shippingAddress
|
||||
}
|
||||
})
|
||||
}
|
||||
/>
|
||||
<OrderAddressEditDialog
|
||||
confirmButtonState={orderUpdate.opts.status}
|
||||
address={transformAddressToForm(order?.billingAddress)}
|
||||
countries={
|
||||
data?.shop?.countries.map(country => ({
|
||||
code: country.code,
|
||||
label: country.country
|
||||
})) || []
|
||||
}
|
||||
errors={orderUpdate.opts.data?.orderUpdate.errors || []}
|
||||
open={params.action === "edit-billing-address"}
|
||||
variant="billing"
|
||||
onClose={closeModal}
|
||||
onConfirm={billingAddress =>
|
||||
orderUpdate.mutate({
|
||||
id,
|
||||
input: {
|
||||
billingAddress
|
||||
}
|
||||
})
|
||||
}
|
||||
action={params.action}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ 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, { MetadataFormData } from "@saleor/components/Metadata";
|
||||
import PageHeader from "@saleor/components/PageHeader";
|
||||
import SaveButtonBar from "@saleor/components/SaveButtonBar";
|
||||
import SeoForm from "@saleor/components/SeoForm";
|
||||
|
|
@ -11,6 +12,8 @@ import VisibilityCard from "@saleor/components/VisibilityCard";
|
|||
import { PageErrorFragment } from "@saleor/fragments/types/PageErrorFragment";
|
||||
import useDateLocalize from "@saleor/hooks/useDateLocalize";
|
||||
import { sectionNames } from "@saleor/intl";
|
||||
import { mapMetadataItemToInput } from "@saleor/utils/maps";
|
||||
import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger";
|
||||
import {
|
||||
ContentState,
|
||||
convertFromRaw,
|
||||
|
|
@ -24,7 +27,7 @@ import { maybe } from "../../../misc";
|
|||
import { PageDetails_page } from "../../types/PageDetails";
|
||||
import PageInfo from "../PageInfo";
|
||||
|
||||
export interface FormData {
|
||||
export interface FormData extends MetadataFormData {
|
||||
content: RawDraftContentState;
|
||||
isPublished: boolean;
|
||||
publicationDate: string;
|
||||
|
|
@ -56,6 +59,12 @@ const PageDetailsPage: React.FC<PageDetailsPageProps> = ({
|
|||
}) => {
|
||||
const intl = useIntl();
|
||||
const localizeDate = useDateLocalize();
|
||||
const {
|
||||
isMetadataModified,
|
||||
isPrivateMetadataModified,
|
||||
makeChangeHandler: makeMetadataChangeHandler
|
||||
} = useMetadataChangeTrigger();
|
||||
|
||||
const pageExists = page !== null;
|
||||
|
||||
const initialForm: FormData = {
|
||||
|
|
@ -63,109 +72,126 @@ const PageDetailsPage: React.FC<PageDetailsPageProps> = ({
|
|||
() => JSON.parse(page.contentJson),
|
||||
convertToRaw(ContentState.createFromText(""))
|
||||
),
|
||||
isPublished: maybe(() => page.isPublished, false),
|
||||
publicationDate: maybe(() => page.publicationDate, ""),
|
||||
seoDescription: maybe(() => page.seoDescription || "", ""),
|
||||
seoTitle: maybe(() => page.seoTitle || "", ""),
|
||||
slug: maybe(() => page.slug, ""),
|
||||
title: maybe(() => page.title, "")
|
||||
isPublished: page?.isPublished,
|
||||
metadata: pageExists ? page?.metadata?.map(mapMetadataItemToInput) : [],
|
||||
privateMetadata: pageExists
|
||||
? page?.privateMetadata?.map(mapMetadataItemToInput)
|
||||
: [],
|
||||
publicationDate: page?.publicationDate || "",
|
||||
seoDescription: page?.seoDescription || "",
|
||||
seoTitle: page?.seoTitle || "",
|
||||
slug: page?.slug || "",
|
||||
title: page?.title || ""
|
||||
};
|
||||
|
||||
const handleSubmit = (data: FormData) => onSubmit(getParsedData(data));
|
||||
const handleSubmit = (data: FormData) => {
|
||||
const metadata = isMetadataModified ? data.metadata : undefined;
|
||||
const privateMetadata = isPrivateMetadataModified
|
||||
? data.privateMetadata
|
||||
: undefined;
|
||||
|
||||
const getParsedData = (data: FormData) => ({
|
||||
...data,
|
||||
isPublished: data.isPublished || !!data.publicationDate
|
||||
});
|
||||
onSubmit({
|
||||
...data,
|
||||
isPublished: data.isPublished || !!data.publicationDate,
|
||||
metadata,
|
||||
privateMetadata
|
||||
});
|
||||
};
|
||||
|
||||
return (
|
||||
<Form initial={initialForm} onSubmit={handleSubmit}>
|
||||
{({ change, data, hasChanged, submit }) => (
|
||||
<Container>
|
||||
<AppHeader onBack={onBack}>
|
||||
{intl.formatMessage(sectionNames.pages)}
|
||||
</AppHeader>
|
||||
<PageHeader
|
||||
title={
|
||||
!pageExists
|
||||
? intl.formatMessage({
|
||||
defaultMessage: "Create Page",
|
||||
description: "page header"
|
||||
})
|
||||
: maybe(() => page.title)
|
||||
}
|
||||
/>
|
||||
<Grid>
|
||||
<div>
|
||||
<PageInfo
|
||||
data={data}
|
||||
disabled={disabled}
|
||||
errors={errors}
|
||||
page={page}
|
||||
onChange={change}
|
||||
/>
|
||||
<CardSpacer />
|
||||
<SeoForm
|
||||
errors={errors}
|
||||
allowEmptySlug={!pageExists}
|
||||
description={data.seoDescription}
|
||||
disabled={disabled}
|
||||
descriptionPlaceholder={maybe(
|
||||
() =>
|
||||
convertFromRaw(data.content)
|
||||
.getPlainText()
|
||||
.slice(0, 300),
|
||||
""
|
||||
)}
|
||||
onChange={change}
|
||||
slug={data.slug}
|
||||
slugPlaceholder={data.title}
|
||||
title={data.seoTitle}
|
||||
titlePlaceholder={data.title}
|
||||
helperText={intl.formatMessage({
|
||||
defaultMessage:
|
||||
"Add search engine title and description to make this page easier to find"
|
||||
})}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<CardSpacer />
|
||||
<VisibilityCard
|
||||
data={data}
|
||||
errors={errors}
|
||||
disabled={disabled}
|
||||
messages={{
|
||||
hiddenLabel: intl.formatMessage({
|
||||
defaultMessage: "Hidden",
|
||||
description: "page label"
|
||||
}),
|
||||
hiddenSecondLabel: intl.formatMessage(
|
||||
{
|
||||
defaultMessage: "will be visible from {date}",
|
||||
description: "page"
|
||||
},
|
||||
{
|
||||
date: localizeDate(data.publicationDate, "L")
|
||||
}
|
||||
),
|
||||
visibleLabel: intl.formatMessage({
|
||||
defaultMessage: "Visible",
|
||||
description: "page label"
|
||||
})
|
||||
}}
|
||||
onChange={change}
|
||||
/>
|
||||
</div>
|
||||
</Grid>
|
||||
<SaveButtonBar
|
||||
disabled={disabled || !hasChanged}
|
||||
state={saveButtonBarState}
|
||||
onCancel={onBack}
|
||||
onDelete={page === null ? undefined : onRemove}
|
||||
onSave={submit}
|
||||
/>
|
||||
</Container>
|
||||
)}
|
||||
{({ change, data, hasChanged, submit }) => {
|
||||
const changeMetadata = makeMetadataChangeHandler(change);
|
||||
|
||||
return (
|
||||
<Container>
|
||||
<AppHeader onBack={onBack}>
|
||||
{intl.formatMessage(sectionNames.pages)}
|
||||
</AppHeader>
|
||||
<PageHeader
|
||||
title={
|
||||
!pageExists
|
||||
? intl.formatMessage({
|
||||
defaultMessage: "Create Page",
|
||||
description: "page header"
|
||||
})
|
||||
: maybe(() => page.title)
|
||||
}
|
||||
/>
|
||||
<Grid>
|
||||
<div>
|
||||
<PageInfo
|
||||
data={data}
|
||||
disabled={disabled}
|
||||
errors={errors}
|
||||
page={page}
|
||||
onChange={change}
|
||||
/>
|
||||
<CardSpacer />
|
||||
<SeoForm
|
||||
errors={errors}
|
||||
allowEmptySlug={!pageExists}
|
||||
description={data.seoDescription}
|
||||
disabled={disabled}
|
||||
descriptionPlaceholder={maybe(
|
||||
() =>
|
||||
convertFromRaw(data.content)
|
||||
.getPlainText()
|
||||
.slice(0, 300),
|
||||
""
|
||||
)}
|
||||
onChange={change}
|
||||
slug={data.slug}
|
||||
slugPlaceholder={data.title}
|
||||
title={data.seoTitle}
|
||||
titlePlaceholder={data.title}
|
||||
helperText={intl.formatMessage({
|
||||
defaultMessage:
|
||||
"Add search engine title and description to make this page easier to find"
|
||||
})}
|
||||
/>
|
||||
<CardSpacer />
|
||||
<Metadata data={data} onChange={changeMetadata} />
|
||||
</div>
|
||||
<div>
|
||||
<CardSpacer />
|
||||
<VisibilityCard
|
||||
data={data}
|
||||
errors={errors}
|
||||
disabled={disabled}
|
||||
messages={{
|
||||
hiddenLabel: intl.formatMessage({
|
||||
defaultMessage: "Hidden",
|
||||
description: "page label"
|
||||
}),
|
||||
hiddenSecondLabel: intl.formatMessage(
|
||||
{
|
||||
defaultMessage: "will be visible from {date}",
|
||||
description: "page"
|
||||
},
|
||||
{
|
||||
date: localizeDate(data.publicationDate, "L")
|
||||
}
|
||||
),
|
||||
visibleLabel: intl.formatMessage({
|
||||
defaultMessage: "Visible",
|
||||
description: "page label"
|
||||
})
|
||||
}}
|
||||
onChange={change}
|
||||
/>
|
||||
</div>
|
||||
</Grid>
|
||||
<SaveButtonBar
|
||||
disabled={disabled || !hasChanged}
|
||||
state={saveButtonBarState}
|
||||
onCancel={onBack}
|
||||
onDelete={page === null ? undefined : onRemove}
|
||||
onSave={submit}
|
||||
/>
|
||||
</Container>
|
||||
);
|
||||
}}
|
||||
</Form>
|
||||
);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -37,6 +37,14 @@ export const page: PageDetails_page = {
|
|||
contentJson: JSON.stringify(content),
|
||||
id: "Kzx152sEm==",
|
||||
isPublished: false,
|
||||
metadata: [
|
||||
{
|
||||
__typename: "MetadataItem",
|
||||
key: "integration.id",
|
||||
value: "100023123"
|
||||
}
|
||||
],
|
||||
privateMetadata: [],
|
||||
publicationDate: "",
|
||||
seoDescription: "About",
|
||||
seoTitle: "About",
|
||||
|
|
|
|||
|
|
@ -14,12 +14,26 @@ export interface PageCreate_pageCreate_errors {
|
|||
field: string | null;
|
||||
}
|
||||
|
||||
export interface PageCreate_pageCreate_page_metadata {
|
||||
__typename: "MetadataItem";
|
||||
key: string;
|
||||
value: string;
|
||||
}
|
||||
|
||||
export interface PageCreate_pageCreate_page_privateMetadata {
|
||||
__typename: "MetadataItem";
|
||||
key: string;
|
||||
value: string;
|
||||
}
|
||||
|
||||
export interface PageCreate_pageCreate_page {
|
||||
__typename: "Page";
|
||||
id: string;
|
||||
title: string;
|
||||
slug: string;
|
||||
isPublished: boolean;
|
||||
metadata: (PageCreate_pageCreate_page_metadata | null)[];
|
||||
privateMetadata: (PageCreate_pageCreate_page_privateMetadata | null)[];
|
||||
contentJson: any;
|
||||
seoTitle: string | null;
|
||||
seoDescription: string | null;
|
||||
|
|
|
|||
|
|
@ -6,12 +6,26 @@
|
|||
// GraphQL query operation: PageDetails
|
||||
// ====================================================
|
||||
|
||||
export interface PageDetails_page_metadata {
|
||||
__typename: "MetadataItem";
|
||||
key: string;
|
||||
value: string;
|
||||
}
|
||||
|
||||
export interface PageDetails_page_privateMetadata {
|
||||
__typename: "MetadataItem";
|
||||
key: string;
|
||||
value: string;
|
||||
}
|
||||
|
||||
export interface PageDetails_page {
|
||||
__typename: "Page";
|
||||
id: string;
|
||||
title: string;
|
||||
slug: string;
|
||||
isPublished: boolean;
|
||||
metadata: (PageDetails_page_metadata | null)[];
|
||||
privateMetadata: (PageDetails_page_privateMetadata | null)[];
|
||||
contentJson: any;
|
||||
seoTitle: string | null;
|
||||
seoDescription: string | null;
|
||||
|
|
|
|||
|
|
@ -14,12 +14,26 @@ export interface PageUpdate_pageUpdate_errors {
|
|||
field: string | null;
|
||||
}
|
||||
|
||||
export interface PageUpdate_pageUpdate_page_metadata {
|
||||
__typename: "MetadataItem";
|
||||
key: string;
|
||||
value: string;
|
||||
}
|
||||
|
||||
export interface PageUpdate_pageUpdate_page_privateMetadata {
|
||||
__typename: "MetadataItem";
|
||||
key: string;
|
||||
value: string;
|
||||
}
|
||||
|
||||
export interface PageUpdate_pageUpdate_page {
|
||||
__typename: "Page";
|
||||
id: string;
|
||||
title: string;
|
||||
slug: string;
|
||||
isPublished: boolean;
|
||||
metadata: (PageUpdate_pageUpdate_page_metadata | null)[];
|
||||
privateMetadata: (PageUpdate_pageUpdate_page_privateMetadata | null)[];
|
||||
contentJson: any;
|
||||
seoTitle: string | null;
|
||||
seoDescription: string | null;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,15 @@
|
|||
import { WindowTitle } from "@saleor/components/WindowTitle";
|
||||
import useNavigator from "@saleor/hooks/useNavigator";
|
||||
import useNotifier from "@saleor/hooks/useNotifier";
|
||||
import createMetadataCreateHandler from "@saleor/utils/handlers/metadataCreateHandler";
|
||||
import {
|
||||
useMetadataUpdate,
|
||||
usePrivateMetadataUpdate
|
||||
} from "@saleor/utils/metadata/updateMetadata";
|
||||
import React from "react";
|
||||
import { useIntl } from "react-intl";
|
||||
|
||||
import PageDetailsPage from "../components/PageDetailsPage";
|
||||
import PageDetailsPage, { FormData } from "../components/PageDetailsPage";
|
||||
import { TypedPageCreate } from "../mutations";
|
||||
import { PageCreate as PageCreateData } from "../types/PageCreate";
|
||||
import { pageListUrl, pageUrl } from "../urls";
|
||||
|
|
@ -17,6 +22,8 @@ export const PageCreate: React.FC<PageCreateProps> = () => {
|
|||
const navigate = useNavigator();
|
||||
const notify = useNotifier();
|
||||
const intl = useIntl();
|
||||
const [updateMetadata] = useMetadataUpdate({});
|
||||
const [updatePrivateMetadata] = usePrivateMetadataUpdate({});
|
||||
|
||||
const handlePageCreate = (data: PageCreateData) => {
|
||||
if (data.pageCreate.errors.length === 0) {
|
||||
|
|
@ -32,41 +39,52 @@ export const PageCreate: React.FC<PageCreateProps> = () => {
|
|||
|
||||
return (
|
||||
<TypedPageCreate onCompleted={handlePageCreate}>
|
||||
{(pageCreate, pageCreateOpts) => (
|
||||
<>
|
||||
<WindowTitle
|
||||
title={intl.formatMessage({
|
||||
defaultMessage: "Create Page",
|
||||
description: "header"
|
||||
})}
|
||||
/>
|
||||
<PageDetailsPage
|
||||
disabled={pageCreateOpts.loading}
|
||||
errors={pageCreateOpts.data?.pageCreate.errors || []}
|
||||
saveButtonBarState={pageCreateOpts.status}
|
||||
page={null}
|
||||
onBack={() => navigate(pageListUrl())}
|
||||
onRemove={() => undefined}
|
||||
onSubmit={formData =>
|
||||
pageCreate({
|
||||
variables: {
|
||||
input: {
|
||||
contentJson: JSON.stringify(formData.content),
|
||||
isPublished: formData.isPublished,
|
||||
publicationDate: formData.publicationDate,
|
||||
seo: {
|
||||
description: formData.seoDescription,
|
||||
title: formData.seoTitle
|
||||
},
|
||||
slug: formData.slug === "" ? null : formData.slug,
|
||||
title: formData.title
|
||||
}
|
||||
}
|
||||
})
|
||||
{(pageCreate, pageCreateOpts) => {
|
||||
const handleCreate = async (formData: FormData) => {
|
||||
const result = await pageCreate({
|
||||
variables: {
|
||||
input: {
|
||||
contentJson: JSON.stringify(formData.content),
|
||||
isPublished: formData.isPublished,
|
||||
publicationDate: formData.publicationDate,
|
||||
seo: {
|
||||
description: formData.seoDescription,
|
||||
title: formData.seoTitle
|
||||
},
|
||||
slug: formData.slug === "" ? null : formData.slug,
|
||||
title: formData.title
|
||||
}
|
||||
}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
});
|
||||
|
||||
return result.data.pageCreate.page?.id || null;
|
||||
};
|
||||
const handleSubmit = createMetadataCreateHandler(
|
||||
handleCreate,
|
||||
updateMetadata,
|
||||
updatePrivateMetadata
|
||||
);
|
||||
|
||||
return (
|
||||
<>
|
||||
<WindowTitle
|
||||
title={intl.formatMessage({
|
||||
defaultMessage: "Create Page",
|
||||
description: "header"
|
||||
})}
|
||||
/>
|
||||
<PageDetailsPage
|
||||
disabled={pageCreateOpts.loading}
|
||||
errors={pageCreateOpts.data?.pageCreate.errors || []}
|
||||
saveButtonBarState={pageCreateOpts.status}
|
||||
page={null}
|
||||
onBack={() => navigate(pageListUrl())}
|
||||
onRemove={() => undefined}
|
||||
onSubmit={handleSubmit}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}}
|
||||
</TypedPageCreate>
|
||||
);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,6 +4,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";
|
||||
|
||||
|
|
@ -36,6 +41,8 @@ export const PageDetails: React.FC<PageDetailsProps> = ({ id, params }) => {
|
|||
const navigate = useNavigator();
|
||||
const notify = useNotifier();
|
||||
const intl = useIntl();
|
||||
const [updateMetadata] = useMetadataUpdate({});
|
||||
const [updatePrivateMetadata] = usePrivateMetadataUpdate({});
|
||||
|
||||
const handlePageRemove = (data: PageRemove) => {
|
||||
if (data.pageDelete.errors.length === 0) {
|
||||
|
|
@ -46,68 +53,82 @@ export const PageDetails: React.FC<PageDetailsProps> = ({ id, params }) => {
|
|||
navigate(pageListUrl());
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<TypedPageRemove variables={{ id }} onCompleted={handlePageRemove}>
|
||||
{(pageRemove, pageRemoveOpts) => (
|
||||
<TypedPageUpdate>
|
||||
{(pageUpdate, pageUpdateOpts) => (
|
||||
<TypedPageDetailsQuery variables={{ id }}>
|
||||
{pageDetails => (
|
||||
<>
|
||||
<WindowTitle
|
||||
title={maybe(() => pageDetails.data.page.title)}
|
||||
/>
|
||||
<PageDetailsPage
|
||||
disabled={pageDetails.loading}
|
||||
errors={pageUpdateOpts.data?.pageUpdate.errors || []}
|
||||
saveButtonBarState={pageUpdateOpts.status}
|
||||
page={pageDetails.data?.page}
|
||||
onBack={() => navigate(pageListUrl())}
|
||||
onRemove={() =>
|
||||
navigate(
|
||||
pageUrl(id, {
|
||||
action: "remove"
|
||||
})
|
||||
)
|
||||
{pageDetails => {
|
||||
const handleUpdate = async (data: FormData) => {
|
||||
const result = await pageUpdate({
|
||||
variables: {
|
||||
id,
|
||||
input: createPageInput(data)
|
||||
}
|
||||
onSubmit={formData =>
|
||||
pageUpdate({
|
||||
variables: {
|
||||
id,
|
||||
input: createPageInput(formData)
|
||||
}
|
||||
})
|
||||
}
|
||||
/>
|
||||
<ActionDialog
|
||||
open={params.action === "remove"}
|
||||
confirmButtonState={pageRemoveOpts.status}
|
||||
title={intl.formatMessage({
|
||||
defaultMessage: "Delete Page",
|
||||
description: "dialog header"
|
||||
})}
|
||||
onClose={() => navigate(pageUrl(id))}
|
||||
onConfirm={pageRemove}
|
||||
variant="delete"
|
||||
>
|
||||
<DialogContentText>
|
||||
<FormattedMessage
|
||||
defaultMessage="Are you sure you want to delete {title}?"
|
||||
description="delete page"
|
||||
values={{
|
||||
title: (
|
||||
<strong>
|
||||
{getStringOrPlaceholder(
|
||||
pageDetails.data?.page?.title
|
||||
)}
|
||||
</strong>
|
||||
)
|
||||
}}
|
||||
/>
|
||||
</DialogContentText>
|
||||
</ActionDialog>
|
||||
</>
|
||||
)}
|
||||
});
|
||||
|
||||
return result.data.pageUpdate.errors;
|
||||
};
|
||||
|
||||
const handleSubmit = createMetadataUpdateHandler(
|
||||
pageDetails.data?.page,
|
||||
handleUpdate,
|
||||
variables => updateMetadata({ variables }),
|
||||
variables => updatePrivateMetadata({ variables })
|
||||
);
|
||||
|
||||
return (
|
||||
<>
|
||||
<WindowTitle
|
||||
title={maybe(() => pageDetails.data.page.title)}
|
||||
/>
|
||||
<PageDetailsPage
|
||||
disabled={pageDetails.loading}
|
||||
errors={pageUpdateOpts.data?.pageUpdate.errors || []}
|
||||
saveButtonBarState={pageUpdateOpts.status}
|
||||
page={pageDetails.data?.page}
|
||||
onBack={() => navigate(pageListUrl())}
|
||||
onRemove={() =>
|
||||
navigate(
|
||||
pageUrl(id, {
|
||||
action: "remove"
|
||||
})
|
||||
)
|
||||
}
|
||||
onSubmit={handleSubmit}
|
||||
/>
|
||||
<ActionDialog
|
||||
open={params.action === "remove"}
|
||||
confirmButtonState={pageRemoveOpts.status}
|
||||
title={intl.formatMessage({
|
||||
defaultMessage: "Delete Page",
|
||||
description: "dialog header"
|
||||
})}
|
||||
onClose={() => navigate(pageUrl(id))}
|
||||
onConfirm={pageRemove}
|
||||
variant="delete"
|
||||
>
|
||||
<DialogContentText>
|
||||
<FormattedMessage
|
||||
defaultMessage="Are you sure you want to delete {title}?"
|
||||
description="delete page"
|
||||
values={{
|
||||
title: (
|
||||
<strong>
|
||||
{getStringOrPlaceholder(
|
||||
pageDetails.data?.page?.title
|
||||
)}
|
||||
</strong>
|
||||
)
|
||||
}}
|
||||
/>
|
||||
</DialogContentText>
|
||||
</ActionDialog>
|
||||
</>
|
||||
);
|
||||
}}
|
||||
</TypedPageDetailsQuery>
|
||||
)}
|
||||
</TypedPageUpdate>
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
|
|||
|
||||
const getStocksData = () => {
|
||||
if (product.productType.hasVariants) {
|
||||
return { removeStocks: [], updateStocks: [] };
|
||||
return { addStocks: [], removeStocks: [], updateStocks: [] };
|
||||
}
|
||||
|
||||
const dataStocks = stocks.map(stock => stock.id);
|
||||
|
|
@ -209,6 +209,9 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
|
|||
const stockDiff = diff(variantStocks, dataStocks);
|
||||
|
||||
return {
|
||||
addStocks: stocks.filter(stock =>
|
||||
stockDiff.added.some(addedStock => addedStock === stock.id)
|
||||
),
|
||||
removeStocks: stockDiff.removed,
|
||||
updateStocks: stocks.filter(
|
||||
stock => !stockDiff.added.some(addedStock => addedStock === stock.id)
|
||||
|
|
@ -228,7 +231,6 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
|
|||
...getAvailabilityData(data),
|
||||
...getStocksData(),
|
||||
...getMetadata(data),
|
||||
addStocks: [],
|
||||
attributes
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -67,5 +67,5 @@ export const getProductAvailabilityVariables = ({
|
|||
}: ProductAvailabilityArgs) => ({
|
||||
isAvailable: isAvailableForPurchase,
|
||||
productId,
|
||||
startDate: availableForPurchase
|
||||
startDate: availableForPurchase || null
|
||||
});
|
||||
|
|
|
|||
|
|
@ -11673,24 +11673,6 @@ exports[`Storyshots Orders / OrderDraftCancelDialog errors 1`] = `
|
|||
/>
|
||||
`;
|
||||
|
||||
exports[`Storyshots Orders / OrderDraftFinalizeDialog default 1`] = `
|
||||
<div
|
||||
style="padding:24px"
|
||||
/>
|
||||
`;
|
||||
|
||||
exports[`Storyshots Orders / OrderDraftFinalizeDialog with errors 1`] = `
|
||||
<div
|
||||
style="padding:24px"
|
||||
/>
|
||||
`;
|
||||
|
||||
exports[`Storyshots Orders / OrderDraftFinalizeDialog with warnings 1`] = `
|
||||
<div
|
||||
style="padding:24px"
|
||||
/>
|
||||
`;
|
||||
|
||||
exports[`Storyshots Orders / OrderFulfillmentCancelDialog default 1`] = `
|
||||
<div
|
||||
style="padding:24px"
|
||||
|
|
@ -113412,6 +113394,289 @@ Ctrl + K"
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="CardSpacer-spacer-id"
|
||||
/>
|
||||
<div
|
||||
class="MuiPaper-root-id MuiPaper-elevation0-id MuiCard-root-id MuiPaper-rounded-id"
|
||||
data-test="metadataEditor"
|
||||
data-test-expanded="true"
|
||||
data-test-is-private="false"
|
||||
>
|
||||
<div
|
||||
class="CardTitle-root-id"
|
||||
>
|
||||
<span
|
||||
class="MuiTypography-root-id CardTitle-title-id MuiTypography-h5-id"
|
||||
>
|
||||
Metadata
|
||||
</span>
|
||||
<div
|
||||
class="CardTitle-toolbar-id"
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
class="CardTitle-children-id"
|
||||
/>
|
||||
<hr
|
||||
class="CardTitle-hr-id"
|
||||
/>
|
||||
<div
|
||||
class="MuiCardContent-root-id Metadata-content-id"
|
||||
>
|
||||
<div
|
||||
class="Metadata-togglable-id"
|
||||
>
|
||||
<div
|
||||
class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorTextSecondary-id"
|
||||
>
|
||||
1 Field
|
||||
</div>
|
||||
<button
|
||||
class="MuiButtonBase-root-id MuiIconButton-root-id"
|
||||
data-test="expand"
|
||||
tabindex="0"
|
||||
type="button"
|
||||
>
|
||||
<span
|
||||
class="MuiIconButton-label-id"
|
||||
>
|
||||
<svg
|
||||
aria-hidden="true"
|
||||
class="MuiSvgIcon-root-id"
|
||||
focusable="false"
|
||||
role="presentation"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
d="M7 10l5 5 5-5z"
|
||||
/>
|
||||
</svg>
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<table
|
||||
class="MuiTable-root-id Metadata-table-id"
|
||||
>
|
||||
<thead
|
||||
class="MuiTableHead-root-id"
|
||||
>
|
||||
<tr
|
||||
class="MuiTableRow-root-id MuiTableRow-head-id"
|
||||
>
|
||||
<th
|
||||
class="MuiTableCell-root-id MuiTableCell-head-id Metadata-colNameHeader-id"
|
||||
scope="col"
|
||||
>
|
||||
Field
|
||||
</th>
|
||||
<th
|
||||
class="MuiTableCell-root-id MuiTableCell-head-id Metadata-colValue-id"
|
||||
scope="col"
|
||||
>
|
||||
Value
|
||||
</th>
|
||||
<th
|
||||
class="MuiTableCell-root-id MuiTableCell-head-id Metadata-colActionHeader-id"
|
||||
scope="col"
|
||||
>
|
||||
Actions
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody
|
||||
class="MuiTableBody-root-id"
|
||||
>
|
||||
<tr
|
||||
class="MuiTableRow-root-id"
|
||||
data-test="field"
|
||||
>
|
||||
<td
|
||||
class="MuiTableCell-root-id MuiTableCell-body-id Metadata-colName-id"
|
||||
>
|
||||
<div
|
||||
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
|
||||
>
|
||||
<div
|
||||
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
|
||||
>
|
||||
<input
|
||||
aria-invalid="false"
|
||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id Metadata-nameInput-id"
|
||||
name="name:0"
|
||||
type="text"
|
||||
value="integration.id"
|
||||
/>
|
||||
<fieldset
|
||||
aria-hidden="true"
|
||||
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
|
||||
style="padding-left:8px"
|
||||
>
|
||||
<legend
|
||||
class="PrivateNotchedOutline-legend-id"
|
||||
style="width:0"
|
||||
>
|
||||
<span>
|
||||
|
||||
</span>
|
||||
</legend>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td
|
||||
class="MuiTableCell-root-id MuiTableCell-body-id Metadata-colValue-id"
|
||||
>
|
||||
<div
|
||||
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
|
||||
>
|
||||
<div
|
||||
class="MuiInputBase-root-id MuiOutlinedInput-root-id Metadata-input-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id"
|
||||
>
|
||||
<textarea
|
||||
aria-invalid="false"
|
||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id"
|
||||
name="value:0"
|
||||
rows="1"
|
||||
>
|
||||
100023123
|
||||
</textarea>
|
||||
<textarea
|
||||
aria-hidden="true"
|
||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id"
|
||||
readonly=""
|
||||
style="visibility:hidden;position:absolute;overflow:hidden;height:0;top:0;left:0;transform:translateZ(0)"
|
||||
tabindex="-1"
|
||||
/>
|
||||
<fieldset
|
||||
aria-hidden="true"
|
||||
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
|
||||
style="padding-left:8px"
|
||||
>
|
||||
<legend
|
||||
class="PrivateNotchedOutline-legend-id"
|
||||
style="width:0"
|
||||
>
|
||||
<span>
|
||||
|
||||
</span>
|
||||
</legend>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td
|
||||
class="MuiTableCell-root-id MuiTableCell-body-id Metadata-colAction-id"
|
||||
>
|
||||
<button
|
||||
class="MuiButtonBase-root-id MuiIconButton-root-id MuiIconButton-colorPrimary-id"
|
||||
data-test="deleteField"
|
||||
data-test-id="0"
|
||||
tabindex="0"
|
||||
type="button"
|
||||
>
|
||||
<span
|
||||
class="MuiIconButton-label-id"
|
||||
>
|
||||
<svg
|
||||
aria-hidden="true"
|
||||
class="MuiSvgIcon-root-id"
|
||||
focusable="false"
|
||||
role="presentation"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
|
||||
/>
|
||||
</svg>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div
|
||||
class="MuiCardActions-root-id MuiCardActions-spacing-id"
|
||||
>
|
||||
<button
|
||||
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-text-id MuiButton-textPrimary-id"
|
||||
data-test="addField"
|
||||
tabindex="0"
|
||||
type="button"
|
||||
>
|
||||
<span
|
||||
class="MuiButton-label-id"
|
||||
>
|
||||
Add Field
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="CardSpacer-spacer-id"
|
||||
/>
|
||||
<div
|
||||
class="MuiPaper-root-id MuiPaper-elevation0-id MuiCard-root-id MuiPaper-rounded-id"
|
||||
data-test="metadataEditor"
|
||||
data-test-expanded="true"
|
||||
data-test-is-private="true"
|
||||
>
|
||||
<div
|
||||
class="CardTitle-root-id"
|
||||
>
|
||||
<span
|
||||
class="MuiTypography-root-id CardTitle-title-id MuiTypography-h5-id"
|
||||
>
|
||||
Private Metadata
|
||||
</span>
|
||||
<div
|
||||
class="CardTitle-toolbar-id"
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
class="CardTitle-children-id"
|
||||
/>
|
||||
<hr
|
||||
class="CardTitle-hr-id"
|
||||
/>
|
||||
<div
|
||||
class="MuiCardContent-root-id Metadata-content-id"
|
||||
/>
|
||||
<div
|
||||
class="Metadata-emptyContainer-id"
|
||||
>
|
||||
<span
|
||||
class="isvg pending Metadata-emptyImage-id"
|
||||
/>
|
||||
<div
|
||||
class="MuiTypography-root-id MuiTypography-body1-id MuiTypography-colorTextSecondary-id"
|
||||
>
|
||||
There is no private metadata created for this element.
|
||||
</div>
|
||||
<div
|
||||
class="MuiTypography-root-id MuiTypography-body1-id MuiTypography-colorTextSecondary-id"
|
||||
>
|
||||
Use the button below to add new metadata field
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="MuiCardActions-root-id MuiCardActions-spacing-id"
|
||||
>
|
||||
<button
|
||||
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-text-id MuiButton-textPrimary-id"
|
||||
data-test="addField"
|
||||
tabindex="0"
|
||||
type="button"
|
||||
>
|
||||
<span
|
||||
class="MuiButton-label-id"
|
||||
>
|
||||
Add Field
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div
|
||||
|
|
@ -114236,6 +114501,289 @@ Ctrl + K"
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="CardSpacer-spacer-id"
|
||||
/>
|
||||
<div
|
||||
class="MuiPaper-root-id MuiPaper-elevation0-id MuiCard-root-id MuiPaper-rounded-id"
|
||||
data-test="metadataEditor"
|
||||
data-test-expanded="true"
|
||||
data-test-is-private="false"
|
||||
>
|
||||
<div
|
||||
class="CardTitle-root-id"
|
||||
>
|
||||
<span
|
||||
class="MuiTypography-root-id CardTitle-title-id MuiTypography-h5-id"
|
||||
>
|
||||
Metadata
|
||||
</span>
|
||||
<div
|
||||
class="CardTitle-toolbar-id"
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
class="CardTitle-children-id"
|
||||
/>
|
||||
<hr
|
||||
class="CardTitle-hr-id"
|
||||
/>
|
||||
<div
|
||||
class="MuiCardContent-root-id Metadata-content-id"
|
||||
>
|
||||
<div
|
||||
class="Metadata-togglable-id"
|
||||
>
|
||||
<div
|
||||
class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorTextSecondary-id"
|
||||
>
|
||||
1 Field
|
||||
</div>
|
||||
<button
|
||||
class="MuiButtonBase-root-id MuiIconButton-root-id"
|
||||
data-test="expand"
|
||||
tabindex="0"
|
||||
type="button"
|
||||
>
|
||||
<span
|
||||
class="MuiIconButton-label-id"
|
||||
>
|
||||
<svg
|
||||
aria-hidden="true"
|
||||
class="MuiSvgIcon-root-id"
|
||||
focusable="false"
|
||||
role="presentation"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
d="M7 10l5 5 5-5z"
|
||||
/>
|
||||
</svg>
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<table
|
||||
class="MuiTable-root-id Metadata-table-id"
|
||||
>
|
||||
<thead
|
||||
class="MuiTableHead-root-id"
|
||||
>
|
||||
<tr
|
||||
class="MuiTableRow-root-id MuiTableRow-head-id"
|
||||
>
|
||||
<th
|
||||
class="MuiTableCell-root-id MuiTableCell-head-id Metadata-colNameHeader-id"
|
||||
scope="col"
|
||||
>
|
||||
Field
|
||||
</th>
|
||||
<th
|
||||
class="MuiTableCell-root-id MuiTableCell-head-id Metadata-colValue-id"
|
||||
scope="col"
|
||||
>
|
||||
Value
|
||||
</th>
|
||||
<th
|
||||
class="MuiTableCell-root-id MuiTableCell-head-id Metadata-colActionHeader-id"
|
||||
scope="col"
|
||||
>
|
||||
Actions
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody
|
||||
class="MuiTableBody-root-id"
|
||||
>
|
||||
<tr
|
||||
class="MuiTableRow-root-id"
|
||||
data-test="field"
|
||||
>
|
||||
<td
|
||||
class="MuiTableCell-root-id MuiTableCell-body-id Metadata-colName-id"
|
||||
>
|
||||
<div
|
||||
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
|
||||
>
|
||||
<div
|
||||
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
|
||||
>
|
||||
<input
|
||||
aria-invalid="false"
|
||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id Metadata-nameInput-id"
|
||||
name="name:0"
|
||||
type="text"
|
||||
value="integration.id"
|
||||
/>
|
||||
<fieldset
|
||||
aria-hidden="true"
|
||||
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
|
||||
style="padding-left:8px"
|
||||
>
|
||||
<legend
|
||||
class="PrivateNotchedOutline-legend-id"
|
||||
style="width:0"
|
||||
>
|
||||
<span>
|
||||
|
||||
</span>
|
||||
</legend>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td
|
||||
class="MuiTableCell-root-id MuiTableCell-body-id Metadata-colValue-id"
|
||||
>
|
||||
<div
|
||||
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
|
||||
>
|
||||
<div
|
||||
class="MuiInputBase-root-id MuiOutlinedInput-root-id Metadata-input-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id"
|
||||
>
|
||||
<textarea
|
||||
aria-invalid="false"
|
||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id"
|
||||
name="value:0"
|
||||
rows="1"
|
||||
>
|
||||
100023123
|
||||
</textarea>
|
||||
<textarea
|
||||
aria-hidden="true"
|
||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id"
|
||||
readonly=""
|
||||
style="visibility:hidden;position:absolute;overflow:hidden;height:0;top:0;left:0;transform:translateZ(0)"
|
||||
tabindex="-1"
|
||||
/>
|
||||
<fieldset
|
||||
aria-hidden="true"
|
||||
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
|
||||
style="padding-left:8px"
|
||||
>
|
||||
<legend
|
||||
class="PrivateNotchedOutline-legend-id"
|
||||
style="width:0"
|
||||
>
|
||||
<span>
|
||||
|
||||
</span>
|
||||
</legend>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td
|
||||
class="MuiTableCell-root-id MuiTableCell-body-id Metadata-colAction-id"
|
||||
>
|
||||
<button
|
||||
class="MuiButtonBase-root-id MuiIconButton-root-id MuiIconButton-colorPrimary-id"
|
||||
data-test="deleteField"
|
||||
data-test-id="0"
|
||||
tabindex="0"
|
||||
type="button"
|
||||
>
|
||||
<span
|
||||
class="MuiIconButton-label-id"
|
||||
>
|
||||
<svg
|
||||
aria-hidden="true"
|
||||
class="MuiSvgIcon-root-id"
|
||||
focusable="false"
|
||||
role="presentation"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"
|
||||
/>
|
||||
</svg>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div
|
||||
class="MuiCardActions-root-id MuiCardActions-spacing-id"
|
||||
>
|
||||
<button
|
||||
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-text-id MuiButton-textPrimary-id"
|
||||
data-test="addField"
|
||||
tabindex="0"
|
||||
type="button"
|
||||
>
|
||||
<span
|
||||
class="MuiButton-label-id"
|
||||
>
|
||||
Add Field
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="CardSpacer-spacer-id"
|
||||
/>
|
||||
<div
|
||||
class="MuiPaper-root-id MuiPaper-elevation0-id MuiCard-root-id MuiPaper-rounded-id"
|
||||
data-test="metadataEditor"
|
||||
data-test-expanded="true"
|
||||
data-test-is-private="true"
|
||||
>
|
||||
<div
|
||||
class="CardTitle-root-id"
|
||||
>
|
||||
<span
|
||||
class="MuiTypography-root-id CardTitle-title-id MuiTypography-h5-id"
|
||||
>
|
||||
Private Metadata
|
||||
</span>
|
||||
<div
|
||||
class="CardTitle-toolbar-id"
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
class="CardTitle-children-id"
|
||||
/>
|
||||
<hr
|
||||
class="CardTitle-hr-id"
|
||||
/>
|
||||
<div
|
||||
class="MuiCardContent-root-id Metadata-content-id"
|
||||
/>
|
||||
<div
|
||||
class="Metadata-emptyContainer-id"
|
||||
>
|
||||
<span
|
||||
class="isvg pending Metadata-emptyImage-id"
|
||||
/>
|
||||
<div
|
||||
class="MuiTypography-root-id MuiTypography-body1-id MuiTypography-colorTextSecondary-id"
|
||||
>
|
||||
There is no private metadata created for this element.
|
||||
</div>
|
||||
<div
|
||||
class="MuiTypography-root-id MuiTypography-body1-id MuiTypography-colorTextSecondary-id"
|
||||
>
|
||||
Use the button below to add new metadata field
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="MuiCardActions-root-id MuiCardActions-spacing-id"
|
||||
>
|
||||
<button
|
||||
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-text-id MuiButton-textPrimary-id"
|
||||
data-test="addField"
|
||||
tabindex="0"
|
||||
type="button"
|
||||
>
|
||||
<span
|
||||
class="MuiButton-label-id"
|
||||
>
|
||||
Add Field
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div
|
||||
|
|
@ -114863,6 +115411,80 @@ Ctrl + K"
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="CardSpacer-spacer-id"
|
||||
/>
|
||||
<div
|
||||
class="MuiPaper-root-id MuiPaper-elevation0-id MuiCard-root-id MuiPaper-rounded-id"
|
||||
data-test="metadataEditor"
|
||||
data-test-expanded="true"
|
||||
data-test-is-private="false"
|
||||
>
|
||||
<div
|
||||
class="CardTitle-root-id"
|
||||
>
|
||||
<span
|
||||
class="MuiTypography-root-id CardTitle-title-id MuiTypography-h5-id"
|
||||
>
|
||||
Metadata
|
||||
</span>
|
||||
<div
|
||||
class="CardTitle-toolbar-id"
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
class="CardTitle-children-id"
|
||||
/>
|
||||
<hr
|
||||
class="CardTitle-hr-id"
|
||||
/>
|
||||
<div
|
||||
class="MuiCardContent-root-id"
|
||||
>
|
||||
<span
|
||||
class="Skeleton-skeleton-id"
|
||||
>
|
||||
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="CardSpacer-spacer-id"
|
||||
/>
|
||||
<div
|
||||
class="MuiPaper-root-id MuiPaper-elevation0-id MuiCard-root-id MuiPaper-rounded-id"
|
||||
data-test="metadataEditor"
|
||||
data-test-expanded="true"
|
||||
data-test-is-private="true"
|
||||
>
|
||||
<div
|
||||
class="CardTitle-root-id"
|
||||
>
|
||||
<span
|
||||
class="MuiTypography-root-id CardTitle-title-id MuiTypography-h5-id"
|
||||
>
|
||||
Private Metadata
|
||||
</span>
|
||||
<div
|
||||
class="CardTitle-toolbar-id"
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
class="CardTitle-children-id"
|
||||
/>
|
||||
<hr
|
||||
class="CardTitle-hr-id"
|
||||
/>
|
||||
<div
|
||||
class="MuiCardContent-root-id"
|
||||
>
|
||||
<span
|
||||
class="Skeleton-skeleton-id"
|
||||
>
|
||||
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div
|
||||
|
|
|
|||
|
|
@ -121,7 +121,6 @@ function loadStories() {
|
|||
require("./stories/orders/OrderCustomer");
|
||||
require("./stories/orders/OrderDetailsPage");
|
||||
require("./stories/orders/OrderDraftCancelDialog");
|
||||
require("./stories/orders/OrderDraftFinalizeDialog");
|
||||
require("./stories/orders/OrderDraftListPage");
|
||||
require("./stories/orders/OrderDraftPage");
|
||||
require("./stories/orders/OrderFulfillmentCancelDialog");
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
import { OrderErrorCode } from "@saleor/types/globalTypes";
|
||||
import { storiesOf } from "@storybook/react";
|
||||
import React from "react";
|
||||
|
||||
import OrderDraftFinalize, {
|
||||
OrderDraftFinalizeDialogProps,
|
||||
OrderDraftFinalizeWarning
|
||||
} from "../../../orders/components/OrderDraftFinalizeDialog";
|
||||
import Decorator from "../../Decorator";
|
||||
|
||||
const props: OrderDraftFinalizeDialogProps = {
|
||||
confirmButtonState: "default",
|
||||
errors: [],
|
||||
onClose: () => undefined,
|
||||
onConfirm: () => undefined,
|
||||
open: true,
|
||||
orderNumber: "5",
|
||||
warnings: []
|
||||
};
|
||||
|
||||
storiesOf("Orders / OrderDraftFinalizeDialog", module)
|
||||
.addDecorator(Decorator)
|
||||
.add("default", () => <OrderDraftFinalize {...props} />)
|
||||
.add("with warnings", () => (
|
||||
<OrderDraftFinalize
|
||||
{...props}
|
||||
warnings={[
|
||||
OrderDraftFinalizeWarning.NO_SHIPPING_METHOD,
|
||||
OrderDraftFinalizeWarning.NO_SHIPPING,
|
||||
OrderDraftFinalizeWarning.NO_BILLING,
|
||||
OrderDraftFinalizeWarning.NO_USER
|
||||
]}
|
||||
/>
|
||||
))
|
||||
.add("with errors", () => (
|
||||
<OrderDraftFinalize
|
||||
{...props}
|
||||
errors={[
|
||||
{
|
||||
__typename: "OrderError",
|
||||
code: OrderErrorCode.GRAPHQL_ERROR,
|
||||
field: null
|
||||
}
|
||||
]}
|
||||
/>
|
||||
));
|
||||
|
|
@ -119,6 +119,7 @@ export enum CollectionSortField {
|
|||
AVAILABILITY = "AVAILABILITY",
|
||||
NAME = "NAME",
|
||||
PRODUCT_COUNT = "PRODUCT_COUNT",
|
||||
PUBLICATION_DATE = "PUBLICATION_DATE",
|
||||
}
|
||||
|
||||
export enum ConfigurationTypeFieldEnum {
|
||||
|
|
@ -737,6 +738,7 @@ export enum ProductOrderField {
|
|||
MINIMAL_PRICE = "MINIMAL_PRICE",
|
||||
NAME = "NAME",
|
||||
PRICE = "PRICE",
|
||||
PUBLICATION_DATE = "PUBLICATION_DATE",
|
||||
PUBLISHED = "PUBLISHED",
|
||||
TYPE = "TYPE",
|
||||
}
|
||||
|
|
@ -1176,6 +1178,7 @@ export interface IntRangeInput {
|
|||
|
||||
export interface MenuCreateInput {
|
||||
name: string;
|
||||
slug?: string | null;
|
||||
items?: (MenuItemInput | null)[] | null;
|
||||
}
|
||||
|
||||
|
|
@ -1379,6 +1382,7 @@ export interface ProductFilterInput {
|
|||
price?: PriceRangeInput | null;
|
||||
minimalPrice?: PriceRangeInput | null;
|
||||
productTypes?: (string | null)[] | null;
|
||||
ids?: (string | null)[] | null;
|
||||
}
|
||||
|
||||
export interface ProductInput {
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ export interface UpdateMetadata_deleteMetadata_item_privateMetadata {
|
|||
}
|
||||
|
||||
export interface UpdateMetadata_deleteMetadata_item {
|
||||
__typename: "ServiceAccount" | "App" | "Product" | "ProductType" | "Attribute" | "Category" | "ProductVariant" | "DigitalContent" | "Collection" | "User" | "Checkout" | "Order" | "Fulfillment" | "Invoice";
|
||||
__typename: "ServiceAccount" | "App" | "Product" | "ProductType" | "Attribute" | "Category" | "ProductVariant" | "DigitalContent" | "Collection" | "Page" | "User" | "Checkout" | "Order" | "Fulfillment" | "Invoice";
|
||||
metadata: (UpdateMetadata_deleteMetadata_item_metadata | null)[];
|
||||
privateMetadata: (UpdateMetadata_deleteMetadata_item_privateMetadata | null)[];
|
||||
id: string;
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ export interface UpdatePrivateMetadata_deletePrivateMetadata_item_privateMetadat
|
|||
}
|
||||
|
||||
export interface UpdatePrivateMetadata_deletePrivateMetadata_item {
|
||||
__typename: "ServiceAccount" | "App" | "Product" | "ProductType" | "Attribute" | "Category" | "ProductVariant" | "DigitalContent" | "Collection" | "User" | "Checkout" | "Order" | "Fulfillment" | "Invoice";
|
||||
__typename: "ServiceAccount" | "App" | "Product" | "ProductType" | "Attribute" | "Category" | "ProductVariant" | "DigitalContent" | "Collection" | "Page" | "User" | "Checkout" | "Order" | "Fulfillment" | "Invoice";
|
||||
metadata: (UpdatePrivateMetadata_deletePrivateMetadata_item_metadata | null)[];
|
||||
privateMetadata: (UpdatePrivateMetadata_deletePrivateMetadata_item_privateMetadata | null)[];
|
||||
id: string;
|
||||
|
|
|
|||
Loading…
Reference in a new issue