From 012f256b7745101a8968676d099d10fc587bd520 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Fri, 18 Jun 2021 11:22:49 -0700 Subject: [PATCH] Add delivery to checklist & remove jria submit on error. --- bodyshop_translations.babel | 4 +- .../error-boundary.component.jsx | 52 +++++++++++++------ .../job-checklist-form.component.jsx | 9 ++++ .../job-checklist-display.component.jsx | 1 - client/src/graphql/jobs.queries.js | 1 + client/src/translations/en_us/common.json | 2 +- client/src/translations/es/common.json | 2 +- client/src/translations/fr/common.json | 2 +- 8 files changed, 52 insertions(+), 21 deletions(-) diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 9f9abea4e..be57f200d 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -12706,7 +12706,7 @@ - submit + senderrortosupport false @@ -12727,7 +12727,7 @@ - submitticket + submit false diff --git a/client/src/components/error-boundary/error-boundary.component.jsx b/client/src/components/error-boundary/error-boundary.component.jsx index 0eca73dea..327a2b7de 100644 --- a/client/src/components/error-boundary/error-boundary.component.jsx +++ b/client/src/components/error-boundary/error-boundary.component.jsx @@ -5,9 +5,14 @@ import { logImEXEvent } from "../../firebase/firebase.utils"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; -import { selectCurrentUser } from "../../redux/user/user.selectors"; +import { + selectBodyshop, + selectCurrentUser, +} from "../../redux/user/user.selectors"; + const mapStateToProps = createStructuredSelector({ currentUser: selectCurrentUser, + bodyshop: selectBodyshop, }); const mapDispatchToProps = (dispatch) => ({ //setUserLanguage: language => dispatch(setUserLanguage(language)) @@ -34,24 +39,41 @@ class ErrorBoundary extends React.Component { } handleErrorSubmit = () => { - const errorDescription = `**Please add relevant details about what you were doing before you encountered this issue** + window.$crisp.push([ + "do", + "message:send", + [ + "text", + `I hit the following error: \n\n + ${this.state.error.message}\n\n + ${this.state.error.stack}\n\n + URL:${window.location} as ${this.props.currentUser.email} for ${ + this.props.bodyshop && this.props.bodyshop.name + } + `, + ], + ]); ----- -System Generated Log: -${this.state.error.message} -${this.state.error.stack} - `; + window.$crisp.push(["do", "chat:open"]); + // const errorDescription = `**Please add relevant details about what you were doing before you encountered this issue** - const URL = `https://bodyshop.atlassian.net/servicedesk/customer/portal/3/group/8/create/26?summary=123&description=${encodeURI( - errorDescription - )}&customfield_10049=${window.location}&email=${ - this.props.currentUser.email - }`; - console.log(`URL`, URL); - window.open(URL, "_blank"); + // ---- + // System Generated Log: + // ${this.state.error.message} + // ${this.state.error.stack} + // `; + + // const URL = `https://bodyshop.atlassian.net/servicedesk/customer/portal/3/group/8/create/26?summary=123&description=${encodeURI( + // errorDescription + // )}&customfield_10049=${window.location}&email=${ + // this.props.currentUser.email + // }`; + // console.log(`URL`, URL); + // window.open(URL, "_blank"); }; render() { + console.log("this.props :>> ", this.props); const { t } = this.props; const { error, info } = this.state; if (this.state.hasErrored === true) { @@ -91,7 +113,7 @@ ${this.state.error.stack} {t("general.actions.refresh")} } diff --git a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx index a7b1da714..5d29b26a4 100644 --- a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx +++ b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx @@ -82,6 +82,7 @@ export function JobChecklistForm({ ...(type === "deliver" && { scheduled_delivery: values.scheduled_delivery, + actual_delivery: values.actual_delivery, }), ...(type === "deliver" && values.removeFromProduction && { @@ -147,6 +148,7 @@ export function JobChecklistForm({ ...(type === "deliver" && { removeFromProduction: true, actual_completion: job && job.actual_completion, + actual_delivery: job && job.actual_delivery, }), ...formItems .filter((fi) => fi.value) @@ -212,6 +214,13 @@ export function JobChecklistForm({ > + + + checklist", checklist); if (!checklist) return
; return (
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index a608f1e48..f2584ae72 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -1838,6 +1838,7 @@ export const QUERY_JOB_CHECKLISTS = gql` scheduled_completion actual_completion scheduled_delivery + actual_delivery production_vars bodyshop { id diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index b96c433a6..7f6c14b4f 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -812,8 +812,8 @@ "save": "Save", "saveandnew": "Save and New", "selectall": "Select All", + "senderrortosupport": "Send Error to Support", "submit": "Submit", - "submitticket": "Submit a Support Ticket", "view": "View", "viewreleasenotes": "See What's Changed" }, diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index eae5783f5..687714c0e 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -812,8 +812,8 @@ "save": "Salvar", "saveandnew": "", "selectall": "", + "senderrortosupport": "", "submit": "", - "submitticket": "", "view": "", "viewreleasenotes": "" }, diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 8f4784000..39e09c7a6 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -812,8 +812,8 @@ "save": "sauvegarder", "saveandnew": "", "selectall": "", + "senderrortosupport": "", "submit": "", - "submitticket": "", "view": "", "viewreleasenotes": "" },