feature/IO-2976-GlobalSearch-First-link-Navigate - Fix global search so it goes to the first url if it is available, added an ID for rome tours.

Signed-off-by: Dave Richer <dave@imexsystems.ca>

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

@@ -3,13 +3,15 @@ import axios from "axios";
 import _ from "lodash";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
+import { Link, useNavigate } 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 navigate = useNavigate();
+
   const [loading, setLoading] = useState(false);
   const [data, setData] = useState(false);
 
@@ -177,7 +179,18 @@ export default function GlobalSearchOs() {
   };
 
   return (
-    <AutoComplete options={data} onSearch={handleSearch} defaultActiveFirstOption onClear={() => setData([])}>
+    <AutoComplete
+      options={data}
+      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
         size="large"
         placeholder={t("general.labels.globalsearch")}

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

@@ -3,7 +3,7 @@ import { AutoComplete, Divider, Input, Space } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
+import { Link, useNavigate } from "react-router-dom";
 import { GLOBAL_SEARCH_QUERY } from "../../graphql/search.queries";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import AlertComponent from "../alert/alert.component";
@@ -13,6 +13,7 @@ import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.compon
 export default function GlobalSearch() {
   const { t } = useTranslation();
   const [callSearch, { loading, error, data }] = useLazyQuery(GLOBAL_SEARCH_QUERY);
+  const navigate = useNavigate();
 
   const executeSearch = (v) => {
     if (v && v.variables.search && v.variables.search !== "" && v.variables.search.length >= 3) callSearch(v);
@@ -20,7 +21,6 @@ export default function GlobalSearch() {
   const debouncedExecuteSearch = _.debounce(executeSearch, 750);
 
   const handleSearch = (value) => {
-    console.log("Handle Search");
     debouncedExecuteSearch({ variables: { search: value } });
   };
 
@@ -156,7 +156,17 @@ export default function GlobalSearch() {
   if (error) return <AlertComponent message={error.message} type="error" />;
 
   return (
-    <AutoComplete options={options} onSearch={handleSearch} defaultActiveFirstOption>
+    <AutoComplete
+      options={options}
+      onSearch={handleSearch}
+      defaultActiveFirstOption
+      onKeyDown={(e) => {
+        if (e.key !== "Enter") return;
+        const firstUrlForSearch = options?.[0]?.options?.[0]?.label?.props?.to;
+        if (!firstUrlForSearch) return;
+        navigate(firstUrlForSearch);
+      }}
+    >
       <Input.Search
         size="large"
         placeholder={t("general.labels.globalsearch")}

client/src/components/parts-order-list-table/parts-order-list-table.component.jsx

@@ -242,7 +242,8 @@ export function PartsOrderListTableComponent({
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
-      render: (text, record) => recordActions(record, true)
+      render: (text, record) => recordActions(record, true),
+      id: "parts-order-list-table-actions"
     }
   ];
 

client/src/components/production-board-kanban/settings/defaultKanbanSettings.js

@@ -1,66 +1,15 @@
-import InstanceRenderManager from "../../../utils/instanceRenderMgr.js";
-
 const statisticsItems = [
   { id: 0, name: "totalHrs", label: "total_hours_in_production" },
   { id: 1, name: "totalAmountInProduction", label: "total_amount_in_production" },
   { id: 2, name: "totalLAB", label: "total_lab_in_production" },
   { id: 3, name: "totalLAR", label: "total_lar_in_production" },
   { id: 4, name: "jobsInProduction", label: "jobs_in_production" },
-
-  {
-    id: 5,
-    name: "totalHrsOnBoard",
-    label: InstanceRenderManager({
-      imex: "total_hours_in_view",
-      rome: "total_hours_on_board",
-      promanager: "total_hours_on_board"
-    })
-  },
-  {
-    id: 6,
-    name: "totalAmountOnBoard",
-    label: InstanceRenderManager({
-      imex: "total_amount_in_view",
-      rome: "total_amount_on_board",
-      promanager: "total_amount_on_board"
-    })
-  },
-  {
-    id: 7,
-    name: "totalLABOnBoard",
-    label: InstanceRenderManager({
-      imex: "total_lab_in_view",
-      rome: "total_lab_on_board",
-      promanager: "total_lab_on_board"
-    })
-  },
-  {
-    id: 8,
-    name: "totalLAROnBoard",
-    label: InstanceRenderManager({
-      imex: "total_lar_in_view",
-      rome: "total_lar_on_board",
-      promanager: "total_lar_on_board"
-    })
-  },
-  {
-    id: 9,
-    name: "jobsOnBoard",
-    label: InstanceRenderManager({
-      imex: "total_jobs_in_view",
-      rome: "total_jobs_on_board",
-      promanager: "total_jobs_on_board"
-    })
-  },
-  {
-    id: 10,
-    name: "tasksOnBoard",
-    label: InstanceRenderManager({
-      imex: "tasks_in_view",
-      rome: "tasks_on_board",
-      promanager: "tasks_on_board"
-    })
-  },
+  { id: 5, name: "totalHrsOnBoard", label: "total_hours_on_board" },
+  { id: 6, name: "totalAmountOnBoard", label: "total_amount_on_board" },
+  { id: 7, name: "totalLABOnBoard", label: "total_lab_on_board" },
+  { id: 8, name: "totalLAROnBoard", label: "total_lar_on_board" },
+  { id: 9, name: "jobsOnBoard", label: "total_jobs_on_board" },
+  { id: 10, name: "tasksOnBoard", label: "tasks_on_board" },
   { id: 11, name: "tasksInProduction", label: "tasks_in_production" }
 ];
 

client/src/translations/en_us/common.json

@@ -2849,21 +2849,15 @@
           "jobs_in_production": "Jobs in Production",
           "tasks_in_production": "Tasks in Production",
           "tasks_on_board": "Tasks on Board",
-          "tasks_in_view": "Tasks in View",
           "total_amount_in_production": "Dollars in Production",
           "total_amount_on_board": "Dollars on Board",
-          "total_amount_in_view": "Dollars in View",
           "total_hours_in_production": "Hours in Production",
           "total_hours_on_board": "Hours on Board",
-          "total_hours_in_view": "Hours in View",
           "total_jobs_on_board": "Jobs on Board",
-          "total_jobs_in_view": "Jobs in View",
           "total_lab_in_production": "Body Hours in Production",
           "total_lab_on_board": "Body Hours on Board",
-          "total_lab_in_view": "Body Hours in View",
           "total_lar_in_production": "Refinish Hours in Production",
-          "total_lar_on_board": "Refinish Hours on Board",
-          "total_lar_in_view": "Refinish Hours in View"
+          "total_lar_on_board": "Refinish Hours on Board"
         },
         "statistics_title": "Statistics"
       },
@@ -2875,21 +2869,15 @@
         "tasks": "Tasks",
         "tasks_in_production": "Tasks in Production",
         "tasks_on_board": "Tasks on Board",
-        "tasks_in_view": "Tasks in View",
         "total_amount_in_production": "Dollars in Production",
         "total_amount_on_board": "Dollars on Board",
-        "total_amount_in_view": "Dollars in View",
         "total_hours_in_production": "Hours in Production",
         "total_hours_on_board": "Hours on Board",
-        "total_hours_in_view": "Hours in View",
         "total_jobs_on_board": "Jobs on Board",
-        "total_jobs_in_view": "Jobs in View",
         "total_lab_in_production": "Body Hours in Production",
         "total_lab_on_board": "Body Hours on Board",
-        "total_lab_in_view": "Body Hours in View",
         "total_lar_in_production": "Refinish Hours in Production",
-        "total_lar_on_board": "Refinish Hours on Board",
-        "total_lar_in_view": "Refinish Hours in View"
+        "total_lar_on_board": "Refinish Hours on Board"
       },
       "successes": {
         "removed": "Job removed from production."

client/src/translations/es/common.json

@@ -2849,21 +2849,15 @@
           "jobs_in_production": "",
           "tasks_in_production": "",
           "tasks_on_board": "",
-          "tasks_in_view": "",
           "total_amount_in_production": "",
           "total_amount_on_board": "",
-          "total_amount_in_view": "",
           "total_hours_in_production": "",
           "total_hours_on_board": "",
-          "total_hours_in_view": "",
           "total_jobs_on_board": "",
-          "total_jobs_in_view": "",
           "total_lab_in_production": "",
           "total_lab_on_board": "",
-          "total_lab_in_view": "",
           "total_lar_in_production": "",
-          "total_lar_on_board": "",
-          "total_lar_in_view": ""
+          "total_lar_on_board": ""
         },
         "statistics_title": ""
       },
@@ -2875,21 +2869,15 @@
         "tasks": "",
         "tasks_in_production": "",
         "tasks_on_board": "",
-        "tasks_in_view": "",
         "total_amount_in_production": "",
         "total_amount_on_board": "",
-        "total_amount_in_view": "",
         "total_hours_in_production": "",
         "total_hours_on_board": "",
-        "total_hours_in_view": "",
         "total_jobs_on_board": "",
-        "total_jobs_in_view": "",
         "total_lab_in_production": "",
         "total_lab_on_board": "",
-        "total_lab_in_view": "",
         "total_lar_in_production": "",
-        "total_lar_on_board": "",
-        "total_lar_in_view": ""
+        "total_lar_on_board": ""
       },
       "successes": {
         "removed": ""

client/src/translations/fr/common.json

@@ -2845,52 +2845,40 @@
 				"filters_title": "",
 				"information": "",
 				"layout": "",
-        "statistics": {
-          "jobs_in_production": "",
-          "tasks_in_production": "",
-          "tasks_on_board": "",
-          "tasks_in_view": "",
-          "total_amount_in_production": "",
-          "total_amount_on_board": "",
-          "total_amount_in_view": "",
-          "total_hours_in_production": "",
-          "total_hours_on_board": "",
-          "total_hours_in_view": "",
-          "total_jobs_on_board": "",
-          "total_jobs_in_view": "",
-          "total_lab_in_production": "",
-          "total_lab_on_board": "",
-          "total_lab_in_view": "",
-          "total_lar_in_production": "",
-          "total_lar_on_board": "",
-          "total_lar_in_view": ""
-        },
+				"statistics": {
+					"jobs_in_production": "",
+					"tasks_in_production": "",
+					"tasks_on_board": "",
+					"total_amount_in_production": "",
+					"total_amount_on_board": "",
+					"total_hours_in_production": "",
+					"total_hours_on_board": "",
+					"total_jobs_on_board": "",
+					"total_lab_in_production": "",
+					"total_lab_on_board": "",
+					"total_lar_in_production": "",
+					"total_lar_on_board": ""
+				},
 				"statistics_title": ""
 			},
-      "statistics": {
-        "currency_symbol": "",
-        "hours": "",
-        "jobs": "",
-        "jobs_in_production": "",
-        "tasks": "",
-        "tasks_in_production": "",
-        "tasks_on_board": "",
-        "tasks_in_view": "",
-        "total_amount_in_production": "",
-        "total_amount_on_board": "",
-        "total_amount_in_view": "",
-        "total_hours_in_production": "",
-        "total_hours_on_board": "",
-        "total_hours_in_view": "",
-        "total_jobs_on_board": "",
-        "total_jobs_in_view": "",
-        "total_lab_in_production": "",
-        "total_lab_on_board": "",
-        "total_lab_in_view": "",
-        "total_lar_in_production": "",
-        "total_lar_on_board": "",
-        "total_lar_in_view": ""
-      },
+			"statistics": {
+				"currency_symbol": "",
+				"hours": "",
+				"jobs": "",
+				"jobs_in_production": "",
+				"tasks": "",
+				"tasks_in_production": "",
+				"tasks_on_board": "",
+				"total_amount_in_production": "",
+				"total_amount_on_board": "",
+				"total_hours_in_production": "",
+				"total_hours_on_board": "",
+				"total_jobs_on_board": "",
+				"total_lab_in_production": "",
+				"total_lab_on_board": "",
+				"total_lar_in_production": "",
+				"total_lar_on_board": ""
+			},
 			"successes": {
 				"removed": ""
 			}