From f6bcc743d8d9b36d74c0485f94b0e0cf67065109 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Mon, 6 Nov 2023 15:04:01 -0800 Subject: [PATCH 1/8] IO-2330 Remove phone validation for vendor sav.e --- client/src/components/vendors-form/vendors-form.component.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/components/vendors-form/vendors-form.component.jsx b/client/src/components/vendors-form/vendors-form.component.jsx index 95693041b..38571fb92 100644 --- a/client/src/components/vendors-form/vendors-form.component.jsx +++ b/client/src/components/vendors-form/vendors-form.component.jsx @@ -154,7 +154,6 @@ export function VendorsFormComponent({ label={t("vendors.fields.phone")} name="phone" rules={[ - { required: true, message: t("general.validation.required") }, ({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "phone"), ]} From 4e1dd52beaf828c62e52973e91b32778fc5bc353 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Mon, 6 Nov 2023 15:07:26 -0800 Subject: [PATCH 2/8] IO-2332 filter insurance company name on convert. --- .../jobs-convert-button/jobs-convert-button.component.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx index b48deb3b5..543ad36ca 100644 --- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx +++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx @@ -108,7 +108,7 @@ export function JobsConvertButton({ }, ]} > - {bodyshop.md_ins_cos.map((s, i) => ( {s.name} From 3e05b21c909f3ad7fd2a8067c6b293d539834a3e Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 7 Nov 2023 08:55:59 -0800 Subject: [PATCH 3/8] IO-2426 Add FCM Cache update for conversation aggregate count. --- client/src/utils/fcm-handler.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/client/src/utils/fcm-handler.js b/client/src/utils/fcm-handler.js index 07193e8b6..9a0f4472c 100644 --- a/client/src/utils/fcm-handler.js +++ b/client/src/utils/fcm-handler.js @@ -12,6 +12,13 @@ export default async function FcmHandler({ client, payload }) { }, }, }); + client.cache.modify({ + fields: { + messages_aggregate(cached) { + return { aggregate: { count: cached.aggregate.count + 1 } }; + }, + }, + }); break; case "messaging-outbound": client.cache.modify({ @@ -30,6 +37,7 @@ export default async function FcmHandler({ client, payload }) { }); break; case "messaging-mark-conversation-read": + let previousUnreadCount = 0; client.cache.modify({ id: client.cache.identify({ __typename: "conversations", @@ -37,10 +45,22 @@ export default async function FcmHandler({ client, payload }) { }), fields: { messages_aggregate(cached) { + previousUnreadCount = cached.aggregate.count; return { aggregate: { count: 0 } }; }, }, }); + client.cache.modify({ + fields: { + messages_aggregate(cached) { + return { + aggregate: { + count: cached.aggregate.count - previousUnreadCount, + }, + }; + }, + }, + }); break; default: console.log("No payload type set."); From 99977934e7def269ef9984b9da3ab579760fe180 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 7 Nov 2023 09:24:21 -0800 Subject: [PATCH 4/8] IO-2429 Remove CIECA information on duplication. --- .../jobs-detail-header-actions.duplicate.util.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js index fc5b9c0ca..503bcc740 100644 --- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js +++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js @@ -27,6 +27,8 @@ export default async function DuplicateJob( delete existingJob.id; delete existingJob.createdat; delete existingJob.updatedat; + delete existingJob.cieca_stl; + delete existingJob.cieca_ttl; const newJob = { ...existingJob, @@ -81,6 +83,8 @@ export async function CreateIouForJob( delete existingJob.id; delete existingJob.createdat; delete existingJob.updatedat; + delete existingJob.cieca_stl; + delete existingJob.cieca_ttl; const newJob = { ...existingJob, From 682ea860fbb38ad7a8f21ca56d03fb2f47849736 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 7 Nov 2023 12:36:30 -0800 Subject: [PATCH 5/8] IO-2437 override CDK make model on update. --- bodyshop_translations.babel | 191 +++++++++++++++++- .../dms-post-form/dms-post-form.component.jsx | 7 + client/src/translations/en_us/common.json | 1 + client/src/translations/es/common.json | 1 + client/src/translations/fr/common.json | 1 + server/cdk/cdk-job-export.js | 6 + 6 files changed, 206 insertions(+), 1 deletion(-) diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 5bc83e3b8..304566b29 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -1,4 +1,4 @@ - +