From cac7df66e1594e273cd46c7ad3625adb452b47e0 Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Tue, 14 May 2024 12:19:58 -0400 Subject: [PATCH 1/3] Fix issue with global search --- .../global-search-os.component.jsx | 70 +++++----------- .../global-search/global-search.component.jsx | 82 ++++++------------- 2 files changed, 47 insertions(+), 105 deletions(-) diff --git a/client/src/components/global-search/global-search-os.component.jsx b/client/src/components/global-search/global-search-os.component.jsx index 82e5152b4..6bba04d5e 100644 --- a/client/src/components/global-search/global-search-os.component.jsx +++ b/client/src/components/global-search/global-search-os.component.jsx @@ -5,9 +5,7 @@ import React, { useState } from "react"; import { useTranslation } from "react-i18next"; import { Link, useHistory } from "react-router-dom"; import PhoneNumberFormatter from "../../utils/PhoneFormatter"; -import OwnerNameDisplay, { - OwnerNameDisplayFunction, -} from "../owner-name-display/owner-name-display.component"; +import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component"; import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component"; export default function GlobalSearchOs() { @@ -21,7 +19,7 @@ export default function GlobalSearchOs() { try { setLoading(true); const searchData = await axios.post("/search", { - search: v, + search: v }); const resultsByType = { @@ -29,7 +27,7 @@ export default function GlobalSearchOs() { jobs: [], bills: [], owners: [], - vehicles: [], + vehicles: [] }; searchData.data.hits.hits.forEach((hit) => { @@ -50,16 +48,14 @@ export default function GlobalSearchOs() { - {`${job.v_model_yr || ""} ${ - job.v_make_desc || "" - } ${job.v_model_desc || ""}`} + {`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`} {`${job.clm_no || ""}`} {`${job.plate_no || ""}`} - ), + ) }; - }), + }) }, { label: renderTitle(t("menus.header.search.owners")), @@ -69,53 +65,39 @@ export default function GlobalSearchOs() { value: OwnerNameDisplayFunction(owner), label: ( - } - wrap - > + } wrap> - - {owner.ownr_ph1} - - - {owner.ownr_ph2} - + {owner.ownr_ph1} + {owner.ownr_ph2} - ), + ) }; - }), + }) }, { label: renderTitle(t("menus.header.search.vehicles")), options: resultsByType.vehicles.map((vehicle) => { return { key: vehicle.id, - value: `${vehicle.v_model_yr || ""} ${ - vehicle.v_make_desc || "" - } ${vehicle.v_model_desc || ""}`, + value: `${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`, label: ( }> - {`${vehicle.v_model_yr || ""} ${ - vehicle.v_make_desc || "" - } ${vehicle.v_model_desc || ""}`} + {`${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`} {vehicle.plate_no || ""} - - {vehicle.v_vin || ""} - + {vehicle.v_vin || ""} - ), + ) }; - }), + }) }, { label: renderTitle(t("menus.header.search.payments")), @@ -133,9 +115,9 @@ export default function GlobalSearchOs() { {payment.transactionid || ""} - ), + ) }; - }), + }) }, { label: renderTitle(t("menus.header.search.bills")), @@ -151,10 +133,10 @@ export default function GlobalSearchOs() { {bill.date} - ), + ) }; - }), - }, + }) + } // { // label: renderTitle(t("menus.header.search.phonebook")), // options: resultsByType.search_phonebook.map((pb) => { @@ -196,15 +178,7 @@ export default function GlobalSearchOs() { }; return ( - { - history.push(opt.label.props.to); - }} - onClear={() => setData([])} - > + setData([])}> { - if ( - v && - v.variables.search && - v.variables.search !== "" && - v.variables.search.length >= 3 - ) - callSearch(v); + if (v && v.variables.search && v.variables.search !== "" && v.variables.search.length >= 3) callSearch(v); }; const debouncedExecuteSearch = _.debounce(executeSearch, 750); @@ -53,15 +44,13 @@ export default function GlobalSearch() { - {`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${ - job.v_model_desc || "" - }`} + {`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`} {`${job.clm_no || ""}`} - ), + ) }; - }), + }) }, { label: renderTitle(t("menus.header.search.owners")), @@ -75,45 +64,35 @@ export default function GlobalSearch() { - - {owner.ownr_ph1} - - - {owner.ownr_ph2} - + {owner.ownr_ph1} + {owner.ownr_ph2} - ), + ) }; - }), + }) }, { label: renderTitle(t("menus.header.search.vehicles")), options: data.search_vehicles.map((vehicle) => { return { key: vehicle.id, - value: `${vehicle.v_model_yr || ""} ${ - vehicle.v_make_desc || "" - } ${vehicle.v_model_desc || ""}`, + value: `${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`, label: ( }> - {`${vehicle.v_model_yr || ""} ${ - vehicle.v_make_desc || "" - } ${vehicle.v_model_desc || ""}`} + {`${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`} {vehicle.plate_no || ""} - - {vehicle.v_vin || ""} - + {vehicle.v_vin || ""} - ), + ) }; - }), + }) }, { label: renderTitle(t("menus.header.search.payments")), @@ -131,9 +110,9 @@ export default function GlobalSearch() { {payment.transactionid || ""} - ), + ) }; - }), + }) }, { label: renderTitle(t("menus.header.search.bills")), @@ -149,46 +128,35 @@ export default function GlobalSearch() { {bill.date} - ), + ) }; - }), + }) }, { label: renderTitle(t("menus.header.search.phonebook")), options: data.search_phonebook.map((pb) => { return { key: pb.id, - value: `${pb.firstname || ""} ${pb.lastname || ""} ${ - pb.company || "" - }`, + value: `${pb.firstname || ""} ${pb.lastname || ""} ${pb.company || ""}`, label: ( }> - {`${pb.firstname || ""} ${pb.lastname || ""} ${ - pb.company || "" - }`} + {`${pb.firstname || ""} ${pb.lastname || ""} ${pb.company || ""}`} {pb.phone1} {pb.email} - ), + ) }; - }), - }, + }) + } ] : []; if (error) return ; return ( - { - history.push(opt.label.props.to); - }} - > + Date: Tue, 14 May 2024 12:37:33 -0400 Subject: [PATCH 2/3] Progress Commit Signed-off-by: Dave Richer --- .../components/global-search/global-search-os.component.jsx | 3 +-- .../src/components/global-search/global-search.component.jsx | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/client/src/components/global-search/global-search-os.component.jsx b/client/src/components/global-search/global-search-os.component.jsx index 6bba04d5e..f46a4c811 100644 --- a/client/src/components/global-search/global-search-os.component.jsx +++ b/client/src/components/global-search/global-search-os.component.jsx @@ -3,14 +3,13 @@ import axios from "axios"; import _ from "lodash"; import React, { useState } from "react"; import { useTranslation } from "react-i18next"; -import { Link, useHistory } from "react-router-dom"; +import { Link } from "react-router-dom"; import PhoneNumberFormatter from "../../utils/PhoneFormatter"; import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component"; import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component"; export default function GlobalSearchOs() { const { t } = useTranslation(); - const history = useHistory(); const [loading, setLoading] = useState(false); const [data, setData] = useState(false); diff --git a/client/src/components/global-search/global-search.component.jsx b/client/src/components/global-search/global-search.component.jsx index 38aee849c..37b94f46c 100644 --- a/client/src/components/global-search/global-search.component.jsx +++ b/client/src/components/global-search/global-search.component.jsx @@ -3,15 +3,15 @@ import { AutoComplete, Divider, Input, Space } from "antd"; import _ from "lodash"; import React from "react"; import { useTranslation } from "react-i18next"; -import { Link, useHistory } from "react-router-dom"; +import { Link } from "react-router-dom"; import { GLOBAL_SEARCH_QUERY } from "../../graphql/search.queries"; import PhoneNumberFormatter from "../../utils/PhoneFormatter"; import AlertComponent from "../alert/alert.component"; import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component"; import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component"; + export default function GlobalSearch() { const { t } = useTranslation(); - const history = useHistory(); const [callSearch, { loading, error, data }] = useLazyQuery(GLOBAL_SEARCH_QUERY); const executeSearch = (v) => { From bdfbe52244b9a972c52d3e0972a5be532e1cd8a4 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 24 May 2024 10:18:58 -0700 Subject: [PATCH 3/3] Remove API from master deployment. --- .circleci/config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5d6f8f506..d5f65733e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -134,10 +134,6 @@ jobs: workflows: deploy_and_build: jobs: - - api-deploy: - filters: - branches: - only: master - app-build: filters: branches: