Deploying to gh-pages from @ 85f35d3 🚀

built-on-openfin · Oct 17, 2023 · 0b78251 · 0b78251
1 parent d34d3e1
commit 0b78251
Show file tree

Hide file tree

Showing 3 changed files with 285 additions and 205 deletions.
diff --git a/...n/fdc3-intent-picker/workspace-platform-starter/common/windows/intents/instance-picker.js b/...n/fdc3-intent-picker/workspace-platform-starter/common/windows/intents/instance-picker.js
@@ -1,7 +1,5 @@
 import { createOptionEntry, setElementVisibility } from './helper.js';
 
-let rejectAppSelection;
-let resolveAppSelection;
 let launchBtn;
 let cancelSelectionBtn;
 let intentsContainer;
@@ -76,18 +74,8 @@ async function init() {
 	}
 	await setupIntentView(intents);
 
-	if (Array.isArray(apps)) {
-		for (const app of apps) {
-			appLookup[app.appId] = app;
-		}
-		await setupAppView(apps, intent.name);
-	}
-
 	cancelSelectionBtn.addEventListener('click', async () => {
-		if (rejectAppSelection !== undefined) {
-			rejectAppSelection('UserCancelledResolution');
-		}
-		fin.me.close(true);
+		await fin.me.dispatchPopupResult();
 	});
 
 	launchBtn.addEventListener('click', async () => {
@@ -97,9 +85,15 @@ async function init() {
 		}
 		const appId = appsContainer.value;
 
-		resolveAppSelection({ appId, instanceId, intent });
-		fin.me.close(true);
+		await fin.me.dispatchPopupResult({ appId, instanceId, intent });
 	});
+
+	if (Array.isArray(apps)) {
+		for (const app of apps) {
+			appLookup[app.appId] = app;
+		}
+		await setupAppView(apps, intent.name);
+	}
 }
 
 /**
@@ -287,12 +281,3 @@ function setupAppMetadata(appId) {
 		setElementVisibility(appSummaryContainer, false);
 	}
 }
-
-// this function is called by the interop broker.ts file in the src directory so that it waits to see whether the end user has made a selection or cancelled the intent request.
-window['getIntentSelection'] = async () => {
-	launchBtn.disabled = false;
-	return new Promise((resolve, reject) => {
-		resolveAppSelection = resolve;
-		rejectAppSelection = reject;
-	});
-};
diff --git a/dev/john/fdc3-intent-picker/workspace-platform-starter/common/windows/intents/picker.js b/dev/john/fdc3-intent-picker/workspace-platform-starter/common/windows/intents/picker.js
@@ -1,7 +1,5 @@
 import { createRadioEntry, getSelection, setElementVisibility } from './helper.js';
 
-let rejectAppSelection;
-let resolveAppSelection;
 let backBtn;
 let launchBtn;
 let cancelAppSelectionBtn;
@@ -84,10 +82,7 @@ function setupIntentView(setupIntents) {
 		}
 
 		cancelIntentSelectionBtn.addEventListener('click', async () => {
-			if (rejectAppSelection !== undefined) {
-				rejectAppSelection('Application selection cancelled.');
-			}
-			fin.me.close(true);
+			await fin.me.dispatchPopupResult();
 		});
 
 		nextBtn.addEventListener('click', () => {
@@ -136,31 +131,18 @@ function setupAppView(applications) {
 		});
 
 		cancelAppSelectionBtn.addEventListener('click', async () => {
-			if (rejectAppSelection !== undefined) {
-				rejectAppSelection('UserCancelledResolution');
-			}
-			fin.me.close(true);
+			await fin.me.dispatchPopupResult();
 		});
 
 		launchBtn.addEventListener('click', async () => {
-			resolveAppSelection({ appId: getSelection(listName), intent });
-			fin.me.close(true);
+			await fin.me.dispatchPopupResult({ appId: getSelection(listName), intent });
 		});
 
 		setElementVisibility(intentSelectionContainer, false);
 		setElementVisibility(appSelectionContainer, true);
 	}
 }
 
-// this function is called by the interopbroker.ts file in the src directory so that it waits to see whether the end user has made a selection or cancelled the intent request.
-window['getIntentSelection'] = async () => {
-	launchBtn.disabled = false;
-	return new Promise((resolve, reject) => {
-		resolveAppSelection = resolve;
-		rejectAppSelection = reject;
-	});
-};
-
 document.addEventListener('DOMContentLoaded', () => {
 	initializeDOM();
 });