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

Handle order extension mount points (#2055)

Browse source 
* Handle order extension mount points

* Add missing onClick to ButtonWithSelect component

* Update snapshots

* Fix ButtonWithSelect styles
This commit is contained in:
Jakub Majorek 2022-05-23 11:24:20 +02:00 committed by GitHub
parent 707c6b94a7
commit 0d4fecf8cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 3574 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2339
introspection.json
View file

File diff suppressed because it is too large Load diff

737
schema.graphql
View file

File diff suppressed because it is too large Load diff

5
src/apps/useExtensions.ts
View file

@ -25,6 +25,11 @@ export const extensionMountPoints = {
AppExtensionMountEnum.PRODUCT_OVERVIEW_CREATE,
AppExtensionMountEnum.PRODUCT_OVERVIEW_MORE_ACTIONS
],
ORDER_LIST: [
AppExtensionMountEnum.ORDER_OVERVIEW_CREATE,
AppExtensionMountEnum.ORDER_OVERVIEW_MORE_ACTIONS
],
ORDER_DETAILS: [AppExtensionMountEnum.ORDER_DETAILS_MORE_ACTIONS],
PRODUCT_DETAILS: [AppExtensionMountEnum.PRODUCT_DETAILS_MORE_ACTIONS],
NAVIGATION_SIDEBAR: [
AppExtensionMountEnum.NAVIGATION_CATALOG,

25
src/components/ButtonWithSelect/ButtonWithSelect.tsx
View file

@ -1,6 +1,7 @@
import {
ButtonGroup,
ButtonGroupProps,
ButtonProps,
ClickAwayListener,
Grow,
MenuItem,
@ -21,15 +22,17 @@ interface Option {
}
export interface ButtonWithSelectProps
extends Omit<ButtonGroupProps, "onClick"> {
extends Omit<ButtonGroupProps, "onClick">,
Pick<ButtonProps, "onClick"> {
options: Option[];
href: string;
href?: string;
}
export const ButtonWithSelect: React.FC<ButtonWithSelectProps> = ({
options,
children,
href,
onClick,
...props
}) => {
const [open, setOpen] = React.useState(false);
@ -61,20 +64,20 @@ export const ButtonWithSelect: React.FC<ButtonWithSelectProps> = ({
return (
<>
<ButtonGroup
variant="contained"
color="primary"
ref={anchorRef}
aria-label="button with select"
{...props}
>
<Button variant="primary" href={href} style={{ width: "100%" }}>
<ButtonGroup ref={anchorRef} aria-label="button with select" {...props}>
<Button
variant="primary"
color="primary"
onClick={onClick}
href={href}
style={{ width: "100%" }}
>
{children}
</Button>
{options.length > 0 && (
<Button
variant="primary"
color="primary"
size="small"
aria-controls={open ? "button-with-select-menu" : undefined}
aria-expanded={open ? "true" : undefined}
aria-label="select different option"

15
src/graphql/fragmentTypes.generated.ts
View file

@ -23,6 +23,12 @@
"GiftCardUpdated",
"GiftCardDeleted",
"GiftCardStatusChanged",
"MenuCreated",
"MenuUpdated",
"MenuDeleted",
"MenuItemCreated",
"MenuItemUpdated",
"MenuItemDeleted",
"OrderCreated",
"OrderUpdated",
"OrderConfirmed",
@ -64,8 +70,12 @@
"ShippingZoneCreated",
"ShippingZoneUpdated",
"ShippingZoneDeleted",
"TransactionActionRequest",
"TranslationCreated",
"TranslationUpdated"
"TranslationUpdated",
"VoucherCreated",
"VoucherUpdated",
"VoucherDeleted"
],
"Job": [
"AppInstallation",
@ -147,6 +157,8 @@
"StaffNotificationRecipient",
"Stock",
"Transaction",
"TransactionEvent",
"TransactionItem",
"User",
"Voucher",
"VoucherChannelListing",
@ -178,6 +190,7 @@
"ShippingMethod",
"ShippingMethodType",
"ShippingZone",
"TransactionItem",
"User",
"Voucher",
"Warehouse"

203
src/graphql/typePolicies.generated.ts
View file

File diff suppressed because one or more lines are too long

239
src/graphql/types.generated.ts
View file

File diff suppressed because one or more lines are too long

18
src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx
View file

@ -1,4 +1,9 @@
import { Typography } from "@material-ui/core";
import {
extensionMountPoints,
mapToMenuItems,
useExtensions
} from "@saleor/apps/useExtensions";
import { Backlink } from "@saleor/components/Backlink";
import CardMenu from "@saleor/components/CardMenu";
import { CardSpacer } from "@saleor/components/CardSpacer";
@ -216,6 +221,12 @@ const OrderDetailsPage: React.FC<OrderDetailsPageProps> = props => {
}
]);
const { ORDER_DETAILS_MORE_ACTIONS } = useExtensions(
extensionMountPoints.ORDER_DETAILS
);
const extensionMenuItems = mapToMenuItems(ORDER_DETAILS_MORE_ACTIONS);
return (
<Form confirmLeave initial={initial} onSubmit={handleSubmit}>
{({ change, data, submit }) => {
@ -230,7 +241,12 @@ const OrderDetailsPage: React.FC<OrderDetailsPageProps> = props => {
className={classes.header}
inline
title={<Title order={order} />}
cardMenu={<CardMenu outlined menuItems={selectCardMenuItems} />}
cardMenu={
<CardMenu
outlined
menuItems={[...selectCardMenuItems, ...extensionMenuItems]}
/>
}
/>
<div className={classes.date}>
{order && order.created ? (

24
src/orders/components/OrderListPage/OrderListPage.tsx
View file

@ -1,5 +1,10 @@
import { Card } from "@material-ui/core";
import { Button } from "@saleor/components/Button";
import {
extensionMountPoints,
mapToMenuItems,
useExtensions
} from "@saleor/apps/useExtensions";
import { ButtonWithSelect } from "@saleor/components/ButtonWithSelect";
import CardMenu from "@saleor/components/CardMenu";
import Container from "@saleor/components/Container";
import FilterBar from "@saleor/components/FilterBar";
@ -66,6 +71,12 @@ const OrderListPage: React.FC<OrderListPageProps> = ({
const filterStructure = createFilterStructure(intl, filterOpts);
const limitsReached = isLimitReached(limits, "orders");
const { ORDER_OVERVIEW_CREATE, ORDER_OVERVIEW_MORE_ACTIONS } = useExtensions(
extensionMountPoints.ORDER_LIST
);
const extensionMenuItems = mapToMenuItems(ORDER_OVERVIEW_MORE_ACTIONS);
const extensionCreateButtonItems = mapToMenuItems(ORDER_OVERVIEW_CREATE);
return (
<Container>
<PageHeader
@ -96,24 +107,25 @@ const OrderListPage: React.FC<OrderListPageProps> = ({
description: "button"
}),
onSelect: onSettingsOpen
}
},
...extensionMenuItems
]}
/>
)
}
>
<Button
<ButtonWithSelect
disabled={limitsReached}
variant="primary"
onClick={onAdd}
options={extensionCreateButtonItems}
data-test-id="create-order-button"
onClick={onAdd}
>
<FormattedMessage
id="LshEVn"
defaultMessage="Create order"
description="button"
/>
</Button>
</ButtonWithSelect>
</PageHeader>
{limitsReached && <OrderLimitReached />}
<Card>

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

@ -141228,18 +141228,25 @@ exports[`Storyshots Views / Orders / Order list default 1`] = `
>
230/500 orders
</div>
<button
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButton-containedPrimary-id"
<div
aria-label="button with select"
class="MuiButtonGroup-root-id"
data-test-id="create-order-button"
tabindex="0"
type="button"
role="group"
>
<span
class="MuiButton-label-id"
<button
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButtonGroup-groupedOutlinedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButton-containedPrimary-id"
style="width:100%"
tabindex="0"
type="button"
>
Create order
</span>
</button>
<span
class="MuiButton-label-id"
>
Create order
</span>
</button>
</div>
</div>
</div>
</div>
@ -142909,19 +142916,26 @@ exports[`Storyshots Views / Orders / Order list limits reached 1`] = `
>
500/500 orders
</div>
<button
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButton-containedPrimary-id MuiButton-disabled-id MuiButtonBase-disabled-id"
<div
aria-label="button with select"
class="MuiButtonGroup-root-id"
data-test-id="create-order-button"
disabled=""
tabindex="-1"
type="button"
role="group"
>
<span
class="MuiButton-label-id"
<button
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButtonGroup-groupedOutlinedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButtonGroup-disabled-id MuiButton-containedPrimary-id MuiButton-disabled-id MuiButtonBase-disabled-id"
disabled=""
style="width:100%"
tabindex="-1"
type="button"
>
Create order
</span>
</button>
<span
class="MuiButton-label-id"
>
Create order
</span>
</button>
</div>
</div>
</div>
</div>
@ -144670,18 +144684,25 @@ exports[`Storyshots Views / Orders / Order list loading 1`] = `
>
230/500 orders
</div>
<button
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButton-containedPrimary-id"
<div
aria-label="button with select"
class="MuiButtonGroup-root-id"
data-test-id="create-order-button"
tabindex="0"
type="button"
role="group"
>
<span
class="MuiButton-label-id"
<button
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButtonGroup-groupedOutlinedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButton-containedPrimary-id"
style="width:100%"
tabindex="0"
type="button"
>
Create order
</span>
</button>
<span
class="MuiButton-label-id"
>
Create order
</span>
</button>
</div>
</div>
</div>
</div>
@ -145103,18 +145124,25 @@ exports[`Storyshots Views / Orders / Order list no limits 1`] = `
<div
class="PageHeader-root-id"
>
<button
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButton-containedPrimary-id"
<div
aria-label="button with select"
class="MuiButtonGroup-root-id"
data-test-id="create-order-button"
tabindex="0"
type="button"
role="group"
>
<span
class="MuiButton-label-id"
<button
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButtonGroup-groupedOutlinedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButton-containedPrimary-id"
style="width:100%"
tabindex="0"
type="button"
>
Create order
</span>
</button>
<span
class="MuiButton-label-id"
>
Create order
</span>
</button>
</div>
</div>
</div>
</div>
@ -146784,18 +146812,25 @@ exports[`Storyshots Views / Orders / Order list when no data 1`] = `
>
230/500 orders
</div>
<button
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButton-containedPrimary-id"
<div
aria-label="button with select"
class="MuiButtonGroup-root-id"
data-test-id="create-order-button"
tabindex="0"
type="button"
role="group"
>
<span
class="MuiButton-label-id"
<button
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButtonGroup-groupedOutlinedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButton-containedPrimary-id"
style="width:100%"
tabindex="0"
type="button"
>
Create order
</span>
</button>
<span
class="MuiButton-label-id"
>
Create order
</span>
</button>
</div>
</div>
</div>
</div>
@ -209853,13 +209888,13 @@ exports[`Storyshots Views / Products / Product list default 1`] = `
</div>
<div
aria-label="button with select"
class="MuiButtonGroup-root-id MuiButtonGroup-contained-id"
class="MuiButtonGroup-root-id"
data-test-id="add-product"
role="group"
>
<a
aria-disabled="false"
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedContained-id MuiButtonGroup-groupedContainedHorizontal-id MuiButtonGroup-groupedContainedPrimary-id MuiButton-containedPrimary-id"
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButtonGroup-groupedOutlinedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButton-containedPrimary-id"
href="/products/add"
role="button"
style="width:100%"
@ -212468,13 +212503,13 @@ exports[`Storyshots Views / Products / Product list limits reached 1`] = `
</div>
<div
aria-label="button with select"
class="MuiButtonGroup-root-id MuiButtonGroup-contained-id"
class="MuiButtonGroup-root-id"
data-test-id="add-product"
role="group"
>
<a
aria-disabled="true"
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedContained-id MuiButtonGroup-groupedContainedHorizontal-id MuiButtonGroup-groupedContainedPrimary-id MuiButtonGroup-disabled-id MuiButton-containedPrimary-id MuiButton-disabled-id MuiButtonBase-disabled-id"
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButtonGroup-groupedOutlinedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButtonGroup-disabled-id MuiButton-containedPrimary-id MuiButton-disabled-id MuiButtonBase-disabled-id"
href="/products/add"
role="button"
style="width:100%"
@ -215162,13 +215197,13 @@ exports[`Storyshots Views / Products / Product list loading 1`] = `
</div>
<div
aria-label="button with select"
class="MuiButtonGroup-root-id MuiButtonGroup-contained-id"
class="MuiButtonGroup-root-id"
data-test-id="add-product"
role="group"
>
<a
aria-disabled="false"
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedContained-id MuiButtonGroup-groupedContainedHorizontal-id MuiButtonGroup-groupedContainedPrimary-id MuiButton-containedPrimary-id"
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButtonGroup-groupedOutlinedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButton-containedPrimary-id"
href="/products/add"
role="button"
style="width:100%"
@ -215725,13 +215760,13 @@ exports[`Storyshots Views / Products / Product list no channels 1`] = `
</div>
<div
aria-label="button with select"
class="MuiButtonGroup-root-id MuiButtonGroup-contained-id"
class="MuiButtonGroup-root-id"
data-test-id="add-product"
role="group"
>
<a
aria-disabled="false"
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedContained-id MuiButtonGroup-groupedContainedHorizontal-id MuiButtonGroup-groupedContainedPrimary-id MuiButton-containedPrimary-id"
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButtonGroup-groupedOutlinedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButton-containedPrimary-id"
href="/products/add"
role="button"
style="width:100%"
@ -218340,13 +218375,13 @@ exports[`Storyshots Views / Products / Product list no data 1`] = `
</div>
<div
aria-label="button with select"
class="MuiButtonGroup-root-id MuiButtonGroup-contained-id"
class="MuiButtonGroup-root-id"
data-test-id="add-product"
role="group"
>
<a
aria-disabled="false"
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedContained-id MuiButtonGroup-groupedContainedHorizontal-id MuiButtonGroup-groupedContainedPrimary-id MuiButton-containedPrimary-id"
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButtonGroup-groupedOutlinedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButton-containedPrimary-id"
href="/products/add"
role="button"
style="width:100%"
@ -218741,13 +218776,13 @@ exports[`Storyshots Views / Products / Product list no limits 1`] = `
</div>
<div
aria-label="button with select"
class="MuiButtonGroup-root-id MuiButtonGroup-contained-id"
class="MuiButtonGroup-root-id"
data-test-id="add-product"
role="group"
>
<a
aria-disabled="false"
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedContained-id MuiButtonGroup-groupedContainedHorizontal-id MuiButtonGroup-groupedContainedPrimary-id MuiButton-containedPrimary-id"
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButtonGroup-groupedOutlinedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButton-containedPrimary-id"
href="/products/add"
role="button"
style="width:100%"
@ -221356,13 +221391,13 @@ exports[`Storyshots Views / Products / Product list with data 1`] = `
</div>
<div
aria-label="button with select"
class="MuiButtonGroup-root-id MuiButtonGroup-contained-id"
class="MuiButtonGroup-root-id"
data-test-id="add-product"
role="group"
>
<a
aria-disabled="false"
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedContained-id MuiButtonGroup-groupedContainedHorizontal-id MuiButtonGroup-groupedContainedPrimary-id MuiButton-containedPrimary-id"
class="MuiButtonBase-root-id MuiButton-root-id MuiButton-contained-id MuiButtonGroup-grouped-id MuiButtonGroup-groupedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButtonGroup-groupedOutlinedHorizontal-id MuiButtonGroup-groupedOutlined-id MuiButton-containedPrimary-id"
href="/products/add"
role="button"
style="width:100%"