Skip to content

Commit

Permalink
Merge pull request #78 from built-on-openfin/dev/v32
Browse files Browse the repository at this point in the history
  • Loading branch information
adam-saland authored Oct 11, 2023
2 parents 25247c6 + 621932b commit 84e4e8c
Show file tree
Hide file tree
Showing 62 changed files with 22,640 additions and 21,945 deletions.
4 changes: 2 additions & 2 deletions how-to/container-platform-starter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
},
"license": "ISC",
"devDependencies": {
"@openfin/core": "^28.72.17",
"openfin-adapter": "^28.72.17",
"@openfin/core": "^32.76.10",
"openfin-adapter": "32.76.10",
"ts-loader": "^9.4.4",
"typescript": "^5.1.6",
"webpack": "^5.88.1",
Expand Down
2 changes: 1 addition & 1 deletion how-to/container-platform-starter/public/manifest.fin.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"runtime": {
"arguments": "--v=1 --inspect",
"version": "26.102.70.16"
"version": "32.114.76.10"
},
"platform": {
"enableBeforeUnload": true,
Expand Down
2 changes: 2 additions & 0 deletions how-to/create-window/client/src/app.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import type OpenFin from "@openfin/core";

document.addEventListener("DOMContentLoaded", async () => {
try {
await initDom();
Expand Down
2 changes: 1 addition & 1 deletion how-to/create-window/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"author": "[email protected]",
"license": "SEE LICENSE IN LICENSE.MD",
"devDependencies": {
"openfin-adapter": "^28.72.17",
"openfin-adapter": "32.76.10",
"ts-loader": "^9.4.4",
"typescript": "^5.1.6",
"webpack": "^5.88.1",
Expand Down
2 changes: 1 addition & 1 deletion how-to/create-window/public/app.fin.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"runtime": {
"arguments": "--enable-crash-reporting --no-sandbox",
"version": "26.102.70.16"
"version": "32.114.76.10"
},
"shortcut": {
"company": "OpenFin",
Expand Down
2 changes: 1 addition & 1 deletion how-to/create-window/public/manifest.fin.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"runtime": {
"arguments": "--v=1 --inspect",
"version": "26.102.70.16"
"version": "32.114.76.10"
},
"platform": {
"uuid": "how-to-open-windows",
Expand Down
2 changes: 1 addition & 1 deletion how-to/integration-excel/client/src/provider-tray.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export {};
import type OpenFin from "@openfin/core";

window.addEventListener("DOMContentLoaded", async () => {
const platform: OpenFin.Platform = fin.Platform.getCurrentSync();
Expand Down
2 changes: 1 addition & 1 deletion how-to/integration-excel/client/src/provider.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export {};
import type OpenFin from "@openfin/core";

window.addEventListener("DOMContentLoaded", async () => {
const platform: OpenFin.Platform = fin.Platform.getCurrentSync();
Expand Down
5 changes: 3 additions & 2 deletions how-to/integration-excel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@
"license": "SEE LICENSE IN LICENSE.MD",
"devDependencies": {
"@finos/fdc3": "^2.0.3",
"openfin-adapter": "^28.72.17",
"openfin-adapter": "32.76.10",
"ts-loader": "^9.4.4",
"typescript": "^5.1.6",
"webpack": "^5.88.1",
"webpack-cli": "^5.1.4"
},
"dependencies": {
"@openfin/excel": "^1.4.1"
"@openfin/excel": "^1.4.1",
"@openfin/core": "32.76.10"
}
}
2 changes: 1 addition & 1 deletion how-to/integration-excel/public/manifest.fin.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"runtime": {
"arguments": "--v=1 --inspect",
"version": "26.102.70.16"
"version": "32.114.76.10"
},
"platform": {
"uuid": "integration-excel",
Expand Down
2 changes: 1 addition & 1 deletion how-to/integration-excel/public/second.manifest.fin.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"runtime": {
"arguments": "--v=1 --inspect",
"version": "26.102.70.16"
"version": "32.114.76.10"
},
"platform": {
"uuid": "integration-excel-tray",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"author": "[email protected]",
"license": "SEE LICENSE IN LICENSE.MD",
"devDependencies": {
"openfin-adapter": "^26.70.16"
"openfin-adapter": "32.76.10"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"licenseKey": "openfin-demo-license-key",
"runtime": {
"arguments": "--v=1 --inspect",
"version": "26.102.70.16",
"version": "32.114.76.10",
"autoShow": false
},
"platform": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"licenseKey": "openfin-demo-license-key",
"runtime": {
"arguments": "--v=1 --inspect",
"version": "26.102.70.16",
"version": "32.114.76.10",
"autoShow": false
},
"platform": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export {};
import type OpenFin from "@openfin/core";

window.addEventListener("DOMContentLoaded", async () => {
const platform: OpenFin.Platform = fin.Platform.getCurrentSync();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export {};
import type OpenFin from "@openfin/core";

document.addEventListener("DOMContentLoaded", async () => {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"author": "[email protected]",
"license": "SEE LICENSE IN LICENSE.MD",
"devDependencies": {
"openfin-adapter": "^28.72.17",
"openfin-adapter": "32.76.10",
"ts-loader": "^9.4.4",
"typescript": "^5.1.6",
"webpack": "^5.88.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"licenseKey": "openfin-demo-license-key",
"runtime": {
"version": "26.102.70.16",
"version": "32.114.76.10",
"arguments": "--v=1"
},
"startup_app": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"runtime": {
"arguments": "--v=1 --inspect",
"version": "26.102.70.16"
"version": "32.114.76.10"
},
"platform": {
"uuid": "how-to-use-channel-api-issue-commands-to-a-platform",
Expand Down
2 changes: 2 additions & 0 deletions how-to/use-content-creation-rules/client/src/app.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export {};

document.addEventListener("DOMContentLoaded", async () => {
await initDom();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ async function initDom(): Promise<void> {
// The content creation rules construct the options for the view in the childOptions
// The view has been created but not yet attached or navigated
console.log(e);
const viewOptions: OpenFin.PlatformViewCreationOptions = e.childOptions;
const viewOptions = e.childOptions;
let originalTargetName;
let create = true;

Expand Down Expand Up @@ -79,7 +79,7 @@ async function initDom(): Promise<void> {
// view created for us by the content creation rules
// Or if it had the name swapped due to a target specified in the original
// window.open it will create a new view with the derived name
const view = await platform.createView(viewOptions, e.target as OpenFin.Identity);
const view = await platform.createView(viewOptions, e.target);

// We must explicitly navigate the view created by the content creation rules
await view.navigate(viewOptions.url);
Expand Down
2 changes: 1 addition & 1 deletion how-to/use-content-creation-rules/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"author": "@adam-saland",
"license": "SEE LICENSE IN LICENSE.MD",
"devDependencies": {
"openfin-adapter": "^28.72.17",
"openfin-adapter": "32.76.10",
"ts-loader": "^9.4.4",
"typescript": "^5.1.6",
"webpack": "^5.88.1",
Expand Down
190 changes: 95 additions & 95 deletions how-to/use-content-creation-rules/public/manifest.fin.json
Original file line number Diff line number Diff line change
@@ -1,95 +1,95 @@
{
"runtime": {
"arguments": "--v=1 --inspect",
"version": "26.102.71.7"
},
"shortcut": {
"company": "OpenFin",
"description": "Content Creation Rules",
"icon": "http://localhost:5050/favicon.ico",
"name": "Content Creation Rules"
},
"platform": {
"uuid": "use-content-creation-rules",
"name": "use-content-creation-rules",
"icon": "http://localhost:5050/favicon.ico",
"autoShow": false,
"providerUrl": "http://localhost:5050/html/platform-provider.html",
"waitForPageLoad": false,
"defaultWindowOptions": {
"waitForPageLoad": false,
"url": "http://localhost:5050/html/default-platform-window.html",
"icon": "http://localhost:5050/favicon.ico",
"contextMenu": true,
"defaultWidth": 600,
"defaultHeight": 600,
"defaultLeft": 0,
"defaultTop": 0,
"saveWindowState": false,
"backgroundThrottling": true,
"minHeight": 445,
"minWidth": 308
},
"defaultViewOptions": {
"contentCreation": {
"rules": [
{
"behavior": "view",
"match": ["*://*.google.com/*"]
},
{
"behavior": "view",
"match": ["*://*.examples.com/category/business/*"]
},
{
"behavior": "window",
"match": ["*://*.bing.com/*"]
},
{
"behavior": "window",
"match": ["*://*.examples.com/category/education/*"]
},
{
"behavior": "browser",
"match": ["*://*.microsoft.com/*"]
},
{
"behavior": "block",
"match": ["*://*.apple.com/*"]
}
]
}
},
"commands": [
{
"command": "stack.nextTab",
"keys": "Ctrl+Tab"
}
]
},
"snapshot": {
"windows": [
{
"layout": {
"content": [
{
"type": "stack",
"id": "no-drop-target",
"content": [
{
"type": "component",
"componentName": "view",
"componentState": {
"name": "component_A1",
"processAffinity": "ps_1",
"url": "http://localhost:5050/html/app.html"
}
}
]
}
]
}
}
]
}
}
{
"runtime": {
"arguments": "--v=1 --inspect",
"version": "32.114.76.10"
},
"shortcut": {
"company": "OpenFin",
"description": "Content Creation Rules",
"icon": "http://localhost:5050/favicon.ico",
"name": "Content Creation Rules"
},
"platform": {
"uuid": "use-content-creation-rules",
"name": "use-content-creation-rules",
"icon": "http://localhost:5050/favicon.ico",
"autoShow": false,
"providerUrl": "http://localhost:5050/html/platform-provider.html",
"waitForPageLoad": false,
"defaultWindowOptions": {
"waitForPageLoad": false,
"url": "http://localhost:5050/html/default-platform-window.html",
"icon": "http://localhost:5050/favicon.ico",
"contextMenu": true,
"defaultWidth": 600,
"defaultHeight": 600,
"defaultLeft": 0,
"defaultTop": 0,
"saveWindowState": false,
"backgroundThrottling": true,
"minHeight": 445,
"minWidth": 308
},
"defaultViewOptions": {
"contentCreation": {
"rules": [
{
"behavior": "view",
"match": ["*://*.google.com/*"]
},
{
"behavior": "view",
"match": ["*://*.examples.com/category/business/*"]
},
{
"behavior": "window",
"match": ["*://*.bing.com/*"]
},
{
"behavior": "window",
"match": ["*://*.examples.com/category/education/*"]
},
{
"behavior": "browser",
"match": ["*://*.microsoft.com/*"]
},
{
"behavior": "block",
"match": ["*://*.apple.com/*"]
}
]
}
},
"commands": [
{
"command": "stack.nextTab",
"keys": "Ctrl+Tab"
}
]
},
"snapshot": {
"windows": [
{
"layout": {
"content": [
{
"type": "stack",
"id": "no-drop-target",
"content": [
{
"type": "component",
"componentName": "view",
"componentState": {
"name": "component_A1",
"processAffinity": "ps_1",
"url": "http://localhost:5050/html/app.html"
}
}
]
}
]
}
}
]
}
}
2 changes: 1 addition & 1 deletion how-to/use-dynamic-manifest/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"license": "SEE LICENSE IN LICENSE.MD",
"devDependencies": {
"express": "^4.18.2",
"openfin-adapter": "^28.72.17",
"openfin-adapter": "32.76.10",
"ts-loader": "^9.4.4",
"typescript": "^5.1.6",
"webpack": "^5.88.1",
Expand Down
Loading

0 comments on commit 84e4e8c

Please sign in to comment.