From 06c35a4ff82d202ee13e3fdbe9d6e393ee37bd99 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Mon, 18 Sep 2023 16:08:20 -0700 Subject: [PATCH] Add additonal query limits and restrictors for performance. --- .../job-search-select/job-search-select.component.jsx | 2 +- .../owner-search-select/owner-search-select.component.jsx | 2 +- client/src/components/owners-list/owners-list.component.jsx | 6 +++++- .../vehicle-search-select.component.jsx | 2 +- client/src/graphql/jobs.queries.js | 2 +- client/src/graphql/owners.queries.js | 2 +- client/src/graphql/vehicles.queries.js | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/client/src/components/job-search-select/job-search-select.component.jsx b/client/src/components/job-search-select/job-search-select.component.jsx index 180fb93dc..64ca39e07 100644 --- a/client/src/components/job-search-select/job-search-select.component.jsx +++ b/client/src/components/job-search-select/job-search-select.component.jsx @@ -33,7 +33,7 @@ const JobSearchSelect = ( useLazyQuery(SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE); const executeSearch = (v) => { - if (v && v !== "") callSearch(v); + if (v && v !== "" && v.length >= 3) callSearch(v); }; const debouncedExecuteSearch = _.debounce(executeSearch, 500); diff --git a/client/src/components/owner-search-select/owner-search-select.component.jsx b/client/src/components/owner-search-select/owner-search-select.component.jsx index 85e4d9833..c243e313e 100644 --- a/client/src/components/owner-search-select/owner-search-select.component.jsx +++ b/client/src/components/owner-search-select/owner-search-select.component.jsx @@ -21,7 +21,7 @@ const OwnerSearchSelect = ({ value, onChange, onBlur, disabled }, ref) => { useLazyQuery(SEARCH_OWNERS_BY_ID_FOR_AUTOCOMPLETE); const executeSearch = (v) => { - callSearch(v); + if (v && v !== "" && v.length >= 3) callSearch(v); }; const debouncedExecuteSearch = _.debounce(executeSearch, 500); diff --git a/client/src/components/owners-list/owners-list.component.jsx b/client/src/components/owners-list/owners-list.component.jsx index 78e2c3cb3..d4c5f7e5c 100644 --- a/client/src/components/owners-list/owners-list.component.jsx +++ b/client/src/components/owners-list/owners-list.component.jsx @@ -106,7 +106,11 @@ export default function OwnersListComponent({ { - search.search = value; + if (value?.length >= 3) { + search.search = value; + } else { + delete search.search; + } history.push({ search: queryString.stringify(search) }); }} enterButton diff --git a/client/src/components/vehicle-search-select/vehicle-search-select.component.jsx b/client/src/components/vehicle-search-select/vehicle-search-select.component.jsx index 4d8d49894..8f187b77b 100644 --- a/client/src/components/vehicle-search-select/vehicle-search-select.component.jsx +++ b/client/src/components/vehicle-search-select/vehicle-search-select.component.jsx @@ -22,7 +22,7 @@ const VehicleSearchSelect = ({ value, onChange, onBlur, disabled }, ref) => { ] = useLazyQuery(SEARCH_VEHICLES_BY_ID_FOR_AUTOCOMPLETE); const executeSearch = (v) => { - callSearch(v); + if (v && v !== "" && v.length >= 3) callSearch(v); }; const debouncedExecuteSearch = _.debounce(executeSearch, 500); diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index 60846e2fa..ad965bd74 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -1242,7 +1242,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql` ) { search_jobs( args: { search: $search } - limit: 50 + limit: 25 where: { _and: { converted: { _eq: $isConverted } diff --git a/client/src/graphql/owners.queries.js b/client/src/graphql/owners.queries.js index a4e5d1c80..ea0062cd5 100644 --- a/client/src/graphql/owners.queries.js +++ b/client/src/graphql/owners.queries.js @@ -36,7 +36,7 @@ export const SEARCH_OWNERS_FOR_AUTOCOMPLETE = gql` query SEARCH_OWNERS_FOR_AUTOCOMPLETE($search: String) { search_owners( args: { search: $search } - limit: 50 + limit: 25 order_by: { ownr_ln: desc_nulls_last } ) { id diff --git a/client/src/graphql/vehicles.queries.js b/client/src/graphql/vehicles.queries.js index 9df3c4238..619ff8961 100644 --- a/client/src/graphql/vehicles.queries.js +++ b/client/src/graphql/vehicles.queries.js @@ -184,7 +184,7 @@ export const SEARCH_VEHICLES_BY_ID_FOR_AUTOCOMPLETE = gql` `; export const SEARCH_VEHICLES_FOR_AUTOCOMPLETE = gql` query SEARCH_VEHICLES_FOR_AUTOCOMPLETE($search: String) { - search_vehicles(args: { search: $search }, limit: 50) { + search_vehicles(args: { search: $search }, limit: 25) { id v_vin v_model_yr