From 988b19169096478b403c474de86dd597db547aad Mon Sep 17 00:00:00 2001 From: Dawid Tarasiuk Date: Wed, 2 Jun 2021 21:11:30 +0200 Subject: [PATCH] Change attribute values to choices (#1129) * Change attribute values to choices * Trigger CI --- schema.graphql | 22 +- .../AttributePage/AttributePage.tsx | 4 +- src/attributes/fixtures.ts | 26 +- src/attributes/mutations.ts | 8 +- src/attributes/queries.ts | 2 +- src/attributes/types/AttributeDetails.ts | 20 +- src/attributes/types/AttributeValueCreate.ts | 20 +- src/attributes/types/AttributeValueDelete.ts | 20 +- src/attributes/types/AttributeValueReorder.ts | 16 +- src/attributes/types/AttributeValueUpdate.ts | 20 +- src/attributes/utils/data.ts | 1 + src/attributes/utils/handlers.ts | 5 +- .../AttributeDetails/AttributeDetails.tsx | 20 +- src/fragments/products.ts | 4 +- src/fragments/types/Product.ts | 40 +-- .../types/ProductVariantAttributesFragment.ts | 40 +-- src/productTypes/fixtures.ts | 24 +- .../ProductCreatePage/ProductCreatePage.tsx | 4 +- .../ProductUpdatePage/ProductUpdatePage.tsx | 4 +- .../ProductVariantCreator.stories.tsx | 6 +- .../ProductVariantCreatorSummary.tsx | 2 +- .../ProductVariantCreatorValues.tsx | 2 +- .../ProductVariantCreatorPage/utils.ts | 10 +- src/products/fixtures.ts | 14 +- src/products/queries.ts | 4 +- .../types/InitialProductFilterAttributes.ts | 16 +- src/products/types/ProductDetails.ts | 40 +-- src/products/types/ProductType.ts | 20 +- src/products/types/ProductUpdate.ts | 40 +-- src/products/types/SimpleProductUpdate.ts | 336 ++---------------- src/products/utils/data.ts | 4 +- .../views/ProductCreate/ProductCreate.tsx | 4 +- src/products/views/ProductList/filters.ts | 2 +- src/products/views/ProductList/fixtures.ts | 6 +- .../views/ProductUpdate/ProductUpdate.tsx | 4 +- .../views/ProductUpdate/handlers/index.ts | 2 +- .../ProductVariantCreator.tsx | 7 +- src/searches/types/SearchAttributeValues.ts | 20 +- src/searches/useAttributeValueSearch.ts | 20 +- .../stories/attributes/AttributePage.tsx | 2 +- .../attributes/AttributeValueEditDialog.tsx | 2 +- 41 files changed, 291 insertions(+), 572 deletions(-) diff --git a/schema.graphql b/schema.graphql index 117ebae11..85128aeea 100644 --- a/schema.graphql +++ b/schema.graphql @@ -413,7 +413,7 @@ type Attribute implements Node & ObjectWithMetadata { slug: String type: AttributeTypeEnum unit: MeasurementUnitsEnum - values(filter: AttributeValueFilterInput, before: String, after: String, first: Int, last: Int): AttributeValueCountableConnection + choices(sortBy: AttributeChoicesSortingInput, filter: AttributeValueFilterInput, before: String, after: String, first: Int, last: Int): AttributeValueCountableConnection valueRequired: Boolean! visibleInStorefront: Boolean! filterableInStorefront: Boolean! @@ -429,6 +429,16 @@ type AttributeBulkDelete { errors: [AttributeError!]! } +enum AttributeChoicesSortField { + NAME + SLUG +} + +input AttributeChoicesSortingInput { + direction: OrderDirection! + field: AttributeChoicesSortField! +} + type AttributeCountableConnection { pageInfo: PageInfo! edges: [AttributeCountableEdge!]! @@ -809,7 +819,7 @@ type CategoryTranslation implements Node { id: ID! seoTitle: String seoDescription: String - name: String! + name: String description: JSONString language: LanguageDisplay! descriptionJson: JSONString @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") @@ -1283,7 +1293,7 @@ type CollectionTranslation implements Node { id: ID! seoTitle: String seoDescription: String - name: String! + name: String description: JSONString language: LanguageDisplay! descriptionJson: JSONString @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") @@ -1315,6 +1325,7 @@ enum ConfigurationTypeFieldEnum { SECRET PASSWORD SECRETMULTILINE + OUTPUT } type ConfirmAccount { @@ -3606,6 +3617,7 @@ input PageFilterInput { search: String metadata: [MetadataInput] pageTypes: [ID] + ids: [ID] } type PageInfo { @@ -3665,7 +3677,7 @@ type PageTranslation implements Node { id: ID! seoTitle: String seoDescription: String - title: String! + title: String content: JSONString language: LanguageDisplay! contentJson: JSONString @deprecated(reason: "Will be removed in Saleor 4.0. Use the `content` field instead.") @@ -4411,7 +4423,7 @@ type ProductTranslation implements Node { id: ID! seoTitle: String seoDescription: String - name: String! + name: String description: JSONString language: LanguageDisplay! descriptionJson: JSONString @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") diff --git a/src/attributes/components/AttributePage/AttributePage.tsx b/src/attributes/components/AttributePage/AttributePage.tsx index 6c2d61070..fec9192cb 100644 --- a/src/attributes/components/AttributePage/AttributePage.tsx +++ b/src/attributes/components/AttributePage/AttributePage.tsx @@ -1,4 +1,4 @@ -import { AttributeDetails_attribute_values } from "@saleor/attributes/types/AttributeDetails"; +import { AttributeDetails_attribute_choices } from "@saleor/attributes/types/AttributeDetails"; import { ATTRIBUTE_TYPES_WITH_DEDICATED_VALUES } from "@saleor/attributes/utils/data"; import AppHeader from "@saleor/components/AppHeader"; import CardSpacer from "@saleor/components/CardSpacer"; @@ -37,7 +37,7 @@ export interface AttributePageProps { disabled: boolean; errors: AttributeErrorFragment[]; saveButtonBarState: ConfirmButtonTransitionState; - values: AttributeDetails_attribute_values; + values: AttributeDetails_attribute_choices; onBack: () => void; onDelete: () => void; onSubmit: (data: AttributePageFormData) => void; diff --git a/src/attributes/fixtures.ts b/src/attributes/fixtures.ts index d1f3908ec..2083d3567 100644 --- a/src/attributes/fixtures.ts +++ b/src/attributes/fixtures.ts @@ -29,7 +29,7 @@ export const attribute: AttributeDetails_attribute = { type: AttributeTypeEnum.PRODUCT_TYPE, valueRequired: true, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection" as "AttributeValueCountableConnection", pageInfo: { __typename: "PageInfo" as "PageInfo", @@ -82,7 +82,7 @@ export const attributes: Array, existingAttribute: | PageDetails_page_attributes + | ProductDetails_product_attributes | SelectedVariantAttributeFragment ) => { if (existingAttribute.attribute.inputType !== AttributeInputTypeEnum.FILE) { diff --git a/src/attributes/utils/handlers.ts b/src/attributes/utils/handlers.ts index 768444df2..f8971dbd1 100644 --- a/src/attributes/utils/handlers.ts +++ b/src/attributes/utils/handlers.ts @@ -13,6 +13,7 @@ import { } from "@saleor/hooks/useFormset"; import { PageDetails_page_attributes } from "@saleor/pages/types/PageDetails"; import { ProductDetails_product_attributes } from "@saleor/products/types/ProductDetails"; +import { ProductVariantDetails_productVariant_nonSelectionAttributes } from "@saleor/products/types/ProductVariantDetails"; import { FetchMoreProps, ReorderEvent } from "@saleor/types"; import { AttributeEntityTypeEnum, @@ -234,7 +235,9 @@ export const handleUploadMultipleFiles = async ( export const handleDeleteMultipleAttributeValues = async ( attributesWithNewFileValue: FormsetData, attributes: Array< - PageDetails_page_attributes | ProductDetails_product_attributes + | PageDetails_page_attributes + | ProductDetails_product_attributes + | ProductVariantDetails_productVariant_nonSelectionAttributes >, deleteAttributeValue: ( variables: AttributeValueDeleteVariables diff --git a/src/attributes/views/AttributeDetails/AttributeDetails.tsx b/src/attributes/views/AttributeDetails/AttributeDetails.tsx index 4b1455946..d538af9eb 100644 --- a/src/attributes/views/AttributeDetails/AttributeDetails.tsx +++ b/src/attributes/views/AttributeDetails/AttributeDetails.tsx @@ -73,7 +73,7 @@ const AttributeDetails: React.FC = ({ id, params }) => { const paginationState = createPaginationState(settings?.rowNumber, params); const { loadNextPage, loadPreviousPage, pageInfo } = paginate( - data?.attribute?.values?.pageInfo, + data?.attribute?.choices?.pageInfo, paginationState, params ); @@ -175,14 +175,14 @@ const AttributeDetails: React.FC = ({ id, params }) => { __typename: "AttributeReorderValues", attribute: { ...data.attribute, - values: { + choices: { __typename: "AttributeValueCountableConnection", pageInfo: { - ...data.attribute.values.pageInfo + ...data.attribute.choices.pageInfo }, edges: move( - data.attribute.values.edges[oldIndex], - data.attribute.values.edges, + data.attribute.choices.edges[oldIndex], + data.attribute.choices.edges, (a, b) => a.node.id === b.node.id, newIndex ) @@ -194,7 +194,7 @@ const AttributeDetails: React.FC = ({ id, params }) => { variables: { id, move: { - id: data.attribute.values.edges[oldIndex].node.id, + id: data.attribute.choices.edges[oldIndex].node.id, sortOrder: newIndex - oldIndex }, firstValues: settings.rowNumber, @@ -251,7 +251,7 @@ const AttributeDetails: React.FC = ({ id, params }) => { }) } saveButtonBarState={attributeUpdateOpts.status} - values={maybe(() => data.attribute.values)} + values={maybe(() => data.attribute.choices)} settings={settings} onUpdateListSettings={updateListSettings} pageInfo={pageInfo} @@ -276,7 +276,7 @@ const AttributeDetails: React.FC = ({ id, params }) => { open={params.action === "remove-value"} name={maybe( () => - data.attribute.values.edges.find( + data.attribute.choices.edges.find( value => params.id === value.node.id ).node.name, "..." @@ -317,7 +317,7 @@ const AttributeDetails: React.FC = ({ id, params }) => { - data.attribute.values.edges.find( + data.attribute.choices.edges.find( value => params.id === value.node.id ).node )} @@ -331,7 +331,7 @@ const AttributeDetails: React.FC = ({ id, params }) => { onSubmit={input => attributeValueUpdate({ variables: { - id: data.attribute.values.edges.find( + id: data.attribute.choices.edges.find( value => params.id === value.node.id ).node.id, input, diff --git a/src/fragments/products.ts b/src/fragments/products.ts index 43c602bc3..7857d62b3 100644 --- a/src/fragments/products.ts +++ b/src/fragments/products.ts @@ -132,7 +132,7 @@ export const productVariantAttributesFragment = gql` entityType valueRequired unit - values( + choices( first: $firstValues after: $afterValues last: $lastValues @@ -150,7 +150,7 @@ export const productVariantAttributesFragment = gql` variantAttributes(variantSelection: VARIANT_SELECTION) { id name - values( + choices( first: $firstValues after: $afterValues last: $lastValues diff --git a/src/fragments/types/Product.ts b/src/fragments/types/Product.ts index d55181f29..d38de7247 100644 --- a/src/fragments/types/Product.ts +++ b/src/fragments/types/Product.ts @@ -9,7 +9,7 @@ import { AttributeInputTypeEnum, AttributeEntityTypeEnum, MeasurementUnitsEnum, // GraphQL fragment: Product // ==================================================== -export interface Product_attributes_attribute_values_pageInfo { +export interface Product_attributes_attribute_choices_pageInfo { __typename: "PageInfo"; endCursor: string | null; hasNextPage: boolean; @@ -17,32 +17,32 @@ export interface Product_attributes_attribute_values_pageInfo { startCursor: string | null; } -export interface Product_attributes_attribute_values_edges_node_file { +export interface Product_attributes_attribute_choices_edges_node_file { __typename: "File"; url: string; contentType: string | null; } -export interface Product_attributes_attribute_values_edges_node { +export interface Product_attributes_attribute_choices_edges_node { __typename: "AttributeValue"; id: string; name: string | null; slug: string | null; - file: Product_attributes_attribute_values_edges_node_file | null; + file: Product_attributes_attribute_choices_edges_node_file | null; reference: string | null; richText: any | null; } -export interface Product_attributes_attribute_values_edges { +export interface Product_attributes_attribute_choices_edges { __typename: "AttributeValueCountableEdge"; cursor: string; - node: Product_attributes_attribute_values_edges_node; + node: Product_attributes_attribute_choices_edges_node; } -export interface Product_attributes_attribute_values { +export interface Product_attributes_attribute_choices { __typename: "AttributeValueCountableConnection"; - pageInfo: Product_attributes_attribute_values_pageInfo; - edges: Product_attributes_attribute_values_edges[]; + pageInfo: Product_attributes_attribute_choices_pageInfo; + edges: Product_attributes_attribute_choices_edges[]; } export interface Product_attributes_attribute { @@ -54,7 +54,7 @@ export interface Product_attributes_attribute { entityType: AttributeEntityTypeEnum | null; valueRequired: boolean; unit: MeasurementUnitsEnum | null; - values: Product_attributes_attribute_values | null; + choices: Product_attributes_attribute_choices | null; } export interface Product_attributes_values_file { @@ -79,7 +79,7 @@ export interface Product_attributes { values: (Product_attributes_values | null)[]; } -export interface Product_productType_variantAttributes_values_pageInfo { +export interface Product_productType_variantAttributes_choices_pageInfo { __typename: "PageInfo"; endCursor: string | null; hasNextPage: boolean; @@ -87,39 +87,39 @@ export interface Product_productType_variantAttributes_values_pageInfo { startCursor: string | null; } -export interface Product_productType_variantAttributes_values_edges_node_file { +export interface Product_productType_variantAttributes_choices_edges_node_file { __typename: "File"; url: string; contentType: string | null; } -export interface Product_productType_variantAttributes_values_edges_node { +export interface Product_productType_variantAttributes_choices_edges_node { __typename: "AttributeValue"; id: string; name: string | null; slug: string | null; - file: Product_productType_variantAttributes_values_edges_node_file | null; + file: Product_productType_variantAttributes_choices_edges_node_file | null; reference: string | null; richText: any | null; } -export interface Product_productType_variantAttributes_values_edges { +export interface Product_productType_variantAttributes_choices_edges { __typename: "AttributeValueCountableEdge"; cursor: string; - node: Product_productType_variantAttributes_values_edges_node; + node: Product_productType_variantAttributes_choices_edges_node; } -export interface Product_productType_variantAttributes_values { +export interface Product_productType_variantAttributes_choices { __typename: "AttributeValueCountableConnection"; - pageInfo: Product_productType_variantAttributes_values_pageInfo; - edges: Product_productType_variantAttributes_values_edges[]; + pageInfo: Product_productType_variantAttributes_choices_pageInfo; + edges: Product_productType_variantAttributes_choices_edges[]; } export interface Product_productType_variantAttributes { __typename: "Attribute"; id: string; name: string | null; - values: Product_productType_variantAttributes_values | null; + choices: Product_productType_variantAttributes_choices | null; } export interface Product_productType_taxType { diff --git a/src/fragments/types/ProductVariantAttributesFragment.ts b/src/fragments/types/ProductVariantAttributesFragment.ts index 9a714cc81..6e227c2ee 100644 --- a/src/fragments/types/ProductVariantAttributesFragment.ts +++ b/src/fragments/types/ProductVariantAttributesFragment.ts @@ -9,7 +9,7 @@ import { AttributeInputTypeEnum, AttributeEntityTypeEnum, MeasurementUnitsEnum } // GraphQL fragment: ProductVariantAttributesFragment // ==================================================== -export interface ProductVariantAttributesFragment_attributes_attribute_values_pageInfo { +export interface ProductVariantAttributesFragment_attributes_attribute_choices_pageInfo { __typename: "PageInfo"; endCursor: string | null; hasNextPage: boolean; @@ -17,32 +17,32 @@ export interface ProductVariantAttributesFragment_attributes_attribute_values_pa startCursor: string | null; } -export interface ProductVariantAttributesFragment_attributes_attribute_values_edges_node_file { +export interface ProductVariantAttributesFragment_attributes_attribute_choices_edges_node_file { __typename: "File"; url: string; contentType: string | null; } -export interface ProductVariantAttributesFragment_attributes_attribute_values_edges_node { +export interface ProductVariantAttributesFragment_attributes_attribute_choices_edges_node { __typename: "AttributeValue"; id: string; name: string | null; slug: string | null; - file: ProductVariantAttributesFragment_attributes_attribute_values_edges_node_file | null; + file: ProductVariantAttributesFragment_attributes_attribute_choices_edges_node_file | null; reference: string | null; richText: any | null; } -export interface ProductVariantAttributesFragment_attributes_attribute_values_edges { +export interface ProductVariantAttributesFragment_attributes_attribute_choices_edges { __typename: "AttributeValueCountableEdge"; cursor: string; - node: ProductVariantAttributesFragment_attributes_attribute_values_edges_node; + node: ProductVariantAttributesFragment_attributes_attribute_choices_edges_node; } -export interface ProductVariantAttributesFragment_attributes_attribute_values { +export interface ProductVariantAttributesFragment_attributes_attribute_choices { __typename: "AttributeValueCountableConnection"; - pageInfo: ProductVariantAttributesFragment_attributes_attribute_values_pageInfo; - edges: ProductVariantAttributesFragment_attributes_attribute_values_edges[]; + pageInfo: ProductVariantAttributesFragment_attributes_attribute_choices_pageInfo; + edges: ProductVariantAttributesFragment_attributes_attribute_choices_edges[]; } export interface ProductVariantAttributesFragment_attributes_attribute { @@ -54,7 +54,7 @@ export interface ProductVariantAttributesFragment_attributes_attribute { entityType: AttributeEntityTypeEnum | null; valueRequired: boolean; unit: MeasurementUnitsEnum | null; - values: ProductVariantAttributesFragment_attributes_attribute_values | null; + choices: ProductVariantAttributesFragment_attributes_attribute_choices | null; } export interface ProductVariantAttributesFragment_attributes_values_file { @@ -79,7 +79,7 @@ export interface ProductVariantAttributesFragment_attributes { values: (ProductVariantAttributesFragment_attributes_values | null)[]; } -export interface ProductVariantAttributesFragment_productType_variantAttributes_values_pageInfo { +export interface ProductVariantAttributesFragment_productType_variantAttributes_choices_pageInfo { __typename: "PageInfo"; endCursor: string | null; hasNextPage: boolean; @@ -87,39 +87,39 @@ export interface ProductVariantAttributesFragment_productType_variantAttributes_ startCursor: string | null; } -export interface ProductVariantAttributesFragment_productType_variantAttributes_values_edges_node_file { +export interface ProductVariantAttributesFragment_productType_variantAttributes_choices_edges_node_file { __typename: "File"; url: string; contentType: string | null; } -export interface ProductVariantAttributesFragment_productType_variantAttributes_values_edges_node { +export interface ProductVariantAttributesFragment_productType_variantAttributes_choices_edges_node { __typename: "AttributeValue"; id: string; name: string | null; slug: string | null; - file: ProductVariantAttributesFragment_productType_variantAttributes_values_edges_node_file | null; + file: ProductVariantAttributesFragment_productType_variantAttributes_choices_edges_node_file | null; reference: string | null; richText: any | null; } -export interface ProductVariantAttributesFragment_productType_variantAttributes_values_edges { +export interface ProductVariantAttributesFragment_productType_variantAttributes_choices_edges { __typename: "AttributeValueCountableEdge"; cursor: string; - node: ProductVariantAttributesFragment_productType_variantAttributes_values_edges_node; + node: ProductVariantAttributesFragment_productType_variantAttributes_choices_edges_node; } -export interface ProductVariantAttributesFragment_productType_variantAttributes_values { +export interface ProductVariantAttributesFragment_productType_variantAttributes_choices { __typename: "AttributeValueCountableConnection"; - pageInfo: ProductVariantAttributesFragment_productType_variantAttributes_values_pageInfo; - edges: ProductVariantAttributesFragment_productType_variantAttributes_values_edges[]; + pageInfo: ProductVariantAttributesFragment_productType_variantAttributes_choices_pageInfo; + edges: ProductVariantAttributesFragment_productType_variantAttributes_choices_edges[]; } export interface ProductVariantAttributesFragment_productType_variantAttributes { __typename: "Attribute"; id: string; name: string | null; - values: ProductVariantAttributesFragment_productType_variantAttributes_values | null; + choices: ProductVariantAttributesFragment_productType_variantAttributes_choices | null; } export interface ProductVariantAttributesFragment_productType { diff --git a/src/productTypes/fixtures.ts b/src/productTypes/fixtures.ts index 655278e1c..ede68182d 100644 --- a/src/productTypes/fixtures.ts +++ b/src/productTypes/fixtures.ts @@ -23,7 +23,7 @@ export const attributes: ProductType_productType_productAttributes[] = [ slug: "author", valueRequired: true, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection" as "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", @@ -79,7 +79,7 @@ export const attributes: ProductType_productType_productAttributes[] = [ slug: "box-size", valueRequired: true, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection" as "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", @@ -167,7 +167,7 @@ export const attributes: ProductType_productType_productAttributes[] = [ slug: "brand", valueRequired: true, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection" as "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", @@ -207,7 +207,7 @@ export const attributes: ProductType_productType_productAttributes[] = [ slug: "candy-box-size", valueRequired: true, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection" as "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", @@ -279,7 +279,7 @@ export const attributes: ProductType_productType_productAttributes[] = [ slug: "coffee-genre", valueRequired: true, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection" as "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", @@ -335,7 +335,7 @@ export const attributes: ProductType_productType_productAttributes[] = [ slug: "collar", valueRequired: true, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection" as "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", @@ -407,7 +407,7 @@ export const attributes: ProductType_productType_productAttributes[] = [ slug: "color", valueRequired: true, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection" as "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", @@ -463,7 +463,7 @@ export const attributes: ProductType_productType_productAttributes[] = [ slug: "cover", valueRequired: true, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection" as "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", @@ -583,7 +583,7 @@ export const attributes: ProductType_productType_productAttributes[] = [ slug: "flavor", valueRequired: true, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection" as "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", @@ -639,7 +639,7 @@ export const attributes: ProductType_productType_productAttributes[] = [ slug: "language", valueRequired: true, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection" as "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", @@ -695,7 +695,7 @@ export const attributes: ProductType_productType_productAttributes[] = [ slug: "publisher", valueRequired: true, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection" as "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", @@ -751,7 +751,7 @@ export const attributes: ProductType_productType_productAttributes[] = [ slug: "size", valueRequired: true, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection" as "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", diff --git a/src/products/components/ProductCreatePage/ProductCreatePage.tsx b/src/products/components/ProductCreatePage/ProductCreatePage.tsx index 9e2284ea1..619a072ed 100644 --- a/src/products/components/ProductCreatePage/ProductCreatePage.tsx +++ b/src/products/components/ProductCreatePage/ProductCreatePage.tsx @@ -25,7 +25,7 @@ import { sectionNames } from "@saleor/intl"; import ProductVariantPrice from "@saleor/products/components/ProductVariantPrice"; import { ProductType_productType } from "@saleor/products/types/ProductType"; import { getChoices } from "@saleor/products/utils/data"; -import { SearchAttributeValues_attribute_values_edges_node } from "@saleor/searches/types/SearchAttributeValues"; +import { SearchAttributeValues_attribute_choices_edges_node } from "@saleor/searches/types/SearchAttributeValues"; import { SearchCategories_search_edges_node } from "@saleor/searches/types/SearchCategories"; import { SearchCollections_search_edges_node } from "@saleor/searches/types/SearchCollections"; import { SearchPages_search_edges_node } from "@saleor/searches/types/SearchPages"; @@ -55,7 +55,7 @@ interface ProductCreatePageProps { currentChannels: ChannelData[]; collections: SearchCollections_search_edges_node[]; categories: SearchCategories_search_edges_node[]; - attributeValues: SearchAttributeValues_attribute_values_edges_node[]; + attributeValues: SearchAttributeValues_attribute_choices_edges_node[]; loading: boolean; fetchMoreCategories: FetchMoreProps; fetchMoreCollections: FetchMoreProps; diff --git a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx index 2488e8896..96c6a629c 100644 --- a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx +++ b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx @@ -29,7 +29,7 @@ import { maybe } from "@saleor/misc"; import ProductExternalMediaDialog from "@saleor/products/components/ProductExternalMediaDialog"; import ProductVariantPrice from "@saleor/products/components/ProductVariantPrice"; import { ChannelsWithVariantsData } from "@saleor/products/views/ProductUpdate/types"; -import { SearchAttributeValues_attribute_values_edges_node } from "@saleor/searches/types/SearchAttributeValues"; +import { SearchAttributeValues_attribute_choices_edges_node } from "@saleor/searches/types/SearchAttributeValues"; import { SearchCategories_search_edges_node } from "@saleor/searches/types/SearchCategories"; import { SearchCollections_search_edges_node } from "@saleor/searches/types/SearchCollections"; import { SearchPages_search_edges_node } from "@saleor/searches/types/SearchPages"; @@ -76,7 +76,7 @@ export interface ProductUpdatePageProps extends ListActions, ChannelProps { placeholderImage: string; collections: SearchCollections_search_edges_node[]; categories: SearchCategories_search_edges_node[]; - attributeValues: SearchAttributeValues_attribute_values_edges_node[]; + attributeValues: SearchAttributeValues_attribute_choices_edges_node[]; disabled: boolean; fetchMoreCategories: FetchMoreProps; fetchMoreCollections: FetchMoreProps; diff --git a/src/products/components/ProductVariantCreatorPage/ProductVariantCreator.stories.tsx b/src/products/components/ProductVariantCreatorPage/ProductVariantCreator.stories.tsx index 4fbd94d7e..69dd20f8e 100644 --- a/src/products/components/ProductVariantCreatorPage/ProductVariantCreator.stories.tsx +++ b/src/products/components/ProductVariantCreatorPage/ProductVariantCreator.stories.tsx @@ -34,7 +34,7 @@ const price: Price = { attribute: selectedAttributes[0].id, channels, mode: "attribute", - values: selectedAttributes[0].values.edges.map(attribute => ({ + values: selectedAttributes[0].choices.edges.map(attribute => ({ slug: attribute.node.slug, value: channels })) @@ -46,7 +46,7 @@ const stock: Stock = { value: selectedWarehouses.map( (_, warehouseIndex) => (warehouseIndex + 2) * 3 ), - values: selectedAttributes[0].values.edges.map( + values: selectedAttributes[0].choices.edges.map( (attribute, attributeIndex) => ({ slug: attribute.node.slug, value: selectedWarehouses.map( @@ -59,7 +59,7 @@ const stock: Stock = { const dataAttributes = selectedAttributes.map(attribute => ({ id: attribute.id, - values: attribute.values.edges + values: attribute.choices.edges .map(value => value.node.slug) .filter((_, valueIndex) => valueIndex % 2 !== 1) })); diff --git a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorSummary.tsx b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorSummary.tsx index 0a04223b4..416a6ff51 100644 --- a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorSummary.tsx +++ b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorSummary.tsx @@ -118,7 +118,7 @@ function getVariantName( return attributes.reduce( (acc, attribute) => [ ...acc, - attribute.values.edges.find( + attribute.choices.edges.find( value => value.node.slug === variant.attributes.find( diff --git a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorValues.tsx b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorValues.tsx index b7bc791ce..c6c66c417 100644 --- a/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorValues.tsx +++ b/src/products/components/ProductVariantCreatorPage/ProductVariantCreatorValues.tsx @@ -71,7 +71,7 @@ const ProductVariantCreatorValues: React.FC = className={classes.valueContainer} data-test-id="value-container" > - {attribute.values.edges.map(({ node: value }) => ( + {attribute.choices.edges.map(({ node: value }) => ( onValueClick(attribute.id, value.slug)} time={100} diff --git a/src/products/components/ProductVariantCreatorPage/utils.ts b/src/products/components/ProductVariantCreatorPage/utils.ts index 5518b50c7..5ba6a1651 100644 --- a/src/products/components/ProductVariantCreatorPage/utils.ts +++ b/src/products/components/ProductVariantCreatorPage/utils.ts @@ -1,6 +1,6 @@ import { ProductDetails_product_productType_variantAttributes, - ProductDetails_product_productType_variantAttributes_values_edges_node + ProductDetails_product_productType_variantAttributes_choices_edges_node } from "@saleor/products/types/ProductDetails"; import { ProductVariantCreateFormData } from "./form"; @@ -8,13 +8,13 @@ import { ProductVariantCreateFormData } from "./form"; export function getPriceAttributeValues( data: ProductVariantCreateFormData, attributes: ProductDetails_product_productType_variantAttributes[] -): ProductDetails_product_productType_variantAttributes_values_edges_node[] { +): ProductDetails_product_productType_variantAttributes_choices_edges_node[] { return data.price.mode === "all" ? null : data.price.attribute ? attributes .find(attribute => attribute.id === data.price.attribute) - .values.edges.filter(value => + .choices.edges.filter(value => data.attributes .find(attribute => attribute.id === data.price.attribute) .values.includes(value.node.slug) @@ -26,13 +26,13 @@ export function getPriceAttributeValues( export function getStockAttributeValues( data: ProductVariantCreateFormData, attributes: ProductDetails_product_productType_variantAttributes[] -): ProductDetails_product_productType_variantAttributes_values_edges_node[] { +): ProductDetails_product_productType_variantAttributes_choices_edges_node[] { return data.stock.mode === "all" ? null : data.stock.attribute ? attributes .find(attribute => attribute.id === data.stock.attribute) - .values.edges.filter(value => + .choices.edges.filter(value => data.attributes .find(attribute => attribute.id === data.stock.attribute) .values.includes(value.node.slug) diff --git a/src/products/fixtures.ts b/src/products/fixtures.ts index b5fdfb3c7..406fea026 100644 --- a/src/products/fixtures.ts +++ b/src/products/fixtures.ts @@ -30,7 +30,7 @@ export const product: ( slug: "Borders", valueRequired: false, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", @@ -92,7 +92,7 @@ export const product: ( slug: "Legacy", valueRequired: true, unit: null, - values: { + choices: { __typename: "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", @@ -426,11 +426,8 @@ export const product: ( { __typename: "Attribute", id: "isdugfhud", - inputType: AttributeInputTypeEnum.FILE, name: "Attachment", - slug: "attachment", - valueRequired: true, - values: { + choices: { __typename: "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", @@ -463,11 +460,8 @@ export const product: ( { __typename: "Attribute", id: "pta18161", - inputType: AttributeInputTypeEnum.DROPDOWN, name: "Color", - slug: "color", - valueRequired: true, - values: { + choices: { __typename: "AttributeValueCountableConnection", pageInfo: { endCursor: "WyI4IiwgIjMiXQ==", diff --git a/src/products/queries.ts b/src/products/queries.ts index 7e135e3e2..50e6cc410 100644 --- a/src/products/queries.ts +++ b/src/products/queries.ts @@ -76,7 +76,7 @@ const initialProductFilterAttributesQuery = gql` id name slug - values( + choices( first: $firstValues after: $afterValues last: $lastValues @@ -260,7 +260,7 @@ const productTypeQuery = gql` name valueRequired unit - values( + choices( first: $firstValues after: $afterValues last: $lastValues diff --git a/src/products/types/InitialProductFilterAttributes.ts b/src/products/types/InitialProductFilterAttributes.ts index e10d4077a..ab792e3db 100644 --- a/src/products/types/InitialProductFilterAttributes.ts +++ b/src/products/types/InitialProductFilterAttributes.ts @@ -7,7 +7,7 @@ // GraphQL query operation: InitialProductFilterAttributes // ==================================================== -export interface InitialProductFilterAttributes_attributes_edges_node_values_pageInfo { +export interface InitialProductFilterAttributes_attributes_edges_node_choices_pageInfo { __typename: "PageInfo"; endCursor: string | null; hasNextPage: boolean; @@ -15,23 +15,23 @@ export interface InitialProductFilterAttributes_attributes_edges_node_values_pag startCursor: string | null; } -export interface InitialProductFilterAttributes_attributes_edges_node_values_edges_node { +export interface InitialProductFilterAttributes_attributes_edges_node_choices_edges_node { __typename: "AttributeValue"; id: string; name: string | null; slug: string | null; } -export interface InitialProductFilterAttributes_attributes_edges_node_values_edges { +export interface InitialProductFilterAttributes_attributes_edges_node_choices_edges { __typename: "AttributeValueCountableEdge"; cursor: string; - node: InitialProductFilterAttributes_attributes_edges_node_values_edges_node; + node: InitialProductFilterAttributes_attributes_edges_node_choices_edges_node; } -export interface InitialProductFilterAttributes_attributes_edges_node_values { +export interface InitialProductFilterAttributes_attributes_edges_node_choices { __typename: "AttributeValueCountableConnection"; - pageInfo: InitialProductFilterAttributes_attributes_edges_node_values_pageInfo; - edges: InitialProductFilterAttributes_attributes_edges_node_values_edges[]; + pageInfo: InitialProductFilterAttributes_attributes_edges_node_choices_pageInfo; + edges: InitialProductFilterAttributes_attributes_edges_node_choices_edges[]; } export interface InitialProductFilterAttributes_attributes_edges_node { @@ -39,7 +39,7 @@ export interface InitialProductFilterAttributes_attributes_edges_node { id: string; name: string | null; slug: string | null; - values: InitialProductFilterAttributes_attributes_edges_node_values | null; + choices: InitialProductFilterAttributes_attributes_edges_node_choices | null; } export interface InitialProductFilterAttributes_attributes_edges { diff --git a/src/products/types/ProductDetails.ts b/src/products/types/ProductDetails.ts index 50f9cd58f..545e18043 100644 --- a/src/products/types/ProductDetails.ts +++ b/src/products/types/ProductDetails.ts @@ -9,7 +9,7 @@ import { AttributeInputTypeEnum, AttributeEntityTypeEnum, MeasurementUnitsEnum, // GraphQL query operation: ProductDetails // ==================================================== -export interface ProductDetails_product_attributes_attribute_values_pageInfo { +export interface ProductDetails_product_attributes_attribute_choices_pageInfo { __typename: "PageInfo"; endCursor: string | null; hasNextPage: boolean; @@ -17,32 +17,32 @@ export interface ProductDetails_product_attributes_attribute_values_pageInfo { startCursor: string | null; } -export interface ProductDetails_product_attributes_attribute_values_edges_node_file { +export interface ProductDetails_product_attributes_attribute_choices_edges_node_file { __typename: "File"; url: string; contentType: string | null; } -export interface ProductDetails_product_attributes_attribute_values_edges_node { +export interface ProductDetails_product_attributes_attribute_choices_edges_node { __typename: "AttributeValue"; id: string; name: string | null; slug: string | null; - file: ProductDetails_product_attributes_attribute_values_edges_node_file | null; + file: ProductDetails_product_attributes_attribute_choices_edges_node_file | null; reference: string | null; richText: any | null; } -export interface ProductDetails_product_attributes_attribute_values_edges { +export interface ProductDetails_product_attributes_attribute_choices_edges { __typename: "AttributeValueCountableEdge"; cursor: string; - node: ProductDetails_product_attributes_attribute_values_edges_node; + node: ProductDetails_product_attributes_attribute_choices_edges_node; } -export interface ProductDetails_product_attributes_attribute_values { +export interface ProductDetails_product_attributes_attribute_choices { __typename: "AttributeValueCountableConnection"; - pageInfo: ProductDetails_product_attributes_attribute_values_pageInfo; - edges: ProductDetails_product_attributes_attribute_values_edges[]; + pageInfo: ProductDetails_product_attributes_attribute_choices_pageInfo; + edges: ProductDetails_product_attributes_attribute_choices_edges[]; } export interface ProductDetails_product_attributes_attribute { @@ -54,7 +54,7 @@ export interface ProductDetails_product_attributes_attribute { entityType: AttributeEntityTypeEnum | null; valueRequired: boolean; unit: MeasurementUnitsEnum | null; - values: ProductDetails_product_attributes_attribute_values | null; + choices: ProductDetails_product_attributes_attribute_choices | null; } export interface ProductDetails_product_attributes_values_file { @@ -79,7 +79,7 @@ export interface ProductDetails_product_attributes { values: (ProductDetails_product_attributes_values | null)[]; } -export interface ProductDetails_product_productType_variantAttributes_values_pageInfo { +export interface ProductDetails_product_productType_variantAttributes_choices_pageInfo { __typename: "PageInfo"; endCursor: string | null; hasNextPage: boolean; @@ -87,39 +87,39 @@ export interface ProductDetails_product_productType_variantAttributes_values_pag startCursor: string | null; } -export interface ProductDetails_product_productType_variantAttributes_values_edges_node_file { +export interface ProductDetails_product_productType_variantAttributes_choices_edges_node_file { __typename: "File"; url: string; contentType: string | null; } -export interface ProductDetails_product_productType_variantAttributes_values_edges_node { +export interface ProductDetails_product_productType_variantAttributes_choices_edges_node { __typename: "AttributeValue"; id: string; name: string | null; slug: string | null; - file: ProductDetails_product_productType_variantAttributes_values_edges_node_file | null; + file: ProductDetails_product_productType_variantAttributes_choices_edges_node_file | null; reference: string | null; richText: any | null; } -export interface ProductDetails_product_productType_variantAttributes_values_edges { +export interface ProductDetails_product_productType_variantAttributes_choices_edges { __typename: "AttributeValueCountableEdge"; cursor: string; - node: ProductDetails_product_productType_variantAttributes_values_edges_node; + node: ProductDetails_product_productType_variantAttributes_choices_edges_node; } -export interface ProductDetails_product_productType_variantAttributes_values { +export interface ProductDetails_product_productType_variantAttributes_choices { __typename: "AttributeValueCountableConnection"; - pageInfo: ProductDetails_product_productType_variantAttributes_values_pageInfo; - edges: ProductDetails_product_productType_variantAttributes_values_edges[]; + pageInfo: ProductDetails_product_productType_variantAttributes_choices_pageInfo; + edges: ProductDetails_product_productType_variantAttributes_choices_edges[]; } export interface ProductDetails_product_productType_variantAttributes { __typename: "Attribute"; id: string; name: string | null; - values: ProductDetails_product_productType_variantAttributes_values | null; + choices: ProductDetails_product_productType_variantAttributes_choices | null; } export interface ProductDetails_product_productType_taxType { diff --git a/src/products/types/ProductType.ts b/src/products/types/ProductType.ts index 62ed0baef..1e22ce8c5 100644 --- a/src/products/types/ProductType.ts +++ b/src/products/types/ProductType.ts @@ -9,7 +9,7 @@ import { AttributeInputTypeEnum, AttributeEntityTypeEnum, MeasurementUnitsEnum } // GraphQL query operation: ProductType // ==================================================== -export interface ProductType_productType_productAttributes_values_pageInfo { +export interface ProductType_productType_productAttributes_choices_pageInfo { __typename: "PageInfo"; endCursor: string | null; hasNextPage: boolean; @@ -17,32 +17,32 @@ export interface ProductType_productType_productAttributes_values_pageInfo { startCursor: string | null; } -export interface ProductType_productType_productAttributes_values_edges_node_file { +export interface ProductType_productType_productAttributes_choices_edges_node_file { __typename: "File"; url: string; contentType: string | null; } -export interface ProductType_productType_productAttributes_values_edges_node { +export interface ProductType_productType_productAttributes_choices_edges_node { __typename: "AttributeValue"; id: string; name: string | null; slug: string | null; - file: ProductType_productType_productAttributes_values_edges_node_file | null; + file: ProductType_productType_productAttributes_choices_edges_node_file | null; reference: string | null; richText: any | null; } -export interface ProductType_productType_productAttributes_values_edges { +export interface ProductType_productType_productAttributes_choices_edges { __typename: "AttributeValueCountableEdge"; cursor: string; - node: ProductType_productType_productAttributes_values_edges_node; + node: ProductType_productType_productAttributes_choices_edges_node; } -export interface ProductType_productType_productAttributes_values { +export interface ProductType_productType_productAttributes_choices { __typename: "AttributeValueCountableConnection"; - pageInfo: ProductType_productType_productAttributes_values_pageInfo; - edges: ProductType_productType_productAttributes_values_edges[]; + pageInfo: ProductType_productType_productAttributes_choices_pageInfo; + edges: ProductType_productType_productAttributes_choices_edges[]; } export interface ProductType_productType_productAttributes { @@ -54,7 +54,7 @@ export interface ProductType_productType_productAttributes { name: string | null; valueRequired: boolean; unit: MeasurementUnitsEnum | null; - values: ProductType_productType_productAttributes_values | null; + choices: ProductType_productType_productAttributes_choices | null; } export interface ProductType_productType_taxType { diff --git a/src/products/types/ProductUpdate.ts b/src/products/types/ProductUpdate.ts index b30468cb8..62f344544 100644 --- a/src/products/types/ProductUpdate.ts +++ b/src/products/types/ProductUpdate.ts @@ -16,7 +16,7 @@ export interface ProductUpdate_productUpdate_errors { attributes: string[] | null; } -export interface ProductUpdate_productUpdate_product_attributes_attribute_values_pageInfo { +export interface ProductUpdate_productUpdate_product_attributes_attribute_choices_pageInfo { __typename: "PageInfo"; endCursor: string | null; hasNextPage: boolean; @@ -24,32 +24,32 @@ export interface ProductUpdate_productUpdate_product_attributes_attribute_values startCursor: string | null; } -export interface ProductUpdate_productUpdate_product_attributes_attribute_values_edges_node_file { +export interface ProductUpdate_productUpdate_product_attributes_attribute_choices_edges_node_file { __typename: "File"; url: string; contentType: string | null; } -export interface ProductUpdate_productUpdate_product_attributes_attribute_values_edges_node { +export interface ProductUpdate_productUpdate_product_attributes_attribute_choices_edges_node { __typename: "AttributeValue"; id: string; name: string | null; slug: string | null; - file: ProductUpdate_productUpdate_product_attributes_attribute_values_edges_node_file | null; + file: ProductUpdate_productUpdate_product_attributes_attribute_choices_edges_node_file | null; reference: string | null; richText: any | null; } -export interface ProductUpdate_productUpdate_product_attributes_attribute_values_edges { +export interface ProductUpdate_productUpdate_product_attributes_attribute_choices_edges { __typename: "AttributeValueCountableEdge"; cursor: string; - node: ProductUpdate_productUpdate_product_attributes_attribute_values_edges_node; + node: ProductUpdate_productUpdate_product_attributes_attribute_choices_edges_node; } -export interface ProductUpdate_productUpdate_product_attributes_attribute_values { +export interface ProductUpdate_productUpdate_product_attributes_attribute_choices { __typename: "AttributeValueCountableConnection"; - pageInfo: ProductUpdate_productUpdate_product_attributes_attribute_values_pageInfo; - edges: ProductUpdate_productUpdate_product_attributes_attribute_values_edges[]; + pageInfo: ProductUpdate_productUpdate_product_attributes_attribute_choices_pageInfo; + edges: ProductUpdate_productUpdate_product_attributes_attribute_choices_edges[]; } export interface ProductUpdate_productUpdate_product_attributes_attribute { @@ -61,7 +61,7 @@ export interface ProductUpdate_productUpdate_product_attributes_attribute { entityType: AttributeEntityTypeEnum | null; valueRequired: boolean; unit: MeasurementUnitsEnum | null; - values: ProductUpdate_productUpdate_product_attributes_attribute_values | null; + choices: ProductUpdate_productUpdate_product_attributes_attribute_choices | null; } export interface ProductUpdate_productUpdate_product_attributes_values_file { @@ -86,7 +86,7 @@ export interface ProductUpdate_productUpdate_product_attributes { values: (ProductUpdate_productUpdate_product_attributes_values | null)[]; } -export interface ProductUpdate_productUpdate_product_productType_variantAttributes_values_pageInfo { +export interface ProductUpdate_productUpdate_product_productType_variantAttributes_choices_pageInfo { __typename: "PageInfo"; endCursor: string | null; hasNextPage: boolean; @@ -94,39 +94,39 @@ export interface ProductUpdate_productUpdate_product_productType_variantAttribut startCursor: string | null; } -export interface ProductUpdate_productUpdate_product_productType_variantAttributes_values_edges_node_file { +export interface ProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges_node_file { __typename: "File"; url: string; contentType: string | null; } -export interface ProductUpdate_productUpdate_product_productType_variantAttributes_values_edges_node { +export interface ProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges_node { __typename: "AttributeValue"; id: string; name: string | null; slug: string | null; - file: ProductUpdate_productUpdate_product_productType_variantAttributes_values_edges_node_file | null; + file: ProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges_node_file | null; reference: string | null; richText: any | null; } -export interface ProductUpdate_productUpdate_product_productType_variantAttributes_values_edges { +export interface ProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges { __typename: "AttributeValueCountableEdge"; cursor: string; - node: ProductUpdate_productUpdate_product_productType_variantAttributes_values_edges_node; + node: ProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges_node; } -export interface ProductUpdate_productUpdate_product_productType_variantAttributes_values { +export interface ProductUpdate_productUpdate_product_productType_variantAttributes_choices { __typename: "AttributeValueCountableConnection"; - pageInfo: ProductUpdate_productUpdate_product_productType_variantAttributes_values_pageInfo; - edges: ProductUpdate_productUpdate_product_productType_variantAttributes_values_edges[]; + pageInfo: ProductUpdate_productUpdate_product_productType_variantAttributes_choices_pageInfo; + edges: ProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges[]; } export interface ProductUpdate_productUpdate_product_productType_variantAttributes { __typename: "Attribute"; id: string; name: string | null; - values: ProductUpdate_productUpdate_product_productType_variantAttributes_values | null; + choices: ProductUpdate_productUpdate_product_productType_variantAttributes_choices | null; } export interface ProductUpdate_productUpdate_product_productType_taxType { diff --git a/src/products/types/SimpleProductUpdate.ts b/src/products/types/SimpleProductUpdate.ts index 5c4103f30..56b29b33f 100644 --- a/src/products/types/SimpleProductUpdate.ts +++ b/src/products/types/SimpleProductUpdate.ts @@ -16,7 +16,7 @@ export interface SimpleProductUpdate_productUpdate_errors { attributes: string[] | null; } -export interface SimpleProductUpdate_productUpdate_product_attributes_attribute_values_pageInfo { +export interface SimpleProductUpdate_productUpdate_product_attributes_attribute_choices_pageInfo { __typename: "PageInfo"; endCursor: string | null; hasNextPage: boolean; @@ -24,32 +24,32 @@ export interface SimpleProductUpdate_productUpdate_product_attributes_attribute_ startCursor: string | null; } -export interface SimpleProductUpdate_productUpdate_product_attributes_attribute_values_edges_node_file { +export interface SimpleProductUpdate_productUpdate_product_attributes_attribute_choices_edges_node_file { __typename: "File"; url: string; contentType: string | null; } -export interface SimpleProductUpdate_productUpdate_product_attributes_attribute_values_edges_node { +export interface SimpleProductUpdate_productUpdate_product_attributes_attribute_choices_edges_node { __typename: "AttributeValue"; id: string; name: string | null; slug: string | null; - file: SimpleProductUpdate_productUpdate_product_attributes_attribute_values_edges_node_file | null; + file: SimpleProductUpdate_productUpdate_product_attributes_attribute_choices_edges_node_file | null; reference: string | null; richText: any | null; } -export interface SimpleProductUpdate_productUpdate_product_attributes_attribute_values_edges { +export interface SimpleProductUpdate_productUpdate_product_attributes_attribute_choices_edges { __typename: "AttributeValueCountableEdge"; cursor: string; - node: SimpleProductUpdate_productUpdate_product_attributes_attribute_values_edges_node; + node: SimpleProductUpdate_productUpdate_product_attributes_attribute_choices_edges_node; } -export interface SimpleProductUpdate_productUpdate_product_attributes_attribute_values { +export interface SimpleProductUpdate_productUpdate_product_attributes_attribute_choices { __typename: "AttributeValueCountableConnection"; - pageInfo: SimpleProductUpdate_productUpdate_product_attributes_attribute_values_pageInfo; - edges: SimpleProductUpdate_productUpdate_product_attributes_attribute_values_edges[]; + pageInfo: SimpleProductUpdate_productUpdate_product_attributes_attribute_choices_pageInfo; + edges: SimpleProductUpdate_productUpdate_product_attributes_attribute_choices_edges[]; } export interface SimpleProductUpdate_productUpdate_product_attributes_attribute { @@ -61,7 +61,7 @@ export interface SimpleProductUpdate_productUpdate_product_attributes_attribute entityType: AttributeEntityTypeEnum | null; valueRequired: boolean; unit: MeasurementUnitsEnum | null; - values: SimpleProductUpdate_productUpdate_product_attributes_attribute_values | null; + choices: SimpleProductUpdate_productUpdate_product_attributes_attribute_choices | null; } export interface SimpleProductUpdate_productUpdate_product_attributes_values_file { @@ -86,7 +86,7 @@ export interface SimpleProductUpdate_productUpdate_product_attributes { values: (SimpleProductUpdate_productUpdate_product_attributes_values | null)[]; } -export interface SimpleProductUpdate_productUpdate_product_productType_variantAttributes_values_pageInfo { +export interface SimpleProductUpdate_productUpdate_product_productType_variantAttributes_choices_pageInfo { __typename: "PageInfo"; endCursor: string | null; hasNextPage: boolean; @@ -94,39 +94,39 @@ export interface SimpleProductUpdate_productUpdate_product_productType_variantAt startCursor: string | null; } -export interface SimpleProductUpdate_productUpdate_product_productType_variantAttributes_values_edges_node_file { +export interface SimpleProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges_node_file { __typename: "File"; url: string; contentType: string | null; } -export interface SimpleProductUpdate_productUpdate_product_productType_variantAttributes_values_edges_node { +export interface SimpleProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges_node { __typename: "AttributeValue"; id: string; name: string | null; slug: string | null; - file: SimpleProductUpdate_productUpdate_product_productType_variantAttributes_values_edges_node_file | null; + file: SimpleProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges_node_file | null; reference: string | null; richText: any | null; } -export interface SimpleProductUpdate_productUpdate_product_productType_variantAttributes_values_edges { +export interface SimpleProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges { __typename: "AttributeValueCountableEdge"; cursor: string; - node: SimpleProductUpdate_productUpdate_product_productType_variantAttributes_values_edges_node; + node: SimpleProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges_node; } -export interface SimpleProductUpdate_productUpdate_product_productType_variantAttributes_values { +export interface SimpleProductUpdate_productUpdate_product_productType_variantAttributes_choices { __typename: "AttributeValueCountableConnection"; - pageInfo: SimpleProductUpdate_productUpdate_product_productType_variantAttributes_values_pageInfo; - edges: SimpleProductUpdate_productUpdate_product_productType_variantAttributes_values_edges[]; + pageInfo: SimpleProductUpdate_productUpdate_product_productType_variantAttributes_choices_pageInfo; + edges: SimpleProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges[]; } export interface SimpleProductUpdate_productUpdate_product_productType_variantAttributes { __typename: "Attribute"; id: string; name: string | null; - values: SimpleProductUpdate_productUpdate_product_productType_variantAttributes_values | null; + choices: SimpleProductUpdate_productUpdate_product_productType_variantAttributes_choices | null; } export interface SimpleProductUpdate_productUpdate_product_productType_taxType { @@ -353,42 +353,6 @@ export interface SimpleProductUpdate_productVariantUpdate_productVariant_private value: string; } -export interface SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute_values_pageInfo { - __typename: "PageInfo"; - endCursor: string | null; - hasNextPage: boolean; - hasPreviousPage: boolean; - startCursor: string | null; -} - -export interface SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute_values_edges_node_file { - __typename: "File"; - url: string; - contentType: string | null; -} - -export interface SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute_values_edges_node { - __typename: "AttributeValue"; - id: string; - name: string | null; - slug: string | null; - file: SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute_values_edges_node_file | null; - reference: string | null; - richText: any | null; -} - -export interface SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute_values_edges { - __typename: "AttributeValueCountableEdge"; - cursor: string; - node: SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute_values_edges_node; -} - -export interface SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute_values { - __typename: "AttributeValueCountableConnection"; - pageInfo: SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute_values_pageInfo; - edges: SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute_values_edges[]; -} - export interface SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute { __typename: "Attribute"; id: string; @@ -398,7 +362,6 @@ export interface SimpleProductUpdate_productVariantUpdate_productVariant_selecti entityType: AttributeEntityTypeEnum | null; valueRequired: boolean; unit: MeasurementUnitsEnum | null; - values: SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute_values | null; } export interface SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_values_file { @@ -423,42 +386,6 @@ export interface SimpleProductUpdate_productVariantUpdate_productVariant_selecti values: (SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_values | null)[]; } -export interface SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute_values_pageInfo { - __typename: "PageInfo"; - endCursor: string | null; - hasNextPage: boolean; - hasPreviousPage: boolean; - startCursor: string | null; -} - -export interface SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute_values_edges_node_file { - __typename: "File"; - url: string; - contentType: string | null; -} - -export interface SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute_values_edges_node { - __typename: "AttributeValue"; - id: string; - name: string | null; - slug: string | null; - file: SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute_values_edges_node_file | null; - reference: string | null; - richText: any | null; -} - -export interface SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute_values_edges { - __typename: "AttributeValueCountableEdge"; - cursor: string; - node: SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute_values_edges_node; -} - -export interface SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute_values { - __typename: "AttributeValueCountableConnection"; - pageInfo: SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute_values_pageInfo; - edges: SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute_values_edges[]; -} - export interface SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute { __typename: "Attribute"; id: string; @@ -468,7 +395,6 @@ export interface SimpleProductUpdate_productVariantUpdate_productVariant_nonSele entityType: AttributeEntityTypeEnum | null; valueRequired: boolean; unit: MeasurementUnitsEnum | null; - values: SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute_values | null; } export interface SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_values_file { @@ -684,42 +610,6 @@ export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_p value: string; } -export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_attribute_values_pageInfo { - __typename: "PageInfo"; - endCursor: string | null; - hasNextPage: boolean; - hasPreviousPage: boolean; - startCursor: string | null; -} - -export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_attribute_values_edges_node_file { - __typename: "File"; - url: string; - contentType: string | null; -} - -export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_attribute_values_edges_node { - __typename: "AttributeValue"; - id: string; - name: string | null; - slug: string | null; - file: SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_attribute_values_edges_node_file | null; - reference: string | null; - richText: any | null; -} - -export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_attribute_values_edges { - __typename: "AttributeValueCountableEdge"; - cursor: string; - node: SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_attribute_values_edges_node; -} - -export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_attribute_values { - __typename: "AttributeValueCountableConnection"; - pageInfo: SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_attribute_values_pageInfo; - edges: SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_attribute_values_edges[]; -} - export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_attribute { __typename: "Attribute"; id: string; @@ -729,7 +619,6 @@ export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_s entityType: AttributeEntityTypeEnum | null; valueRequired: boolean; unit: MeasurementUnitsEnum | null; - values: SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_attribute_values | null; } export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_values_file { @@ -754,42 +643,6 @@ export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_s values: (SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_values | null)[]; } -export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_attribute_values_pageInfo { - __typename: "PageInfo"; - endCursor: string | null; - hasNextPage: boolean; - hasPreviousPage: boolean; - startCursor: string | null; -} - -export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_attribute_values_edges_node_file { - __typename: "File"; - url: string; - contentType: string | null; -} - -export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_attribute_values_edges_node { - __typename: "AttributeValue"; - id: string; - name: string | null; - slug: string | null; - file: SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_attribute_values_edges_node_file | null; - reference: string | null; - richText: any | null; -} - -export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_attribute_values_edges { - __typename: "AttributeValueCountableEdge"; - cursor: string; - node: SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_attribute_values_edges_node; -} - -export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_attribute_values { - __typename: "AttributeValueCountableConnection"; - pageInfo: SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_attribute_values_pageInfo; - edges: SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_attribute_values_edges[]; -} - export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_attribute { __typename: "Attribute"; id: string; @@ -799,7 +652,6 @@ export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_n entityType: AttributeEntityTypeEnum | null; valueRequired: boolean; unit: MeasurementUnitsEnum | null; - values: SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_attribute_values | null; } export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_values_file { @@ -1014,42 +866,6 @@ export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_p value: string; } -export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_attribute_values_pageInfo { - __typename: "PageInfo"; - endCursor: string | null; - hasNextPage: boolean; - hasPreviousPage: boolean; - startCursor: string | null; -} - -export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_attribute_values_edges_node_file { - __typename: "File"; - url: string; - contentType: string | null; -} - -export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_attribute_values_edges_node { - __typename: "AttributeValue"; - id: string; - name: string | null; - slug: string | null; - file: SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_attribute_values_edges_node_file | null; - reference: string | null; - richText: any | null; -} - -export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_attribute_values_edges { - __typename: "AttributeValueCountableEdge"; - cursor: string; - node: SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_attribute_values_edges_node; -} - -export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_attribute_values { - __typename: "AttributeValueCountableConnection"; - pageInfo: SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_attribute_values_pageInfo; - edges: SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_attribute_values_edges[]; -} - export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_attribute { __typename: "Attribute"; id: string; @@ -1059,7 +875,6 @@ export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_s entityType: AttributeEntityTypeEnum | null; valueRequired: boolean; unit: MeasurementUnitsEnum | null; - values: SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_attribute_values | null; } export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_values_file { @@ -1084,42 +899,6 @@ export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_s values: (SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_values | null)[]; } -export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_attribute_values_pageInfo { - __typename: "PageInfo"; - endCursor: string | null; - hasNextPage: boolean; - hasPreviousPage: boolean; - startCursor: string | null; -} - -export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_attribute_values_edges_node_file { - __typename: "File"; - url: string; - contentType: string | null; -} - -export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_attribute_values_edges_node { - __typename: "AttributeValue"; - id: string; - name: string | null; - slug: string | null; - file: SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_attribute_values_edges_node_file | null; - reference: string | null; - richText: any | null; -} - -export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_attribute_values_edges { - __typename: "AttributeValueCountableEdge"; - cursor: string; - node: SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_attribute_values_edges_node; -} - -export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_attribute_values { - __typename: "AttributeValueCountableConnection"; - pageInfo: SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_attribute_values_pageInfo; - edges: SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_attribute_values_edges[]; -} - export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_attribute { __typename: "Attribute"; id: string; @@ -1129,7 +908,6 @@ export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_n entityType: AttributeEntityTypeEnum | null; valueRequired: boolean; unit: MeasurementUnitsEnum | null; - values: SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_attribute_values | null; } export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_values_file { @@ -1345,42 +1123,6 @@ export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_p value: string; } -export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute_values_pageInfo { - __typename: "PageInfo"; - endCursor: string | null; - hasNextPage: boolean; - hasPreviousPage: boolean; - startCursor: string | null; -} - -export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute_values_edges_node_file { - __typename: "File"; - url: string; - contentType: string | null; -} - -export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute_values_edges_node { - __typename: "AttributeValue"; - id: string; - name: string | null; - slug: string | null; - file: SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute_values_edges_node_file | null; - reference: string | null; - richText: any | null; -} - -export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute_values_edges { - __typename: "AttributeValueCountableEdge"; - cursor: string; - node: SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute_values_edges_node; -} - -export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute_values { - __typename: "AttributeValueCountableConnection"; - pageInfo: SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute_values_pageInfo; - edges: SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute_values_edges[]; -} - export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute { __typename: "Attribute"; id: string; @@ -1390,7 +1132,6 @@ export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_s entityType: AttributeEntityTypeEnum | null; valueRequired: boolean; unit: MeasurementUnitsEnum | null; - values: SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute_values | null; } export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_values_file { @@ -1415,42 +1156,6 @@ export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_s values: (SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_values | null)[]; } -export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute_values_pageInfo { - __typename: "PageInfo"; - endCursor: string | null; - hasNextPage: boolean; - hasPreviousPage: boolean; - startCursor: string | null; -} - -export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute_values_edges_node_file { - __typename: "File"; - url: string; - contentType: string | null; -} - -export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute_values_edges_node { - __typename: "AttributeValue"; - id: string; - name: string | null; - slug: string | null; - file: SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute_values_edges_node_file | null; - reference: string | null; - richText: any | null; -} - -export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute_values_edges { - __typename: "AttributeValueCountableEdge"; - cursor: string; - node: SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute_values_edges_node; -} - -export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute_values { - __typename: "AttributeValueCountableConnection"; - pageInfo: SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute_values_pageInfo; - edges: SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute_values_edges[]; -} - export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute { __typename: "Attribute"; id: string; @@ -1460,7 +1165,6 @@ export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_n entityType: AttributeEntityTypeEnum | null; valueRequired: boolean; unit: MeasurementUnitsEnum | null; - values: SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute_values | null; } export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_values_file { diff --git a/src/products/utils/data.ts b/src/products/utils/data.ts index e59c5a7c1..acb111438 100644 --- a/src/products/utils/data.ts +++ b/src/products/utils/data.ts @@ -52,7 +52,7 @@ export function getAttributeInputFromProduct( inputType: attribute.attribute.inputType, isRequired: attribute.attribute.valueRequired, selectedValues: attribute.values, - values: mapEdgesToItems(attribute.attribute.values), + values: mapEdgesToItems(attribute.attribute.choices), unit: attribute.attribute.unit }, id: attribute.attribute.id, @@ -71,7 +71,7 @@ export function getAttributeInputFromProductType( entityType: attribute.entityType, inputType: attribute.inputType, isRequired: attribute.valueRequired, - values: mapEdgesToItems(attribute.values), + values: mapEdgesToItems(attribute.choices), unit: attribute.unit }, id: attribute.id, diff --git a/src/products/views/ProductCreate/ProductCreate.tsx b/src/products/views/ProductCreate/ProductCreate.tsx index 57f106754..bff44125a 100644 --- a/src/products/views/ProductCreate/ProductCreate.tsx +++ b/src/products/views/ProductCreate/ProductCreate.tsx @@ -258,7 +258,7 @@ export const ProductCreateView: React.FC = ({ params }) => { onFetchMore: loadMoreProducts }; const fetchMoreAttributeValues = { - hasMore: !!searchAttributeValuesOpts.data?.attribute?.values?.pageInfo + hasMore: !!searchAttributeValuesOpts.data?.attribute?.choices?.pageInfo ?.hasNextPage, loading: !!searchAttributeValuesOpts.loading, onFetchMore: loadMoreAttributeValues @@ -302,7 +302,7 @@ export const ProductCreateView: React.FC = ({ params }) => { categories={mapEdgesToItems(searchCategoryOpts?.data?.search)} collections={mapEdgesToItems(searchCollectionOpts?.data?.search)} attributeValues={mapEdgesToItems( - searchAttributeValuesOpts?.data?.attribute.values + searchAttributeValuesOpts?.data?.attribute.choices )} loading={loading} channelsErrors={ diff --git a/src/products/views/ProductList/filters.ts b/src/products/views/ProductList/filters.ts index 3babf23b3..9ecb52641 100644 --- a/src/products/views/ProductList/filters.ts +++ b/src/products/views/ProductList/filters.ts @@ -68,7 +68,7 @@ export function getFilterOpts( .sort((a, b) => (a.name > b.name ? 1 : -1)) .map(attr => ({ active: maybe(() => params.attributes[attr.slug].length > 0, false), - choices: attr.values?.edges?.map(val => ({ + choices: attr.choices?.edges?.map(val => ({ label: val.node.name, value: val.node.slug })), diff --git a/src/products/views/ProductList/fixtures.ts b/src/products/views/ProductList/fixtures.ts index daef20b0b..6dedc2d86 100644 --- a/src/products/views/ProductList/fixtures.ts +++ b/src/products/views/ProductList/fixtures.ts @@ -9,15 +9,15 @@ import { StockAvailability } from "@saleor/types/globalTypes"; export const productListFilterOpts: ProductListFilterOpts = { attributes: attributes.map(attr => ({ active: false, - choices: attr.values.edges.map(val => ({ + choices: attr.choices.edges.map(val => ({ label: val.node.name, value: val.node.slug })), name: attr.name, slug: attr.slug, value: [ - attr.values.edges[0].node.slug, - attr.values.edges.length > 2 && attr.values.edges[2].node.slug + attr.choices.edges[0].node.slug, + attr.choices.edges.length > 2 && attr.choices.edges[2].node.slug ] })), categories: { diff --git a/src/products/views/ProductUpdate/ProductUpdate.tsx b/src/products/views/ProductUpdate/ProductUpdate.tsx index 4f0c48c7a..fa6ff6535 100644 --- a/src/products/views/ProductUpdate/ProductUpdate.tsx +++ b/src/products/views/ProductUpdate/ProductUpdate.tsx @@ -448,7 +448,7 @@ export const ProductUpdate: React.FC = ({ id, params }) => { const collections = mapEdgesToItems(searchCollectionsOpts?.data?.search); const attributeValues = mapEdgesToItems( - searchAttributeValuesOpts?.data?.attribute.values + searchAttributeValuesOpts?.data?.attribute.choices ); const errors = [ @@ -488,7 +488,7 @@ export const ProductUpdate: React.FC = ({ id, params }) => { ); const fetchMoreAttributeValues = { - hasMore: !!searchAttributeValuesOpts.data?.attribute?.values?.pageInfo + hasMore: !!searchAttributeValuesOpts.data?.attribute?.choices?.pageInfo ?.hasNextPage, loading: !!searchAttributeValuesOpts.loading, onFetchMore: loadMoreAttributeValues diff --git a/src/products/views/ProductUpdate/handlers/index.ts b/src/products/views/ProductUpdate/handlers/index.ts index 1794f373e..a7a6e5b1f 100644 --- a/src/products/views/ProductUpdate/handlers/index.ts +++ b/src/products/views/ProductUpdate/handlers/index.ts @@ -162,7 +162,7 @@ export function createUpdateHandler( attributes: product.productType.variantAttributes?.map(attribute => ({ id: attribute.id, - values: attribute.values.edges.map(value => value.node.slug) + values: attribute.choices.edges.map(value => value.node.slug) })) || [], product: product.id, sku: data.sku, diff --git a/src/products/views/ProductVariantCreator/ProductVariantCreator.tsx b/src/products/views/ProductVariantCreator/ProductVariantCreator.tsx index 912d7ec3b..3e286e315 100644 --- a/src/products/views/ProductVariantCreator/ProductVariantCreator.tsx +++ b/src/products/views/ProductVariantCreator/ProductVariantCreator.tsx @@ -67,7 +67,12 @@ const ProductVariantCreator: React.FC = ({ name: listing.channel.name, price: "" }))} - attributes={data?.product?.productType?.variantAttributes || []} + attributes={ + data?.product?.productType?.variantAttributes?.map(attr => ({ + ...attr, + choices: attr.values + })) || [] + } limits={limitOpts.data?.shop?.limits} onSubmit={inputs => bulkProductVariantCreate({ diff --git a/src/searches/types/SearchAttributeValues.ts b/src/searches/types/SearchAttributeValues.ts index 324ff1279..7b1f1e156 100644 --- a/src/searches/types/SearchAttributeValues.ts +++ b/src/searches/types/SearchAttributeValues.ts @@ -7,28 +7,28 @@ // GraphQL query operation: SearchAttributeValues // ==================================================== -export interface SearchAttributeValues_attribute_values_edges_node_file { +export interface SearchAttributeValues_attribute_choices_edges_node_file { __typename: "File"; url: string; contentType: string | null; } -export interface SearchAttributeValues_attribute_values_edges_node { +export interface SearchAttributeValues_attribute_choices_edges_node { __typename: "AttributeValue"; id: string; name: string | null; slug: string | null; - file: SearchAttributeValues_attribute_values_edges_node_file | null; + file: SearchAttributeValues_attribute_choices_edges_node_file | null; reference: string | null; richText: any | null; } -export interface SearchAttributeValues_attribute_values_edges { +export interface SearchAttributeValues_attribute_choices_edges { __typename: "AttributeValueCountableEdge"; - node: SearchAttributeValues_attribute_values_edges_node; + node: SearchAttributeValues_attribute_choices_edges_node; } -export interface SearchAttributeValues_attribute_values_pageInfo { +export interface SearchAttributeValues_attribute_choices_pageInfo { __typename: "PageInfo"; endCursor: string | null; hasNextPage: boolean; @@ -36,16 +36,16 @@ export interface SearchAttributeValues_attribute_values_pageInfo { startCursor: string | null; } -export interface SearchAttributeValues_attribute_values { +export interface SearchAttributeValues_attribute_choices { __typename: "AttributeValueCountableConnection"; - edges: SearchAttributeValues_attribute_values_edges[]; - pageInfo: SearchAttributeValues_attribute_values_pageInfo; + edges: SearchAttributeValues_attribute_choices_edges[]; + pageInfo: SearchAttributeValues_attribute_choices_pageInfo; } export interface SearchAttributeValues_attribute { __typename: "Attribute"; id: string; - values: SearchAttributeValues_attribute_values | null; + choices: SearchAttributeValues_attribute_choices | null; } export interface SearchAttributeValues { diff --git a/src/searches/useAttributeValueSearch.ts b/src/searches/useAttributeValueSearch.ts index ef91ff656..c8205a53a 100644 --- a/src/searches/useAttributeValueSearch.ts +++ b/src/searches/useAttributeValueSearch.ts @@ -19,7 +19,7 @@ export const searchAttributeValues = gql` ) { attribute(id: $id) { id - values(after: $after, first: $first, filter: { search: $query }) { + choices(after: $after, first: $first, filter: { search: $query }) { edges { node { ...AttributeValueFragment @@ -37,12 +37,12 @@ export default makeSearch< SearchAttributeValues, SearchAttributeValuesVariables >(searchAttributeValues, result => { - if (result.data?.attribute.values.pageInfo.hasNextPage) { + if (result.data?.attribute.choices.pageInfo.hasNextPage) { result.loadMore( (prev, next) => { if ( - prev.attribute.values.pageInfo.endCursor === - next.attribute.values.pageInfo.endCursor + prev.attribute.choices.pageInfo.endCursor === + next.attribute.choices.pageInfo.endCursor ) { return prev; } @@ -51,20 +51,20 @@ export default makeSearch< ...prev, attribute: { ...prev.attribute, - values: { - ...prev.attribute.values, + choices: { + ...prev.attribute.choices, edges: [ - ...prev.attribute.values.edges, - ...next.attribute.values.edges + ...prev.attribute.choices.edges, + ...next.attribute.choices.edges ], - pageInfo: next.attribute.values.pageInfo + pageInfo: next.attribute.choices.pageInfo } } }; }, { ...result.variables, - after: result.data.attribute.values.pageInfo.endCursor + after: result.data.attribute.choices.pageInfo.endCursor } ); } diff --git a/src/storybook/stories/attributes/AttributePage.tsx b/src/storybook/stories/attributes/AttributePage.tsx index e007b2625..231f8fec1 100644 --- a/src/storybook/stories/attributes/AttributePage.tsx +++ b/src/storybook/stories/attributes/AttributePage.tsx @@ -23,7 +23,7 @@ const props: AttributePageProps = { onValueReorder: () => undefined, onValueUpdate: () => undefined, saveButtonBarState: "default", - values: attribute.values, + values: attribute.choices, pageInfo: { hasNextPage: false, hasPreviousPage: false diff --git a/src/storybook/stories/attributes/AttributeValueEditDialog.tsx b/src/storybook/stories/attributes/AttributeValueEditDialog.tsx index dd72185f8..c22b13454 100644 --- a/src/storybook/stories/attributes/AttributeValueEditDialog.tsx +++ b/src/storybook/stories/attributes/AttributeValueEditDialog.tsx @@ -9,7 +9,7 @@ import AttributeValueEditDialog, { import Decorator from "../../Decorator"; const props: AttributeValueEditDialogProps = { - attributeValue: attribute.values[0], + attributeValue: attribute.choices[0], confirmButtonState: "default", disabled: false, errors: [],