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

Merge branch 'master' into fix/unassign_user

Browse source
This commit is contained in:
Krzysztof Wolski 2020-08-20 14:13:48 +02:00 committed by GitHub
commit 6f3c8647f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
78 changed files with 18442 additions and 8419 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/test-env-cleanup.yml vendored
View file

@ -14,7 +14,7 @@ jobs:
- name: Set domain
# Set test instance domain based on branch name slug
run: |
echo "::set-env name=domain::${{ env.GITHUB_HEAD_REF_SLUG }}.dashboard.saleor.rocks"
echo "::set-env name=domain::${{ env.GITHUB_HEAD_REF_SLUG_URL }}.dashboard.saleor.rocks"
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
@ -34,4 +34,4 @@ jobs:
with:
step: deactivate-env
token: ${{ secrets.GITHUB_TOKEN }}
env: ${{ env.GITHUB_HEAD_REF_SLUG }}
env: ${{ env.GITHUB_HEAD_REF_SLUG_URL }}

4
.github/workflows/test-env-deploy.yml vendored
View file

@ -22,7 +22,7 @@ jobs:
with:
step: start
token: ${{ secrets.GITHUB_TOKEN }}
env: ${{ env.GITHUB_HEAD_REF_SLUG }}
env: ${{ env.GITHUB_HEAD_REF_SLUG_URL }}
ref: ${{ github.head_ref }}
- name: Cache node modules
@ -63,7 +63,7 @@ jobs:
- name: Set domain
# Set test instance domain based on branch name slug
run: |
echo "::set-env name=domain::${{ env.GITHUB_HEAD_REF_SLUG }}.dashboard.saleor.rocks"
echo "::set-env name=domain::${{ env.GITHUB_HEAD_REF_SLUG_URL }}.dashboard.saleor.rocks"
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1

4
.github/workflows/test.yml vendored
View file

@ -81,8 +81,8 @@ jobs:
env:
API_URI: https://pwa.demo.saleor.rocks/graphql/
with:
start: |
npm start
build: npm run build
start: npx http-server -a localhost -p 9000 build/dashboard
wait-on: http://localhost:9000/
wait-on-timeout: 120
- uses: actions/upload-artifact@v1

10
CHANGELOG.md
View file

@ -16,6 +16,16 @@ All notable, unreleased changes to this project will be documented in this file.
- Refactor authorization - #624 by @dominik-zeglen
- Fix minor bugs - #628 by @dominik-zeglen
- Add navigator button - #635 by @dominik-zeglen
- Update to newest schema - #638 by @dominik-zeglen
- Fix missing save button - #636 by @dominik-zeglen
- Fix user avatars - #639 by @dominik-zeglen
- Reset modal state after closing - #644 by @dominik-zeglen
- Fix incorrect messages - #643 by @dominik-zeglen
- Do not use devserver to run cypress tests - #650 by @dominik-zeglen
- Fix updating product that has no variants - #649 by @dominik-zeglen
- Update checkbox design - #651 by @dominik-zeglen
- Add warehouse choice - #646 by @dominik-zeglen
- Fix user management modal actions - #637 by @eaglesemanation
## 2.10.1

1
assets/images/navigator.svg Normal file
View file

@ -0,0 +1 @@
<svg width="12" height="18" viewBox="0 0 12 18" fill="none" xmlns="http://www.w3.org/2000/svg" ><path d="M0 11.2324L6.99609 0L6.1875 6.78516H11.6895L4.79883 18L5.51953 11.2324H0Z" fill="currentColor" /></svg>
Side by side

After

Width:  |  Height:  |  Size: 208 B

141
locale/defaultMessages.json
View file

@ -205,6 +205,62 @@
"context": "vat not included in order price",
"string": "does not apply"
},
"productExportFieldCategory": {
"context": "product field",
"string": "Category"
},
"productExportFieldCollections": {
"context": "product field",
"string": "Collections"
},
"productExportFieldDescription": {
"context": "product field",
"string": "Description"
},
"productExportFieldName": {
"context": "product field",
"string": "Name"
},
"productExportFieldPrice": {
"context": "product field",
"string": "Cost Price"
},
"productExportFieldProductImages": {
"context": "product field",
"string": "Product Images"
},
"productExportFieldProductWeight": {
"context": "product field",
"string": "Export Product Weight"
},
"productExportFieldTaxes": {
"context": "product field",
"string": "Charge Taxes"
},
"productExportFieldType": {
"context": "product field",
"string": "Type"
},
"productExportFieldVariantImages": {
"context": "product field",
"string": "Variant Images"
},
"productExportFieldVariantPrice": {
"context": "product field",
"string": "Variant Price"
},
"productExportFieldVariantSku": {
"context": "product field",
"string": "Export Variant SKU"
},
"productExportFieldVariantWeight": {
"context": "product field",
"string": "Export Variant Weight"
},
"productExportFieldVisibility": {
"context": "product field",
"string": "Visibility"
},
"productStatusLabel": {
"context": "product",
"string": "Published"
@ -557,9 +613,9 @@
"context": "apps content",
"string": "You don’t have any installed apps in your dashboard"
},
"src_dot_apps_dot_components_dot_InstalledApps_dot_2008086393": {
"src_dot_apps_dot_components_dot_InstalledApps_dot_3504763431": {
"context": "section header",
"string": "Thirdparty Apps"
"string": "Third-party Apps"
},
"src_dot_apps_dot_components_dot_Marketplace_dot_2932910073": {
"context": "section header",
@ -1055,6 +1111,9 @@
"context": "dialog title",
"string": "Delete products"
},
"src_dot_categories_dot_views_dot_3296953393": {
"string": "Remember this will also unpin all products assigned to this category, making them unavailable in storefront."
},
"src_dot_categories_dot_views_dot_3488150607": {
"string": "Remember this will also delete all products assigned to this category."
},
@ -1512,6 +1571,9 @@
"src_dot_components_dot_MultiSelectField_dot_4205644805": {
"string": "No results found"
},
"src_dot_components_dot_NavigatorButton_dot_154826674": {
"string": "Navigator"
},
"src_dot_components_dot_Navigator_dot_1116468870": {
"context": "navigator placeholder",
"string": "Order Number"
@ -3922,34 +3984,22 @@
"context": "product name",
"string": "Name"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_1004476569": {
"context": "option",
"string": "Export stock for all warehouses"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_108342258": {
"context": "button",
"string": "Load More"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_1459686496": {
"context": "product field",
"string": "Visibility"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_1547327218": {
"context": "there are more elements of list that are hidden",
"string": "and {number} more"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_1755013298": {
"context": "product field",
"string": "Category"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_1890035856": {
"context": "informations about product organization, header",
"string": "Product Organization"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_1952810469": {
"context": "product field",
"string": "Type"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_2051669917": {
"context": "product field",
"string": "Cost Price"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_2119710854": {
"context": "informations about product seo, header",
"string": "SEO Information"
@ -3958,10 +4008,6 @@
"context": "export selected products to csv file",
"string": "Selected products ({number})"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_222873645": {
"context": "product field",
"string": "Collections"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_2318723509": {
"context": "export products to csv file, choice field label",
"string": "Export information for:"
@ -3970,6 +4016,10 @@
"context": "export all products to csv file",
"string": "All products ({number})"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_2474350154": {
"context": "list of warehouses",
"string": "Warehouses A to Z"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_2659464408": {
"context": "product export to csv file, header",
"string": "Information exported"
@ -3982,10 +4032,6 @@
"context": "export products to csv file, button",
"string": "export products"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_2949617129": {
"context": "product field",
"string": "Product Images"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_3012202273": {
"context": "export products to csv file, dialog header",
"string": "Export Information"
@ -3994,14 +4040,6 @@
"context": "product export to csv file, header",
"string": "Export Settings"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_3374163063": {
"context": "product field",
"string": "Description"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_3441755345": {
"context": "product field",
"string": "Charge Taxes"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_3443345452": {
"context": "selectt all options",
"string": "Select All"
@ -4010,13 +4048,12 @@
"context": "export products as spreadsheet",
"string": "Spreadsheet for Excel, Numbers etc."
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_3544554440": {
"context": "product field",
"string": "Variant Weight"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_3599582104": {
"string": "Search Atrtibuttes"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_3902059658": {
"string": "Export Product Stock Quantity to CSV"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_3919525499": {
"context": "informations about product stock, header",
"string": "Inventory Information"
@ -4025,10 +4062,6 @@
"context": "export products as csv file",
"string": "Plain CSV file"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_4160582036": {
"context": "product field",
"string": "Variant Price"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_472026385": {
"context": "select product informations to be exported",
"string": "Information exported:"
@ -4037,14 +4070,6 @@
"context": "input helper text, search attributes",
"string": "Search by attribute name"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_636461959": {
"context": "product field",
"string": "Name"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_693960049": {
"context": "product field",
"string": "SKU"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_700651641": {
"context": "export filtered products to csv file",
"string": "Current search ({number})"
@ -4053,14 +4078,6 @@
"context": "informations about product prices etc, header",
"string": "Financial Information"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_746695941": {
"context": "product field",
"string": "Weight"
},
"src_dot_products_dot_components_dot_ProductExportDialog_dot_897437458": {
"context": "product field",
"string": "Variant Images"
},
"src_dot_products_dot_components_dot_ProductImageNavigation_dot_3060635772": {
"context": "section header",
"string": "All Photos"
@ -5731,6 +5748,10 @@
"context": "dialog header",
"string": "Delete Webhook"
},
"src_dot_webhooks_dot_components_dot_WebhookEvents_dot_1087314240": {
"context": "event",
"string": "Checkout updated"
},
"src_dot_webhooks_dot_components_dot_WebhookEvents_dot_1368317066": {
"context": "event",
"string": "Invoice deleted"
@ -5743,6 +5764,10 @@
"context": "event",
"string": "Order updated"
},
"src_dot_webhooks_dot_components_dot_WebhookEvents_dot_2240725235": {
"context": "event",
"string": "Checkout created"
},
"src_dot_webhooks_dot_components_dot_WebhookEvents_dot_2454751033": {
"context": "event",
"string": "All events"

2621
schema.graphql
View file

File diff suppressed because it is too large Load diff

2
src/apps/components/InstalledApps/InstalledApps.tsx
View file

@ -47,7 +47,7 @@ const InstalledApps: React.FC<InstalledAppsProps> = ({
header={
<CardTitle
title={intl.formatMessage({
defaultMessage: "Thirdparty Apps",
defaultMessage: "Third-party Apps",
description: "section header"
})}
/>

4
src/attributes/views/AttributeList/filters.ts
View file

@ -17,7 +17,7 @@ import {
AttributeListUrlQueryParams
} from "../../urls";
export const PRODUCT_FILTERS_KEY = "productFilters";
export const ATTRIBUTE_FILTERS_KEY = "attributeFilters";
export function getFilterOpts(
params: AttributeListUrlFilters
@ -130,7 +130,7 @@ export const {
deleteFilterTab,
getFilterTabs,
saveFilterTab
} = createFilterTabUtils<AttributeListUrlFilters>(PRODUCT_FILTERS_KEY);
} = createFilterTabUtils<AttributeListUrlFilters>(ATTRIBUTE_FILTERS_KEY);
export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
AttributeListUrlQueryParams,

9
src/auth/errors.ts
View file

@ -8,7 +8,14 @@ export enum JWTError {
}
export function isJwtError(error: GraphQLError): boolean {
return !!findValueInEnum(error.extensions.exception.code, JWTError);
let jwtError: boolean;
try {
jwtError = !!findValueInEnum(error.extensions.exception.code, JWTError);
} catch (e) {
jwtError = false;
}
return jwtError;
}
export function isTokenExpired(error: GraphQLError): boolean {

2
src/categories/views/CategoryDetails.tsx
View file

@ -285,7 +285,7 @@ export const CategoryDetails: React.FC<CategoryDetailsProps> = ({
/>
</DialogContentText>
<DialogContentText>
<FormattedMessage defaultMessage="Remember this will also delete all products assigned to this category." />
<FormattedMessage defaultMessage="Remember this will also unpin all products assigned to this category, making them unavailable in storefront." />
</DialogContentText>
</ActionDialog>
<ActionDialog

19
src/components/AppLayout/AppLayout.tsx
View file

@ -28,6 +28,8 @@ import useRouter from "use-react-router";
import Container from "../Container";
import ErrorPage from "../ErrorPage";
import Navigator from "../Navigator";
import NavigatorButton from "../NavigatorButton/NavigatorButton";
import AppActionContext from "./AppActionContext";
import AppHeaderContext from "./AppHeaderContext";
import { appLoaderHeight, drawerWidth, drawerWidthExpanded } from "./consts";
@ -310,6 +312,7 @@ const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
const intl = useIntl();
const [appState, dispatchAppState] = useAppState();
const { location } = useRouter();
const [isNavigatorVisible, setNavigatorVisibility] = React.useState(false);
const menuStructure = createMenuStructure(intl);
const configurationMenu = createConfigurationMenu(intl);
@ -356,6 +359,11 @@ const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
};
return (
<>
<Navigator
visible={isNavigatorVisible}
setVisibility={setNavigatorVisibility}
/>
<AppHeaderContext.Provider value={appHeaderAnchor}>
<AppActionContext.Provider value={appActionAnchor}>
<div className={classes.root}>
@ -371,7 +379,9 @@ const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
[classes.logoDark]: isDark
})}
>
<SVG src={isMenuSmall ? saleorDarkLogoSmall : saleorDarkLogo} />
<SVG
src={isMenuSmall ? saleorDarkLogoSmall : saleorDarkLogo}
/>
</div>
<Hidden smDown>
<div
@ -429,6 +439,12 @@ const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
checked={isDark}
onClick={toggleTheme}
/>
<NavigatorButton
isMac={navigator.platform
.toLowerCase()
.includes("mac")}
onClick={() => setNavigatorVisibility(true)}
/>
<div className={classes.userMenuContainer} ref={anchor}>
<Chip
avatar={
@ -520,6 +536,7 @@ const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
</div>
</AppActionContext.Provider>
</AppHeaderContext.Provider>
</>
);
};

129
src/components/Checkbox/Checkbox.tsx
View file

@ -1,136 +1,25 @@
import ButtonBase from "@material-ui/core/ButtonBase";
import { CheckboxProps as MuiCheckboxProps } from "@material-ui/core/Checkbox";
import { makeStyles } from "@material-ui/core/styles";
import { fade } from "@material-ui/core/styles/colorManipulator";
import classNames from "classnames";
import MuiCheckbox, {
CheckboxProps as MuiCheckboxProps
} from "@material-ui/core/Checkbox";
import React from "react";
export type CheckboxProps = Omit<
MuiCheckboxProps,
| "checkedIcon"
| "color"
| "icon"
| "indeterminateIcon"
| "classes"
| "onChange"
| "onClick"
"checkedIcon" | "color" | "icon" | "indeterminateIcon" | "classes" | "onClick"
> & {
disableClickPropagation?: boolean;
onChange?: (event: React.ChangeEvent<any>) => void;
};
const useStyles = makeStyles(
theme => ({
box: {
"&$checked": {
"&:before": {
background: theme.palette.primary.main,
color: theme.palette.background.paper,
content: '"\\2713"',
fontWeight: "bold",
textAlign: "center"
},
borderColor: theme.palette.primary.main
},
"&$disabled": {
borderColor: theme.palette.grey[200]
},
"&$indeterminate": {
"&:before": {
background: theme.palette.primary.main,
height: 2,
top: 5
},
borderColor: theme.palette.primary.main
},
"&:before": {
background: "rgba(0, 0, 0, 0)",
content: '""',
height: 14,
left: -1,
position: "absolute",
top: -1,
transition: theme.transitions.duration.short + "ms",
width: 14
},
WebkitAppearance: "none",
border: `1px solid ${theme.palette.action.active}`,
boxSizing: "border-box",
cursor: "pointer",
height: 14,
outline: "0",
position: "relative",
userSelect: "none",
width: 14
},
checked: {},
disabled: {},
indeterminate: {},
root: {
"&:hover": {
background: fade(theme.palette.primary.main, 0.1)
},
alignSelf: "start",
borderRadius: "100%",
cursor: "pointer",
display: "flex",
height: 30,
justifyContent: "center",
margin: "5px 9px",
width: 30
}
}),
{ name: "Checkbox" }
);
const Checkbox: React.FC<CheckboxProps> = props => {
const {
checked,
className,
disabled,
disableClickPropagation,
indeterminate,
onChange,
value,
name,
...rest
} = props;
const classes = useStyles(props);
const inputRef = React.useRef<HTMLInputElement>(null);
const handleClick = React.useCallback(
disableClickPropagation
? event => {
event.stopPropagation();
inputRef.current.click();
}
: () => inputRef.current.click(),
[]
);
const { disableClickPropagation, ...rest } = props;
return (
<ButtonBase
<MuiCheckbox
{...rest}
centerRipple
className={classNames(classes.root, className)}
disabled={disabled}
onClick={handleClick}
>
<input
className={classNames(classes.box, {
[classes.checked]: checked,
[classes.disabled]: disabled,
[classes.indeterminate]: indeterminate
})}
disabled={disabled}
type="checkbox"
name={name}
value={checked !== undefined && checked.toString()}
ref={inputRef}
onChange={onChange}
onClick={
disableClickPropagation ? event => event.stopPropagation() : undefined
}
/>
</ButtonBase>
);
};
Checkbox.displayName = "Checkbox";

4
src/components/ControlledCheckbox.tsx
View file

@ -1,8 +1,7 @@
import Checkbox from "@material-ui/core/Checkbox";
import FormControlLabel from "@material-ui/core/FormControlLabel";
import React from "react";
import Checkbox from "./Checkbox";
interface ControlledCheckboxProps {
className?: string;
name: string;
@ -27,7 +26,6 @@ export const ControlledCheckbox: React.FC<ControlledCheckboxProps> = ({
checked={checked}
disabled={disabled}
name={name}
disableClickPropagation
onChange={() => onChange({ target: { name, value: !checked } })}
/>
}

14
src/components/Navigator/Navigator.tsx
View file

@ -60,8 +60,12 @@ const useStyles = makeStyles(
}
);
const Navigator: React.FC = () => {
const [visible, setVisible] = React.useState(false);
export interface NavigatorProps {
visible: boolean;
setVisibility: (state: boolean) => void;
}
const Navigator: React.FC<NavigatorProps> = ({ visible, setVisibility }) => {
const input = React.useRef(null);
const [query, mode, change, actions] = useQuickSearch(visible, input);
const intl = useIntl();
@ -76,7 +80,7 @@ const Navigator: React.FC = () => {
React.useEffect(() => {
hotkeys(navigatorHotkey, event => {
event.preventDefault();
setVisible(!visible);
setVisibility(!visible);
});
if (cmp(APP_VERSION, "2.1.0") !== 1 && !notifiedAboutNavigator) {
@ -110,7 +114,7 @@ const Navigator: React.FC = () => {
<Modal
className={classes.modal}
open={visible}
onClose={() => setVisible(false)}
onClose={() => setVisibility(false)}
>
<Fade appear in={visible} timeout={theme.transitions.duration.short}>
<div className={classes.root}>
@ -122,7 +126,7 @@ const Navigator: React.FC = () => {
onSelect={(item: QuickSearchAction) => {
const shouldRemainVisible = item.onClick();
if (!shouldRemainVisible) {
setVisible(false);
setVisibility(false);
}
}}
onInputValueChange={value =>

12
src/components/NavigatorButton/NavigatorButton.stories.tsx Normal file
View file

@ -0,0 +1,12 @@
import CardDecorator from "@saleor/storybook/CardDecorator";
import Decorator from "@saleor/storybook/Decorator";
import { storiesOf } from "@storybook/react";
import React from "react";
import NavigatorButton from "./NavigatorButton";
storiesOf("Generics / NavigatorButton", module)
.addDecorator(Decorator)
.addDecorator(CardDecorator)
.add("mac", () => <NavigatorButton isMac={true} />)
.add("other", () => <NavigatorButton isMac={false} />);

153
src/components/NavigatorButton/NavigatorButton.tsx Normal file
View file

@ -0,0 +1,153 @@
import navigatorIcon from "@assets/images/navigator.svg";
import Grow from "@material-ui/core/Grow";
import IconButton, { IconButtonProps } from "@material-ui/core/IconButton";
import Paper from "@material-ui/core/Paper";
import Popper from "@material-ui/core/Popper";
import makeStyles from "@material-ui/core/styles/makeStyles";
import classNames from "classnames";
import React from "react";
import ReactSVG from "react-inlinesvg";
import { FormattedMessage } from "react-intl";
const useStyles = makeStyles(
theme => {
const triangle = (color: string, width: number) => ({
borderBottom: `${width}px solid ${color}`,
borderLeft: `${width}px solid transparent`,
borderRight: `${width}px solid transparent`,
height: 0,
width: 0
});
return {
keyTile: {
"&:first-child": {
marginLeft: theme.spacing()
},
alignItems: "center",
background: theme.palette.background.default,
borderRadius: 8,
display: "inline-flex",
height: 32,
justifyContent: "center",
marginLeft: theme.spacing(0.5),
padding: theme.spacing(),
width: 32
},
keyTileLabel: {
verticalAlign: "middle"
},
paper: {
"&:after": {
...triangle(theme.palette.background.paper, 7),
content: "''",
left: theme.spacing(2) + 2,
position: "absolute",
top: -theme.spacing() + 1
},
"&:before": {
...triangle(theme.palette.divider, 8),
content: "''",
left: theme.spacing(2) + 1,
position: "absolute",
top: -theme.spacing()
},
border: `1px solid ${theme.palette.divider}`,
borderRadius: 6,
marginTop: theme.spacing(2),
padding: theme.spacing(2),
position: "relative"
},
root: {
"& path": {
color: theme.palette.primary.main
},
"&:not(:hover)": {
backgroundColor: theme.palette.background.paper
},
border: `1px solid ${theme.palette.divider}`,
height: 40,
marginRight: theme.spacing(2),
width: 40
}
};
},
{
name: "NavigatorButton"
}
);
export interface NavigatorButtonProps extends IconButtonProps {
isMac: boolean;
}
const NavigatorButton: React.FC<NavigatorButtonProps> = ({
className,
isMac,
...props
}) => {
const classes = useStyles({});
const helperTimer = React.useRef(null);
const [helperVisibility, setHelperVisibility] = React.useState(false);
const anchor = React.useRef<HTMLButtonElement>();
const setHelper = () => {
helperTimer.current = setTimeout(() => setHelperVisibility(true), 2 * 1000);
};
const clearHelper = () => {
if (helperTimer.current) {
clearTimeout(helperTimer.current);
helperTimer.current = null;
}
setHelperVisibility(false);
};
return (
<>
<IconButton
className={classNames(className, classes.root)}
data-test="navigator"
onMouseEnter={setHelper}
onMouseLeave={clearHelper}
{...props}
ref={anchor}
>
<ReactSVG src={navigatorIcon} />
</IconButton>
<Popper
open={helperVisibility}
anchorEl={anchor.current}
transition
disablePortal
placement="bottom-start"
>
{({ TransitionProps, placement }) => (
<Grow
{...TransitionProps}
style={{
transformOrigin:
placement === "bottom" ? "right top" : "right bottom"
}}
>
<Paper className={classes.paper} elevation={0}>
<FormattedMessage defaultMessage="Navigator" />
<div className={classes.keyTile}>
<span className={classes.keyTileLabel}>
{isMac ? "⌘" : "Ctrl"}
</span>
</div>
<div className={classes.keyTile}>
<span className={classes.keyTileLabel}>K</span>
</div>
</Paper>
</Grow>
)}
</Popper>
</>
);
};
NavigatorButton.displayName = "NavigatorButton";
export default NavigatorButton;

22
src/components/TableHead/TableHead.tsx
View file

@ -28,23 +28,6 @@ const useStyles = makeStyles(
cell: {
padding: 0
},
checkboxPartialSelect: {
"& input": {
"&:before": {
background: [theme.palette.background.paper, "!important"] as any,
border: `solid 1px ${theme.palette.primary.main}`,
content: "''"
},
background: theme.palette.background.paper
},
"&:after": {
background: theme.palette.primary.main,
content: "''",
height: 2,
position: "absolute",
width: 6
}
},
checkboxSelected: {
backgroundColor: fade(theme.palette.primary.main, 0.05)
},
@ -113,10 +96,7 @@ const TableHead: React.FC<TableHeadProps> = props => {
})}
>
<Checkbox
className={classNames({
[classes.checkboxPartialSelect]:
items && items.length > selected && selected > 0
})}
indeterminate={items && items.length > selected && selected > 0}
checked={selected === 0 ? false : true}
disabled={disabled}
onChange={() => toggleAll(items, selected)}

5
src/discounts/views/SaleList/filters.ts
View file

@ -117,4 +117,7 @@ export const {
export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
SaleListUrlQueryParams,
SaleListUrlFilters
>(SaleListUrlFiltersEnum);
>({
...SaleListUrlFiltersEnum,
...SaleListUrlFiltersWithMultipleValues
});

5
src/discounts/views/VoucherList/filters.ts
View file

@ -149,4 +149,7 @@ export const {
export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
VoucherListUrlQueryParams,
VoucherListUrlFilters
>(VoucherListUrlFiltersEnum);
>({
...VoucherListUrlFiltersEnum,
...VoucherListUrlFiltersWithMultipleValues
});

3
src/fragments/permissionGroups.ts
View file

@ -33,6 +33,9 @@ export const permissionGroupDetailsFragment = gql`
}
users {
...StaffMemberFragment
avatar(size: 48) {
url
}
}
}
`;

6
src/fragments/staff.ts
View file

@ -7,9 +7,6 @@ export const staffMemberFragment = gql`
firstName
isActive
lastName
avatar {
url
}
}
`;
export const staffMemberDetailsFragment = gql`
@ -25,5 +22,8 @@ export const staffMemberDetailsFragment = gql`
code
name
}
avatar(size: 120) {
url
}
}
`;

4
src/fragments/types/Product.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { AttributeInputTypeEnum } from "./../../types/globalTypes";
import { AttributeInputTypeEnum, WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL fragment: Product
@ -170,7 +170,7 @@ export interface Product_variants {
export interface Product_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/fragments/types/ProductTypeDetailsFragment.ts
View file

@ -2,6 +2,8 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL fragment: ProductTypeDetailsFragment
// ====================================================
@ -34,7 +36,7 @@ export interface ProductTypeDetailsFragment_variantAttributes {
export interface ProductTypeDetailsFragment_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/fragments/types/ProductVariant.ts
View file

@ -2,6 +2,8 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL fragment: ProductVariant
// ====================================================
@ -105,7 +107,7 @@ export interface ProductVariant_stocks {
export interface ProductVariant_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

6
src/fragments/types/ShippingMethodFragment.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { ShippingMethodTypeEnum } from "./../../types/globalTypes";
import { WeightUnitsEnum, ShippingMethodTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL fragment: ShippingMethodFragment
@ -16,7 +16,7 @@ export interface ShippingMethodFragment_minimumOrderPrice {
export interface ShippingMethodFragment_minimumOrderWeight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}
@ -28,7 +28,7 @@ export interface ShippingMethodFragment_maximumOrderPrice {
export interface ShippingMethodFragment_maximumOrderWeight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

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

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { ShippingMethodTypeEnum } from "./../../types/globalTypes";
import { WeightUnitsEnum, ShippingMethodTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL fragment: ShippingZoneDetailsFragment
@ -22,7 +22,7 @@ export interface ShippingZoneDetailsFragment_shippingMethods_minimumOrderPrice {
export interface ShippingZoneDetailsFragment_shippingMethods_minimumOrderWeight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}
@ -34,7 +34,7 @@ export interface ShippingZoneDetailsFragment_shippingMethods_maximumOrderPrice {
export interface ShippingZoneDetailsFragment_shippingMethods_maximumOrderWeight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

12
src/fragments/types/StaffMemberDetailsFragment.ts
View file

@ -8,11 +8,6 @@ import { PermissionEnum } from "./../../types/globalTypes";
// GraphQL fragment: StaffMemberDetailsFragment
// ====================================================
export interface StaffMemberDetailsFragment_avatar {
__typename: "Image";
url: string;
}
export interface StaffMemberDetailsFragment_permissionGroups {
__typename: "Group";
id: string;
@ -26,6 +21,11 @@ export interface StaffMemberDetailsFragment_userPermissions {
name: string;
}
export interface StaffMemberDetailsFragment_avatar {
__typename: "Image";
url: string;
}
export interface StaffMemberDetailsFragment {
__typename: "User";
id: string;
@ -33,7 +33,7 @@ export interface StaffMemberDetailsFragment {
firstName: string;
isActive: boolean;
lastName: string;
avatar: StaffMemberDetailsFragment_avatar | null;
permissionGroups: (StaffMemberDetailsFragment_permissionGroups | null)[] | null;
userPermissions: (StaffMemberDetailsFragment_userPermissions | null)[] | null;
avatar: StaffMemberDetailsFragment_avatar | null;
}

6
src/fragments/types/StaffMemberFragment.ts
View file

@ -6,11 +6,6 @@
// GraphQL fragment: StaffMemberFragment
// ====================================================
export interface StaffMemberFragment_avatar {
__typename: "Image";
url: string;
}
export interface StaffMemberFragment {
__typename: "User";
id: string;
@ -18,5 +13,4 @@ export interface StaffMemberFragment {
firstName: string;
isActive: boolean;
lastName: string;
avatar: StaffMemberFragment_avatar | null;
}

4
src/fragments/types/WeightFragment.ts
View file

@ -2,12 +2,14 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL fragment: WeightFragment
// ====================================================
export interface WeightFragment {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

18
src/icons/Checkbox.tsx Normal file
View file

@ -0,0 +1,18 @@
import createSvgIcon from "@material-ui/icons/utils/createSvgIcon";
import React from "react";
const Checkbox = createSvgIcon(
<>
<rect
x="5"
y="5"
width="14"
height="14"
stroke="currentColor"
fill="none"
/>
</>,
"Checkbox"
);
export default Checkbox;

17
src/icons/CheckboxChecked.tsx Normal file
View file

@ -0,0 +1,17 @@
import createSvgIcon from "@material-ui/icons/utils/createSvgIcon";
import React from "react";
const CheckboxChecked = createSvgIcon(
<>
<rect x="5" y="5" width="14" height="14" fill="currentColor" />
<path
fillRule="evenodd"
clipRule="evenodd"
d="M 16.7527 9.33783 L 10.86618 15.7595 L 8 12.32006 L 8.76822 11.67988 L 10.90204 14.24046 L 16.0155 8.66211 L 16.7527 9.33783 Z"
fill="white"
/>
</>,
"CheckboxChecked"
);
export default CheckboxChecked;

19
src/icons/CheckboxIndeterminate.tsx Normal file
View file

@ -0,0 +1,19 @@
import createSvgIcon from "@material-ui/icons/utils/createSvgIcon";
import React from "react";
const CheckboxIndeterminate = createSvgIcon(
<>
<rect
x="5"
y="5"
width="14"
height="14"
stroke="currentColor"
fill="none"
/>
<rect x="8" y="11" width="8" height="2" fill="currentColor" />
</>,
"CheckboxIndeterminate"
);
export default CheckboxIndeterminate;

2
src/index.tsx
View file

@ -1,4 +1,3 @@
import Navigator from "@saleor/components/Navigator";
import useAppState from "@saleor/hooks/useAppState";
import { defaultDataIdFromObject, InMemoryCache } from "apollo-cache-inmemory";
import { ApolloClient } from "apollo-client";
@ -139,7 +138,6 @@ const Routes: React.FC = () => {
<WindowTitle title={intl.formatMessage(commonMessages.dashboard)} />
{isAuthenticated && !tokenAuthLoading && !tokenVerifyLoading ? (
<AppLayout>
<Navigator />
<ErrorBoundary
onError={() =>
dispatchAppState({

4
src/misc.ts
View file

@ -306,10 +306,10 @@ export function createHref(url: string) {
interface AnyEvent {
stopPropagation: () => void;
}
export function stopPropagation(cb: () => void) {
export function stopPropagation(cb: (event?: AnyEvent) => void) {
return (event: AnyEvent) => {
event.stopPropagation();
cb();
cb(event);
};
}

4
src/permissionGroups/components/PermissionGroupMemberList/PermissionGroupMemberList.tsx
View file

@ -52,8 +52,8 @@ const useStyles = makeStyles(
width: 47
},
avatarDefault: {
"& p": {
color: "#fff",
"& div": {
color: theme.palette.primary.contrastText,
lineHeight: "47px"
},
background: theme.palette.primary.main,

4
src/productTypes/fixtures.ts
View file

@ -3,7 +3,7 @@ import {
SearchProductTypes_search_edges_node_productAttributes
} from "@saleor/searches/types/SearchProductTypes";
import { AttributeInputTypeEnum } from "../types/globalTypes";
import { AttributeInputTypeEnum, WeightUnitsEnum } from "../types/globalTypes";
import { ProductTypeDetails_productType } from "./types/ProductTypeDetails";
import { ProductTypeList_productTypes_edges_node } from "./types/ProductTypeList";
@ -601,7 +601,7 @@ export const productType: ProductTypeDetails_productType = {
],
weight: {
__typename: "Weight",
unit: "kg",
unit: WeightUnitsEnum.KG,
value: 7.82
}
};

4
src/productTypes/types/AssignAttribute.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { AttributeAssignInput } from "./../../types/globalTypes";
import { AttributeAssignInput, WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: AssignAttribute
@ -42,7 +42,7 @@ export interface AssignAttribute_attributeAssign_productType_variantAttributes {
export interface AssignAttribute_attributeAssign_productType_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/productTypes/types/ProductTypeAttributeReorder.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { ReorderInput, AttributeTypeEnum } from "./../../types/globalTypes";
import { ReorderInput, AttributeTypeEnum, WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: ProductTypeAttributeReorder
@ -42,7 +42,7 @@ export interface ProductTypeAttributeReorder_productTypeReorderAttributes_produc
export interface ProductTypeAttributeReorder_productTypeReorderAttributes_productType_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/productTypes/types/ProductTypeCreate.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { ProductTypeInput } from "./../../types/globalTypes";
import { ProductTypeInput, WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: ProductTypeCreate
@ -42,7 +42,7 @@ export interface ProductTypeCreate_productTypeCreate_productType_variantAttribut
export interface ProductTypeCreate_productTypeCreate_productType_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

2
src/productTypes/types/ProductTypeDetails.ts
View file

@ -36,7 +36,7 @@ export interface ProductTypeDetails_productType_variantAttributes {
export interface ProductTypeDetails_productType_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/productTypes/types/ProductTypeUpdate.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { ProductTypeInput } from "./../../types/globalTypes";
import { ProductTypeInput, WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: ProductTypeUpdate
@ -42,7 +42,7 @@ export interface ProductTypeUpdate_productTypeUpdate_productType_variantAttribut
export interface ProductTypeUpdate_productTypeUpdate_productType_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/productTypes/types/UnassignAttribute.ts
View file

@ -2,6 +2,8 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: UnassignAttribute
// ====================================================
@ -40,7 +42,7 @@ export interface UnassignAttribute_attributeUnassign_productType_variantAttribut
export interface UnassignAttribute_attributeUnassign_productType_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/products/components/ProductExportDialog/ProductExportDialog.stories.tsx
View file

@ -3,6 +3,7 @@ import {
ExportErrorCode,
ExportProductsInput
} from "@saleor/types/globalTypes";
import { warehouseList } from "@saleor/warehouses/fixtures";
import { storiesOf } from "@storybook/react";
import React from "react";
@ -30,7 +31,8 @@ const props: ProductExportDialogProps = {
all: 100,
filter: 32
},
selectedProducts: 18
selectedProducts: 18,
warehouses: warehouseList
};
storiesOf("Views / Products / Export / Export settings", module)

69
src/products/components/ProductExportDialog/ProductExportDialog.tsx
View file

@ -8,11 +8,11 @@ import ConfirmButton, {
ConfirmButtonTransitionState
} from "@saleor/components/ConfirmButton";
import makeCreatorSteps, { Step } from "@saleor/components/CreatorSteps";
import Form from "@saleor/components/Form";
import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField";
import { ExportErrorFragment } from "@saleor/fragments/types/ExportErrorFragment";
import { FormChange } from "@saleor/hooks/useForm";
import useForm, { FormChange } from "@saleor/hooks/useForm";
import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors";
import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen";
import useWizard from "@saleor/hooks/useWizard";
import { buttonMessages } from "@saleor/intl";
import { SearchAttributes_search_edges_node } from "@saleor/searches/types/SearchAttributes";
@ -25,11 +25,13 @@ import {
import getExportErrorMessage from "@saleor/utils/errors/export";
import { toggle } from "@saleor/utils/lists";
import { mapNodeToChoice } from "@saleor/utils/maps";
import { WarehouseList_warehouses_edges_node } from "@saleor/warehouses/types/WarehouseList";
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";
import ProductExportDialogInfo, {
attributeNamePrefix
attributeNamePrefix,
warehouseNamePrefix
} from "./ProductExportDialogInfo";
import ProductExportDialogSettings, {
ProductQuantity
@ -64,7 +66,8 @@ function useSteps(): Array<Step<ProductExportStep>> {
const initialForm: ExportProductsInput = {
exportInfo: {
attributes: [],
fields: []
fields: [],
warehouses: []
},
fileType: FileTypesEnum.CSV,
scope: ExportScope.ALL
@ -78,6 +81,7 @@ export interface ProductExportDialogProps extends DialogProps, FetchMoreProps {
errors: ExportErrorFragment[];
productQuantity: ProductQuantity;
selectedProducts: number;
warehouses: WarehouseList_warehouses_edges_node[];
onFetch: (query: string) => void;
onSubmit: (data: ExportProductsInput) => void;
}
@ -91,6 +95,7 @@ const ProductExportDialog: React.FC<ProductExportDialogProps> = ({
onSubmit,
open,
selectedProducts,
warehouses,
...fetchMoreProps
}) => {
const [step, { next, prev, set: setStep }] = useWizard(
@ -104,13 +109,18 @@ const ProductExportDialog: React.FC<ProductExportDialogProps> = ({
const [selectedAttributes, setSelectedAttributes] = React.useState<
MultiAutocompleteChoiceType[]
>([]);
const { change, data, reset, submit } = useForm(initialForm, onSubmit);
useModalDialogOpen(open, {
onClose: () => {
reset();
setStep(ProductExportStep.INFO);
}
});
const attributeChoices = mapNodeToChoice(attributes);
const warehouseChoices = mapNodeToChoice(warehouses);
return (
<Dialog onClose={onClose} open={open} maxWidth="sm" fullWidth>
<Form initial={initialForm} onSubmit={onSubmit}>
{({ change, data }) => {
const handleAttributeSelect: FormChange = event => {
const id = event.target.name.substr(attributeNamePrefix.length);
@ -119,11 +129,7 @@ const ProductExportDialog: React.FC<ProductExportDialogProps> = ({
name: "exportInfo",
value: {
...data.exportInfo,
attributes: toggle(
id,
data.exportInfo.attributes,
(a, b) => a === b
)
attributes: toggle(id, data.exportInfo.attributes, (a, b) => a === b)
}
}
});
@ -135,7 +141,37 @@ const ProductExportDialog: React.FC<ProductExportDialogProps> = ({
);
};
const handleWarehouseSelect: FormChange = event =>
change({
target: {
name: "exportInfo",
value: {
...data.exportInfo,
warehouses: toggle(
event.target.name.substr(warehouseNamePrefix.length),
data.exportInfo.warehouses,
(a, b) => a === b
)
}
}
});
const handleToggleAllWarehouses: FormChange = () =>
change({
target: {
name: "exportInfo",
value: {
...data.exportInfo,
warehouses:
data.exportInfo.warehouses.length === warehouses.length
? []
: warehouses.map(warehouse => warehouse.id)
}
}
});
return (
<Dialog onClose={onClose} open={open} maxWidth="sm" fullWidth>
<>
<DialogTitle>
<FormattedMessage
@ -155,7 +191,10 @@ const ProductExportDialog: React.FC<ProductExportDialogProps> = ({
data={data}
selectedAttributes={selectedAttributes}
onAttrtibuteSelect={handleAttributeSelect}
onWarehouseSelect={handleWarehouseSelect}
onChange={change}
warehouses={warehouseChoices}
onSelectAllWarehouses={handleToggleAllWarehouses}
{...fetchMoreProps}
/>
)}
@ -207,6 +246,7 @@ const ProductExportDialog: React.FC<ProductExportDialogProps> = ({
variant="contained"
type="submit"
data-test="submit"
onClick={submit}
>
<FormattedMessage
defaultMessage="export products"
@ -216,9 +256,6 @@ const ProductExportDialog: React.FC<ProductExportDialogProps> = ({
)}
</DialogActions>
</>
);
}}
</Form>
</Dialog>
);
};

252
src/products/components/ProductExportDialog/ProductExportDialogInfo.tsx
View file

@ -1,15 +1,15 @@
import Button from "@material-ui/core/Button";
import Checkbox from "@material-ui/core/Checkbox";
import CircularProgress from "@material-ui/core/CircularProgress";
import FormControlLabel from "@material-ui/core/FormControlLabel";
import makeStyles from "@material-ui/core/styles/makeStyles";
import TextField from "@material-ui/core/TextField";
import Typography from "@material-ui/core/Typography";
import Accordion, { AccordionProps } from "@saleor/components/Accordion";
import Checkbox from "@saleor/components/Checkbox";
import Chip from "@saleor/components/Chip";
import Hr from "@saleor/components/Hr";
import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField";
import { ChangeEvent } from "@saleor/hooks/useForm";
import { ChangeEvent, FormChange } from "@saleor/hooks/useForm";
import useSearchQuery from "@saleor/hooks/useSearchQuery";
import { sectionNames } from "@saleor/intl";
import { FetchMoreProps } from "@saleor/types";
@ -22,9 +22,18 @@ import React from "react";
import { useIntl } from "react-intl";
import { FormattedMessage } from "react-intl";
import useProductExportFieldMessages from "./messages";
export const attributeNamePrefix = "attribute-";
export const warehouseNamePrefix = "warehouse-";
const maxChips = 4;
const inventoryFields = [
ProductFieldEnum.PRODUCT_WEIGHT,
ProductFieldEnum.VARIANT_SKU,
ProductFieldEnum.VARIANT_WEIGHT
];
const useStyles = makeStyles(
theme => ({
accordion: {
@ -45,12 +54,23 @@ const useStyles = makeStyles(
marginBottom: theme.spacing(3),
marginTop: theme.spacing(3)
},
hrWarehouses: {
marginBottom: theme.spacing(3),
marginTop: theme.spacing(1)
},
label: {
"&&": {
overflow: "visible"
},
"&:first-of-type": {
paddingTop: 0
},
"&:not(:last-of-type)": {
borderBottom: `1px solid ${theme.palette.divider}`
},
justifyContent: "space-between",
margin: theme.spacing(0),
padding: theme.spacing(1, 0),
width: "100%"
},
loadMoreContainer: {
@ -62,8 +82,14 @@ const useStyles = makeStyles(
display: "inline-block",
marginBottom: theme.spacing()
},
optionLabel: {
marginLeft: 0
},
quickPeekContainer: {
marginBottom: theme.spacing(-1)
},
warehousesLabel: {
marginBottom: theme.spacing(2)
}
}),
{
@ -80,12 +106,14 @@ const Option: React.FC<{
return (
<FormControlLabel
classes={{
label: classes.optionLabel
}}
color="primary"
control={
<Checkbox
className={classes.checkbox}
checked={checked}
color="primary"
name={name}
onChange={onChange}
/>
@ -104,66 +132,7 @@ const FieldAccordion: React.FC<AccordionProps & {
onToggleAll: (field: ProductFieldEnum[], setTo: boolean) => void;
}> = ({ data, fields, onChange, onToggleAll, ...props }) => {
const classes = useStyles({});
const intl = useIntl();
const fieldNames: Record<ProductFieldEnum, string> = {
[ProductFieldEnum.CATEGORY]: intl.formatMessage({
defaultMessage: "Category",
description: "product field"
}),
[ProductFieldEnum.CHARGE_TAXES]: intl.formatMessage({
defaultMessage: "Charge Taxes",
description: "product field"
}),
[ProductFieldEnum.COLLECTIONS]: intl.formatMessage({
defaultMessage: "Collections",
description: "product field"
}),
[ProductFieldEnum.COST_PRICE]: intl.formatMessage({
defaultMessage: "Cost Price",
description: "product field"
}),
[ProductFieldEnum.DESCRIPTION]: intl.formatMessage({
defaultMessage: "Description",
description: "product field"
}),
[ProductFieldEnum.NAME]: intl.formatMessage({
defaultMessage: "Name",
description: "product field"
}),
[ProductFieldEnum.PRODUCT_IMAGES]: intl.formatMessage({
defaultMessage: "Product Images",
description: "product field"
}),
[ProductFieldEnum.PRODUCT_TYPE]: intl.formatMessage({
defaultMessage: "Type",
description: "product field"
}),
[ProductFieldEnum.PRODUCT_WEIGHT]: intl.formatMessage({
defaultMessage: "Weight",
description: "product field"
}),
[ProductFieldEnum.VARIANT_IMAGES]: intl.formatMessage({
defaultMessage: "Variant Images",
description: "product field"
}),
[ProductFieldEnum.VARIANT_PRICE]: intl.formatMessage({
defaultMessage: "Variant Price",
description: "product field"
}),
[ProductFieldEnum.VARIANT_SKU]: intl.formatMessage({
defaultMessage: "SKU",
description: "product field"
}),
[ProductFieldEnum.VARIANT_WEIGHT]: intl.formatMessage({
defaultMessage: "Variant Weight",
description: "product field"
}),
[ProductFieldEnum.VISIBLE]: intl.formatMessage({
defaultMessage: "Visibility",
description: "product field"
})
};
const getFieldLabel = useProductExportFieldMessages();
const selectedAll = fields.every(field =>
data.exportInfo.fields.includes(field)
@ -181,7 +150,7 @@ const FieldAccordion: React.FC<AccordionProps & {
{selectedFields.slice(0, maxChips).map(field => (
<Chip
className={classes.chip}
label={fieldNames[field]}
label={getFieldLabel(field)}
onClose={() =>
onChange({
target: {
@ -190,6 +159,7 @@ const FieldAccordion: React.FC<AccordionProps & {
}
})
}
key={field}
/>
))}
{selectedFields.length > maxChips && (
@ -225,7 +195,7 @@ const FieldAccordion: React.FC<AccordionProps & {
onChange={onChange}
key={field}
>
{fieldNames[field]}
{getFieldLabel(field)}
</Option>
))}
</Accordion>
@ -234,11 +204,14 @@ const FieldAccordion: React.FC<AccordionProps & {
export interface ProductExportDialogInfoProps extends FetchMoreProps {
attributes: MultiAutocompleteChoiceType[];
warehouses: MultiAutocompleteChoiceType[];
data: ExportProductsInput;
selectedAttributes: MultiAutocompleteChoiceType[];
onAttrtibuteSelect: (event: ChangeEvent) => void;
onChange: (event: ChangeEvent) => void;
onAttrtibuteSelect: FormChange;
onWarehouseSelect: FormChange;
onChange: FormChange;
onFetch: (query: string) => void;
onSelectAllWarehouses: FormChange;
}
const ProductExportDialogInfo: React.FC<ProductExportDialogInfoProps> = ({
@ -247,14 +220,18 @@ const ProductExportDialogInfo: React.FC<ProductExportDialogInfoProps> = ({
hasMore,
selectedAttributes,
loading,
warehouses,
onAttrtibuteSelect,
onWarehouseSelect,
onChange,
onFetch,
onFetchMore
onFetchMore,
onSelectAllWarehouses
}) => {
const classes = useStyles({});
const intl = useIntl();
const [query, onQueryChange] = useSearchQuery(onFetch);
const getFieldLabel = useProductExportFieldMessages();
const handleFieldChange = (event: ChangeEvent) =>
onChange({
@ -289,6 +266,12 @@ const ProductExportDialogInfo: React.FC<ProductExportDialogInfoProps> = ({
}
});
const selectedInventoryFields = data.exportInfo.fields.filter(field =>
inventoryFields.includes(field)
);
const selectedAllInventoryFields =
selectedInventoryFields.length === inventoryFields.length;
return (
<>
<Typography className={classes.dialogLabel}>
@ -331,6 +314,7 @@ const ProductExportDialogInfo: React.FC<ProductExportDialogInfoProps> = ({
}
})
}
key={attribute.value}
/>
))}
{selectedAttributes.length > maxChips && (
@ -408,22 +392,134 @@ const ProductExportDialogInfo: React.FC<ProductExportDialogInfoProps> = ({
onToggleAll={handleToggleAllFields}
data-test="financial"
/>
<FieldAccordion
<Accordion
className={classes.accordion}
title={intl.formatMessage({
defaultMessage: "Inventory Information",
description: "informations about product stock, header"
})}
data={data}
fields={[
ProductFieldEnum.PRODUCT_WEIGHT,
ProductFieldEnum.VARIANT_SKU,
ProductFieldEnum.VARIANT_WEIGHT
]}
onChange={handleFieldChange}
onToggleAll={handleToggleAllFields}
data-test="inventory"
quickPeek={
(data.exportInfo.warehouses.length > 0 ||
selectedInventoryFields.length > 0) && (
<div className={classes.quickPeekContainer}>
{selectedInventoryFields.slice(0, maxChips).map(field => (
<Chip
className={classes.chip}
label={getFieldLabel(field)}
onClose={() =>
onChange({
target: {
name: field,
value: false
}
})
}
/>
))}
{data.exportInfo.warehouses
.slice(0, maxChips - selectedInventoryFields.length)
.map(warehouseId => (
<Chip
className={classes.chip}
label={
warehouses.find(
warehouse => warehouse.value === warehouseId
).label
}
onClose={() =>
onWarehouseSelect({
target: {
name: warehouseNamePrefix + warehouseId,
value: undefined
}
})
}
/>
))}
{data.exportInfo.warehouses.length +
selectedInventoryFields.length >
maxChips && (
<Typography className={classes.moreLabel} variant="caption">
<FormattedMessage
defaultMessage="and {number} more"
description="there are more elements of list that are hidden"
values={{
number:
data.exportInfo.warehouses.length +
selectedInventoryFields.length -
maxChips
}}
/>
</Typography>
)}
</div>
)
}
data-test="inventory"
>
<div>
<Option
checked={selectedAllInventoryFields}
name="all"
onChange={() =>
handleToggleAllFields(
inventoryFields,
!selectedAllInventoryFields
)
}
>
<FormattedMessage
defaultMessage="Select All"
description="selectt all options"
/>
</Option>
{inventoryFields.map(field => (
<Option
checked={data.exportInfo.fields.includes(field)}
name={field}
onChange={handleFieldChange}
key={field}
>
{getFieldLabel(field)}
</Option>
))}
</div>
<Hr className={classes.hrWarehouses} />
<Typography>
<FormattedMessage defaultMessage="Export Product Stock Quantity to CSV" />
</Typography>
<div>
<Option
checked={warehouses.every(warehouse =>
data.exportInfo.warehouses.includes(warehouse.value)
)}
name="all-warehouses"
onChange={onSelectAllWarehouses}
>
<FormattedMessage
defaultMessage="Export stock for all warehouses"
description="option"
/>
</Option>
</div>
<Hr className={classes.hrWarehouses} />
<Typography className={classes.warehousesLabel} variant="subtitle1">
<FormattedMessage
defaultMessage="Warehouses A to Z"
description="list of warehouses"
/>
</Typography>
{warehouses.map(warehouse => (
<Option
checked={data.exportInfo.warehouses.includes(warehouse.value)}
name={warehouseNamePrefix + warehouse.value}
onChange={onWarehouseSelect}
key={warehouse.value}
>
{warehouse.label}
</Option>
))}
</Accordion>
<FieldAccordion
title={intl.formatMessage({
defaultMessage: "SEO Information",

83
src/products/components/ProductExportDialog/messages.ts Normal file
View file

@ -0,0 +1,83 @@
import { ProductFieldEnum } from "@saleor/types/globalTypes";
import { useIntl } from "react-intl";
function useProductExportFieldMessages() {
const intl = useIntl();
const messages = {
[ProductFieldEnum.CATEGORY]: intl.formatMessage({
defaultMessage: "Category",
description: "product field",
id: "productExportFieldCategory"
}),
[ProductFieldEnum.CHARGE_TAXES]: intl.formatMessage({
defaultMessage: "Charge Taxes",
description: "product field",
id: "productExportFieldTaxes"
}),
[ProductFieldEnum.COLLECTIONS]: intl.formatMessage({
defaultMessage: "Collections",
description: "product field",
id: "productExportFieldCollections"
}),
[ProductFieldEnum.COST_PRICE]: intl.formatMessage({
defaultMessage: "Cost Price",
description: "product field",
id: "productExportFieldPrice"
}),
[ProductFieldEnum.DESCRIPTION]: intl.formatMessage({
defaultMessage: "Description",
description: "product field",
id: "productExportFieldDescription"
}),
[ProductFieldEnum.NAME]: intl.formatMessage({
defaultMessage: "Name",
description: "product field",
id: "productExportFieldName"
}),
[ProductFieldEnum.PRODUCT_IMAGES]: intl.formatMessage({
defaultMessage: "Product Images",
description: "product field",
id: "productExportFieldProductImages"
}),
[ProductFieldEnum.PRODUCT_TYPE]: intl.formatMessage({
defaultMessage: "Type",
description: "product field",
id: "productExportFieldType"
}),
[ProductFieldEnum.PRODUCT_WEIGHT]: intl.formatMessage({
defaultMessage: "Export Product Weight",
description: "product field",
id: "productExportFieldProductWeight"
}),
[ProductFieldEnum.VARIANT_IMAGES]: intl.formatMessage({
defaultMessage: "Variant Images",
description: "product field",
id: "productExportFieldVariantImages"
}),
[ProductFieldEnum.VARIANT_PRICE]: intl.formatMessage({
defaultMessage: "Variant Price",
description: "product field",
id: "productExportFieldVariantPrice"
}),
[ProductFieldEnum.VARIANT_SKU]: intl.formatMessage({
defaultMessage: "Export Variant SKU",
description: "product field",
id: "productExportFieldVariantSku"
}),
[ProductFieldEnum.VARIANT_WEIGHT]: intl.formatMessage({
defaultMessage: "Export Variant Weight",
description: "product field",
id: "productExportFieldVariantWeight"
}),
[ProductFieldEnum.VISIBLE]: intl.formatMessage({
defaultMessage: "Visibility",
description: "product field",
id: "productExportFieldVisibility"
})
};
return (field: ProductFieldEnum) => messages[field];
}
export default useProductExportFieldMessages;

12
src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
View file

@ -167,8 +167,17 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
const hasVariants = maybe(() => product.productType.hasVariants, false);
const handleSubmit = (data: ProductUpdatePageFormData) => {
if (product.productType.hasVariants) {
onSubmit({
...data,
addStocks: [],
attributes,
removeStocks: [],
updateStocks: []
});
} else {
const dataStocks = stocks.map(stock => stock.id);
const variantStocks = product.variants[0].stocks.map(
const variantStocks = product.variants[0]?.stocks.map(
stock => stock.warehouse.id
);
const stockDiff = diff(variantStocks, dataStocks);
@ -184,6 +193,7 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
stock => !stockDiff.added.some(addedStock => addedStock === stock.id)
)
});
}
};
return (

13
src/products/fixtures.ts
View file

@ -1,5 +1,8 @@
import { ProductVariant } from "@saleor/fragments/types/ProductVariant";
import { AttributeInputTypeEnum } from "@saleor/types/globalTypes";
import {
AttributeInputTypeEnum,
WeightUnitsEnum
} from "@saleor/types/globalTypes";
import { warehouseList } from "@saleor/warehouses/fixtures";
import { content } from "../storybook/stories/components/RichTextEditor";
@ -281,7 +284,7 @@ export const product: (
trackInventory: true,
weight: {
__typename: "Weight",
unit: "kg",
unit: WeightUnitsEnum.KG,
value: 3
}
},
@ -316,14 +319,14 @@ export const product: (
trackInventory: false,
weight: {
__typename: "Weight",
unit: "kg",
unit: WeightUnitsEnum.KG,
value: 4
}
}
],
weight: {
__typename: "Weight",
unit: "kg",
unit: WeightUnitsEnum.KG,
value: 5
}
});
@ -1672,7 +1675,7 @@ export const variant = (placeholderImage: string): ProductVariant => ({
trackInventory: true,
weight: {
__typename: "Weight",
unit: "kg",
unit: WeightUnitsEnum.KG,
value: 6
}
});

5
src/products/index.tsx
View file

@ -52,7 +52,10 @@ const ProductUpdate: React.FC<RouteComponentProps<any>> = ({ match }) => {
return (
<ProductUpdateComponent
id={decodeURIComponent(match.params.id)}
params={params}
params={{
...params,
ids: getArrayQueryParam(qs.ids)
}}
/>
);
};

4
src/products/types/ProductCreate.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { AttributeValueInput, SeoInput, StockInput, ProductErrorCode, AttributeInputTypeEnum } from "./../../types/globalTypes";
import { AttributeValueInput, SeoInput, StockInput, ProductErrorCode, AttributeInputTypeEnum, WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: ProductCreate
@ -176,7 +176,7 @@ export interface ProductCreate_productCreate_product_variants {
export interface ProductCreate_productCreate_product_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/products/types/ProductDetails.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { AttributeInputTypeEnum } from "./../../types/globalTypes";
import { AttributeInputTypeEnum, WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL query operation: ProductDetails
@ -170,7 +170,7 @@ export interface ProductDetails_product_variants {
export interface ProductDetails_product_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/products/types/ProductImageCreate.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { ProductErrorCode, AttributeInputTypeEnum } from "./../../types/globalTypes";
import { ProductErrorCode, AttributeInputTypeEnum, WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: ProductImageCreate
@ -176,7 +176,7 @@ export interface ProductImageCreate_productImageCreate_product_variants {
export interface ProductImageCreate_productImageCreate_product_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/products/types/ProductImageUpdate.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { ProductErrorCode, AttributeInputTypeEnum } from "./../../types/globalTypes";
import { ProductErrorCode, AttributeInputTypeEnum, WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: ProductImageUpdate
@ -176,7 +176,7 @@ export interface ProductImageUpdate_productImageUpdate_product_variants {
export interface ProductImageUpdate_productImageUpdate_product_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/products/types/ProductUpdate.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { AttributeValueInput, SeoInput, ProductErrorCode, AttributeInputTypeEnum } from "./../../types/globalTypes";
import { AttributeValueInput, SeoInput, ProductErrorCode, AttributeInputTypeEnum, WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: ProductUpdate
@ -176,7 +176,7 @@ export interface ProductUpdate_productUpdate_product_variants {
export interface ProductUpdate_productUpdate_product_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/products/types/ProductVariantDetails.ts
View file

@ -2,6 +2,8 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL query operation: ProductVariantDetails
// ====================================================
@ -105,7 +107,7 @@ export interface ProductVariantDetails_productVariant_stocks {
export interface ProductVariantDetails_productVariant_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

12
src/products/types/SimpleProductUpdate.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { AttributeValueInput, ProductVariantInput, SeoInput, StockInput, ProductErrorCode, AttributeInputTypeEnum, StockErrorCode } from "./../../types/globalTypes";
import { AttributeValueInput, ProductVariantInput, SeoInput, StockInput, ProductErrorCode, AttributeInputTypeEnum, WeightUnitsEnum, StockErrorCode } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: SimpleProductUpdate
@ -176,7 +176,7 @@ export interface SimpleProductUpdate_productUpdate_product_variants {
export interface SimpleProductUpdate_productUpdate_product_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}
@ -314,7 +314,7 @@ export interface SimpleProductUpdate_productVariantUpdate_productVariant_stocks
export interface SimpleProductUpdate_productVariantUpdate_productVariant_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}
@ -445,7 +445,7 @@ export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_s
export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}
@ -575,7 +575,7 @@ export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_s
export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}
@ -706,7 +706,7 @@ export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_s
export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/products/types/VariantCreate.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { ProductVariantCreateInput, ProductErrorCode } from "./../../types/globalTypes";
import { ProductVariantCreateInput, ProductErrorCode, WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: VariantCreate
@ -113,7 +113,7 @@ export interface VariantCreate_productVariantCreate_productVariant_stocks {
export interface VariantCreate_productVariantCreate_productVariant_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/products/types/VariantImageAssign.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { ProductErrorCode } from "./../../types/globalTypes";
import { ProductErrorCode, WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: VariantImageAssign
@ -113,7 +113,7 @@ export interface VariantImageAssign_variantImageAssign_productVariant_stocks {
export interface VariantImageAssign_variantImageAssign_productVariant_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/products/types/VariantImageUnassign.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { ProductErrorCode } from "./../../types/globalTypes";
import { ProductErrorCode, WeightUnitsEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: VariantImageUnassign
@ -113,7 +113,7 @@ export interface VariantImageUnassign_variantImageUnassign_productVariant_stocks
export interface VariantImageUnassign_variantImageUnassign_productVariant_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

6
src/products/types/VariantUpdate.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { StockInput, AttributeValueInput, ProductErrorCode, StockErrorCode } from "./../../types/globalTypes";
import { StockInput, AttributeValueInput, ProductErrorCode, WeightUnitsEnum, StockErrorCode } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: VariantUpdate
@ -113,7 +113,7 @@ export interface VariantUpdate_productVariantUpdate_productVariant_stocks {
export interface VariantUpdate_productVariantUpdate_productVariant_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}
@ -244,7 +244,7 @@ export interface VariantUpdate_productVariantStocksUpdate_productVariant_stocks
export interface VariantUpdate_productVariantStocksUpdate_productVariant_weight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

11
src/products/views/ProductList/ProductList.tsx
View file

@ -39,6 +39,7 @@ import { ListViews } from "@saleor/types";
import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers";
import createFilterHandlers from "@saleor/utils/handlers/filterHandlers";
import { getSortUrlVariables } from "@saleor/utils/sort";
import { useWarehouseList } from "@saleor/warehouses/queries";
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";
@ -124,6 +125,11 @@ export const ProductList: React.FC<ProductListProps> = ({ params }) => {
first: 10
}
});
const warehouses = useWarehouseList({
variables: {
first: 100
}
});
React.useEffect(
() =>
@ -551,6 +557,11 @@ export const ProductList: React.FC<ProductListProps> = ({ params }) => {
filter: data?.products.totalCount
}}
selectedProducts={listElements.length}
warehouses={
warehouses.data?.warehouses.edges.map(
edge => edge.node
) || []
}
onClose={closeModal}
onSubmit={data =>
exportProducts({

7
src/products/views/ProductList/filters.ts
View file

@ -41,6 +41,7 @@ import {
} from "../../../utils/filters";
import {
ProductListUrlFilters,
ProductListUrlFiltersAsDictWithMultipleValues,
ProductListUrlFiltersEnum,
ProductListUrlFiltersWithMultipleValues,
ProductListUrlQueryParams
@ -295,4 +296,8 @@ export const {
export const { areFiltersApplied, getActiveFilters } = createFilterUtils<
ProductListUrlQueryParams,
ProductListUrlFilters
>(ProductListUrlFiltersEnum);
>({
...ProductListUrlFiltersEnum,
...ProductListUrlFiltersWithMultipleValues,
...ProductListUrlFiltersAsDictWithMultipleValues
});

12
src/shipping/fixtures.ts
View file

@ -1,7 +1,7 @@
import { ShippingZoneDetailsFragment } from "@saleor/fragments/types/ShippingZoneDetailsFragment";
import { ShippingZoneFragment } from "@saleor/fragments/types/ShippingZoneFragment";
import { ShippingMethodTypeEnum } from "../types/globalTypes";
import { ShippingMethodTypeEnum, WeightUnitsEnum } from "../types/globalTypes";
export const shippingZones: ShippingZoneFragment[] = [
{
@ -1554,7 +1554,7 @@ export const shippingZone: ShippingZoneDetailsFragment = {
maximumOrderPrice: null,
maximumOrderWeight: {
__typename: "Weight",
unit: "kg",
unit: WeightUnitsEnum.KG,
value: 80
},
minimumOrderPrice: {
@ -1564,7 +1564,7 @@ export const shippingZone: ShippingZoneDetailsFragment = {
},
minimumOrderWeight: {
__typename: "Weight",
unit: "kg",
unit: WeightUnitsEnum.KG,
value: 0
},
name: "DB Schenker",
@ -1587,7 +1587,7 @@ export const shippingZone: ShippingZoneDetailsFragment = {
},
minimumOrderWeight: {
__typename: "Weight",
unit: "kg",
unit: WeightUnitsEnum.KG,
value: 0
},
name: "Registred priority",
@ -1610,7 +1610,7 @@ export const shippingZone: ShippingZoneDetailsFragment = {
},
minimumOrderWeight: {
__typename: "Weight",
unit: "kg",
unit: WeightUnitsEnum.KG,
value: 0
},
@ -1634,7 +1634,7 @@ export const shippingZone: ShippingZoneDetailsFragment = {
},
minimumOrderWeight: {
__typename: "Weight",
unit: "kg",
unit: WeightUnitsEnum.KG,
value: 0
},
name: "DHL",

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

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { ShippingPriceInput, ShippingErrorCode, ShippingMethodTypeEnum } from "./../../types/globalTypes";
import { ShippingPriceInput, ShippingErrorCode, WeightUnitsEnum, ShippingMethodTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: CreateShippingRate
@ -28,7 +28,7 @@ export interface CreateShippingRate_shippingPriceCreate_shippingZone_shippingMet
export interface CreateShippingRate_shippingPriceCreate_shippingZone_shippingMethods_minimumOrderWeight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}
@ -40,7 +40,7 @@ export interface CreateShippingRate_shippingPriceCreate_shippingZone_shippingMet
export interface CreateShippingRate_shippingPriceCreate_shippingZone_shippingMethods_maximumOrderWeight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

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

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { ShippingErrorCode, ShippingMethodTypeEnum } from "./../../types/globalTypes";
import { ShippingErrorCode, WeightUnitsEnum, ShippingMethodTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: DeleteShippingRate
@ -28,7 +28,7 @@ export interface DeleteShippingRate_shippingPriceDelete_shippingZone_shippingMet
export interface DeleteShippingRate_shippingPriceDelete_shippingZone_shippingMethods_minimumOrderWeight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}
@ -40,7 +40,7 @@ export interface DeleteShippingRate_shippingPriceDelete_shippingZone_shippingMet
export interface DeleteShippingRate_shippingPriceDelete_shippingZone_shippingMethods_maximumOrderWeight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

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

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { ShippingMethodTypeEnum } from "./../../types/globalTypes";
import { WeightUnitsEnum, ShippingMethodTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL query operation: ShippingZone
@ -22,7 +22,7 @@ export interface ShippingZone_shippingZone_shippingMethods_minimumOrderPrice {
export interface ShippingZone_shippingZone_shippingMethods_minimumOrderWeight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}
@ -34,7 +34,7 @@ export interface ShippingZone_shippingZone_shippingMethods_maximumOrderPrice {
export interface ShippingZone_shippingZone_shippingMethods_maximumOrderWeight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

6
src/shipping/types/UpdateShippingRate.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */
// This file was automatically generated and should not be edited.
import { ShippingPriceInput, ShippingErrorCode, ShippingMethodTypeEnum } from "./../../types/globalTypes";
import { ShippingPriceInput, ShippingErrorCode, WeightUnitsEnum, ShippingMethodTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: UpdateShippingRate
@ -22,7 +22,7 @@ export interface UpdateShippingRate_shippingPriceUpdate_shippingMethod_minimumOr
export interface UpdateShippingRate_shippingPriceUpdate_shippingMethod_minimumOrderWeight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}
@ -34,7 +34,7 @@ export interface UpdateShippingRate_shippingPriceUpdate_shippingMethod_maximumOr
export interface UpdateShippingRate_shippingPriceUpdate_shippingMethod_maximumOrderWeight {
__typename: "Weight";
unit: string;
unit: WeightUnitsEnum;
value: number;
}

4
src/staff/components/StaffList/StaffList.tsx
View file

@ -38,8 +38,8 @@ const useStyles = makeStyles(
width: 47
},
avatarDefault: {
"& p": {
color: "#fff",
"& div": {
color: theme.palette.primary.contrastText,
lineHeight: "47px"
},
background: theme.palette.primary.main,

2
src/staff/components/StaffProperties/StaffProperties.tsx
View file

@ -35,7 +35,7 @@ const useStyles = makeStyles(
width: 120
},
avatarDefault: {
"& p": {
"& div": {
color: "#fff",
fontSize: 35,
fontWeight: "bold",

3
src/staff/queries.ts
View file

@ -34,6 +34,9 @@ const staffList = gql`
cursor
node {
...StaffMemberFragment
avatar(size: 48) {
url
}
}
}
pageInfo {

12
src/staff/types/StaffMemberAdd.ts
View file

@ -14,11 +14,6 @@ export interface StaffMemberAdd_staffCreate_errors {
field: string | null;
}
export interface StaffMemberAdd_staffCreate_user_avatar {
__typename: "Image";
url: string;
}
export interface StaffMemberAdd_staffCreate_user_permissionGroups {
__typename: "Group";
id: string;
@ -32,6 +27,11 @@ export interface StaffMemberAdd_staffCreate_user_userPermissions {
name: string;
}
export interface StaffMemberAdd_staffCreate_user_avatar {
__typename: "Image";
url: string;
}
export interface StaffMemberAdd_staffCreate_user {
__typename: "User";
id: string;
@ -39,9 +39,9 @@ export interface StaffMemberAdd_staffCreate_user {
firstName: string;
isActive: boolean;
lastName: string;
avatar: StaffMemberAdd_staffCreate_user_avatar | null;
permissionGroups: (StaffMemberAdd_staffCreate_user_permissionGroups | null)[] | null;
userPermissions: (StaffMemberAdd_staffCreate_user_userPermissions | null)[] | null;
avatar: StaffMemberAdd_staffCreate_user_avatar | null;
}
export interface StaffMemberAdd_staffCreate {

12
src/staff/types/StaffMemberDetails.ts
View file

@ -8,11 +8,6 @@ import { PermissionEnum } from "./../../types/globalTypes";
// GraphQL query operation: StaffMemberDetails
// ====================================================
export interface StaffMemberDetails_user_avatar {
__typename: "Image";
url: string;
}
export interface StaffMemberDetails_user_permissionGroups {
__typename: "Group";
id: string;
@ -26,6 +21,11 @@ export interface StaffMemberDetails_user_userPermissions {
name: string;
}
export interface StaffMemberDetails_user_avatar {
__typename: "Image";
url: string;
}
export interface StaffMemberDetails_user {
__typename: "User";
id: string;
@ -33,9 +33,9 @@ export interface StaffMemberDetails_user {
firstName: string;
isActive: boolean;
lastName: string;
avatar: StaffMemberDetails_user_avatar | null;
permissionGroups: (StaffMemberDetails_user_permissionGroups | null)[] | null;
userPermissions: (StaffMemberDetails_user_userPermissions | null)[] | null;
avatar: StaffMemberDetails_user_avatar | null;
}
export interface StaffMemberDetails {

12
src/staff/types/StaffMemberUpdate.ts
View file

@ -14,11 +14,6 @@ export interface StaffMemberUpdate_staffUpdate_errors {
field: string | null;
}
export interface StaffMemberUpdate_staffUpdate_user_avatar {
__typename: "Image";
url: string;
}
export interface StaffMemberUpdate_staffUpdate_user_permissionGroups {
__typename: "Group";
id: string;
@ -32,6 +27,11 @@ export interface StaffMemberUpdate_staffUpdate_user_userPermissions {
name: string;
}
export interface StaffMemberUpdate_staffUpdate_user_avatar {
__typename: "Image";
url: string;
}
export interface StaffMemberUpdate_staffUpdate_user {
__typename: "User";
id: string;
@ -39,9 +39,9 @@ export interface StaffMemberUpdate_staffUpdate_user {
firstName: string;
isActive: boolean;
lastName: string;
avatar: StaffMemberUpdate_staffUpdate_user_avatar | null;
permissionGroups: (StaffMemberUpdate_staffUpdate_user_permissionGroups | null)[] | null;
userPermissions: (StaffMemberUpdate_staffUpdate_user_userPermissions | null)[] | null;
avatar: StaffMemberUpdate_staffUpdate_user_avatar | null;
}
export interface StaffMemberUpdate_staffUpdate {

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

File diff suppressed because it is too large Load diff

12
src/theme.ts
View file

@ -1,10 +1,15 @@
import Card from "@material-ui/core/Card";
import Checkbox from "@material-ui/core/Checkbox";
import { createMuiTheme, Theme } from "@material-ui/core/styles";
import { darken, fade } from "@material-ui/core/styles/colorManipulator";
import TextField from "@material-ui/core/TextField";
import Typography from "@material-ui/core/Typography";
import { createElement } from "react";
import { IThemeColors } from "./components/Theme/themes";
import CheckboxIcon from "./icons/Checkbox";
import CheckboxCheckedIcon from "./icons/CheckboxChecked";
import CheckboxIndeterminateIcon from "./icons/CheckboxIndeterminate";
const createShadow = (pv, pb, ps, uv, ub, us, av, ab, as) =>
[
@ -562,3 +567,10 @@ Card.defaultProps = {
Typography.defaultProps = {
component: "div"
};
Checkbox.defaultProps = {
checkedIcon: createElement(CheckboxCheckedIcon),
color: "primary",
icon: createElement(CheckboxIcon),
indeterminateIcon: createElement(CheckboxIndeterminateIcon)
};

2
src/types/globalTypes.ts
View file

@ -865,7 +865,9 @@ export enum WebhookErrorCode {
export enum WebhookEventTypeEnum {
ANY_EVENTS = "ANY_EVENTS",
CHECKOUT_CREATED = "CHECKOUT_CREATED",
CHECKOUT_QUANTITY_CHANGED = "CHECKOUT_QUANTITY_CHANGED",
CHECKOUT_UPDATED = "CHECKOUT_UPDATED",
CUSTOMER_CREATED = "CUSTOMER_CREATED",
FULFILLMENT_CREATED = "FULFILLMENT_CREATED",
INVOICE_DELETED = "INVOICE_DELETED",

8
src/webhooks/components/WebhookEvents/WebhookEvents.tsx
View file

@ -32,6 +32,14 @@ const WebhookEvents: React.FC<WebhookEventsProps> = ({
defaultMessage: "All events",
description: "event"
}),
[WebhookEventTypeEnum.CHECKOUT_CREATED]: intl.formatMessage({
defaultMessage: "Checkout created",
description: "event"
}),
[WebhookEventTypeEnum.CHECKOUT_UPDATED]: intl.formatMessage({
defaultMessage: "Checkout updated",
description: "event"
}),
[WebhookEventTypeEnum.CUSTOMER_CREATED]: intl.formatMessage({
defaultMessage: "Customer created",
description: "event"