admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Progress Commit

Browse Source 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-04-01 16:34:31 -04:00
parent ae07f71e76
commit 1343b68cc6
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/task-list/task-list.component.jsx
View File

@@ -118,6 +118,8 @@ function TaskListComponent({
dataIndex: "assigned_to", dataIndex: "assigned_to",
key: "assigned_to", key: "assigned_to",
width: '10%', width: '10%',
sorter: true,
sortOrder: sortcolumn === "assigned_to" && sortorder,
} }
); );
} }

31
client/src/components/task-list/task-list.container.jsx
View File

@@ -46,18 +46,9 @@ export default function TaskListContainer({bodyshop, titleTranslation ,query, r
* Refetch tasks when a task is updated * Refetch tasks when a task is updated
*/ */
useEffect(() => { useEffect(() => {
const handleTaskUpdated = () => { const handleTaskUpdated = async (event) => {
refetch().catch((e) => { await refetch().catch(e => `Something went wrong fetching tasks: ${e.message || ''}`);
console.error(`Something went wrong fetching tasks: ${e.message || ''}`);
});
}; };
}, [refetch]);
useEffect(() => {
const handleTaskUpdated = (event) => {
refetch();
};
window.addEventListener('taskUpdated', handleTaskUpdated); window.addEventListener('taskUpdated', handleTaskUpdated);
// Clean up the event listener when the component is unmounted. // Clean up the event listener when the component is unmounted.
@@ -87,9 +78,12 @@ export default function TaskListContainer({bodyshop, titleTranslation ,query, r
completed_at: completed_at completed_at: completed_at
} }
}); });
refetch().catch((e) => { // refetch().catch((e) => {
console.error(`Something went wrong fetching tasks: ${e.message || ''}`); // console.error(`Something went wrong fetching tasks: ${e.message || ''}`);
}); // });
window.dispatchEvent( new CustomEvent('taskUpdated', {
detail: { message: 'A task has been completed.' },
}));
notification["success"]({ notification["success"]({
message: t("tasks.successes.completed"), message: t("tasks.successes.completed"),
}); });
@@ -121,9 +115,12 @@ export default function TaskListContainer({bodyshop, titleTranslation ,query, r
deleted_at: deleted_at deleted_at: deleted_at
} }
}); });
refetch().catch((e) => { window.dispatchEvent( new CustomEvent('taskUpdated', {
console.error(`Something went wrong fetching tasks: ${e.message || ''}`); detail: { message: 'A task has been deleted.' },
}); }));
// refetch().catch((e) => {
// console.error(`Something went wrong fetching tasks: ${e.message || ''}`);
// });
notification["success"]({ notification["success"]({
message: t("tasks.successes.deleted"), message: t("tasks.successes.deleted"),
}); });

12
client/src/pages/jobs-detail/jobs-detail.page.component.jsx
View File

@@ -109,6 +109,18 @@ export function JobsDetailPage({
form.resetFields(); form.resetFields();
}, [form, job]); }, [form, job]);
useEffect(() => {
const handleTaskUpdated = async (event) => {
await refetch().catch(e => `Something went wrong fetching tasks: ${e.message || ''}`);
};
window.addEventListener('taskUpdated', handleTaskUpdated);
// Clean up the event listener when the component is unmounted.
return () => {
window.removeEventListener('taskUpdated', handleTaskUpdated);
};
}, [refetch]);
//useKeyboardSaveShortcut(form.submit); //useKeyboardSaveShortcut(form.submit);
const handleFinish = async (values) => { const handleFinish = async (values) => {