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

Fix channel picker hiding in resend code modal bug (#1479)

Browse source 
* Replace savebar with actionbar

* Bump macaw version to 0.2.5

* Update tests
This commit is contained in:
Wojciech Mista 2021-10-21 13:25:24 +02:00 committed by GitHub
parent cc7626be42
commit 2eec208144
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 209 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package-lock.json generated
View file

@ -5166,9 +5166,9 @@
} }
}, },
"@saleor/macaw-ui": { "@saleor/macaw-ui": {
"version": "0.2.3", "version": "0.2.5",
"resolved": "https://registry.npmjs.org/@saleor/macaw-ui/-/macaw-ui-0.2.3.tgz", "resolved": "https://registry.npmjs.org/@saleor/macaw-ui/-/macaw-ui-0.2.5.tgz",
"integrity": "sha512-9vcjY27lbxmySEnesJIefjjZAb/H8Hqm0AtCLUx6gZA2gvUkmJWQuYqcUljTY5VKEIuBpsG9BJtItRTWhQUG9g==", "integrity": "sha512-2/SvxFSV+xrqp2ZZXGRoZuL6dsOv4EeXKuawu2UiBcVhvNX0ikkGDHk1GWJAvjgeVbSsVCobJmlldss93DZSUA==",
"requires": { "requires": {
"clsx": "^1.1.1", "clsx": "^1.1.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",

2
package.json
View file

@ -27,7 +27,7 @@
"@material-ui/icons": "^4.11.2", "@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.58", "@material-ui/lab": "^4.0.0-alpha.58",
"@material-ui/styles": "^4.11.4", "@material-ui/styles": "^4.11.4",
"@saleor/macaw-ui": "^0.2.3", "@saleor/macaw-ui": "^0.2.5",
"@sentry/react": "^6.0.0", "@sentry/react": "^6.0.0",
"@types/faker": "^5.1.6", "@types/faker": "^5.1.6",
"@uiw/react-color-hue": "0.0.34", "@uiw/react-color-hue": "0.0.34",

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

@ -7,8 +7,8 @@ import {
SaleorTheme, SaleorTheme,
Sidebar, Sidebar,
SidebarDrawer, SidebarDrawer,
useActionBar,
useBacklink, useBacklink,
useSavebar,
useTheme useTheme
} from "@saleor/macaw-ui"; } from "@saleor/macaw-ui";
import { isDarkTheme } from "@saleor/misc"; import { isDarkTheme } from "@saleor/misc";
@ -122,7 +122,7 @@ interface AppLayoutProps {
const AppLayout: React.FC<AppLayoutProps> = ({ children }) => { const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
const classes = useStyles({}); const classes = useStyles({});
const { themeType, setTheme } = useTheme(); const { themeType, setTheme } = useTheme();
const { anchor: appActionAnchor, docked } = useSavebar(); const { anchor: appActionAnchor, docked } = useActionBar();
const appHeaderAnchor = useBacklink(); const appHeaderAnchor = useBacklink();
const { logout, user } = useUser(); const { logout, user } = useUser();
const navigate = useNavigator(); const navigate = useNavigator();

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

@ -60303,7 +60303,35 @@ exports[`Storyshots Views / Channels / Channels list limits reached 1`] = `
<div <div
class="Alert-container-id" class="Alert-container-id"
> >
<div /> <div>
<svg
fill="none"
height="40"
viewBox="0 0 40 40"
width="40"
xmlns="http://www.w3.org/2000/svg"
>
<circle
cx="20"
cy="20"
fill="white"
r="20"
/>
<circle
cx="20"
cy="20"
r="14"
stroke="#FFB84E"
stroke-width="4"
/>
<path
clip-rule="evenodd"
d="M19.5 11C18.6716 11 18 11.6716 18 12.5V20.5C18 21.3284 18.6716 22 19.5 22H20.5C21.3284 22 22 21.3284 22 20.5V12.5C22 11.6716 21.3284 11 20.5 11H19.5ZM19.5 25C18.6716 25 18 25.6716 18 26.5V27.5C18 28.3284 18.6716 29 19.5 29H20.5C21.3284 29 22 28.3284 22 27.5V26.5C22 25.6716 21.3284 25 20.5 25H19.5Z"
fill="#FFB84E"
fill-rule="evenodd"
/>
</svg>
</div>
<div <div
class="Alert-content-id" class="Alert-content-id"
> >
@ -116496,7 +116524,35 @@ exports[`Storyshots Views / Orders / Draft order list limits reached 1`] = `
<div <div
class="Alert-container-id" class="Alert-container-id"
> >
<div /> <div>
<svg
fill="none"
height="40"
viewBox="0 0 40 40"
width="40"
xmlns="http://www.w3.org/2000/svg"
>
<circle
cx="20"
cy="20"
fill="white"
r="20"
/>
<circle
cx="20"
cy="20"
r="14"
stroke="#FFB84E"
stroke-width="4"
/>
<path
clip-rule="evenodd"
d="M19.5 11C18.6716 11 18 11.6716 18 12.5V20.5C18 21.3284 18.6716 22 19.5 22H20.5C21.3284 22 22 21.3284 22 20.5V12.5C22 11.6716 21.3284 11 20.5 11H19.5ZM19.5 25C18.6716 25 18 25.6716 18 26.5V27.5C18 28.3284 18.6716 29 19.5 29H20.5C21.3284 29 22 28.3284 22 27.5V26.5C22 25.6716 21.3284 25 20.5 25H19.5Z"
fill="#FFB84E"
fill-rule="evenodd"
/>
</svg>
</div>
<div <div
class="Alert-content-id" class="Alert-content-id"
> >
@ -153535,7 +153591,35 @@ exports[`Storyshots Views / Orders / Order list limits reached 1`] = `
<div <div
class="Alert-container-id" class="Alert-container-id"
> >
<div /> <div>
<svg
fill="none"
height="40"
viewBox="0 0 40 40"
width="40"
xmlns="http://www.w3.org/2000/svg"
>
<circle
cx="20"
cy="20"
fill="white"
r="20"
/>
<circle
cx="20"
cy="20"
r="14"
stroke="#FFB84E"
stroke-width="4"
/>
<path
clip-rule="evenodd"
d="M19.5 11C18.6716 11 18 11.6716 18 12.5V20.5C18 21.3284 18.6716 22 19.5 22H20.5C21.3284 22 22 21.3284 22 20.5V12.5C22 11.6716 21.3284 11 20.5 11H19.5ZM19.5 25C18.6716 25 18 25.6716 18 26.5V27.5C18 28.3284 18.6716 29 19.5 29H20.5C21.3284 29 22 28.3284 22 27.5V26.5C22 25.6716 21.3284 25 20.5 25H19.5Z"
fill="#FFB84E"
fill-rule="evenodd"
/>
</svg>
</div>
<div <div
class="Alert-content-id" class="Alert-content-id"
> >
@ -200625,7 +200709,35 @@ exports[`Storyshots Views / Products / Product edit limits reached 1`] = `
<div <div
class="Alert-container-id" class="Alert-container-id"
> >
<div /> <div>
<svg
fill="none"
height="40"
viewBox="0 0 40 40"
width="40"
xmlns="http://www.w3.org/2000/svg"
>
<circle
cx="20"
cy="20"
fill="white"
r="20"
/>
<circle
cx="20"
cy="20"
r="14"
stroke="#FFB84E"
stroke-width="4"
/>
<path
clip-rule="evenodd"
d="M19.5 11C18.6716 11 18 11.6716 18 12.5V20.5C18 21.3284 18.6716 22 19.5 22H20.5C21.3284 22 22 21.3284 22 20.5V12.5C22 11.6716 21.3284 11 20.5 11H19.5ZM19.5 25C18.6716 25 18 25.6716 18 26.5V27.5C18 28.3284 18.6716 29 19.5 29H20.5C21.3284 29 22 28.3284 22 27.5V26.5C22 25.6716 21.3284 25 20.5 25H19.5Z"
fill="#FFB84E"
fill-rule="evenodd"
/>
</svg>
</div>
<div <div
class="Alert-content-id" class="Alert-content-id"
> >
@ -220396,7 +220508,35 @@ exports[`Storyshots Views / Products / Product list limits reached 1`] = `
<div <div
class="Alert-container-id" class="Alert-container-id"
> >
<div /> <div>
<svg
fill="none"
height="40"
viewBox="0 0 40 40"
width="40"
xmlns="http://www.w3.org/2000/svg"
>
<circle
cx="20"
cy="20"
fill="white"
r="20"
/>
<circle
cx="20"
cy="20"
r="14"
stroke="#FFB84E"
stroke-width="4"
/>
<path
clip-rule="evenodd"
d="M19.5 11C18.6716 11 18 11.6716 18 12.5V20.5C18 21.3284 18.6716 22 19.5 22H20.5C21.3284 22 22 21.3284 22 20.5V12.5C22 11.6716 21.3284 11 20.5 11H19.5ZM19.5 25C18.6716 25 18 25.6716 18 26.5V27.5C18 28.3284 18.6716 29 19.5 29H20.5C21.3284 29 22 28.3284 22 27.5V26.5C22 25.6716 21.3284 25 20.5 25H19.5Z"
fill="#FFB84E"
fill-rule="evenodd"
/>
</svg>
</div>
<div <div
class="Alert-content-id" class="Alert-content-id"
> >
@ -253347,7 +253487,35 @@ exports[`Storyshots Views / Staff / Staff members limits reached 1`] = `
<div <div
class="Alert-container-id" class="Alert-container-id"
> >
<div /> <div>
<svg
fill="none"
height="40"
viewBox="0 0 40 40"
width="40"
xmlns="http://www.w3.org/2000/svg"
>
<circle
cx="20"
cy="20"
fill="white"
r="20"
/>
<circle
cx="20"
cy="20"
r="14"
stroke="#FFB84E"
stroke-width="4"
/>
<path
clip-rule="evenodd"
d="M19.5 11C18.6716 11 18 11.6716 18 12.5V20.5C18 21.3284 18.6716 22 19.5 22H20.5C21.3284 22 22 21.3284 22 20.5V12.5C22 11.6716 21.3284 11 20.5 11H19.5ZM19.5 25C18.6716 25 18 25.6716 18 26.5V27.5C18 28.3284 18.6716 29 19.5 29H20.5C21.3284 29 22 28.3284 22 27.5V26.5C22 25.6716 21.3284 25 20.5 25H19.5Z"
fill="#FFB84E"
fill-rule="evenodd"
/>
</svg>
</div>
<div <div
class="Alert-content-id" class="Alert-content-id"
> >
@ -261369,7 +261537,35 @@ exports[`Storyshots Views / Warehouses / Warehouse list limits reached 1`] = `
<div <div
class="Alert-container-id" class="Alert-container-id"
> >
<div /> <div>
<svg
fill="none"
height="40"
viewBox="0 0 40 40"
width="40"
xmlns="http://www.w3.org/2000/svg"
>
<circle
cx="20"
cy="20"
fill="white"
r="20"
/>
<circle
cx="20"
cy="20"
r="14"
stroke="#FFB84E"
stroke-width="4"
/>
<path
clip-rule="evenodd"
d="M19.5 11C18.6716 11 18 11.6716 18 12.5V20.5C18 21.3284 18.6716 22 19.5 22H20.5C21.3284 22 22 21.3284 22 20.5V12.5C22 11.6716 21.3284 11 20.5 11H19.5ZM19.5 25C18.6716 25 18 25.6716 18 26.5V27.5C18 28.3284 18.6716 29 19.5 29H20.5C21.3284 29 22 28.3284 22 27.5V26.5C22 25.6716 21.3284 25 20.5 25H19.5Z"
fill="#FFB84E"
fill-rule="evenodd"
/>
</svg>
</div>
<div <div
class="Alert-content-id" class="Alert-content-id"
> >