From 5ca6757b449b0eb0adafabd1e3c1bd423ae83435 Mon Sep 17 00:00:00 2001
From: igoroctaviano <igoroctaviano@gmail.com>
Date: Tue, 30 Jun 2020 14:02:23 -0300
Subject: [PATCH] Add error message of generate reportt

---
 .../PanelMeasurementTableTracking/index.js    | 17 +++++++----------
 platform/core/src/DICOMSR/dataExchange.js     | 19 +++++++------------
 .../ui/src/components/Snackbar/Snackbar.css   | 14 --------------
 .../src/components/Snackbar/SnackbarItem.jsx  |  4 +++-
 4 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/index.js b/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/index.js
index e6473ed68..9a40f8ca5 100644
--- a/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/index.js
+++ b/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/index.js
@@ -136,17 +136,14 @@ function PanelMeasurementTableTracking({ servicesManager, extensionManager }) {
       // Would need some way of saying which one is the "push" dataSource
       const dataSource = dataSources[0];
 
-      const { message } = await DICOMSR.storeMeasurements(
-        trackedMeasurements,
-        dataSource,
-        naturalizedReport => {
-          DisplaySetService.makeDisplaySets([naturalizedReport], {
-            madeInClient: true,
-          });
-        }
-      );
+      const naturalizedReport = await DICOMSR.storeMeasurements(trackedMeasurements, dataSource);
 
-      UINotificationService.show({ title: 'STOW SR', message, type: 'success' });
+      DisplaySetService.makeDisplaySets([naturalizedReport], { madeInClient: true });
+      UINotificationService.show({
+        title: 'STOW SR',
+        message: 'Measurements saved successfully',
+        type: 'success'
+      });
     } catch (error) {
       UINotificationService.show({
         title: 'STOW SR',
diff --git a/platform/core/src/DICOMSR/dataExchange.js b/platform/core/src/DICOMSR/dataExchange.js
index 8f86f743c..b0dad9044 100644
--- a/platform/core/src/DICOMSR/dataExchange.js
+++ b/platform/core/src/DICOMSR/dataExchange.js
@@ -79,8 +79,9 @@ const generateReport = measurementData => {
  * @param {object[]} measurementData An array of measurements from the measurements service
  * that you wish to serialize.
  * @param {object} dataSource The dataSource that you wish to use to persist the data.
+ * @return {object} The naturalized report
  */
-const storeMeasurements = async (measurementData, dataSource, onSuccess) => {
+const storeMeasurements = async (measurementData, dataSource) => {
   // TODO -> Eventually use the measurements directly and not the dcmjs adapter,
   // But it is good enough for now whilst we only have cornerstone as a datasource.
   log.info('[DICOMSR] storeMeasurements');
@@ -90,28 +91,22 @@ const storeMeasurements = async (measurementData, dataSource, onSuccess) => {
     return Promise.reject({});
   }
 
-  const naturalizedReport = generateReport(measurementData);
-  const { StudyInstanceUID } = naturalizedReport;
-
   try {
+    const naturalizedReport = generateReport(measurementData);
+    const { StudyInstanceUID } = naturalizedReport;
+
     await dataSource.store.dicom(naturalizedReport);
 
     if (StudyInstanceUID) {
       dataSource.deleteStudyMetadataPromise(StudyInstanceUID);
     }
 
-    if (onSuccess) {
-      onSuccess(naturalizedReport);
-    }
-
-    return {
-      message: 'Measurements saved successfully',
-    };
+    return naturalizedReport;
   } catch (error) {
     log.error(
       `[DICOMSR] Error while saving the measurements: ${error.message}`
     );
-    throw new Error('Error while saving the measurements.');
+    throw new Error(error.message || 'Error while saving the measurements.');
   }
 };
 
diff --git a/platform/ui/src/components/Snackbar/Snackbar.css b/platform/ui/src/components/Snackbar/Snackbar.css
index 0c3a0546a..93db56bfd 100644
--- a/platform/ui/src/components/Snackbar/Snackbar.css
+++ b/platform/ui/src/components/Snackbar/Snackbar.css
@@ -134,20 +134,6 @@
     0 3px 5px -1px rgba(0, 0, 0, 0.14);
 }
 
-.sb-item a {
-  color: white;
-  text-decoration: underline;
-}
-
-.sb-hidden {
-  padding-top: 0;
-  padding-bottom: 0;
-  margin-bottom: 0;
-  height: 0;
-  opacity: 0;
-  transition: all 300ms ease;
-}
-
 @keyframes fadein {
   from {
     opacity: 0;
diff --git a/platform/ui/src/components/Snackbar/SnackbarItem.jsx b/platform/ui/src/components/Snackbar/SnackbarItem.jsx
index dc0f2bcef..1c45790f2 100644
--- a/platform/ui/src/components/Snackbar/SnackbarItem.jsx
+++ b/platform/ui/src/components/Snackbar/SnackbarItem.jsx
@@ -19,10 +19,12 @@ const SnackbarItem = ({ options, onClose }) => {
     [SnackbarTypes.ERROR]: 'bg-red-600'
   };
 
+  const hidden = 'duration-300 transition-all ease-in-out h-0 opacity-0 pt-0 mb-0 pb-0';
+
   return (
     <div
       className={classNames(
-        `${options.visible ? '' : 'sb-hidden'} sb-item`,
+        `${options.visible ? '' : hidden} sb-item`,
         typeClasses[options.type]
       )}
     >