From 13ff4155a7461b5c3599634cf45ee39ecac0a0cc Mon Sep 17 00:00:00 2001
From: Mason Houtz <nerdinacan@gmail.com>
Date: Mon, 18 Jan 2021 11:57:01 -0800
Subject: [PATCH] made success and error messages a little easier to consume

---
 .../model/syncCurrentHistoryToGalaxy.js       | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/client/src/components/History/model/syncCurrentHistoryToGalaxy.js b/client/src/components/History/model/syncCurrentHistoryToGalaxy.js
index a161e981428..7834bd84dec 100644
--- a/client/src/components/History/model/syncCurrentHistoryToGalaxy.js
+++ b/client/src/components/History/model/syncCurrentHistoryToGalaxy.js
@@ -1,7 +1,7 @@
 // Sync Galaxy store to legacy galaxy current history
 
-import { fromEvent } from "rxjs";
-import { map, filter, switchMap, pluck, distinctUntilChanged, retryWhen, take, delay } from "rxjs/operators";
+import { concat, fromEvent, throwError } from "rxjs";
+import { tap, map, filter, switchMap, pluck, distinctUntilChanged, retryWhen, take, delay } from "rxjs/operators";
 
 export function syncCurrentHistoryToGalaxy(galaxy$, store, cfg = {}) {
     const { retryPeriod = 500, retries = 20 } = cfg;
@@ -16,19 +16,22 @@ export function syncCurrentHistoryToGalaxy(galaxy$, store, cfg = {}) {
                 map(() => panel.model.id)
             );
         }),
-        retryWhen(err$ => err$.pipe(
-            delay(retryPeriod),
-            take(retries)
-        )),
+        retryWhen(err$ => {
+            const retries$ = err$.pipe(
+                delay(retryPeriod),
+                take(retries)
+            );
+            const errMsg$ = throwError("Unable to sync to currHistoryPanel because it never appeared");
+            return concat(retries$, errMsg$);
+        }),
         filter(Boolean),
-        distinctUntilChanged()
+        distinctUntilChanged(),
+        tap(() => console.log("Vuex is now tracking galaxy.currHistoryPanel")),
     );
 
     return historyId$.subscribe(
-        (id) => {
-            store.commit("betaHistory/setCurrentHistoryId", id);
-        },
-        (err) => console.log("syncCurrentHistoryToGalaxy error", err),
+        (id) => store.commit("betaHistory/setCurrentHistoryId", id),
+        (err) => console.warn("syncCurrentHistoryToGalaxy error", err),
         () => console.log("syncCurrentHistoryToGalaxy complete")
     );
 }