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 22ec4fec9..2c5eff0a7 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
@@ -266,9 +266,6 @@ export function TaskUpsertModalComponent({
-
-
-
}
*/
const handleExistingTask = async (id, jobId, values) => {
+ const task = replaceUndefinedWithNull(values);
+
+ // Remind at is dirty so lets clear remind_at_sent
+ if (task?.remind_at) {
+ task.remind_at_sent = null;
+ }
+
const taskObject = {
variables: {
taskId: id,
- task: replaceUndefinedWithNull(values)
+ task
}
};
@@ -228,7 +235,6 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
}
return acc;
}, {});
- console.dir(dirtyValues?.remind_at_sent);
try {
await handleExistingTask(taskSource.id, taskSource.jobid, dirtyValues);
} catch (e) {
diff --git a/client/src/graphql/tasks.queries.js b/client/src/graphql/tasks.queries.js
index 94debb87c..2bc4893df 100644
--- a/client/src/graphql/tasks.queries.js
+++ b/client/src/graphql/tasks.queries.js
@@ -15,7 +15,6 @@ export const PARTIAL_TASK_FIELDS = gql`
completed
completed_at
remind_at
- remind_at_sent
priority
job {
id
diff --git a/hasura/metadata/cron_triggers.yaml b/hasura/metadata/cron_triggers.yaml
index b5507b288..d44f1f07f 100644
--- a/hasura/metadata/cron_triggers.yaml
+++ b/hasura/metadata/cron_triggers.yaml
@@ -1,6 +1,6 @@
- name: Task Reminders
webhook: https://worktest.home.irony.online/tasks-remind-handler
- schedule: '*/1 * * * *'
+ schedule: '*/15 * * * *'
include_in_metadata: true
payload: {}
headers:
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 94cba47e3..1006524a7 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -5810,7 +5810,7 @@
interval_sec: 10
num_retries: 3
timeout_sec: 60
- webhook_from_env: HASURA_API_URL
+ webhook: https://worktest.home.irony.online
headers:
- name: event-secret
value_from_env: EVENT_SECRET
diff --git a/server/email/tasksEmails.js b/server/email/tasksEmails.js
index 18625d8dd..80a7097cc 100644
--- a/server/email/tasksEmails.js
+++ b/server/email/tasksEmails.js
@@ -199,10 +199,11 @@ const tasksRemindEmail = async (req, res) => {
if (emailData?.subject && emailData?.html) {
// Send Email
- sendMail("remind", emailData.to, emailData.subject, emailData.html, taskIds, (taskIds) => {});
- client.request(UPDATE_TASKS_REMIND_AT_SENT, {
- taskIds,
- now: moment().toISOString()
+ sendMail("remind", emailData.to, emailData.subject, emailData.html, taskIds, (taskIds) => {
+ client.request(UPDATE_TASKS_REMIND_AT_SENT, {
+ taskIds,
+ now: moment().toISOString()
+ });
});
}
});