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

Fix search in reference attributes (#2878)

Browse source 
* Fix attribute reference search

* Fix attribute reference search
This commit is contained in:
Patryk Andrzejewski 2022-12-20 11:55:28 +01:00 committed by GitHub
parent 1d4c4d878e
commit 2327d92b41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/products/components/ProductCreatePage/ProductCreatePage.tsx
View file

@ -171,8 +171,7 @@ export const ProductCreatePage: React.FC<ProductCreatePageProps> = ({
value: taxClass.id,
})) ?? [];
const canOpenAssignReferencesAttributeDialog =
!!assignReferencesAttributeId && !fetchMoreReferenceProducts.loading;
const canOpenAssignReferencesAttributeDialog = !!assignReferencesAttributeId;
const handleAssignReferenceAttribute = (
attributeValues: string[],
@ -231,6 +230,12 @@ export const ProductCreatePage: React.FC<ProductCreatePageProps> = ({
const isSimpleProduct = data.productType?.hasVariants === false;
const errors = [...apiErrors, ...validationErrors];
const entityType = getReferenceAttributeEntityTypeFromAttribute(
assignReferencesAttributeId,
data.attributes,
);
return (
<Container>
<Backlink href={productListUrl()}>
@ -387,12 +392,9 @@ export const ProductCreatePage: React.FC<ProductCreatePageProps> = ({
state={saveButtonBarState}
disabled={isSaveDisabled}
/>
{canOpenAssignReferencesAttributeDialog && (
{canOpenAssignReferencesAttributeDialog && entityType && (
<AssignAttributeValueDialog
entityType={getReferenceAttributeEntityTypeFromAttribute(
assignReferencesAttributeId,
data.attributes,
)}
entityType={entityType}
confirmButtonState={"default"}
products={referenceProducts}
pages={referencePages}

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

@ -199,8 +199,7 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
value: taxClass.id,
})) || [];
const canOpenAssignReferencesAttributeDialog =
!!assignReferencesAttributeId && !fetchMoreReferenceProducts.loading;
const canOpenAssignReferencesAttributeDialog = !!assignReferencesAttributeId;
const handleAssignReferenceAttribute = (
attributeValues: string[],
@ -310,6 +309,11 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
},
);
const entityType = getReferenceAttributeEntityTypeFromAttribute(
assignReferencesAttributeId,
data.attributes,
);
return (
<>
<Container>
@ -439,12 +443,9 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
state={saveButtonBarState}
disabled={isSaveDisabled}
/>
{canOpenAssignReferencesAttributeDialog && (
{canOpenAssignReferencesAttributeDialog && entityType && (
<AssignAttributeValueDialog
entityType={getReferenceAttributeEntityTypeFromAttribute(
assignReferencesAttributeId,
data.attributes,
)}
entityType={entityType}
confirmButtonState={"default"}
products={referenceProducts}
pages={referencePages}