From 798b197d4aff51274254e64a98cc2c5ed9fa6ae7 Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Tue, 6 Feb 2018 16:26:36 -0200
Subject: [PATCH] Creating a generic UI error handling mechanism

---
 .../client/components/base/section/section.js |  4 +++
 .../components/bootstrap/dialog/form.html     | 18 ++++++++--
 .../components/bootstrap/dialog/form.js       |  7 ++++
 .../components/bootstrap/dialog/header.html   |  2 +-
 .../components/bootstrap/dialog/info.html     |  2 +-
 .../components/bootstrap/dialog/info.js       |  7 ++++
 Packages/ohif-core/client/ui/handleError.js   | 33 +++++++++++++++++++
 Packages/ohif-core/client/ui/index.js         |  1 +
 .../client/classes/HotkeysManager.js          |  4 +--
 .../radialProgressBar/radialProgressBar.styl  |  3 +-
 .../client/components/longitudinal/index.js   |  1 +
 .../longitudinalViewportOverlay.html          |  4 +--
 .../longitudinalViewportOverlay.styl          |  4 +++
 13 files changed, 81 insertions(+), 9 deletions(-)
 create mode 100644 Packages/ohif-core/client/ui/handleError.js
 create mode 100644 Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.styl

diff --git a/Packages/ohif-core/client/components/base/section/section.js b/Packages/ohif-core/client/components/base/section/section.js
index 1712983ba..b8f86af0f 100644
--- a/Packages/ohif-core/client/components/base/section/section.js
+++ b/Packages/ohif-core/client/components/base/section/section.js
@@ -55,3 +55,7 @@ Template.section.onCreated(() => {
         });
     }
 });
+
+Template.registerHelper('hasSection', sectionName => {
+    return !!OHIF.blaze.getSectionContent(Template.instance().view, sectionName);
+});
diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/form.html b/Packages/ohif-core/client/components/bootstrap/dialog/form.html
index 40b039fd6..06d6715de 100644
--- a/Packages/ohif-core/client/components/bootstrap/dialog/form.html
+++ b/Packages/ohif-core/client/components/bootstrap/dialog/form.html
@@ -4,9 +4,23 @@
             {{#form class=(concat 'modal-content ' this.formClass) hideValidationBox=true
                 api=(extend instance.api instance.data.api) schema=this.schema
             }}
-                {{>dialogHeader this}}
+                {{#if or this.title (hasSection 'dialogHeader')}}
+                    {{>dialogHeader this}}
+                {{/if}}
                 <div class="modal-body">
-                    {{this.bodyText}}
+                    <div class="messages">
+                        {{#each message in this.messages}}
+                            <div class="message">{{{message}}}</div>
+                        {{else}}
+                            {{#if isError}}
+                                {{>pageError (extend this error=this.details)}}
+                            {{else}}
+                                {{#let message=(choose this.bodyText this.reason this.message 'An error has ocurred.')}}
+                                    <div class="message">{{message}}</div>
+                                {{/let}}
+                            {{/if}}
+                        {{/each}}
+                    </div>
                     {{>UI.contentBlock}}
                 </div>
                 <div class="modal-footer">
diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/form.js b/Packages/ohif-core/client/components/bootstrap/dialog/form.js
index 7ee2014fc..88fbf5276 100644
--- a/Packages/ohif-core/client/components/bootstrap/dialog/form.js
+++ b/Packages/ohif-core/client/components/bootstrap/dialog/form.js
@@ -105,3 +105,10 @@ Template.dialogForm.events({
         }
     }
 });
+
+Template.dialogForm.helpers({
+    isError() {
+        const data = Template.instance().data;
+        return data instanceof Error || (data && data.error instanceof Error);
+    }
+});
diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/header.html b/Packages/ohif-core/client/components/bootstrap/dialog/header.html
index 4ad0a6c4f..e21e97b3f 100644
--- a/Packages/ohif-core/client/components/bootstrap/dialog/header.html
+++ b/Packages/ohif-core/client/components/bootstrap/dialog/header.html
@@ -1,7 +1,7 @@
 <template name="dialogHeader">
     <div class="modal-header">
         {{>section 'dialogHeader'}}
-        {{#if this.title}}
+        {{#if or this.title (hasSection 'dialogHeader')}}
             {{#button class='close' action='cancel'
                 tagAttributes=(extend this.tagAttributes
                     data-dismiss='modal' aria-label='Close'
diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/info.html b/Packages/ohif-core/client/components/bootstrap/dialog/info.html
index 5126a40d2..de3a50b70 100644
--- a/Packages/ohif-core/client/components/bootstrap/dialog/info.html
+++ b/Packages/ohif-core/client/components/bootstrap/dialog/info.html
@@ -6,7 +6,7 @@
       {{#each message in this.messages}}
         <div class="message">{{{message}}}</div>
       {{else}}
-        {{#if eq this.errorType 'Meteor.Error'}}
+        {{#if isError}}
             {{>pageError (extend this error=this.details)}}
         {{else}}
           {{#let message=(choose this.reason this.message 'An error has ocurred.')}}
diff --git a/Packages/ohif-core/client/components/bootstrap/dialog/info.js b/Packages/ohif-core/client/components/bootstrap/dialog/info.js
index bc8797375..47d6ad678 100644
--- a/Packages/ohif-core/client/components/bootstrap/dialog/info.js
+++ b/Packages/ohif-core/client/components/bootstrap/dialog/info.js
@@ -7,3 +7,10 @@ Template.dialogInfo.onRendered(() => {
 
     $modal.one('hidden.bs.modal', () => instance.data.promiseResolve());
 });
+
+Template.dialogInfo.helpers({
+    isError() {
+        const data = Template.instance().data;
+        return data instanceof Error || (data && data.error instanceof Error);
+    }
+});
diff --git a/Packages/ohif-core/client/ui/handleError.js b/Packages/ohif-core/client/ui/handleError.js
new file mode 100644
index 000000000..468c94a51
--- /dev/null
+++ b/Packages/ohif-core/client/ui/handleError.js
@@ -0,0 +1,33 @@
+import { Meteor } from 'meteor/meteor';
+import { OHIF } from 'meteor/ohif:core';
+
+OHIF.ui.handleError = error => {
+    let { title, message } = error;
+
+    if (!title) {
+        if (error instanceof Meteor.Error) {
+            title = error.error;
+        } else if (error instanceof Error) {
+            title = error.name;
+        }
+    }
+
+    if (!message) {
+        if (error instanceof Meteor.Error) {
+            message = error.reason;
+        } else if (error instanceof Error) {
+            message = error.message;
+        }
+    }
+
+    const data = Object.assign({
+        title,
+        message,
+        class: 'themed',
+        hideConfirm: true,
+        cancelLabel: 'Dismiss',
+        cancelClass: 'btn-secondary'
+    }, error || {});
+
+    OHIF.ui.showDialog('dialogForm', data);
+};
diff --git a/Packages/ohif-core/client/ui/index.js b/Packages/ohif-core/client/ui/index.js
index b5252c371..88b79fd10 100644
--- a/Packages/ohif-core/client/ui/index.js
+++ b/Packages/ohif-core/client/ui/index.js
@@ -10,4 +10,5 @@ import './notifications/notifications.js';
 import './popover/display.js';
 import './resizable/resizable.js';
 import './unsavedChanges/unsavedChanges.js';
+import './handleError.js';
 import './styleProperty.js';
diff --git a/Packages/ohif-hotkeys/client/classes/HotkeysManager.js b/Packages/ohif-hotkeys/client/classes/HotkeysManager.js
index 6c9368bc2..e588edd56 100644
--- a/Packages/ohif-hotkeys/client/classes/HotkeysManager.js
+++ b/Packages/ohif-hotkeys/client/classes/HotkeysManager.js
@@ -81,7 +81,7 @@ export class HotkeysManager {
     load(contextName) {
         return new Promise((resolve, reject) => {
             const context = this.getContext(contextName);
-            if (!context) return;
+            if (!context) return reject();
             this.retrieve(contextName).then(defs => {
                 const definitions = defs || this.defaults[contextName];
                 if (!definitions) {
@@ -151,6 +151,6 @@ export class HotkeysManager {
 
         this.currentContextName = contextName;
         newContext.initialize();
-        this.load(contextName);
+        this.load(contextName).catch(() => {});
     }
 }
diff --git a/Packages/ohif-measurements/client/components/caseProgress/radialProgressBar/radialProgressBar.styl b/Packages/ohif-measurements/client/components/caseProgress/radialProgressBar/radialProgressBar.styl
index 8915551e0..90b923db8 100644
--- a/Packages/ohif-measurements/client/components/caseProgress/radialProgressBar/radialProgressBar.styl
+++ b/Packages/ohif-measurements/client/components/caseProgress/radialProgressBar/radialProgressBar.styl
@@ -5,7 +5,8 @@ $circleSize = 26px
 .radialProgress
   border-radius: 100%
   height: $circleSize
-  margin-top: 8px
+  margin-top: 3px
+  margin-right: 4px
   position: relative
   vendorize(box-shadow, 0 0 1em black)
   width: $circleSize
diff --git a/Packages/ohif-measurements/client/components/longitudinal/index.js b/Packages/ohif-measurements/client/components/longitudinal/index.js
index 43398f973..ebaf3b217 100644
--- a/Packages/ohif-measurements/client/components/longitudinal/index.js
+++ b/Packages/ohif-measurements/client/components/longitudinal/index.js
@@ -6,5 +6,6 @@ import './longitudinalStudyListStudy/longitudinalStudyListStudy.js';
 import './longitudinalViewportOverlay/imageViewportIcons.html';
 import './longitudinalViewportOverlay/longitudinalViewportOverlay.html';
 import './longitudinalViewportOverlay/longitudinalViewportOverlay.js';
+import './longitudinalViewportOverlay/longitudinalViewportOverlay.styl';
 
 import './dropdown.js';
diff --git a/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.html b/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.html
index 3a6f9fd49..0ffcad3b8 100644
--- a/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.html
+++ b/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.html
@@ -7,7 +7,7 @@
                 <div>{{getGenderAndAge}}</div>
                 <div class="icons-section">
                     {{#if linked}}
-                        <svg>
+                        <svg class="icon-link">
                             <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-viewport-link"}}></use>
                         </svg>
                     {{/if}}
@@ -18,7 +18,7 @@
                 <div>{{seriesDescription}}</div>
                 <div>{{studyInfo 'AccessionNumber'}}</div>
                 <div>{{formatDA (studyInfo 'AcquisitionDate')}} {{formatTM (studyInfo 'AcquisitionTime')}}</div>
-                <div>{{#if seriesNumber}}S: {{seriesNumber}}{{#if gt numImages 1}},{{/if}} {{/if}}{{#if gt instanceNumber 0}}I: {{instanceNumber}} {{/if}}{{#if gt numImages 1}}({{imageIndex}}/{{numImages}}){{/if}}</div>
+                <div>{{#if seriesNumber}}S: {{seriesNumber}}{{#if gt numImages 1}},{{/if}} {{/if}}{{#if gt numImages 1}}I: {{imageIndex}}/{{numImages}}{{/if}}</div>
                 <div class='timepointName'>{{timepointName}}</div>
             </div>
             <div class="bottomright dicomTag">
diff --git a/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.styl b/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.styl
new file mode 100644
index 000000000..fc31d9ac4
--- /dev/null
+++ b/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.styl
@@ -0,0 +1,4 @@
+@require '{ohif:design}/app'
+
+.imageViewerViewportOverlay .icons-section .icon-link
+  transform(translateY(3px))