Merged in release/2024-05-24 (pull request #1446)

Release/2024 05 24

.circleci/config.yml

@@ -134,10 +134,6 @@ jobs:
 workflows:
   deploy_and_build:
     jobs:
-      - api-deploy:
-          filters:
-            branches:
-              only: master
       - app-build:
           filters:
             branches:

client/src/components/global-search/global-search-os.component.jsx

@@ -3,16 +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, {
+import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
-  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);
 
@@ -21,7 +18,7 @@ export default function GlobalSearchOs() {
       try {
         setLoading(true);
         const searchData = await axios.post("/search", {
-          search: v,
+          search: v
         });
 
         const resultsByType = {
@@ -29,7 +26,7 @@ export default function GlobalSearchOs() {
           jobs: [],
           bills: [],
           owners: [],
-          vehicles: [],
+          vehicles: []
         };
 
         searchData.data.hits.hits.forEach((hit) => {
@@ -50,16 +47,14 @@ export default function GlobalSearchOs() {
                       <span>
                         <OwnerNameDisplay ownerObject={job} />
                       </span>
-                      <span>{`${job.v_model_yr || ""} ${
+                      <span>{`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`}</span>
-                        job.v_make_desc || ""
-                      } ${job.v_model_desc || ""}`}</span>
                       <span>{`${job.clm_no || ""}`}</span>
                       <span>{`${job.plate_no || ""}`}</span>
                     </Space>
                   </Link>
-                ),
+                )
               };
-            }),
+            })
           },
           {
             label: renderTitle(t("menus.header.search.owners")),
@@ -69,53 +64,39 @@ export default function GlobalSearchOs() {
                 value: OwnerNameDisplayFunction(owner),
                 label: (
                   <Link to={`/manage/owners/${owner.id}`}>
-                    <Space
+                    <Space size="small" split={<Divider type="vertical" />} wrap>
-                      size="small"
-                      split={<Divider type="vertical" />}
-                      wrap
-                    >
                       <span>
                         <OwnerNameDisplay ownerObject={owner} />
                       </span>
-                      <PhoneNumberFormatter>
+                      <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
-                        {owner.ownr_ph1}
+                      <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
-                      </PhoneNumberFormatter>
-                      <PhoneNumberFormatter>
-                        {owner.ownr_ph2}
-                      </PhoneNumberFormatter>
                     </Space>
                   </Link>
-                ),
+                )
               };
-            }),
+            })
           },
           {
             label: renderTitle(t("menus.header.search.vehicles")),
             options: resultsByType.vehicles.map((vehicle) => {
               return {
                 key: vehicle.id,
-                value: `${vehicle.v_model_yr || ""} ${
+                value: `${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`,
-                  vehicle.v_make_desc || ""
-                } ${vehicle.v_model_desc || ""}`,
                 label: (
                   <Link to={`/manage/vehicles/${vehicle.id}`}>
                     <Space size="small" split={<Divider type="vertical" />}>
                       <span>
-                        {`${vehicle.v_model_yr || ""} ${
+                        {`${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`}
-                          vehicle.v_make_desc || ""
-                        } ${vehicle.v_model_desc || ""}`}
                       </span>
                       <span>{vehicle.plate_no || ""}</span>
                       <span>
-                        <VehicleVinDisplay>
+                        <VehicleVinDisplay>{vehicle.v_vin || ""}</VehicleVinDisplay>
-                          {vehicle.v_vin || ""}
-                        </VehicleVinDisplay>
                       </span>
                     </Space>
                   </Link>
-                ),
+                )
               };
-            }),
+            })
           },
           {
             label: renderTitle(t("menus.header.search.payments")),
@@ -133,9 +114,9 @@ export default function GlobalSearchOs() {
                       <span>{payment.transactionid || ""}</span>
                     </Space>
                   </Link>
-                ),
+                )
               };
-            }),
+            })
           },
           {
             label: renderTitle(t("menus.header.search.bills")),
@@ -151,10 +132,10 @@ export default function GlobalSearchOs() {
                       <span>{bill.date}</span>
                     </Space>
                   </Link>
-                ),
+                )
               };
-            }),
+            })
-          },
+          }
           // {
           //   label: renderTitle(t("menus.header.search.phonebook")),
           //   options: resultsByType.search_phonebook.map((pb) => {
@@ -196,15 +177,7 @@ export default function GlobalSearchOs() {
   };
 
   return (
-    <AutoComplete
+    <AutoComplete options={data} onSearch={handleSearch} defaultActiveFirstOption onClear={() => setData([])}>
-      options={data}
-      onSearch={handleSearch}
-      defaultActiveFirstOption
-      onSelect={(val, opt) => {
-        history.push(opt.label.props.to);
-      }}
-      onClear={() => setData([])}
-    >
       <Input.Search
         size="large"
         placeholder={t("general.labels.globalsearch")}

client/src/components/global-search/global-search.component.jsx

@@ -3,28 +3,19 @@ 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, {
+import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
-  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 [callSearch, { loading, error, data }] =
-    useLazyQuery(GLOBAL_SEARCH_QUERY);
 
   const executeSearch = (v) => {
-    if (
+    if (v && v.variables.search && v.variables.search !== "" && v.variables.search.length >= 3) callSearch(v);
-      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() {
                     <span>
                       <OwnerNameDisplay ownerObject={job} />
                     </span>
-                    <span>{`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${
+                    <span>{`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`}</span>
-                      job.v_model_desc || ""
-                    }`}</span>
                     <span>{`${job.clm_no || ""}`}</span>
                   </Space>
                 </Link>
-              ),
+              )
             };
-          }),
+          })
         },
         {
           label: renderTitle(t("menus.header.search.owners")),
@@ -75,45 +64,35 @@ export default function GlobalSearch() {
                     <span>
                       <OwnerNameDisplay ownerObject={owner} />
                     </span>
-                    <PhoneNumberFormatter>
+                    <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
-                      {owner.ownr_ph1}
+                    <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
-                    </PhoneNumberFormatter>
-                    <PhoneNumberFormatter>
-                      {owner.ownr_ph2}
-                    </PhoneNumberFormatter>
                   </Space>
                 </Link>
-              ),
+              )
             };
-          }),
+          })
         },
         {
           label: renderTitle(t("menus.header.search.vehicles")),
           options: data.search_vehicles.map((vehicle) => {
             return {
               key: vehicle.id,
-              value: `${vehicle.v_model_yr || ""} ${
+              value: `${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`,
-                vehicle.v_make_desc || ""
-              } ${vehicle.v_model_desc || ""}`,
               label: (
                 <Link to={`/manage/vehicles/${vehicle.id}`}>
                   <Space size="small" split={<Divider type="vertical" />}>
                     <span>
-                      {`${vehicle.v_model_yr || ""} ${
+                      {`${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`}
-                        vehicle.v_make_desc || ""
-                      } ${vehicle.v_model_desc || ""}`}
                     </span>
                     <span>{vehicle.plate_no || ""}</span>
                     <span>
-                      <VehicleVinDisplay>
+                      <VehicleVinDisplay>{vehicle.v_vin || ""}</VehicleVinDisplay>
-                        {vehicle.v_vin || ""}
-                      </VehicleVinDisplay>
                     </span>
                   </Space>
                 </Link>
-              ),
+              )
             };
-          }),
+          })
         },
         {
           label: renderTitle(t("menus.header.search.payments")),
@@ -131,9 +110,9 @@ export default function GlobalSearch() {
                     <span>{payment.transactionid || ""}</span>
                   </Space>
                 </Link>
-              ),
+              )
             };
-          }),
+          })
         },
         {
           label: renderTitle(t("menus.header.search.bills")),
@@ -149,46 +128,35 @@ export default function GlobalSearch() {
                     <span>{bill.date}</span>
                   </Space>
                 </Link>
-              ),
+              )
             };
-          }),
+          })
         },
         {
           label: renderTitle(t("menus.header.search.phonebook")),
           options: data.search_phonebook.map((pb) => {
             return {
               key: pb.id,
-              value: `${pb.firstname || ""} ${pb.lastname || ""} ${
+              value: `${pb.firstname || ""} ${pb.lastname || ""} ${pb.company || ""}`,
-                pb.company || ""
-              }`,
               label: (
                 <Link to={`/manage/phonebook?phonebookentry=${pb.id}`}>
                   <Space size="small" split={<Divider type="vertical" />}>
-                    <span>{`${pb.firstname || ""} ${pb.lastname || ""} ${
+                    <span>{`${pb.firstname || ""} ${pb.lastname || ""} ${pb.company || ""}`}</span>
-                      pb.company || ""
-                    }`}</span>
                     <PhoneNumberFormatter>{pb.phone1}</PhoneNumberFormatter>
                     <span>{pb.email}</span>
                   </Space>
                 </Link>
-              ),
+              )
             };
-          }),
+          })
-        },
+        }
       ]
     : [];
 
   if (error) return <AlertComponent message={error.message} type="error" />;
 
   return (
-    <AutoComplete
+    <AutoComplete options={options} onSearch={handleSearch} defaultActiveFirstOption>
-      options={options}
-      onSearch={handleSearch}
-      defaultActiveFirstOption
-      onSelect={(val, opt) => {
-        history.push(opt.label.props.to);
-      }}
-    >
       <Input.Search
         size="large"
         placeholder={t("general.labels.globalsearch")}