Merged in feature/IO-3554-Form-Row-Layout (pull request #3049)

feature/feature/IO-3554-Form-Row-Layout - Fix search, bump deps, fix formlayout

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

@@ -52,7 +52,7 @@ export default function GlobalSearchOs() {
                       <span>
                         <OwnerNameDisplay ownerObject={job} />
                       </span>
-                      <span>{`${job.v_model_yr || ""} ${job.v_make_desc`` || ""} ${job.v_model_desc || ""}`}</span>
+                      <span>{`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`}</span>
                       <span>{`${job.clm_no || ""}`}</span>
                       <span>{`${job.plate_no || ""}`}</span>
                     </Space>
@@ -184,26 +184,25 @@ export default function GlobalSearchOs() {
   return (
     <AutoComplete
       options={data}
-      showSearch={{
+      defaultActiveFirstOption
-        filterOption: false,
-        onSearch: handleSearch
-      }}
       onKeyDown={(e) => {
         if (e.key !== "Enter") return;
         const firstUrlForSearch = data?.[0]?.options?.[0]?.label?.props?.to;
         if (!firstUrlForSearch) return;
         navigate(firstUrlForSearch);
       }}
-      defaultActiveFirstOption
-      onClear={() => setData([])}
     >
       <Input.Search
-        className="global-search-autocomplete-fix"
+        // className="global-search-autocomplete-fix"
         size="large"
         placeholder={t("general.labels.globalsearch")}
         enterButton
         allowClear
         loading={loading}
+        onSearch={handleSearch}
+        onChange={(e) => {
+          if (!e.target.value) setData([]);
+        }}
       />
     </AutoComplete>
   );

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

@@ -160,10 +160,6 @@ export default function GlobalSearch() {
   return (
     <AutoComplete
       options={options}
-      showSearch={{
-        onSearch: handleSearch,
-        filterOption: false
-      }}
       defaultActiveFirstOption
       onKeyDown={(e) => {
         if (e.key !== "Enter") return;
@@ -173,12 +169,13 @@ export default function GlobalSearch() {
       }}
     >
       <Input.Search
-        className="global-search-autocomplete-fix"
+        // className="global-search-autocomplete-fix"
         size="large"
         placeholder={t("general.labels.globalsearch")}
         enterButton
         allowClear
         loading={loading}
+        onSearch={handleSearch}
       />
     </AutoComplete>
   );