@openfin/core 34.78.66 → 34.78.69

package/out/mock.js

@@ -12602,7 +12602,7 @@ const validate_1 = validate;
 const base_1$6 = base;
 const common_utils_1 = commonUtils;
 const layout_entities_1 = layoutEntities;
-const layout_constants_1 = layout_constants;
+const layout_constants_1$1 = layout_constants;
 /**
  *
  * Layouts give app providers the ability to embed multiple views in a single window. The Layout namespace
@@ -12747,7 +12747,7 @@ class Layout extends base_1$6.Base {
          * Lazily constructed {@link LayoutEntitiesClient} bound to this platform's client and identity
          * The client is for {@link LayoutEntitiesController}
          */
-        _Layout_layoutClient.set(this, new lazy_1.Lazy(async () => layout_entities_1.LayoutNode.newLayoutEntitiesClient(await this.platform.getClient(), layout_constants_1.LAYOUT_CONTROLLER_ID, this.identity)));
+        _Layout_layoutClient.set(this, new lazy_1.Lazy(async () => layout_entities_1.LayoutNode.newLayoutEntitiesClient(await this.platform.getClient(), layout_constants_1$1.LAYOUT_CONTROLLER_ID, this.identity)));
         /**
          * Replaces a Platform window's layout with a new layout.
          *
@@ -12975,11 +12975,12 @@ var __classPrivateFieldSet$4 = (commonjsGlobal && commonjsGlobal.__classPrivateF
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _LayoutModule_instances, _LayoutModule_layoutInitializationAttempted, _LayoutModule_layoutManager, _LayoutModule_waitForBackCompatLayoutManager, _LayoutModule_throwIfLayoutManagerNotInitialized;
+var _LayoutModule_instances, _LayoutModule_layoutInitializationAttempted, _LayoutModule_layoutManager, _LayoutModule_throwIfLayoutManagerNotInitialized;
 Object.defineProperty(Factory$2, "__esModule", { value: true });
 Factory$2.LayoutModule = void 0;
 const base_1$5 = base;
 const Instance_1$2 = Instance$1;
+const layout_constants_1 = layout_constants;
 /**
  * Static namespace for OpenFin API methods that interact with the {@link Layout} class, available under `fin.Platform.Layout`.
  */
@@ -13039,17 +13040,15 @@ class LayoutModule extends base_1$5.Base {
             }
             __classPrivateFieldSet$4(this, _LayoutModule_layoutInitializationAttempted, true, "f");
             __classPrivateFieldSet$4(this, _LayoutModule_layoutManager, await this.wire.environment.initLayoutManager(this.fin, this.wire, options), "f");
-            // in single-layout case, we return the undocumented layoutManager type (deprecate with CORE-1081)
-            let backCompatLayoutPromise;
-            if (!options.layoutManagerOverride) {
-                backCompatLayoutPromise = __classPrivateFieldGet$4(this, _LayoutModule_waitForBackCompatLayoutManager, "f").call(this, this.fin);
-            }
             // apply the initial snapshot which in turn will call fin.Platform.Layout.create()
             const platformClient = await this.fin.Platform.getCurrentSync().getClient();
             const snapshot = await platformClient.dispatch('get-initial-layout-snapshot');
             await __classPrivateFieldGet$4(this, _LayoutModule_layoutManager, "f").applyLayoutSnapshot(snapshot);
-            if (backCompatLayoutPromise) {
-                return backCompatLayoutPromise;
+            if (!options.layoutManagerOverride) {
+                // in single-layout case, we return the undocumented layoutManager type (deprecate with CORE-1081)
+                const layoutIdentity = { layoutName: layout_constants_1.DEFAULT_LAYOUT_KEY, ...this.fin.me.identity };
+                const layoutManager = await this.wire.environment.resolveLayout(__classPrivateFieldGet$4(this, _LayoutModule_layoutManager, "f"), layoutIdentity);
+                return Object.assign(this.wrapSync(layoutIdentity), { layoutManager });
             }
             // warn user if they do not call create() in the next 30 seconds
             setTimeout(() => {
@@ -13060,23 +13059,6 @@ class LayoutModule extends base_1$5.Base {
             }, 30000);
             return this.wrapSync(this.fin.me.identity);
         };
-        // deprecate with CORE-1081
-        _LayoutModule_waitForBackCompatLayoutManager.set(this, async (fin) => {
-            let layoutManager;
-            let resolve;
-            const layoutResolved = new Promise((r) => {
-                resolve = r;
-            });
-            // wait for a layout to be created
-            await fin.me.once('layout-ready', async ({ layoutIdentity }) => {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                layoutManager = await this.wire.environment.resolveLayout(__classPrivateFieldGet$4(this, _LayoutModule_layoutManager, "f"), layoutIdentity);
-                // Backward compat - undocumented / not typed openfin-layout as layoutManager
-                // TODO: eventually deprecate this
-                resolve(Object.assign(this.wrapSync(layoutIdentity), { layoutManager }));
-            });
-            return layoutResolved;
-        });
         /**
          * Returns the layout manager for the current window
          * @returns
@@ -13190,7 +13172,7 @@ class LayoutModule extends base_1$5.Base {
     }
 }
 Factory$2.LayoutModule = LayoutModule;
-_LayoutModule_layoutInitializationAttempted = new WeakMap(), _LayoutModule_layoutManager = new WeakMap(), _LayoutModule_waitForBackCompatLayoutManager = new WeakMap(), _LayoutModule_instances = new WeakSet(), _LayoutModule_throwIfLayoutManagerNotInitialized = function _LayoutModule_throwIfLayoutManagerNotInitialized(method) {
+_LayoutModule_layoutInitializationAttempted = new WeakMap(), _LayoutModule_layoutManager = new WeakMap(), _LayoutModule_instances = new WeakSet(), _LayoutModule_throwIfLayoutManagerNotInitialized = function _LayoutModule_throwIfLayoutManagerNotInitialized(method) {
     if (!__classPrivateFieldGet$4(this, _LayoutModule_layoutManager, "f")) {
         throw new Error(`You must call init before using the API ${method}`);
     }
@@ -16257,29 +16239,33 @@ function requireOverrideCheck () {
 	if (hasRequiredOverrideCheck) return overrideCheck;
 	hasRequiredOverrideCheck = 1;
 	Object.defineProperty(overrideCheck, "__esModule", { value: true });
-	overrideCheck.overrideCheck = overrideCheck.getDefaultViewFdc3VersionFromAppInfo = void 0;
+	overrideCheck.overrideCheck = overrideCheck.checkFDC32Overrides = overrideCheck.getDefaultViewFdc3VersionFromAppInfo = void 0;
 	const InteropBroker_1 = requireInteropBroker();
 	function getDefaultViewFdc3VersionFromAppInfo({ manifest, initialOptions }) {
 	    const setVersion = manifest.platform?.defaultViewOptions?.fdc3InteropApi ?? initialOptions.defaultViewOptions?.fdc3InteropApi;
 	    return ['1.2', '2.0'].includes(setVersion ?? '') ? setVersion : undefined;
 	}
 	overrideCheck.getDefaultViewFdc3VersionFromAppInfo = getDefaultViewFdc3VersionFromAppInfo;
-	// TODO: Unit test this
+	function checkFDC32Overrides(overriddenBroker) {
+	    // These are the APIs that must be overridden for FDC3 2.0 compliance
+	    const mustOverrideAPIs = [
+	        'fdc3HandleFindInstances',
+	        'handleInfoForIntent',
+	        'handleInfoForIntentsByContext',
+	        'fdc3HandleGetAppMetadata',
+	        'fdc3HandleGetInfo',
+	        'fdc3HandleOpen',
+	        'handleFiredIntent',
+	        'handleFiredIntentForContext'
+	    ];
+	    return mustOverrideAPIs.filter((api) => {
+	        return overriddenBroker[api] === InteropBroker_1.InteropBroker.prototype[api];
+	    });
+	}
+	overrideCheck.checkFDC32Overrides = checkFDC32Overrides;
 	function overrideCheck$1(overriddenBroker, fdc3InteropApi) {
 	    if (fdc3InteropApi && fdc3InteropApi === '2.0') {
-	        const mustOverrideAPIs = [
-	            'fdc3HandleFindInstances',
-	            'handleInfoForIntent',
-	            'handleInfoForIntentsByContext',
-	            'fdc3HandleGetAppMetadata',
-	            'fdc3HandleGetInfo',
-	            'fdc3HandleOpen',
-	            'handleFiredIntent',
-	            'handleFiredIntentForContext'
-	        ];
-	        const notOverridden = mustOverrideAPIs.filter((api) => {
-	            return overriddenBroker[api] === InteropBroker_1.InteropBroker.prototype[api];
-	        });
+	        const notOverridden = checkFDC32Overrides(overriddenBroker);
 	        if (notOverridden.length > 0) {
 	            console.warn(`WARNING: FDC3 2.0 has been set as a default option for Views in this Platform, but the required InteropBroker APIs for FDC3 2.0 compliance have not all been overridden.\nThe following APIs need to be overridden:\n${notOverridden.join('\n')}`);
 	        }
@@ -17191,6 +17177,7 @@ var mockWire = {};
 
 Object.defineProperty(mockWire, "__esModule", { value: true });
 mockWire.MockWire = void 0;
+/* eslint-disable @typescript-eslint/no-unused-vars */
 const events_1 = require$$0;
 class MockWire extends events_1.EventEmitter {
     connect() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openfin/core",
-    "version": "34.78.66",
+    "version": "34.78.69",
     "description": "The core renderer entry point of OpenFin",
     "license": "SEE LICENSE IN LICENSE.md",
     "main": "out/mock.js",