Merge branch '1549-workbench-stopped-working-in-1.2' of https://github.com/finos/FDC3 into 1549-workbench-stopped-working-in-1.2

Author: kriswest

toolbox/fdc3-workbench/src/App.tsx

@@ -23,7 +23,7 @@ import { Intents } from './components/Intents';
 import { AppChannels } from './components/AppChannels';
 import snackbarStore from './store/SnackbarStore';
 import './App.css';
-import { getAgent } from '@finos/fdc3';
+import { getWorkbenchAgent } from './utility/Fdc3Api';
 
 const mainTheme = createTheme({
   palette: {
@@ -218,7 +218,7 @@ export const App = observer(() => {
   useEffect(() => {
     (async () => {
       try {
-        await getAgent();
+        await getWorkbenchAgent();
         setFdc3Available(true);
       } catch (e) {}
     })();

toolbox/fdc3-workbench/src/components/Header.tsx

@@ -7,8 +7,7 @@ import React, { useEffect, useState } from 'react';
 import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
 import { AppBar, Toolbar, Tooltip, Typography } from '@material-ui/core';
 import WarningIcon from '@material-ui/icons/Warning';
-import { getAgent } from '@finos/fdc3';
-import { ImplementationMetadata } from '../utility/Fdc3Api';
+import { getWorkbenchAgent, ImplementationMetadata } from '../utility/Fdc3Api';
 
 declare global {
   interface Window {
@@ -88,7 +87,7 @@ export const Header = (props: { fdc3Available: boolean }) => {
 
         //Then if chosenVersion == "2.0"  then implInfo = await implInfoPromise   else implInfo = implInfoPromise  (with handling for <1.2 where getInfo() doesn't exist at all.
         try {
-          const implInfoPromise = getAgent().then(agent => agent.getInfo());
+          const implInfoPromise = getWorkbenchAgent().then(agent => agent.getInfo());
           if (paramVersion == '1.2' && (implInfoPromise as unknown as ImplementationMetadata).fdc3Version) {
             //should not expect a promise if we're really working with 1.2
             implInfo = implInfoPromise as unknown as ImplementationMetadata;

toolbox/fdc3-workbench/src/components/Intents.tsx

@@ -9,6 +9,7 @@ import {
   ContextType,
   getTargetOptions,
   getTargetOptionsForContext,
+  getWorkbenchAgent,
   IntentResolution,
   IntentTargetOption,
 } from '../utility/Fdc3Api';
@@ -48,7 +49,6 @@ import { FormControlLabel } from '@material-ui/core';
 import { RadioGroup } from '@material-ui/core';
 import { Alert, ToggleButton, ToggleButtonGroup } from '@material-ui/lab';
 import InfoOutlinedIcon from '@material-ui/icons/InfoOutlined';
-import { getAgent } from '@finos/fdc3';
 
 // interface copied from lib @material-ui/lab/Autocomplete
 interface FilterOptionsState<T> {
@@ -528,7 +528,7 @@ export const Intents = observer(({ handleTabChange }: { handleTabChange: any })
           return;
         }
         setRaiseIntentError(false);
-        let appIntents = await getAgent().then(agent => agent.findIntentsByContext(toJS(raiseIntentContext)));
+        let appIntents = await getWorkbenchAgent().then(agent => agent.findIntentsByContext(toJS(raiseIntentContext)));
 
         setUseTargets(false);
         clearTargets();

toolbox/fdc3-workbench/src/store/AppChannelStore.tsx

@@ -3,10 +3,10 @@
  * Copyright FINOS FDC3 contributors - see NOTICE file
  */
 import { makeObservable, observable, action, runInAction, toJS } from 'mobx';
-import { ContextType, Fdc3Listener } from '../utility/Fdc3Api';
+import { ContextType, Fdc3Listener, getWorkbenchAgent } from '../utility/Fdc3Api';
 import systemLogStore from './SystemLogStore';
 import { nanoid } from 'nanoid';
-import { Channel, getAgent } from '@finos/fdc3';
+import { Channel } from '@finos/fdc3';
 
 interface ListenerOptionType {
   title: string;
@@ -42,7 +42,7 @@ class AppChannelStore {
 
   async getOrCreateChannel(channelId: string) {
     try {
-      const currentAppChannelObj = await getAgent().then(agent => agent.getOrCreateChannel(channelId));
+      const currentAppChannelObj = await getWorkbenchAgent().then(agent => agent.getOrCreateChannel(channelId));
       if (currentAppChannelObj) {
         const record = {
           id: channelId,
@@ -131,7 +131,7 @@ class AppChannelStore {
 
   async leaveChannel() {
     try {
-      const agent = await getAgent();
+      const agent = await getWorkbenchAgent();
       //check that we're on a channel
       let currentChannel = await agent.getCurrentChannel();
       if (!currentChannel) {

toolbox/fdc3-workbench/src/store/ChannelStore.ts

@@ -4,7 +4,8 @@
  */
 import { makeObservable, observable, action, runInAction } from 'mobx';
 import systemLogStore from './SystemLogStore';
-import { Channel, getAgent } from '@finos/fdc3';
+import { Channel } from '@finos/fdc3';
+import { getWorkbenchAgent } from '../utility/Fdc3Api';
 
 class ChannelStore {
   userChannels: Channel[] = [];
@@ -25,7 +26,7 @@ class ChannelStore {
   }
 
   async getCurrentUserChannel() {
-    const agent = await getAgent();
+    const agent = await getWorkbenchAgent();
     try {
       const userChannel = await agent.getCurrentChannel();
       runInAction(() => {
@@ -50,7 +51,7 @@ class ChannelStore {
   }
 
   async getUserChannels() {
-    const agent = await getAgent();
+    const agent = await getWorkbenchAgent();
     //defer retrieving channels until fdc3 API is ready
     try {
       //backwards compatibility for FDC3 < 2.0
@@ -78,7 +79,7 @@ class ChannelStore {
   }
 
   async joinUserChannel(channelId: string) {
-    const agent = await getAgent();
+    const agent = await getWorkbenchAgent();
     try {
       //backwards compatability for 1.2
       const joinUserChannel = agent.joinUserChannel ?? agent.joinChannel;
@@ -107,7 +108,7 @@ class ChannelStore {
   }
 
   async leaveUserChannel() {
-    const agent = await getAgent();
+    const agent = await getWorkbenchAgent();
     try {
       //check that we're on a channel
       let currentUserChannel = await agent.getCurrentChannel();

toolbox/fdc3-workbench/src/store/ContextStore.ts

@@ -3,12 +3,11 @@
  * Copyright FINOS FDC3 contributors - see NOTICE file
  */
 import { makeObservable, observable, runInAction, action, toJS } from 'mobx';
-import { ContextType, Fdc3Listener } from '../utility/Fdc3Api';
+import { ContextType, Fdc3Listener, getWorkbenchAgent } from '../utility/Fdc3Api';
 import { nanoid } from 'nanoid';
 import { contexts } from '../fixtures/contexts';
 import systemLogStore from './SystemLogStore';
 import { v4 as uuidv4 } from 'uuid';
-import { getAgent } from '@finos/fdc3';
 
 export type ContextItem = {
   id: string;
@@ -91,7 +90,7 @@ class ContextStore {
   }
 
   async broadcast(context: ContextType) {
-    const agent = await getAgent();
+    const agent = await getWorkbenchAgent();
 
     if (!context) {
       systemLogStore.addLog({
@@ -137,7 +136,7 @@ class ContextStore {
       if (typeof contextType === 'string') {
         const listenerId = nanoid();
 
-        const agent = await getAgent();
+        const agent = await getWorkbenchAgent();
 
         // TODO: remove window after fixing https://github.com/finos/FDC3/issues/435
         const contextListener = await agent.addContextListener(

toolbox/fdc3-workbench/src/store/IntentStore.ts

@@ -3,13 +3,20 @@
  * Copyright FINOS FDC3 contributors - see NOTICE file
  */
 import { makeObservable, observable, action, runInAction, toJS } from 'mobx';
-import { ContextType, IntentResolution, Fdc3Listener, AppMetadata, PrivateChannel } from '../utility/Fdc3Api';
+import {
+  ContextType,
+  IntentResolution,
+  Fdc3Listener,
+  AppMetadata,
+  PrivateChannel,
+  getWorkbenchAgent,
+} from '../utility/Fdc3Api';
 import { nanoid } from 'nanoid';
 import { intentTypes } from '../fixtures/intentTypes';
 import systemLogStore from './SystemLogStore';
 import appChannelStore from './AppChannelStore';
 import privateChannelStore from './PrivateChannelStore';
-import { Channel, getAgent, IntentResult } from '@finos/fdc3';
+import { Channel, IntentResult } from '@finos/fdc3';
 
 type IntentItem = { title: string; value: string };
 
@@ -40,7 +47,7 @@ class IntentStore {
     try {
       const listenerId = nanoid();
 
-      const agent = await getAgent();
+      const agent = await getWorkbenchAgent();
 
       const intentListener = await agent.addIntentListener(
         intent,
@@ -146,7 +153,7 @@ class IntentStore {
   }
 
   async raiseIntent(intent: string, context: ContextType, app?: AppMetadata) {
-    const agent = await getAgent();
+    const agent = await getWorkbenchAgent();
 
     if (!context) {
       systemLogStore.addLog({
@@ -187,7 +194,7 @@ class IntentStore {
   }
 
   async raiseIntentForContext(context: ContextType, app?: AppMetadata) {
-    const agent = await getAgent();
+    const agent = await getWorkbenchAgent();
 
     if (!context) {
       systemLogStore.addLog({

toolbox/fdc3-workbench/src/store/PrivateChannelStore.tsx

@@ -6,8 +6,7 @@ import { makeObservable, observable, action, runInAction, toJS } from 'mobx';
 import { ContextType, Fdc3Listener, PrivateChannel } from '../utility/Fdc3Api';
 import systemLogStore from './SystemLogStore';
 import { nanoid } from 'nanoid';
-import { getAgent } from '@finos/fdc3';
-
+import { getWorkbenchAgent } from '../utility/Fdc3Api';
 // interface ListenerOptionType {
 // 	title: string;
 // 	value: string;
@@ -37,7 +36,7 @@ class PrivateChannelStore {
 
   async createPrivateChannel() {
     try {
-      const currentPrivateChannel: any = await getAgent().then(agent => agent.createPrivateChannel());
+      const currentPrivateChannel: any = await getWorkbenchAgent().then(agent => agent.createPrivateChannel());
       const isSuccess = currentPrivateChannel !== null;
       if (isSuccess) {
         this.privateChannelsList.push(currentPrivateChannel);

toolbox/fdc3-workbench/src/utility/Fdc3Api.ts

@@ -67,8 +67,14 @@ export type IntentTargetOption = {
 
 export type ContextTargetOption = { intent: string; targetOptions: IntentTargetOption[] };
 
+export function getWorkbenchAgent(): Promise<fdc3_2.DesktopAgent> {
+  return fdc3_2.getAgent({
+    dontSetWindowFdc3: false,
+  });
+}
+
 export async function getTargetOptions(intent: string, context: ContextType): Promise<IntentTargetOption[]> {
-  const agent = await fdc3_2.getAgent();
+  const agent = await getWorkbenchAgent();
 
   let appIntent = await agent.findIntent(intent, context);
   if (!appIntent?.apps) {
@@ -124,7 +130,7 @@ export async function getTargetOptions(intent: string, context: ContextType): Pr
 }
 
 export async function getTargetOptionsForContext(context: ContextType): Promise<IntentTargetOption[]> {
-  const agent = await fdc3_2.getAgent();
+  const agent = await getWorkbenchAgent();
 
   let appIntents = await agent.findIntentsByContext(context);
   if (appIntents.length === 0) {