@@ -145,7 +145,7 @@ function TaskListComponent({
|
||||
key: "priority",
|
||||
sorter: true,
|
||||
sortOrder: sortcolumn === "priority" && sortorder,
|
||||
width: '5%',
|
||||
width: '8%',
|
||||
render: (text, record) => <PriorityLabel priority={record.priority}
|
||||
/>
|
||||
},
|
||||
@@ -157,7 +157,6 @@ function TaskListComponent({
|
||||
<Space direction='horizontal'>
|
||||
<Button title={t('tasks.buttons.edit')} onClick={() => {
|
||||
setTaskUpsertContext({
|
||||
actions: {},
|
||||
context: {
|
||||
existingTask: record,
|
||||
},
|
||||
|
||||
@@ -2,15 +2,19 @@ import queryString from "query-string";
|
||||
import {useLocation} from "react-router-dom";
|
||||
import {useMutation, useQuery} from "@apollo/client";
|
||||
import {
|
||||
MUTATION_TOGGLE_TASK_COMPLETED, MUTATION_TOGGLE_TASK_DELETED,
|
||||
MUTATION_TOGGLE_TASK_COMPLETED,
|
||||
MUTATION_TOGGLE_TASK_DELETED,
|
||||
QUERY_MY_TASKS_PAGINATED
|
||||
} from "../../graphql/tasks.queries.js";
|
||||
import {pageLimit} from "../../utils/config.js";
|
||||
import AlertComponent from "../alert/alert.component.jsx";
|
||||
import React, {useEffect} from "react";
|
||||
import TaskListComponent from "./task-list.component.jsx";
|
||||
import {notification} from "antd";
|
||||
import {useTranslation} from "react-i18next";
|
||||
|
||||
export default function TaskListContainer({bodyshop, currentUser}) {
|
||||
const {t} = useTranslation();
|
||||
const searchParams = queryString.parse(useLocation().search);
|
||||
const {page, sortcolumn, sortorder, deleted, completed} = searchParams;
|
||||
const {loading, error, data, refetch} = useQuery(
|
||||
@@ -45,7 +49,8 @@ export default function TaskListContainer({bodyshop, currentUser}) {
|
||||
const handleTaskUpdated = () => {
|
||||
refetch().catch((e) => {
|
||||
console.error(`Something went wrong fetching tasks: ${e.message || ''}`);
|
||||
}); };
|
||||
});
|
||||
};
|
||||
}, [refetch]);
|
||||
|
||||
/**
|
||||
@@ -61,16 +66,26 @@ export default function TaskListContainer({bodyshop, currentUser}) {
|
||||
*/
|
||||
const toggleCompletedStatus = async (id, currentStatus) => {
|
||||
const completed_at = !currentStatus ? new Date().toISOString() : null;
|
||||
await toggleTaskCompleted({
|
||||
variables: {
|
||||
id: id,
|
||||
completed: !currentStatus,
|
||||
completed_at: completed_at
|
||||
}
|
||||
});
|
||||
refetch().catch((e) => {
|
||||
console.error(`Something went wrong fetching tasks: ${e.message || ''}`);
|
||||
}); };
|
||||
try {
|
||||
await toggleTaskCompleted({
|
||||
variables: {
|
||||
id: id,
|
||||
completed: !currentStatus,
|
||||
completed_at: completed_at
|
||||
}
|
||||
});
|
||||
refetch().catch((e) => {
|
||||
console.error(`Something went wrong fetching tasks: ${e.message || ''}`);
|
||||
});
|
||||
notification["success"]({
|
||||
message: t("tasks.successes.completed"),
|
||||
});
|
||||
} catch (err) {
|
||||
notification["error"]({
|
||||
message: t("tasks.failures.completed"),
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Toggle task deleted mutation
|
||||
@@ -85,20 +100,30 @@ export default function TaskListContainer({bodyshop, currentUser}) {
|
||||
*/
|
||||
const toggleDeletedStatus = async (id, currentStatus) => {
|
||||
const deleted_at = !currentStatus ? new Date().toISOString() : null;
|
||||
await toggleTaskDeleted({
|
||||
variables: {
|
||||
id: id,
|
||||
deleted: !currentStatus,
|
||||
deleted_at: deleted_at
|
||||
}
|
||||
});
|
||||
refetch().catch((e) => {
|
||||
console.error(`Something went wrong fetching tasks: ${e.message || ''}`);
|
||||
});
|
||||
try {
|
||||
await toggleTaskDeleted({
|
||||
variables: {
|
||||
id: id,
|
||||
deleted: !currentStatus,
|
||||
deleted_at: deleted_at
|
||||
}
|
||||
});
|
||||
refetch().catch((e) => {
|
||||
console.error(`Something went wrong fetching tasks: ${e.message || ''}`);
|
||||
});
|
||||
notification["success"]({
|
||||
message: t("tasks.successes.deleted"),
|
||||
});
|
||||
} catch (err) {
|
||||
notification["error"]({
|
||||
message: t("tasks.failures.deleted"),
|
||||
});
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
if (error) return <AlertComponent message={error.message} type="error"/>;
|
||||
|
||||
|
||||
return (
|
||||
<TaskListComponent
|
||||
loading={loading}
|
||||
|
||||
Reference in New Issue
Block a user