feature/IO-3542-fix-searches

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

@@ -14,8 +14,11 @@ export default function GlobalSearch() {
   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);
+  const executeSearch = (variables) => {
+    if (variables?.search !== "" && variables?.search?.length >= 3)
+      callSearch({
+        variables
+      });
   };
   const debouncedExecuteSearch = _.debounce(executeSearch, 750);
 
@@ -157,7 +160,9 @@ export default function GlobalSearch() {
   return (
     <AutoComplete
       options={options}
-      onSearch={handleSearch}
+      showSearch={{
+        onSearch: handleSearch
+      }}
       defaultActiveFirstOption
       onKeyDown={(e) => {
         if (e.key !== "Enter") return;

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -81,17 +81,16 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
   const employeeData = bodyshop.associations.find((a) => a.useremail === job.admin_clerk)?.user?.employee ?? null;
 
   // Handle checkbox changes
-  const handleCheckboxChange = async (field, e) => {
-    e.preventDefault();
-    e.stopPropagation();
-    const checked = e.target.checked;
+  const handleCheckboxChange = async (field, checked) => {
     const value = checked ? dayjs().toISOString() : null;
     try {
       const ret = await updateJob({
         variables: {
           jobId: job.id,
           job: { [field]: value }
-        }
+        },
+        refetchQueries: ["GET_JOB_BY_PK"],
+        awaitRefetchQueries: true
       });
       insertAuditTrail({
         jobid: job.id,
@@ -183,7 +182,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
                     <Space>
                       <Checkbox
                         checked={!!job.estimate_sent_approval}
-                        onChange={(e) => handleCheckboxChange("estimate_sent_approval", e)}
+                        onChange={(e) => handleCheckboxChange("estimate_sent_approval", e.target.checked)}
                         disabled={disabled || isPartsEntry}
                       >
                         {job.estimate_sent_approval && (
@@ -198,7 +197,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
                     <Space>
                       <Checkbox
                         checked={!!job.estimate_approved}
-                        onChange={(e) => handleCheckboxChange("estimate_approved", e)}
+                        onChange={(e) => handleCheckboxChange("estimate_approved", e.target.checked)}
                         disabled={disabled || isPartsEntry}
                       >
                         {job.estimate_approved && (

client/src/components/owner-search-select/owner-search-select.component.jsx

@@ -16,9 +16,10 @@ const OwnerSearchSelect = ({ value, onChange, onBlur, disabled, ref }) => {
     SEARCH_OWNERS_BY_ID_FOR_AUTOCOMPLETE
   );
 
-  const executeSearch = (v) => {
-    if (v && v.variables?.search !== "" && v.variables.search.length >= 2) callSearch({ variables: v.variables });
+  const executeSearch = (variables) => {
+    if (variables?.search !== "" && variables?.search?.length >= 2) callSearch({ variables });
   };
+
   const debouncedExecuteSearch = _.debounce(executeSearch, 500);
 
   const handleSearch = (value) => {

client/src/components/task-list/task-list.container.jsx

@@ -33,7 +33,8 @@ export function TaskListContainer({
   currentUser,
   onlyMine,
   parentJobId,
-  showRo = true
+  showRo = true,
+  disableJobRefetch = false
 }) {
   const { t } = useTranslation();
   const notification = useNotification();
@@ -90,6 +91,10 @@ export function TaskListContainer({
         refetchQueries: [Object.keys(query)[0]]
       };
 
+      if (!disableJobRefetch) {
+        toggledTaskObject.refetchQueries.push("GET_JOB_BY_PK");
+      }
+
       const toggledTask = await toggleTaskCompleted(toggledTaskObject);
 
       if (!toggledTask.errors) {
@@ -139,6 +144,10 @@ export function TaskListContainer({
         refetchQueries: [Object.keys(query)[0]]
       };
 
+      if (!disableJobRefetch) {
+        toggledTaskObject.refetchQueries.push("GET_JOB_BY_PK");
+      }
+
       const toggledTask = await toggleTaskDeleted(toggledTaskObject);
 
       if (!toggledTask.errors) {

client/src/components/vehicle-search-select/vehicle-search-select.component.jsx

@@ -18,9 +18,10 @@ const VehicleSearchSelect = ({ value, onChange, onBlur, disabled, ref }) => {
     SEARCH_VEHICLES_BY_ID_FOR_AUTOCOMPLETE
   );
 
-  const executeSearch = (v) => {
-    if (v && v.variables?.search !== "" && v.variables.search.length >= 2) callSearch({ variables: v.variables });
+  const executeSearch = (variables) => {
+    if (variables?.search !== "" && variables?.search?.length >= 2) callSearch({ variables });
   };
+
   const debouncedExecuteSearch = _.debounce(executeSearch, 500);
 
   const handleSearch = (value) => {

client/src/pages/tasks/tasks.page.component.jsx

@@ -23,10 +23,17 @@ export function TasksPageComponent({ bodyshop, currentUser, type }) {
           relationshipType={"assigned_to"}
           query={{ QUERY_MY_TASKS_PAGINATED }}
           titleTranslation={"tasks.titles.my_tasks"}
+          disableJobRefetch={true}
         />
       );
     case taskPageTypes.ALL_TASKS:
-      return <TaskListContainer query={{ QUERY_ALL_TASKS_PAGINATED }} titleTranslation={"tasks.titles.all_tasks"} />;
+      return (
+        <TaskListContainer
+          query={{ QUERY_ALL_TASKS_PAGINATED }}
+          titleTranslation={"tasks.titles.all_tasks"}
+          disableJobRefetch={true}
+        />
+      );
     default:
       return <></>;
   }