From f8c1087360a87cb7d1cc13e37cd4b00305f05dc4 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Mon, 14 Jun 2021 09:50:30 -0700 Subject: [PATCH 01/18] IO-1177 Resolve deleting of raw files. --- client/madge-graph.svg | 13 ------------- .../documents-upload/documents-upload.utility.js | 8 ++++++-- .../jobs-documents-gallery.delete.component.jsx | 2 +- server/media/media.js | 2 +- 4 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 client/madge-graph.svg diff --git a/client/madge-graph.svg b/client/madge-graph.svg deleted file mode 100644 index 3f75254d9..000000000 --- a/client/madge-graph.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - -G - - - diff --git a/client/src/components/documents-upload/documents-upload.utility.js b/client/src/components/documents-upload/documents-upload.utility.js index abc0315f1..bca78f094 100644 --- a/client/src/components/documents-upload/documents-upload.utility.js +++ b/client/src/components/documents-upload/documents-upload.utility.js @@ -132,9 +132,13 @@ export const uploadToCloudinary = async ( //Insert the document with the matching key. let takenat; if (fileType.includes("image")) { - const exif = await exifr.parse(file); + try { + const exif = await exifr.parse(file); - takenat = exif && exif.DateTimeOriginal; + takenat = exif && exif.DateTimeOriginal; + } catch (error) { + console.log("Unable to parse image file for EXIF Data"); + } } const documentInsert = await client.mutate({ mutation: INSERT_NEW_DOCUMENT, diff --git a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.delete.component.jsx b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.delete.component.jsx index 9d3764daf..4928c572b 100644 --- a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.delete.component.jsx +++ b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.delete.component.jsx @@ -37,7 +37,7 @@ export default function JobsDocumentsDeleteButton({ }), }); } else { - successfulDeletes.push(key); + successfulDeletes.push(key.replace(/\.[^/.]+$/, "")); } }); }); diff --git a/server/media/media.js b/server/media/media.js index 727c040c9..e427cd069 100644 --- a/server/media/media.js +++ b/server/media/media.js @@ -60,7 +60,7 @@ exports.deleteFiles = async (req, res) => { //delete images returns.push( returns.push( await cloudinary.api.delete_resources( - types.raw.map((x) => x.key), + types.raw.map((x) => `${x.key}.${x.extension}`), { resource_type: "raw" } ) ); From 5b9640a1debd5437170d1da7afd019c44ade0785 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Mon, 14 Jun 2021 09:55:09 -0700 Subject: [PATCH 02/18] IO-1185 Adjust contract find to use plate. --- .../contracts-find-modal/contracts-find-modal.component.jsx | 2 +- .../contracts-find-modal/contracts-find-modal.container.jsx | 4 ++-- client/src/graphql/cccontracts.queries.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/src/components/contracts-find-modal/contracts-find-modal.component.jsx b/client/src/components/contracts-find-modal/contracts-find-modal.component.jsx index ac07f4c19..83a87b39a 100644 --- a/client/src/components/contracts-find-modal/contracts-find-modal.component.jsx +++ b/client/src/components/contracts-find-modal/contracts-find-modal.component.jsx @@ -17,7 +17,7 @@ export function PartsReceiveModalComponent({ bodyshop, form }) { return (
- + Date: Mon, 14 Jun 2021 09:58:40 -0700 Subject: [PATCH 03/18] IO-1202 CC List hyperlink --- .../courtesy-cars-list.component.jsx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx index 98d5b06bc..d531606e5 100644 --- a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx +++ b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx @@ -90,13 +90,12 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) { // sorter: (a, b) => alphaSort(a.model, b.model), sortOrder: state.sortedInfo.columnKey === "model" && state.sortedInfo.order, - render: (text, record) => ( -
- {record.cccontracts.length === 1 - ? record.cccontracts[0].job.ro_number - : null} -
- ), + render: (text, record) => + record.cccontracts.length === 1 ? ( + + {record.cccontracts[0].job.ro_number} + + ) : null, }, ]; From 3ab31c8bee9358d2ae9fdba06bd3a08c84dcea49 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Mon, 14 Jun 2021 10:44:05 -0700 Subject: [PATCH 04/18] IO-1205 IO-1207 IO-1204 Minor UI Updates. --- bodyshop_translations.babel | 2 +- .../parts-order-list-table.component.jsx | 2 +- client/src/translations/en_us/common.json | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 5fcb5546a..74b57be20 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -1,4 +1,4 @@ - +