Demo Intent Resolver Working

finos · Jun 20, 2024 · 14f9424 · 14f9424
1 parent 71d2e6c
commit 14f9424
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 85 deletions.
diff --git a/packages/client/src/intent-resolution/DefaultDesktopAgentIntentResolver.ts b/packages/client/src/intent-resolution/DefaultDesktopAgentIntentResolver.ts
@@ -77,7 +77,8 @@ export class DefaultDesktopAgentIntentResolver implements IntentResolver {
 
     themeContainer(container: HTMLDivElement) {
         const css = this.details.css ?? DEFAULT_INTENT_RESOLVER_DETAILS.css!!
-        for (const k in CSS_ELEMENTS) {
+        for (let i = 0; i < CSS_ELEMENTS.length; i++) {
+            const k = CSS_ELEMENTS[i]
             const value: string | undefined = css[(k as string)]
             if (value != null) {
                 container.style.setProperty(k, value)

diff --git a/packages/demo/src/client/ui/channel-selector.ts b/packages/demo/src/client/ui/channel-selector.ts
@@ -28,7 +28,7 @@ window.addEventListener("load", () => {
             channels = details.channels
             channelId = details.selected
 
-            const selectedColor = (channelId ? (channels.find(c => c.id == channelId)?.displayMetadata?.color) : null) ?? 'black'
+            const selectedColor = (channelId ? (channels.find(c => c.id == channelId)?.displayMetadata?.color) : null) ?? 'white'
             logo.style.backgroundColor = selectedColor
         }
     })

diff --git a/packages/demo/src/client/ui/intent-resolver.ts b/packages/demo/src/client/ui/intent-resolver.ts
@@ -1,89 +1,57 @@
-import { AppIdentifier, AppIntent, IntentMetadata } from "@finos/fdc3";
-import { AppMetadata } from "@finos/fdc3/dist/bridging/BridgingTypes";
-import { io } from "socket.io-client"
-import { FDC3_APP_EVENT } from "../../message-types";
-import { IntentResolutionChoiceAgentRequest } from "@kite9/fdc3-common";
-import { v4 as uuid } from 'uuid'
+import { ResolverIntents, ResolverMessageChoice, SingleAppIntent } from "@kite9/fdc3-common";
 
-function getQueryVariable(variable: string): string {
-    var query = window.location.search.substring(1);
-    var vars = query.split("&");
-    for (var i = 0; i < vars.length; i++) {
-        var pair = vars[i].split("=");
-        if (pair[0] == variable) {
-            return pair[1];
-        }
-    }
-
-    return ""
-}
-
-function getAppIntents(): AppIntent[] {
-    const intentDetails = getQueryVariable("intentDetails")
-    const decoded = decodeURIComponent(intentDetails)
-    const object: AppIntent[] = JSON.parse(decoded)
-    return object
-}
+window.addEventListener("load", () => {
 
-function getSource(): AppIdentifier {
-    const source = getQueryVariable("source")
-    const decoded = decodeURIComponent(source)
-    const object: AppIdentifier = JSON.parse(decoded)
-    return object
-}
+    const parent = window.parent;
 
-const socket = io()
-
-socket.on("connect", async () => {
-
-    const intentDetails = getAppIntents()
-    const source = getSource()
+    const mc = new MessageChannel();
+    const myPort = mc.port1
+    myPort.start()
 
     const list = document.getElementById("intent-list")!!
 
-    function sendChosenIntent(intent: IntentMetadata, app: AppMetadata, source: AppMetadata) {
-        const out: IntentResolutionChoiceAgentRequest = {
-            type: "intentResolutionChoice",
-            meta: {
-                requestUuid: uuid(),
-                timestamp: new Date(),
-                source
-            },
-            payload: {
-                chosenApp: app,
-                intent: intent,
-            }
-        }
+    parent.postMessage({ type: "SelectorMessageInitialize" }, "*", [mc.port2]);
 
-        socket.emit(FDC3_APP_EVENT, out, source)
+    function callback(si: SingleAppIntent | null) {
+        myPort.postMessage({
+            type: "ResolverMessageChoice",
+            payload: si
+        } as ResolverMessageChoice)
     }
 
-    const debug = document.createElement("p")
-    debug.textContent = JSON.stringify(source)
-    document.body.appendChild(debug)
-
-    intentDetails.forEach(intent => {
-
-        intent.apps.forEach(app => {
-            const li = document.createElement("li")
-            const a = document.createElement("a")
-            const description = document.createElement("em")
-
-            if (app.instanceId) {
-                description.textContent = `${intent.intent.displayName ?? ""} on app instance ${app.instanceId} of ${app.appId}`
-            } else {
-                description.textContent = ` ${intent.intent.displayName ?? ""} on a new instance of ${app.appId}`
-            }
-
-            a.textContent = intent.intent.name
-
-            li.appendChild(a)
-            li.appendChild(description)
-            list.appendChild(li)
-            a.setAttribute("href", "#")
-            a.onclick = () => sendChosenIntent(intent.intent, app, source)
-        })
+    myPort.addEventListener("message", (e) => {
+        if (e.data.type == 'ResolverIntents') {
+            const details = e.data as ResolverIntents
+            console.log(JSON.stringify("INTENT DETAILS: " + JSON.stringify(details)))
+
+            details.appIntents.forEach(intent => {
+
+                intent.apps.forEach(app => {
+                    const li = document.createElement("li")
+                    const a = document.createElement("a")
+                    const description = document.createElement("em")
+
+                    if (app.instanceId) {
+                        description.textContent = `${intent.intent.displayName ?? ""} on app instance ${app.instanceId} of ${app.appId}`
+                    } else {
+                        description.textContent = ` ${intent.intent.displayName ?? ""} on a new instance of ${app.appId}`
+                    }
+
+                    a.textContent = intent.intent.name
+
+                    li.appendChild(a)
+                    li.appendChild(description)
+                    list.appendChild(li)
+                    a.setAttribute("href", "#")
+                    a.onclick = () => callback({ intent: intent.intent, chosenApp: app })
+                })
+            })
+        }
+    })
 
+    document.getElementById("cancel")!!.addEventListener("click", () => {
+        callback(null);
     })
 
+
 })
diff --git a/packages/demo/static/da/intent-resolver.html b/packages/demo/static/da/intent-resolver.html
@@ -1,14 +1,13 @@
 <html lang="en">
-
-<head>
+  <head>
     <title>Desktop Agent Intent Resolver</title>
     <meta charset="UTF-8" />
     <script type="module" src="/src/client/ui/intent-resolver.ts"></script>
-</head>
+  </head>
 
-<body style="background-color: #ddd;">
+  <body style="background-color: #ddd">
     <h1>Intent Resolution</h1>
     <ul id="intent-list"></ul>
-</body>
-
-</html>
+    <button id="cancel">Cancel</button>
+  </body>
+</html>