FIREFLY-859: Firefly viewer unable to support multiple instances of different apps (#1135)

Author: loitly

src/firefly/js/api/ApiViewer.js

@@ -36,6 +36,7 @@ export const ViewerType= new Enum([
 
 let defaultViewerFile='';
 let defaultViewerType=ViewerType.TriView;
+const activeViewers = {};     // a map of active viewer windows keyed by channel
 
 /**
  * @returns {{getViewer: function, getExternalViewer: function}}
@@ -79,7 +80,7 @@ export function getViewer(channel, file=defaultViewerFile, scriptUrl) {
         return getViewer && getViewer(channel, file);
     } else {
         // return currently loaded app's Viewer
-        channel = makeViewerChannel(channel || getWsChannel());
+        channel = makeViewerChannel(channel || getWsChannel(), file);
         const dispatch= (action) => dispatchRemoteAction(channel,action);
         const reinitViewer= () => dispatch({ type: REINIT_APP, payload: {}});
 
@@ -297,20 +298,21 @@ function buildChartPart(channel,file,dispatch) {
 }
 
 const doViewerOperation= (() => {
-    let viewerWindow;
     return (channel,file,initMsg, f) => {
         const cnt = getConnectionCount(channel);
         if (cnt > 0) {
-            viewerWindow ? viewerWindow.focus() : dispatchRemoteAction(channel, {type:GRAB_WINDOW_FOCUS});
+            activeViewers[channel] ? activeViewers[channel]?.focus() : dispatchRemoteAction(channel, {type:GRAB_WINDOW_FOCUS});
             f?.();
         } else {
             dispatchAddActionWatcher({
                 callback:windowReadyWatcher, actions:[WS_CONN_UPDATED, NOTIFY_REMOTE_APP_READY], params:{channel,f}
             });
             const url= `${modifyURLToFull(file,getRootURL())}?${WSCH}=${channel}`;
-            viewerWindow = window.open(url, channel);
-            set(viewerWindow, 'firefly.options.RequireWebSocketUptime', true);
-            initMsg && set(viewerWindow, 'firefly.options.initLoadingMessage', initMsg);
+            const win = window.open(url, channel);
+            activeViewers[channel] =  win;
+            win.onclose = () => Reflect.deleteProperty(activeViewers, channel);
+            set(win, 'firefly.options.RequireWebSocketUptime', true);
+            initMsg && set(win, 'firefly.options.initLoadingMessage', initMsg);
         }
     };
 })();

src/firefly/js/core/AppDataCntlr.js

@@ -41,6 +41,7 @@ export const GRAB_WINDOW_FOCUS = `${APP_DATA_PATH}.grabFocus`;
 
 /** the extension to add to a channel string to make a viewer channel */
 const CHANNEL_VIEWER_EXTENSION = '__viewer';
+const channel_matcher = new RegExp(`(.+)${CHANNEL_VIEWER_EXTENSION}(?:-(.+))?`)
 
 /** @type {SearchInfo} */
 const searchInfo = {};
@@ -151,8 +152,7 @@ export function dispatchUpdateAppData(appData) {
 export function dispatchNotifyRemoteAppReady() {
     const channel= getWsChannel();
     if (!channel) return;
-    const sourceChannel= channel.endsWith(CHANNEL_VIEWER_EXTENSION) ?
-        channel.substr(0,channel.lastIndexOf(CHANNEL_VIEWER_EXTENSION)) : channel;
+    const [, sourceChannel, app] = channel.match(channel_matcher) || [,channel];
     dispatchRemoteAction(sourceChannel,{ type : NOTIFY_REMOTE_APP_READY, payload: {ready:true, viewerChannel:channel}});
 }
 
@@ -177,8 +177,9 @@ export function dispatchOnAppReady(callback) {
  * @param {String} channel
  * @return {string}
  */
-export function makeViewerChannel(channel) {
-    return channel + CHANNEL_VIEWER_EXTENSION;
+export function makeViewerChannel(channel, file) {
+    file = file ? '-' + file.replaceAll('.', '_') : '';
+    return channel + CHANNEL_VIEWER_EXTENSION + file;
 }
 
 export function isAppReady() {