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

Fix variant create null thumbnail (#1956)

Browse source 
* Fix null thumbnail error

* Fix too few hooks rendered on non-existent products & variants
This commit is contained in:
Michał Droń 2022-03-30 15:50:47 +02:00 committed by GitHub
parent 879e1da69e
commit 26f8a776be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/products/components/ProductVariantPage/ProductVariantPage.tsx
View file

@ -235,7 +235,7 @@ const ProductVariantPage: React.FC<ProductVariantPageProps> = ({
<ProductVariantNavigation <ProductVariantNavigation
current={variant?.id} current={variant?.id}
defaultVariantId={defaultVariantId} defaultVariantId={defaultVariantId}
fallbackThumbnail={variant?.product?.thumbnail.url} fallbackThumbnail={variant?.product?.thumbnail?.url}
variants={variant?.product.variants} variants={variant?.product.variants}
onAdd={onAdd} onAdd={onAdd}
onRowClick={(variantId: string) => { onRowClick={(variantId: string) => {

7
src/products/views/ProductUpdate/ProductUpdate.tsx
View file

@ -389,9 +389,6 @@ export const ProductUpdate: React.FC<ProductUpdateProps> = ({ id, params }) => {
const handleBack = () => navigate(productListUrl()); const handleBack = () => navigate(productListUrl());
if (product === null) {
return <NotFoundPage onBack={handleBack} />;
}
const handleVariantAdd = () => navigate(productVariantAddUrl(id)); const handleVariantAdd = () => navigate(productVariantAddUrl(id));
const handleVariantsAdd = () => navigate(productVariantCreatorUrl(id)); const handleVariantsAdd = () => navigate(productVariantCreatorUrl(id));
@ -520,6 +517,10 @@ export const ProductUpdate: React.FC<ProductUpdateProps> = ({ id, params }) => {
onFetchMore: loadMoreAttributeValues onFetchMore: loadMoreAttributeValues
}; };
if (product === null) {
return <NotFoundPage onBack={handleBack} />;
}
return ( return (
<> <>
<WindowTitle title={data?.product?.name} /> <WindowTitle title={data?.product?.name} />

8
src/products/views/ProductVariant.tsx
View file

@ -197,10 +197,6 @@ export const ProductVariant: React.FC<ProductUpdateProps> = ({
const variant = data?.productVariant; const variant = data?.productVariant;
const channels = createVariantChannels(variant); const channels = createVariantChannels(variant);
if (variant === null) {
return <NotFoundPage onBack={handleBack} />;
}
const [ const [
deactivatePreorder, deactivatePreorder,
deactivatePreoderOpts deactivatePreoderOpts
@ -360,6 +356,10 @@ export const ProductVariant: React.FC<ProductUpdateProps> = ({
const attributeValues = const attributeValues =
mapEdgesToItems(searchAttributeValuesOpts?.data?.attribute.choices) || []; mapEdgesToItems(searchAttributeValuesOpts?.data?.attribute.choices) || [];
if (variant === null) {
return <NotFoundPage onBack={handleBack} />;
}
return ( return (
<> <>
<WindowTitle title={data?.productVariant?.name} /> <WindowTitle title={data?.productVariant?.name} />