From 7b45ef27583c81ff5ec768e4c0b58f20287e5fe9 Mon Sep 17 00:00:00 2001 From: Wojciech Mista Date: Wed, 30 Mar 2022 09:01:14 +0200 Subject: [PATCH] Fetch only published producs in draft order (#1921) --- src/graphql/hooks.generated.ts | 6 ++++-- src/graphql/types.generated.ts | 2 ++ src/orders/views/OrderDetails/OrderDraftDetails/index.tsx | 5 ++++- .../views/OrderDetails/OrderUnconfirmedDetails/index.tsx | 5 ++++- src/searches/useOrderVariantSearch.ts | 8 +++++++- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/graphql/hooks.generated.ts b/src/graphql/hooks.generated.ts index 8b1cebe64..c01616b73 100644 --- a/src/graphql/hooks.generated.ts +++ b/src/graphql/hooks.generated.ts @@ -12986,11 +12986,11 @@ export type SearchGiftCardTagsQueryHookResult = ReturnType; export type SearchGiftCardTagsQueryResult = Apollo.QueryResult; export const SearchOrderVariantDocument = gql` - query SearchOrderVariant($channel: String!, $first: Int!, $query: String!, $after: String, $address: AddressInput) { + query SearchOrderVariant($channel: String!, $first: Int!, $query: String!, $after: String, $address: AddressInput, $isPublished: Boolean, $stockAvailability: StockAvailability) { search: products( first: $first after: $after - filter: {search: $query} + filter: {search: $query, isPublished: $isPublished, stockAvailability: $stockAvailability} channel: $channel ) { edges { @@ -13059,6 +13059,8 @@ export const SearchOrderVariantDocument = gql` * query: // value for 'query' * after: // value for 'after' * address: // value for 'address' + * isPublished: // value for 'isPublished' + * stockAvailability: // value for 'stockAvailability' * }, * }); */ diff --git a/src/graphql/types.generated.ts b/src/graphql/types.generated.ts index 38bda5079..48a9c1659 100644 --- a/src/graphql/types.generated.ts +++ b/src/graphql/types.generated.ts @@ -6908,6 +6908,8 @@ export type SearchOrderVariantQueryVariables = Exact<{ query: Scalars['String']; after?: InputMaybe; address?: InputMaybe; + isPublished?: InputMaybe; + stockAvailability?: InputMaybe; }>; diff --git a/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx b/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx index 74f24b224..b8ab921f8 100644 --- a/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx +++ b/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx @@ -4,6 +4,7 @@ import { OrderDetailsQuery, OrderDraftUpdateMutation, OrderDraftUpdateMutationVariables, + StockAvailability, useCustomerAddressesQuery } from "@saleor/graphql"; import useNavigator from "@saleor/hooks/useNavigator"; @@ -95,7 +96,9 @@ export const OrderDraftDetails: React.FC = ({ variables: { ...DEFAULT_INITIAL_SEARCH_DATA, channel: order.channel.slug, - address: getVariantSearchAddress(order) + address: getVariantSearchAddress(order), + isPublished: true, + stockAvailability: StockAvailability.IN_STOCK } }); diff --git a/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx b/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx index 5f58f0470..2104bfce1 100644 --- a/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx +++ b/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx @@ -115,7 +115,10 @@ export const OrderUnconfirmedDetails: React.FC = ( search: variantSearch, result: variantSearchOpts } = useOrderVariantSearch({ - variables: { ...DEFAULT_INITIAL_SEARCH_DATA, channel: order.channel.slug } + variables: { + ...DEFAULT_INITIAL_SEARCH_DATA, + channel: order.channel.slug + } }); const warehouses = useWarehouseListQuery({ displayLoader: true, diff --git a/src/searches/useOrderVariantSearch.ts b/src/searches/useOrderVariantSearch.ts index 90cb6a6fd..062eb59b5 100644 --- a/src/searches/useOrderVariantSearch.ts +++ b/src/searches/useOrderVariantSearch.ts @@ -13,11 +13,17 @@ export const searchOrderVariant = gql` $query: String! $after: String $address: AddressInput + $isPublished: Boolean + $stockAvailability: StockAvailability ) { search: products( first: $first after: $after - filter: { search: $query } + filter: { + search: $query + isPublished: $isPublished + stockAvailability: $stockAvailability + } channel: $channel ) { edges {