-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix search by order number in Navigator (#5063)
* use search by order number * fixes * Update src/components/NavigatorSearch/modes/orders.ts Co-authored-by: Paweł Chyła <[email protected]> * lint * add test for making search query * improve test --------- Co-authored-by: Paweł Chyła <[email protected]>
- Loading branch information
Showing
12 changed files
with
134 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"saleor-dashboard": patch | ||
--- | ||
|
||
You can now search by order number in Navigator search. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,11 @@ | ||
// @ts-strict-ignore | ||
import { | ||
CheckIfOrderExistsQuery, | ||
SearchCatalogQuery, | ||
SearchCustomersQuery, | ||
} from "@dashboard/graphql"; | ||
import { SearchCatalogQuery, SearchCustomersQuery } from "@dashboard/graphql"; | ||
import { RelayToFlat } from "@dashboard/types"; | ||
|
||
import { QuickOrderSearchResult } from "../queries/useQuickOrderSearch"; | ||
|
||
export interface ActionQueries { | ||
catalog: SearchCatalogQuery; | ||
customers: RelayToFlat<SearchCustomersQuery["search"]>; | ||
order: CheckIfOrderExistsQuery["order"]; | ||
orders: QuickOrderSearchResult; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 0 additions & 17 deletions
17
src/components/NavigatorSearch/queries/useCheckIfOrderExists.ts
This file was deleted.
Oops, something went wrong.
31 changes: 31 additions & 0 deletions
31
src/components/NavigatorSearch/queries/useQuickOrderSearch.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import { act, renderHook } from "@testing-library/react-hooks"; | ||
|
||
import { useQuickOrderSearch } from "./useQuickOrderSearch"; | ||
|
||
const useSearchOrdersByNumberQuery = jest.fn(); | ||
|
||
jest.mock("@dashboard/graphql", () => ({ | ||
SearchOrdersByNumberQuery: {}, | ||
useSearchOrdersByNumberQuery: (props: any) => useSearchOrdersByNumberQuery(props), | ||
})); | ||
jest.mock("@dashboard/hooks/useDebounce", () => (fn: any) => fn); | ||
|
||
describe("useQuickOrderSearch", () => { | ||
it("invokes search query", () => { | ||
// Arrange | ||
const { result } = renderHook(() => useQuickOrderSearch()); | ||
const [, setQueryDebounced] = result.current; | ||
|
||
// Act | ||
act(() => setQueryDebounced("1234")); | ||
|
||
// Assert | ||
expect(useSearchOrdersByNumberQuery).toHaveBeenCalledWith({ | ||
skip: false, | ||
variables: { | ||
first: 1, | ||
query: "1234", | ||
}, | ||
}); | ||
}); | ||
}); |
28 changes: 28 additions & 0 deletions
28
src/components/NavigatorSearch/queries/useQuickOrderSearch.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
import { | ||
SearchOrdersByNumberQuery, | ||
SearchOrdersByNumberQueryHookResult, | ||
useSearchOrdersByNumberQuery, | ||
} from "@dashboard/graphql"; | ||
import useDebounce from "@dashboard/hooks/useDebounce"; | ||
import { useState } from "react"; | ||
|
||
type OrderNode = NonNullable<SearchOrdersByNumberQuery["orders"]>["edges"][0]["node"]; | ||
export type QuickOrderSearchResult = OrderNode[]; | ||
|
||
export function useQuickOrderSearch(): [ | ||
SearchOrdersByNumberQueryHookResult, | ||
(query: string) => void, | ||
] { | ||
const [query, setQuery] = useState<string>(""); | ||
const setQueryDebounced = useDebounce(setQuery); | ||
|
||
const result = useSearchOrdersByNumberQuery({ | ||
skip: query === "", | ||
variables: { | ||
first: 1, | ||
query, | ||
}, | ||
}); | ||
|
||
return [result, setQueryDebounced]; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters