From 5cb9529b1f5775c5f523c719affca132809e1be4 Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Mon, 25 Nov 2019 16:51:28 +0100 Subject: [PATCH] Do not search customers by default --- src/components/Navigator/modes/default/default.ts | 11 +---------- src/components/Navigator/useQuickSearch.ts | 7 +++---- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/components/Navigator/modes/default/default.ts b/src/components/Navigator/modes/default/default.ts index c54ad2524..09557e4ed 100644 --- a/src/components/Navigator/modes/default/default.ts +++ b/src/components/Navigator/modes/default/default.ts @@ -3,10 +3,8 @@ import { IntlShape } from "react-intl"; import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; import { OrderDraftCreate } from "@saleor/orders/types/OrderDraftCreate"; -import { SearchCustomers_search_edges_node } from "@saleor/searches/types/SearchCustomers"; import { QuickSearchAction } from "../../types"; import { searchInCommands } from "../commands"; -import { searchInCustomers } from "../customers"; import { sortScores } from "../utils"; import searchInViews from "./views"; @@ -17,22 +15,15 @@ function getDefaultModeActions( query: string, intl: IntlShape, navigate: UseNavigatorResult, - customers: SearchCustomers_search_edges_node[], createOrder: MutationFunction ): QuickSearchAction[] { - const actions = [ + return [ ...searchInViews(query, intl, navigate), ...searchInCommands(query, intl, navigate, createOrder) ] .filter(action => action.score >= threshold) .sort(sortScores) .slice(0, maxActions); - - if (query !== "") { - return [...actions, ...searchInCustomers(intl, navigate, customers)]; - } - - return actions; } export default getDefaultModeActions; diff --git a/src/components/Navigator/useQuickSearch.ts b/src/components/Navigator/useQuickSearch.ts index 63f9bbc6b..0eac8ce8c 100644 --- a/src/components/Navigator/useQuickSearch.ts +++ b/src/components/Navigator/useQuickSearch.ts @@ -101,12 +101,11 @@ function useQuickSearch( if (mode === "catalog") { searchCatalog(value); } + if (mode === "customers") { + searchCustomers(value); + } setQuery(value); } - - if ((["customers", "default"] as QuickSearchMode[]).includes(mode)) { - searchCustomers(value); - } }; return [