Merge branch 'main' into osff-demo

finos · Jun 19, 2024 · d2a57fa · d2a57fa
2 parents 9843b53 + ddc437d
commit d2a57fa
Show file tree

Hide file tree

Showing 69 changed files with 15 additions and 462 deletions.
diff --git a/packages/sail2/2022_FDC3_Sail_Logo.svg → ...ages-unused/sail2/2022_FDC3_Sail_Logo.svg b/packages/sail2/2022_FDC3_Sail_Logo.svg → ...ages-unused/sail2/2022_FDC3_Sail_Logo.svg
diff --git a/packages/sail2/README.md → packages-unused/sail2/README.md b/packages/sail2/README.md → packages-unused/sail2/README.md
diff --git a/packages/sail2/package.json → packages-unused/sail2/package.json b/packages/sail2/package.json → packages-unused/sail2/package.json
diff --git a/packages/sail2/src/client/appd/appd.tsx → ...ges-unused/sail2/src/client/appd/appd.tsx b/packages/sail2/src/client/appd/appd.tsx → ...ges-unused/sail2/src/client/appd/appd.tsx
diff --git a/...s/sail2/src/client/appd/styles.module.css → ...d/sail2/src/client/appd/styles.module.css b/...s/sail2/src/client/appd/styles.module.css → ...d/sail2/src/client/appd/styles.module.css
diff --git a/...es/sail2/src/client/controls/controls.tsx → ...ed/sail2/src/client/controls/controls.tsx b/...es/sail2/src/client/controls/controls.tsx → ...ed/sail2/src/client/controls/controls.tsx
diff --git a/...il2/src/client/controls/styles.module.css → ...il2/src/client/controls/styles.module.css b/...il2/src/client/controls/styles.module.css → ...il2/src/client/controls/styles.module.css
diff --git a/packages/sail2/src/client/frame/frame.tsx → ...s-unused/sail2/src/client/frame/frame.tsx b/packages/sail2/src/client/frame/frame.tsx → ...s-unused/sail2/src/client/frame/frame.tsx
diff --git a/.../sail2/src/client/frame/styles.module.css → .../sail2/src/client/frame/styles.module.css b/.../sail2/src/client/frame/styles.module.css → .../sail2/src/client/frame/styles.module.css
diff --git a/packages/sail2/src/client/grid/demo.css → ...ges-unused/sail2/src/client/grid/demo.css b/packages/sail2/src/client/grid/demo.css → ...ges-unused/sail2/src/client/grid/demo.css
diff --git a/packages/sail2/src/client/grid/grid.tsx → ...ges-unused/sail2/src/client/grid/grid.tsx b/packages/sail2/src/client/grid/grid.tsx → ...ges-unused/sail2/src/client/grid/grid.tsx
diff --git a/packages/sail2/src/client/grid/gridstate.ts → ...unused/sail2/src/client/grid/gridstate.ts b/packages/sail2/src/client/grid/gridstate.ts → ...unused/sail2/src/client/grid/gridstate.ts
diff --git a/...s/sail2/src/client/grid/styles.module.css → ...d/sail2/src/client/grid/styles.module.css b/...s/sail2/src/client/grid/styles.module.css → ...d/sail2/src/client/grid/styles.module.css
diff --git a/packages/sail2/src/client/icon/icon.tsx → ...ges-unused/sail2/src/client/icon/icon.tsx b/packages/sail2/src/client/icon/icon.tsx → ...ges-unused/sail2/src/client/icon/icon.tsx
diff --git a/...s/sail2/src/client/icon/styles.module.css → ...d/sail2/src/client/icon/styles.module.css b/...s/sail2/src/client/icon/styles.module.css → ...d/sail2/src/client/icon/styles.module.css
diff --git a/packages/sail2/src/client/index.tsx → packages-unused/sail2/src/client/index.tsx b/packages/sail2/src/client/index.tsx → packages-unused/sail2/src/client/index.tsx
diff --git a/packages/sail2/src/client/popups/popup.tsx → ...-unused/sail2/src/client/popups/popup.tsx b/packages/sail2/src/client/popups/popup.tsx → ...-unused/sail2/src/client/popups/popup.tsx
diff --git a/...ages/sail2/src/client/popups/settings.tsx → ...used/sail2/src/client/popups/settings.tsx b/...ages/sail2/src/client/popups/settings.tsx → ...used/sail2/src/client/popups/settings.tsx
diff --git a/...sail2/src/client/popups/styles.module.css → ...sail2/src/client/popups/styles.module.css b/...sail2/src/client/popups/styles.module.css → ...sail2/src/client/popups/styles.module.css
diff --git a/packages/sail2/src/client/state/client.ts → ...s-unused/sail2/src/client/state/client.ts b/packages/sail2/src/client/state/client.ts → ...s-unused/sail2/src/client/state/client.ts
diff --git a/packages/sail2/src/client/state/server.ts → ...s-unused/sail2/src/client/state/server.ts b/packages/sail2/src/client/state/server.ts → ...s-unused/sail2/src/client/state/server.ts
diff --git a/...s/sail2/src/client/tabs/styles.module.css → ...d/sail2/src/client/tabs/styles.module.css b/...s/sail2/src/client/tabs/styles.module.css → ...d/sail2/src/client/tabs/styles.module.css
diff --git a/packages/sail2/src/client/tabs/tabs.tsx → ...ges-unused/sail2/src/client/tabs/tabs.tsx b/packages/sail2/src/client/tabs/tabs.tsx → ...ges-unused/sail2/src/client/tabs/tabs.tsx
diff --git a/...es/sail2/src/client/top/styles.module.css → ...ed/sail2/src/client/top/styles.module.css b/...es/sail2/src/client/top/styles.module.css → ...ed/sail2/src/client/top/styles.module.css
diff --git a/packages/sail2/src/client/top/top.tsx → packages-unused/sail2/src/client/top/top.tsx b/packages/sail2/src/client/top/top.tsx → packages-unused/sail2/src/client/top/top.tsx
diff --git a/...es/sail2/src/server/appd/SailDirectory.ts → ...ed/sail2/src/server/appd/SailDirectory.ts b/...es/sail2/src/server/appd/SailDirectory.ts → ...ed/sail2/src/server/appd/SailDirectory.ts
diff --git a/...ail2/src/server/da/DesktopAgentService.ts → ...ail2/src/server/da/DesktopAgentService.ts b/...ail2/src/server/da/DesktopAgentService.ts → ...ail2/src/server/da/DesktopAgentService.ts
diff --git a/...rver/da/ReconfigurableBroadcastHandler.ts → ...rver/da/ReconfigurableBroadcastHandler.ts b/...rver/da/ReconfigurableBroadcastHandler.ts → ...rver/da/ReconfigurableBroadcastHandler.ts
diff --git a/...ges/sail2/src/server/da/SailFDC3Server.ts → ...sed/sail2/src/server/da/SailFDC3Server.ts b/...ges/sail2/src/server/da/SailFDC3Server.ts → ...sed/sail2/src/server/da/SailFDC3Server.ts
diff --git a/.../sail2/src/server/da/SailServerContext.ts → .../sail2/src/server/da/SailServerContext.ts b/.../sail2/src/server/da/SailServerContext.ts → .../sail2/src/server/da/SailServerContext.ts
diff --git a/...ages/sail2/src/server/da/message-types.ts → ...used/sail2/src/server/da/message-types.ts b/...ages/sail2/src/server/da/message-types.ts → ...used/sail2/src/server/da/message-types.ts
diff --git a/packages/sail2/src/server/main.ts → packages-unused/sail2/src/server/main.ts b/packages/sail2/src/server/main.ts → packages-unused/sail2/src/server/main.ts
diff --git a/...static/fonts/DM_Sans/DMSans_18pt-Bold.ttf → ...static/fonts/DM_Sans/DMSans_18pt-Bold.ttf b/...static/fonts/DM_Sans/DMSans_18pt-Bold.ttf → ...static/fonts/DM_Sans/DMSans_18pt-Bold.ttf
diff --git a/...tatic/fonts/DM_Sans/DMSans_18pt-Light.ttf → ...tatic/fonts/DM_Sans/DMSans_18pt-Light.ttf b/...tatic/fonts/DM_Sans/DMSans_18pt-Light.ttf → ...tatic/fonts/DM_Sans/DMSans_18pt-Light.ttf
diff --git a/...tic/fonts/DM_Sans/DMSans_18pt-Regular.ttf → ...tic/fonts/DM_Sans/DMSans_18pt-Regular.ttf b/...tic/fonts/DM_Sans/DMSans_18pt-Regular.ttf → ...tic/fonts/DM_Sans/DMSans_18pt-Regular.ttf
diff --git a/...es/sail2/static/fonts/DM_Sans/DM_Sans.css → ...ed/sail2/static/fonts/DM_Sans/DM_Sans.css b/...es/sail2/static/fonts/DM_Sans/DM_Sans.css → ...ed/sail2/static/fonts/DM_Sans/DM_Sans.css
diff --git a/packages/sail2/static/icons/control/add.svg → ...unused/sail2/static/icons/control/add.svg b/packages/sail2/static/icons/control/add.svg → ...unused/sail2/static/icons/control/add.svg
diff --git a/packages/sail2/static/icons/control/bin.svg → ...unused/sail2/static/icons/control/bin.svg b/packages/sail2/static/icons/control/bin.svg → ...unused/sail2/static/icons/control/bin.svg
diff --git a/...sail2/static/icons/control/choose-app.svg → ...sail2/static/icons/control/choose-app.svg b/...sail2/static/icons/control/choose-app.svg → ...sail2/static/icons/control/choose-app.svg
diff --git a/...ages/sail2/static/icons/control/close.svg → ...used/sail2/static/icons/control/close.svg b/...ages/sail2/static/icons/control/close.svg → ...used/sail2/static/icons/control/close.svg
diff --git a/packages/sail2/static/icons/control/dots.svg → ...nused/sail2/static/icons/control/dots.svg b/packages/sail2/static/icons/control/dots.svg → ...nused/sail2/static/icons/control/dots.svg
diff --git a/packages/sail2/static/icons/control/lock.svg → ...nused/sail2/static/icons/control/lock.svg b/packages/sail2/static/icons/control/lock.svg → ...nused/sail2/static/icons/control/lock.svg
diff --git a/...es/sail2/static/icons/control/pop-out.svg → ...ed/sail2/static/icons/control/pop-out.svg b/...es/sail2/static/icons/control/pop-out.svg → ...ed/sail2/static/icons/control/pop-out.svg
diff --git a/...ages/sail2/static/icons/control/start.svg → ...used/sail2/static/icons/control/start.svg b/...ages/sail2/static/icons/control/start.svg → ...used/sail2/static/icons/control/start.svg
diff --git a/packages/sail2/static/icons/logo/logo.png → ...s-unused/sail2/static/icons/logo/logo.png b/packages/sail2/static/icons/logo/logo.png → ...s-unused/sail2/static/icons/logo/logo.png
diff --git a/...atic/icons/tabs/noun-airplane-3707662.svg → ...atic/icons/tabs/noun-airplane-3707662.svg b/...atic/icons/tabs/noun-airplane-3707662.svg → ...atic/icons/tabs/noun-airplane-3707662.svg
diff --git a/...static/icons/tabs/noun-camera-3707659.svg → ...static/icons/tabs/noun-camera-3707659.svg b/...static/icons/tabs/noun-camera-3707659.svg → ...static/icons/tabs/noun-camera-3707659.svg
diff --git a/...static/icons/tabs/noun-camera-3707661.svg → ...static/icons/tabs/noun-camera-3707661.svg b/...static/icons/tabs/noun-camera-3707661.svg → ...static/icons/tabs/noun-camera-3707661.svg
diff --git a/...tic/icons/tabs/noun-cellphone-3707657.svg → ...tic/icons/tabs/noun-cellphone-3707657.svg b/...tic/icons/tabs/noun-cellphone-3707657.svg → ...tic/icons/tabs/noun-cellphone-3707657.svg
diff --git a/...ons/tabs/noun-checked-baggage-3707665.svg → ...ons/tabs/noun-checked-baggage-3707665.svg b/...ons/tabs/noun-checked-baggage-3707665.svg → ...ons/tabs/noun-checked-baggage-3707665.svg
diff --git a/...tatic/icons/tabs/noun-console-3707664.svg → ...tatic/icons/tabs/noun-console-3707664.svg b/...tatic/icons/tabs/noun-console-3707664.svg → ...tatic/icons/tabs/noun-console-3707664.svg
diff --git a/...tatic/icons/tabs/noun-driller-3707669.svg → ...tatic/icons/tabs/noun-driller-3707669.svg b/...tatic/icons/tabs/noun-driller-3707669.svg → ...tatic/icons/tabs/noun-driller-3707669.svg
diff --git a/...tic/icons/tabs/noun-headphone-3707674.svg → ...tic/icons/tabs/noun-headphone-3707674.svg b/...tic/icons/tabs/noun-headphone-3707674.svg → ...tic/icons/tabs/noun-headphone-3707674.svg
diff --git a/...tatic/icons/tabs/noun-machine-3707678.svg → ...tatic/icons/tabs/noun-machine-3707678.svg b/...tatic/icons/tabs/noun-machine-3707678.svg → ...tatic/icons/tabs/noun-machine-3707678.svg
diff --git a/...l2/static/icons/tabs/noun-pen-3707679.svg → ...l2/static/icons/tabs/noun-pen-3707679.svg b/...l2/static/icons/tabs/noun-pen-3707679.svg → ...l2/static/icons/tabs/noun-pen-3707679.svg
diff --git a/.../static/icons/tabs/noun-power-3707684.svg → .../static/icons/tabs/noun-power-3707684.svg b/.../static/icons/tabs/noun-power-3707684.svg → .../static/icons/tabs/noun-power-3707684.svg
diff --git a/...tatic/icons/tabs/noun-printer-3707691.svg → ...tatic/icons/tabs/noun-printer-3707691.svg b/...tatic/icons/tabs/noun-printer-3707691.svg → ...tatic/icons/tabs/noun-printer-3707691.svg
diff --git a/.../static/icons/tabs/noun-radio-3707701.svg → .../static/icons/tabs/noun-radio-3707701.svg b/.../static/icons/tabs/noun-radio-3707701.svg → .../static/icons/tabs/noun-radio-3707701.svg
diff --git a/...2/static/icons/tabs/noun-ship-3707690.svg → ...2/static/icons/tabs/noun-ship-3707690.svg b/...2/static/icons/tabs/noun-ship-3707690.svg → ...2/static/icons/tabs/noun-ship-3707690.svg
diff --git a/...2/static/icons/tabs/noun-ship-3707693.svg → ...2/static/icons/tabs/noun-ship-3707693.svg b/...2/static/icons/tabs/noun-ship-3707693.svg → ...2/static/icons/tabs/noun-ship-3707693.svg
diff --git a/...tatic/icons/tabs/noun-washing-3707699.svg → ...tatic/icons/tabs/noun-washing-3707699.svg b/...tatic/icons/tabs/noun-washing-3707699.svg → ...tatic/icons/tabs/noun-washing-3707699.svg
diff --git a/packages/sail2/static/index.html → packages-unused/sail2/static/index.html b/packages/sail2/static/index.html → packages-unused/sail2/static/index.html
diff --git a/packages/sail2/temp/appd.json → packages-unused/sail2/temp/appd.json b/packages/sail2/temp/appd.json → packages-unused/sail2/temp/appd.json
diff --git a/packages/sail2/tsconfig.json → packages-unused/sail2/tsconfig.json b/packages/sail2/tsconfig.json → packages-unused/sail2/tsconfig.json
diff --git a/packages/client/src/channel-selector/DefaultDesktopAgentChannelSelector.ts b/packages/client/src/channel-selector/DefaultDesktopAgentChannelSelector.ts
@@ -1,5 +1,5 @@
-import { Messaging } from "da-proxy";
-import { ChannelSelector, ChannelSelectorDetails, CSSPositioning, ChannelSelectionChoiceAgentRequest } from "fdc3-common";
+import { Messaging } from "@kite9/da-proxy";
+import { ChannelSelector, ChannelSelectorDetails, CSSPositioning, ChannelSelectionChoiceAgentRequest } from "@kite9/fdc3-common";
 import { Channel } from "@finos/fdc3";
 import { DEFAULT_CONTAINER_CSS } from "../intent-resolution/DefaultDesktopAgentIntentResolver";
 

diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
@@ -8,7 +8,6 @@ export const DEFAULT_OPTIONS: Options = {
     fireFdc3Ready: false,
     strategies: [postMessage], //, electronEvent],
     frame: window.opener ?? window.parent,
-    middlewares: []
 }
 
 /**

diff --git a/packages/demo/package.json b/packages/demo/package.json
@@ -3,9 +3,7 @@
   "private": true,
   "version": "0.0.30",
   "scripts": {
-    "dev": "nodemon -w src/server -x tsx src/server/main.ts",
-    "start": "NODE_ENV=production tsx src/server/main.ts",
-    "build": "vite build"
+    "dev": "nodemon -w src/server -x tsx src/server/main.ts"
   },
   "devDependencies": {
     "@types/express": "^4.17.15",

diff --git a/packages/fdc3-workbench/package.json b/packages/fdc3-workbench/package.json
@@ -8,7 +8,7 @@
     "dev": "vite",
     "start": "vite",
     "preview": "vite preview",
-    "build": "tsc && vite build",
+    "build-removed": "tsc && vite build",
     "lint": "eslint --cache --quiet **/*.{ts,tsx,js,jsx} && prettier --check **/*.{ts,tsx,js,jsx,json,yml,css,html,md}",
     "lint:fix": "eslint --cache --quiet --fix **/*.{ts,tsx,js,jsx} && prettier --write **/*.{ts,tsx,js,jsx} && prettier --write **/*.{json,yml,css,html,md}"
   },
@@ -81,4 +81,4 @@
     "@material-ui/styles": "^4.11.5",
     "rimraf": "^5.0.7"
   }
-}
+}