Skip to content

Commit fa3fb8c

Browse files
authored
[3.22] Fix errors when re-ordering products (#6466)
1 parent c973d5a commit fa3fb8c

6 files changed

Lines changed: 13 additions & 38 deletions

File tree

.changeset/upset-frogs-marry.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"saleor-dashboard": patch
3+
---
4+
5+
Fixed re-ordering products causing 400 error

eslint.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ export default tseslint.config(
339339
"@graphql-eslint/no-duplicate-fields": "error",
340340
"@graphql-eslint/no-deprecated": "warn",
341341
"@graphql-eslint/no-unused-fragments": "warn",
342-
"@graphql-eslint/no-unused-variables": "warn",
342+
"@graphql-eslint/no-unused-variables": "error",
343343
"@graphql-eslint/no-unused-fields": "warn",
344344
},
345345
}, // Disable any rules that conflict with Prettier

src/collections/mutations.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ export const assignCollectionProduct = gql`
3131
$collectionId: ID!
3232
$productIds: [ID!]!
3333
$moves: [MoveProductInput!]!
34-
$first: Int
35-
$after: String
36-
$last: Int
37-
$before: String
3834
) {
3935
collectionAddProducts(collectionId: $collectionId, products: $productIds) {
4036
errors {
@@ -132,14 +128,7 @@ export const collectionChannelListingUpdate = gql`
132128
`;
133129

134130
export const reorderProductsInCollection = gql`
135-
mutation ReorderProductsInCollection(
136-
$collectionId: ID!
137-
$moves: [MoveProductInput!]!
138-
$first: Int
139-
$after: String
140-
$last: Int
141-
$before: String
142-
) {
131+
mutation ReorderProductsInCollection($collectionId: ID!, $moves: [MoveProductInput!]!) {
143132
collectionReorderProducts(collectionId: $collectionId, moves: $moves) {
144133
errors {
145134
message

src/giftCards/GiftCardsList/queries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export const giftCardTotalCount = gql`
6464
`;
6565

6666
export const giftCardProductsCount = gql`
67-
query GiftCardProductsCount($channel: String!) {
67+
query GiftCardProductsCount {
6868
giftCardProductTypes: productTypes(filter: { kind: GIFT_CARD }) {
6969
totalCount
7070
}

src/graphql/hooks.generated.ts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5058,7 +5058,7 @@ export type CollectionUpdateMutationHookResult = ReturnType<typeof useCollection
50585058
export type CollectionUpdateMutationResult = Apollo.MutationResult<Types.CollectionUpdateMutation>;
50595059
export type CollectionUpdateMutationOptions = Apollo.BaseMutationOptions<Types.CollectionUpdateMutation, Types.CollectionUpdateMutationVariables>;
50605060
export const CollectionAssignProductDocument = gql`
5061-
mutation CollectionAssignProduct($collectionId: ID!, $productIds: [ID!]!, $moves: [MoveProductInput!]!, $first: Int, $after: String, $last: Int, $before: String) {
5061+
mutation CollectionAssignProduct($collectionId: ID!, $productIds: [ID!]!, $moves: [MoveProductInput!]!) {
50625062
collectionAddProducts(collectionId: $collectionId, products: $productIds) {
50635063
errors {
50645064
...CollectionError
@@ -5089,10 +5089,6 @@ export type CollectionAssignProductMutationFn = Apollo.MutationFunction<Types.Co
50895089
* collectionId: // value for 'collectionId'
50905090
* productIds: // value for 'productIds'
50915091
* moves: // value for 'moves'
5092-
* first: // value for 'first'
5093-
* after: // value for 'after'
5094-
* last: // value for 'last'
5095-
* before: // value for 'before'
50965092
* },
50975093
* });
50985094
*/
@@ -5312,7 +5308,7 @@ export type CollectionChannelListingUpdateMutationHookResult = ReturnType<typeof
53125308
export type CollectionChannelListingUpdateMutationResult = Apollo.MutationResult<Types.CollectionChannelListingUpdateMutation>;
53135309
export type CollectionChannelListingUpdateMutationOptions = Apollo.BaseMutationOptions<Types.CollectionChannelListingUpdateMutation, Types.CollectionChannelListingUpdateMutationVariables>;
53145310
export const ReorderProductsInCollectionDocument = gql`
5315-
mutation ReorderProductsInCollection($collectionId: ID!, $moves: [MoveProductInput!]!, $first: Int, $after: String, $last: Int, $before: String) {
5311+
mutation ReorderProductsInCollection($collectionId: ID!, $moves: [MoveProductInput!]!) {
53165312
collectionReorderProducts(collectionId: $collectionId, moves: $moves) {
53175313
errors {
53185314
message
@@ -5337,10 +5333,6 @@ export type ReorderProductsInCollectionMutationFn = Apollo.MutationFunction<Type
53375333
* variables: {
53385334
* collectionId: // value for 'collectionId'
53395335
* moves: // value for 'moves'
5340-
* first: // value for 'first'
5341-
* after: // value for 'after'
5342-
* last: // value for 'last'
5343-
* before: // value for 'before'
53445336
* },
53455337
* });
53465338
*/
@@ -10743,7 +10735,7 @@ export type GiftCardTotalCountQueryHookResult = ReturnType<typeof useGiftCardTot
1074310735
export type GiftCardTotalCountLazyQueryHookResult = ReturnType<typeof useGiftCardTotalCountLazyQuery>;
1074410736
export type GiftCardTotalCountQueryResult = Apollo.QueryResult<Types.GiftCardTotalCountQuery, Types.GiftCardTotalCountQueryVariables>;
1074510737
export const GiftCardProductsCountDocument = gql`
10746-
query GiftCardProductsCount($channel: String!) {
10738+
query GiftCardProductsCount {
1074710739
giftCardProductTypes: productTypes(filter: {kind: GIFT_CARD}) {
1074810740
totalCount
1074910741
}
@@ -10762,11 +10754,10 @@ export const GiftCardProductsCountDocument = gql`
1076210754
* @example
1076310755
* const { data, loading, error } = useGiftCardProductsCountQuery({
1076410756
* variables: {
10765-
* channel: // value for 'channel'
1076610757
* },
1076710758
* });
1076810759
*/
10769-
export function useGiftCardProductsCountQuery(baseOptions: ApolloReactHooks.QueryHookOptions<Types.GiftCardProductsCountQuery, Types.GiftCardProductsCountQueryVariables>) {
10760+
export function useGiftCardProductsCountQuery(baseOptions?: ApolloReactHooks.QueryHookOptions<Types.GiftCardProductsCountQuery, Types.GiftCardProductsCountQueryVariables>) {
1077010761
const options = {...defaultOptions, ...baseOptions}
1077110762
return ApolloReactHooks.useQuery<Types.GiftCardProductsCountQuery, Types.GiftCardProductsCountQueryVariables>(GiftCardProductsCountDocument, options);
1077210763
}

src/graphql/types.generated.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10296,10 +10296,6 @@ export type CollectionAssignProductMutationVariables = Exact<{
1029610296
collectionId: Scalars['ID'];
1029710297
productIds: Array<Scalars['ID']> | Scalars['ID'];
1029810298
moves: Array<MoveProductInput> | MoveProductInput;
10299-
first?: InputMaybe<Scalars['Int']>;
10300-
after?: InputMaybe<Scalars['String']>;
10301-
last?: InputMaybe<Scalars['Int']>;
10302-
before?: InputMaybe<Scalars['String']>;
1030310299
}>;
1030410300

1030510301

@@ -10349,10 +10345,6 @@ export type CollectionChannelListingUpdateMutation = { __typename: 'Mutation', c
1034910345
export type ReorderProductsInCollectionMutationVariables = Exact<{
1035010346
collectionId: Scalars['ID'];
1035110347
moves: Array<MoveProductInput> | MoveProductInput;
10352-
first?: InputMaybe<Scalars['Int']>;
10353-
after?: InputMaybe<Scalars['String']>;
10354-
last?: InputMaybe<Scalars['Int']>;
10355-
before?: InputMaybe<Scalars['String']>;
1035610348
}>;
1035710349

1035810350

@@ -11915,9 +11907,7 @@ export type GiftCardTotalCountQueryVariables = Exact<{ [key: string]: never; }>;
1191511907

1191611908
export type GiftCardTotalCountQuery = { __typename: 'Query', giftCards: { __typename: 'GiftCardCountableConnection', totalCount: number | null } | null };
1191711909

11918-
export type GiftCardProductsCountQueryVariables = Exact<{
11919-
channel: Scalars['String'];
11920-
}>;
11910+
export type GiftCardProductsCountQueryVariables = Exact<{ [key: string]: never; }>;
1192111911

1192211912

1192311913
export type GiftCardProductsCountQuery = { __typename: 'Query', giftCardProductTypes: { __typename: 'ProductTypeCountableConnection', totalCount: number | null } | null };

0 commit comments

Comments
 (0)