bugfix/IO-3531 - Disable unnecessary refetch queries causing page reload.

client/src/components/bill-form/bill-form.component.jsx

@@ -373,11 +373,9 @@ export function BillFormComponent({
               "local_tax_rate"
             ]);
             let totals;
-            if (!!values.total && !!values.billlines && values.billlines.length > 0) {
+            if (!!values.total && !!values.billlines && values.billlines.length > 0)
               totals = CalculateBillTotal(values);
-            }
-
-            if (totals) {
+            if (totals)
               return (
                 // TODO: Align is not correct
                 // eslint-disable-next-line react/no-unknown-property
@@ -416,7 +414,7 @@ export function BillFormComponent({
                     <Statistic
                       title={t("bills.labels.discrepancy")}
                       styles={{
-                        content: {
+                        value: {
                           color: totals.discrepancy.getAmount() === 0 ? "green" : "red"
                         }
                       }}
@@ -429,7 +427,6 @@ export function BillFormComponent({
                   ) : null}
                 </div>
               );
-            }
             return null;
           }}
         </Form.Item>

client/src/components/dashboard-components/total-production-hours/total-production-hours.component.jsx

@@ -36,7 +36,7 @@ export function DashboardTotalProductionHours({ bodyshop, data, ...cardProps })
         <Statistic
           title={t("dashboard.labels.prodhrs")}
           value={hours.total.toFixed(1)}
-          styles={{ content: { color: aboveTargetHours ? "green" : "red" } }}
+          styles={{ value: { color: aboveTargetHours ? "green" : "red" } }}
         />
       </Space>
     </Card>

client/src/components/dms-post-form/cdklike-dms-post-form.jsx

@@ -404,7 +404,7 @@ export default function CdkLikePostForm({ bodyshop, socket, job, logsRef, mode,
                 <Typography.Title>=</Typography.Title>
                 <Statistic
                   title={t("jobs.labels.dms.notallocated")}
-                  styles={{ content: { color: discrep.getAmount() === 0 ? "green" : "red" } }}
+                  styles={{ value: { color: discrep.getAmount() === 0 ? "green" : "red" } }}
                   value={discrep.toFormat()}
                 />
                 <Button disabled={disablePost} htmlType="submit">

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

@@ -81,16 +81,17 @@ 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, checked) => {
+  const handleCheckboxChange = async (field, e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    const checked = e.target.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,
@@ -182,7 +183,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
                     <Space>
                       <Checkbox
                         checked={!!job.estimate_sent_approval}
-                        onChange={(e) => handleCheckboxChange("estimate_sent_approval", e.target.checked)}
+                        onChange={(e) => handleCheckboxChange("estimate_sent_approval", e)}
                         disabled={disabled || isPartsEntry}
                       >
                         {job.estimate_sent_approval && (
@@ -197,7 +198,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
                     <Space>
                       <Checkbox
                         checked={!!job.estimate_approved}
-                        onChange={(e) => handleCheckboxChange("estimate_approved", e.target.checked)}
+                        onChange={(e) => handleCheckboxChange("estimate_approved", e)}
                         disabled={disabled || isPartsEntry}
                       >
                         {job.estimate_approved && (

client/src/components/payment-form/payment-form.totalpayments.component.jsx

@@ -33,7 +33,7 @@ export default function PaymentFormTotalPayments({ jobid }) {
       {balance && (
         <Statistic
           title={t("payments.labels.balance")}
-          styles={{ content: { color: balance.getAmount() !== 0 ? "red" : "green" } }}
+          styles={{ value: { color: balance.getAmount() !== 0 ? "red" : "green" } }}
           value={(balance && balance.toFormat()) || ""}
         />
       )}

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

@@ -33,8 +33,7 @@ export function TaskListContainer({
   currentUser,
   onlyMine,
   parentJobId,
-  showRo = true,
-  disableJobRefetch = false
+  showRo = true
 }) {
   const { t } = useTranslation();
   const notification = useNotification();
@@ -91,10 +90,6 @@ 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) {
@@ -144,10 +139,6 @@ 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/pages/jobs-close/jobs-close.component.jsx

@@ -510,7 +510,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
                         <Statistic
                           title={t("jobs.labels.pimraryamountpayable")}
                           styles={{
-                            content: {
+                            value: {
                               color: discrep.getAmount() >= 0 ? "green" : "red"
                             }
                           }}

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

@@ -23,17 +23,10 @@ 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"}
-          disableJobRefetch={true}
-        />
-      );
+      return <TaskListContainer query={{ QUERY_ALL_TASKS_PAGINATED }} titleTranslation={"tasks.titles.all_tasks"} />;
     default:
       return <></>;
   }