diff --git a/client/src/components/report-center-modal/report-center-modal.component.jsx b/client/src/components/report-center-modal/report-center-modal.component.jsx index 49a5372ff..71439f287 100644 --- a/client/src/components/report-center-modal/report-center-modal.component.jsx +++ b/client/src/components/report-center-modal/report-center-modal.component.jsx @@ -236,6 +236,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) { ); + //This was introduced with tasks before assigned_to was shifted to UUID. Keeping in place for reference in the future if needed. if (idtype === "employeeWithEmail") return ( { - const employee = bodyshop?.employees?.find((e) => e.user_email === record.assigned_to); + const employee = bodyshop?.employees?.find((e) => e.id === record.assigned_to); return employee ? `${employee.first_name} ${employee.last_name}` : t("general.labels.na"); } }); diff --git a/client/src/components/task-list/task-list.container.jsx b/client/src/components/task-list/task-list.container.jsx index 1bc801fff..c36d660b8 100644 --- a/client/src/components/task-list/task-list.container.jsx +++ b/client/src/components/task-list/task-list.container.jsx @@ -48,8 +48,8 @@ export function TaskListContainer({ bodyshop: bodyshop.id, [relationshipType]: relationshipId, deleted: deleted === "true", - completed: completed === "true", - assigned_to: mine === "true" ? currentUser.email : undefined, // replace currentUserID with the actual ID of the current user + completed: completed === "true", //TODO: Find where mine is set. + assigned_to: onlyMine ? bodyshop?.employees?.find((e) => e.user_email === currentUser.email)?.id : undefined, // replace currentUserID with the actual ID of the current user offset: page ? (page - 1) * pageLimit : 0, limit: pageLimit, order: [ diff --git a/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx b/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx index 2c5eff0a7..356c59f15 100644 --- a/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx +++ b/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx @@ -224,9 +224,7 @@ export function TaskUpsertModalComponent({ label={t("tasks.fields.assigned_to")} name="assigned_to" initialValue={ - bodyshop.employees.find((employee) => employee?.user_email === currentUser.email && employee.active) - ? currentUser.email - : undefined + bodyshop.employees.find((employee) => employee?.user_email === currentUser.email && employee.active)?.id } rules={[ { @@ -240,7 +238,7 @@ export function TaskUpsertModalComponent({ .filter((x) => x.active && x.user_email) .map((employee) => ({ key: employee.id, - value: employee.user_email, + value: employee.id, label: `${employee.first_name} ${employee.last_name}` }))} /> diff --git a/client/src/graphql/tasks.queries.js b/client/src/graphql/tasks.queries.js index 2bc4893df..90d5606c7 100644 --- a/client/src/graphql/tasks.queries.js +++ b/client/src/graphql/tasks.queries.js @@ -12,6 +12,10 @@ export const PARTIAL_TASK_FIELDS = gql` due_date created_by assigned_to + assigned_to_employee { + id + user_email + } completed completed_at remind_at @@ -80,7 +84,7 @@ export const QUERY_ALL_TASKS_PAGINATED = gql` $bodyshop: uuid! $deleted: Boolean $completed: Boolean - $assigned_to: String + $assigned_to: uuid $order: [tasks_order_by!]! ) { tasks( @@ -121,7 +125,7 @@ export const QUERY_JOBLINE_TASKS_PAGINATED = gql` $bodyshop: uuid! $deleted: Boolean $completed: Boolean - $assigned_to: String + $assigned_to: uuid $order: [tasks_order_by!]! ) { tasks( @@ -164,7 +168,7 @@ export const QUERY_PARTSORDER_TASKS_PAGINATED = gql` $bodyshop: uuid! $deleted: Boolean $completed: Boolean - $assigned_to: String + $assigned_to: uuid $order: [tasks_order_by!]! ) { tasks( @@ -207,7 +211,7 @@ export const QUERY_BILL_TASKS_PAGINATED = gql` $bodyshop: uuid! $deleted: Boolean $completed: Boolean - $assigned_to: String + $assigned_to: uuid $order: [tasks_order_by!]! ) { tasks( @@ -250,7 +254,7 @@ export const QUERY_JOB_TASKS_PAGINATED = gql` $bodyshop: uuid! $deleted: Boolean $completed: Boolean - $assigned_to: String + $assigned_to: uuid $order: [tasks_order_by!]! ) { tasks( @@ -288,7 +292,7 @@ export const QUERY_MY_TASKS_PAGINATED = gql` query QUERY_MY_TASKS_PAGINATED( $offset: Int $limit: Int - $user: String! + $assigned_to: uuid! $bodyshop: uuid! $deleted: Boolean $completed: Boolean @@ -299,7 +303,7 @@ export const QUERY_MY_TASKS_PAGINATED = gql` limit: $limit order_by: $order where: { - assigned_to: { _eq: $user } + assigned_to: { _eq: $assigned_to } bodyshopid: { _eq: $bodyshop } deleted: { _eq: $deleted } completed: { _eq: $completed } @@ -309,7 +313,7 @@ export const QUERY_MY_TASKS_PAGINATED = gql` } tasks_aggregate( where: { - assigned_to: { _eq: $user } + assigned_to: { _eq: $assigned_to } bodyshopid: { _eq: $bodyshop } deleted: { _eq: $deleted } completed: { _eq: $completed } diff --git a/client/src/pages/tasks/tasks.page.component.jsx b/client/src/pages/tasks/tasks.page.component.jsx index 658c34d7b..75aa9092c 100644 --- a/client/src/pages/tasks/tasks.page.component.jsx +++ b/client/src/pages/tasks/tasks.page.component.jsx @@ -3,24 +3,25 @@ import TaskListContainer from "../../components/task-list/task-list.container.js import { QUERY_ALL_TASKS_PAGINATED, QUERY_MY_TASKS_PAGINATED } from "../../graphql/tasks.queries.js"; import taskPageTypes from "./taskPageTypes.jsx"; import { createStructuredSelector } from "reselect"; -import { selectCurrentUser } from "../../redux/user/user.selectors.js"; +import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors.js"; import { connect } from "react-redux"; const mapStateToProps = createStructuredSelector({ - currentUser: selectCurrentUser + currentUser: selectCurrentUser, + bodyshop: selectBodyshop }); const mapDispatchToProps = (dispatch) => ({}); export default connect(mapStateToProps, mapDispatchToProps)(TasksPageComponent); -export function TasksPageComponent({ currentUser, type }) { +export function TasksPageComponent({ bodyshop, currentUser, type }) { switch (type) { case taskPageTypes.MY_TASKS: return ( e.user_email === currentUser.email)?.id} + relationshipType={"assigned_to"} query={{ QUERY_MY_TASKS_PAGINATED }} titleTranslation={"tasks.titles.my_tasks"} disableJobRefetch={true} diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js index 7415622b9..0296fc317 100644 --- a/client/src/utils/TemplateConstants.js +++ b/client/src/utils/TemplateConstants.js @@ -2114,7 +2114,7 @@ export const TemplateList = (type, context) => { title: i18n.t("reportcenter.templates.tasks_date_employee"), subject: i18n.t("reportcenter.templates.tasks_date_employee"), key: "tasks_date_employee", - idtype: "employeeWithEmail", + idtype: "employee", disabled: false, rangeFilter: { object: i18n.t("reportcenter.labels.objects.tasks"), diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index 052a3971d..d1ad52033 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -2335,6 +2335,13 @@ table: name: jobs schema: public + - name: tasks + using: + foreign_key_constraint_on: + column: assigned_to + table: + name: tasks + schema: public - name: timetickets using: foreign_key_constraint_on: @@ -5678,15 +5685,15 @@ name: tasks schema: public object_relationships: + - name: assigned_to_employee + using: + foreign_key_constraint_on: assigned_to - name: bill using: foreign_key_constraint_on: billid - name: bodyshop using: foreign_key_constraint_on: bodyshopid - - name: employee - using: - foreign_key_constraint_on: assigned_to - name: job using: foreign_key_constraint_on: jobid @@ -5736,6 +5743,7 @@ - role: user permission: columns: + - assigned_to - billid - bodyshopid - completed @@ -5807,7 +5815,7 @@ columns: '*' update: columns: - - bodyshopid + - assigned_to retry_conf: interval_sec: 10 num_retries: 3 diff --git a/hasura/migrations/1713541358566_create_index_tasks_jobid/down.sql b/hasura/migrations/1713541358566_create_index_tasks_jobid/down.sql new file mode 100644 index 000000000..f7d6b496b --- /dev/null +++ b/hasura/migrations/1713541358566_create_index_tasks_jobid/down.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."tasks_jobid"; diff --git a/hasura/migrations/1713541358566_create_index_tasks_jobid/up.sql b/hasura/migrations/1713541358566_create_index_tasks_jobid/up.sql new file mode 100644 index 000000000..f065485c6 --- /dev/null +++ b/hasura/migrations/1713541358566_create_index_tasks_jobid/up.sql @@ -0,0 +1,2 @@ +CREATE INDEX "tasks_jobid" on + "public"."tasks" using btree ("jobid"); diff --git a/hasura/migrations/1713541372519_create_index_tasks_assigned-to/down.sql b/hasura/migrations/1713541372519_create_index_tasks_assigned-to/down.sql new file mode 100644 index 000000000..41e0992c9 --- /dev/null +++ b/hasura/migrations/1713541372519_create_index_tasks_assigned-to/down.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."tasks_assigned-to"; diff --git a/hasura/migrations/1713541372519_create_index_tasks_assigned-to/up.sql b/hasura/migrations/1713541372519_create_index_tasks_assigned-to/up.sql new file mode 100644 index 000000000..973dc5185 --- /dev/null +++ b/hasura/migrations/1713541372519_create_index_tasks_assigned-to/up.sql @@ -0,0 +1,2 @@ +CREATE INDEX "tasks_assigned-to" on + "public"."tasks" using btree ("assigned_to"); diff --git a/hasura/migrations/1713541390310_create_index_tasks_joblineid/down.sql b/hasura/migrations/1713541390310_create_index_tasks_joblineid/down.sql new file mode 100644 index 000000000..729f961f2 --- /dev/null +++ b/hasura/migrations/1713541390310_create_index_tasks_joblineid/down.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."tasks_joblineid"; diff --git a/hasura/migrations/1713541390310_create_index_tasks_joblineid/up.sql b/hasura/migrations/1713541390310_create_index_tasks_joblineid/up.sql new file mode 100644 index 000000000..f7222c1b8 --- /dev/null +++ b/hasura/migrations/1713541390310_create_index_tasks_joblineid/up.sql @@ -0,0 +1,2 @@ +CREATE INDEX "tasks_joblineid" on + "public"."tasks" using btree ("joblineid"); diff --git a/hasura/migrations/1713541406066_create_index_tasks_partsorderid/down.sql b/hasura/migrations/1713541406066_create_index_tasks_partsorderid/down.sql new file mode 100644 index 000000000..a6f8e76ea --- /dev/null +++ b/hasura/migrations/1713541406066_create_index_tasks_partsorderid/down.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."tasks_partsorderid"; diff --git a/hasura/migrations/1713541406066_create_index_tasks_partsorderid/up.sql b/hasura/migrations/1713541406066_create_index_tasks_partsorderid/up.sql new file mode 100644 index 000000000..325c2200b --- /dev/null +++ b/hasura/migrations/1713541406066_create_index_tasks_partsorderid/up.sql @@ -0,0 +1,2 @@ +CREATE INDEX "tasks_partsorderid" on + "public"."tasks" using btree ("partsorderid"); diff --git a/hasura/migrations/1713541425057_create_index_tasks_remind_at/down.sql b/hasura/migrations/1713541425057_create_index_tasks_remind_at/down.sql new file mode 100644 index 000000000..91c5c470c --- /dev/null +++ b/hasura/migrations/1713541425057_create_index_tasks_remind_at/down.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."tasks_remind_at"; diff --git a/hasura/migrations/1713541425057_create_index_tasks_remind_at/up.sql b/hasura/migrations/1713541425057_create_index_tasks_remind_at/up.sql new file mode 100644 index 000000000..3d630e28c --- /dev/null +++ b/hasura/migrations/1713541425057_create_index_tasks_remind_at/up.sql @@ -0,0 +1,2 @@ +CREATE INDEX "tasks_remind_at" on + "public"."tasks" using btree ("remind_at"); diff --git a/hasura/migrations/1713541438204_create_index_tasks_remind_at_sent/down.sql b/hasura/migrations/1713541438204_create_index_tasks_remind_at_sent/down.sql new file mode 100644 index 000000000..4010e7d10 --- /dev/null +++ b/hasura/migrations/1713541438204_create_index_tasks_remind_at_sent/down.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."tasks_remind_at_sent"; diff --git a/hasura/migrations/1713541438204_create_index_tasks_remind_at_sent/up.sql b/hasura/migrations/1713541438204_create_index_tasks_remind_at_sent/up.sql new file mode 100644 index 000000000..9101bbe24 --- /dev/null +++ b/hasura/migrations/1713541438204_create_index_tasks_remind_at_sent/up.sql @@ -0,0 +1,2 @@ +CREATE INDEX "tasks_remind_at_sent" on + "public"."tasks" using btree ("remind_at_sent"); diff --git a/hasura/migrations/1713541475901_create_index_tasks_bodyshopid/down.sql b/hasura/migrations/1713541475901_create_index_tasks_bodyshopid/down.sql new file mode 100644 index 000000000..53e784b5d --- /dev/null +++ b/hasura/migrations/1713541475901_create_index_tasks_bodyshopid/down.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS "public"."tasks_bodyshopid"; diff --git a/hasura/migrations/1713541475901_create_index_tasks_bodyshopid/up.sql b/hasura/migrations/1713541475901_create_index_tasks_bodyshopid/up.sql new file mode 100644 index 000000000..c3dda80b7 --- /dev/null +++ b/hasura/migrations/1713541475901_create_index_tasks_bodyshopid/up.sql @@ -0,0 +1,2 @@ +CREATE INDEX "tasks_bodyshopid" on + "public"."tasks" using btree ("bodyshopid"); diff --git a/server/email/tasksEmails.js b/server/email/tasksEmails.js index 1378a6758..913540ef9 100644 --- a/server/email/tasksEmails.js +++ b/server/email/tasksEmails.js @@ -105,8 +105,8 @@ const formatPriority = (priority) => { const generateTemplateArgs = (title, priority, description, dueDate, taskId) => { return { header: title, - subHeader: `Priority: ${formatPriority(priority)} ${priority} ${formatDate(dueDate)}`, - body: `${description}
Please sign in to your account to view the further details of the Task.` + subHeader: `Priority: ${formatPriority(priority)} ${formatDate(dueDate)}`, + body: `${description || ""}
View this task.` }; }; @@ -154,19 +154,26 @@ const sendMail = (type, to, subject, html, taskIds, successCallback) => { */ const taskAssignedEmail = async (req, res) => { // We have no event Data, bail - if (!req?.payload?.event?.data?.new) { - return res.status(400).json({ message: "No data in the event payload" }); + if (!req?.body?.event?.data?.new) { + return res.status(400).json({ message: "No data in the event body" }); } - const { new: newTask } = req.payload.event.data; + const { new: newTask } = req.body.event.data; // This is not a new task, but a reassignment. - const dirty = req.payload.event.data?.old && req.payload.event.data?.old?.assigned_to; + const dirty = req.body.event.data?.old && req.body.event.data?.old?.assigned_to; + + //Query to get the employee assigned currently. + const { + employees_by_pk: { user_email } + } = await client.request(queries.QUERY_EMPLOYEE_EMAIL_BY_ID, { + id: newTask.assigned_to + }); sendMail( "assigned", - newTask.assigned_to, - `A ${formatPriority(newTask.priority)} PriorityTask has been ${dirty ? "reassigned" : "created"} for you - ${newTask.title}`, + user_email, + `A ${formatPriority(newTask.priority)} priority task has been ${dirty ? "reassigned to" : "created for"} you - ${newTask.title}`, generateEmailTemplate( generateTemplateArgs(newTask.title, newTask.priority, newTask.description, newTask.due_date, newTask.id) ) @@ -195,7 +202,7 @@ const tasksRemindEmail = async (req, res) => { // Group tasks by assigned_to, to avoid sending multiple emails to the same recipient. const groupedTasks = tasksRequest.tasks.reduce((acc, task) => { - const key = task.assigned_to; + const key = task.assigned_to_email.user_email; if (!acc[key]) { acc[key] = []; } diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js index dbd3a851f..42506f897 100644 --- a/server/graphql-client/queries.js +++ b/server/graphql-client/queries.js @@ -2411,6 +2411,10 @@ exports.QUERY_REMIND_TASKS = ` due_date created_by assigned_to + assigned_to_employee { + id + user_email + } remind_at remind_at_sent priority @@ -2428,3 +2432,13 @@ exports.UPDATE_TASKS_REMIND_AT_SENT = `mutation UPDATE_TASK_REMIND_AT_SENT($task affected_rows } }`; + +exports.QUERY_EMPLOYEE_EMAIL_BY_ID = ` +query QUERY_EMPLOYEE_EMAIL_BY_ID($id: uuid!) { + employees_by_pk(id: $id) { + id + user_email + } +} + +`;