Merge pull request #666 from camicroscope/better-load-err

Show tileserver errors as usual redirect
camicroscope · Jan 11, 2024 · 0108ac2 · 0108ac2
2 parents ec883a9 + 25b7947
commit 0108ac2
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/apps/heatmap/init.js b/apps/heatmap/init.js
@@ -60,6 +60,10 @@ function initCore() {
 
   $CAMIC.loadImg(async function(e) {
     Loading.open(document.body, `Loading Data ...`);
+    $CAMIC.viewer.addHandler('open-failed', function(e) {
+      console.error(e.message, e);
+      redirect($D.pages.table, e.message, 5);
+    });
     // image loaded
     if (e.hasError) {
       $UI.message.addError(e.message);

diff --git a/apps/labeling/labeling.js b/apps/labeling/labeling.js
@@ -77,6 +77,10 @@ function initCore() {
         defaultText: `Slide: ${$D.params.data.name}`,
       });
     }
+    $CAMIC.viewer.addHandler('open-failed', function(e) {
+      console.error(e.message, e);
+      redirect($D.pages.table, e.message, 5);
+    });
   });
 
   $CAMIC.viewer.addHandler('open', function() {

diff --git a/apps/mini/init.js b/apps/mini/init.js
@@ -161,6 +161,10 @@ function initCore() {
   }
 
   $CAMIC.loadImg(function(e) {
+    $CAMIC.viewer.addHandler('open-failed', function(e){
+      console.error(e.message, e)
+      redirect($D.pages.table, e.message, 5);
+    })
     // image loaded
     if (e.hasError) {
       // if this is a retry, assume normal behavior (one retry per slide)

diff --git a/apps/model/model.js b/apps/model/model.js
@@ -404,6 +404,10 @@ function initCore() {
     } else {
       $D.params.data = e;
     }
+    $CAMIC.viewer.addHandler('open-failed', function(e) {
+      console.error(e.message, e);
+      redirect($D.pages.table, e.message, 5);
+    });
   });
 
   $CAMIC.store.getSlide($D.params.slideId).then((response) => {

diff --git a/apps/segment/segment.js b/apps/segment/segment.js
@@ -371,6 +371,10 @@ function initCore() {
     } else {
       $D.params.data = e;
     }
+    $CAMIC.viewer.addHandler('open-failed', function(e) {
+      console.error(e.message, e);
+      redirect($D.pages.table, e.message, 5);
+    });
   });
 
   $CAMIC.viewer.addOnceHandler('open', function(e) {

diff --git a/apps/viewer/init.js b/apps/viewer/init.js
@@ -195,6 +195,10 @@ function initCore() {
   }
 
   $CAMIC.loadImg(function(e) {
+    $CAMIC.viewer.addHandler('open-failed', function(e) {
+      console.error(e.message, e);
+      redirect($D.pages.table, e.message, 5);
+    });
     // image loaded
     if (e.hasError) {
       // if this is a retry, assume normal behavior (one retry per slide)