Skip to content

Commit

Permalink
Merge branch 'workspace/vnext' into c/splash-screen-icon
Browse files Browse the repository at this point in the history
  • Loading branch information
johnman committed Jan 24, 2024
2 parents e73fd8c + 2d45521 commit 7e66ea2
Show file tree
Hide file tree
Showing 229 changed files with 3,230 additions and 1,489 deletions.
38 changes: 19 additions & 19 deletions README.md

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions how-to/automation-testing/register-with-home-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"description": "OpenFin Workspace Starter Automation Tests",
"scripts": {
"build": "echo Nothing to build",
"test-remote-mocha": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.js --reporter ./mocha.reporter.json --testFailCount 1 --workspace 17.0.6",
"test-local-mocha": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --workspace 17.0.6",
"test-remote-jasmine": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.js --framework jasmine --reporter ./jasmine.reporter.json --testFailCount 1 --workspace 17.0.6",
"test-local-jasmine": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --framework jasmine --workspace 17.0.6",
"test-remote-jest": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.js --framework jest --reporter ./jest.reporter.json --testFailCount 1 --workspace 17.0.6",
"test-local-jest": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --framework jest --workspace 17.0.6",
"test-offline": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --offline --storageFolder=./offline-storage --workspace 17.0.6",
"test-remote-mocha-selenium": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.js --driver=selenium --workspace 17.0.6",
"test-local-mocha-selenium": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --driver=selenium --workspace 17.0.6"
"test-remote-mocha": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.js --reporter ./mocha.reporter.json --testFailCount 1 --workspace 17.0.8",
"test-local-mocha": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --workspace 17.0.8",
"test-remote-jasmine": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.js --framework jasmine --reporter ./jasmine.reporter.json --testFailCount 1 --workspace 17.0.8",
"test-local-jasmine": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --framework jasmine --workspace 17.0.8",
"test-remote-jest": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.js --framework jest --reporter ./jest.reporter.json --testFailCount 1 --workspace 17.0.8",
"test-local-jest": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --framework jest --workspace 17.0.8",
"test-offline": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --offline --storageFolder=./offline-storage --workspace 17.0.8",
"test-remote-mocha-selenium": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.js --driver=selenium --workspace 17.0.8",
"test-local-mocha-selenium": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --driver=selenium --workspace 17.0.8"
},
"author": "[email protected]",
"license": "SEE LICENSE IN LICENSE.MD",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('Register with Home', () => {
it('The runtime version should be set', async () => {
const fin = await OpenFinProxy.fin();
const version = await fin.System.getVersion();
expect(version).to.equal('34.118.78.76');
expect(version).to.equal('34.118.78.77');
});

it('The identity should be set', async () => {
Expand Down
18 changes: 9 additions & 9 deletions how-to/automation-testing/register-with-home-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"description": "OpenFin Workspace Starter Automation Tests",
"scripts": {
"build": "echo Nothing to build",
"test-remote-mocha": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.ts --workspace 17.0.6 --testFailCount 1",
"test-local-mocha": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.ts --workspace 17.0.6 --testFailCount 1",
"test-remote-jasmine": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.ts --framework jasmine --workspace 17.0.6 --testFailCount 1",
"test-local-jasmine": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.ts --framework jasmine --workspace 17.0.6 --testFailCount 1",
"test-remote-jest": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.ts --framework jest --workspace 17.0.6 --testFailCount 1",
"test-local-jest": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.ts --framework jest --workspace 17.0.6 --testFailCount 1",
"test-offline": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.ts --offline --storageFolder=./offline-storage --workspace 17.0.6 --testFailCount 1",
"test-remote-mocha-selenium": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.ts --driver=selenium --workspace 17.0.6 --testFailCount 1",
"test-local-mocha-selenium": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.ts --driver=selenium --workspace 17.0.6 --testFailCount 1"
"test-remote-mocha": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.ts --workspace 17.0.8 --testFailCount 1",
"test-local-mocha": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.ts --workspace 17.0.8 --testFailCount 1",
"test-remote-jasmine": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.ts --framework jasmine --workspace 17.0.8 --testFailCount 1",
"test-local-jasmine": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.ts --framework jasmine --workspace 17.0.8 --testFailCount 1",
"test-remote-jest": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.ts --framework jest --workspace 17.0.8 --testFailCount 1",
"test-local-jest": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.ts --framework jest --workspace 17.0.8 --testFailCount 1",
"test-offline": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.ts --offline --storageFolder=./offline-storage --workspace 17.0.8 --testFailCount 1",
"test-remote-mocha-selenium": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json ./tests/**/*.spec.ts --driver=selenium --workspace 17.0.8 --testFailCount 1",
"test-local-mocha-selenium": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.ts --driver=selenium --workspace 17.0.8 --testFailCount 1"
},
"author": "[email protected]",
"license": "SEE LICENSE IN LICENSE.MD",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe("Register with Home", () => {
it("The runtime version should be set", async () => {
const fin = await OpenFinProxy.fin();
const version = await fin.System.getVersion();
expect(version).to.equal("34.118.78.76");
expect(version).to.equal("34.118.78.77");
});

it("The identity should be set", async () => {
Expand Down
14 changes: 7 additions & 7 deletions how-to/automation-testing/register-with-store-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"description": "OpenFin Workspace Starter Automation Tests",
"scripts": {
"build": "echo Nothing to build",
"test-remote-mocha": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-store/manifest.fin.json ./tests/**/*.spec.js --workspace 17.0.6",
"test-local-mocha": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --workspace 17.0.6",
"test-remote-jasmine": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-store/manifest.fin.json ./tests/**/*.spec.js --framework jasmine --workspace 17.0.6",
"test-local-jasmine": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --framework jasmine --workspace 17.0.6",
"test-remote-jest": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-store/manifest.fin.json ./tests/**/*.spec.js --framework jest --workspace 17.0.6",
"test-local-jest": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --framework jest --workspace 17.0.6",
"test-offline": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --offline --storageFolder=./offline-storage --workspace 17.0.6"
"test-remote-mocha": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-store/manifest.fin.json ./tests/**/*.spec.js --workspace 17.0.8",
"test-local-mocha": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --workspace 17.0.8",
"test-remote-jasmine": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-store/manifest.fin.json ./tests/**/*.spec.js --framework jasmine --workspace 17.0.8",
"test-local-jasmine": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --framework jasmine --workspace 17.0.8",
"test-remote-jest": "of-automation https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-store/manifest.fin.json ./tests/**/*.spec.js --framework jest --workspace 17.0.8",
"test-local-jest": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --framework jest --workspace 17.0.8",
"test-offline": "of-automation http://localhost:8080/manifest.fin.json ./tests/**/*.spec.js --offline --storageFolder=./offline-storage --workspace 17.0.8"
},
"author": "[email protected]",
"license": "SEE LICENSE IN LICENSE.MD",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('Register with Store', () => {
it('The runtime version should be set', async () => {
const fin = await OpenFinProxy.fin();
const version = await fin.System.getVersion();
expect(version).to.equal('34.118.78.76');
expect(version).to.equal('34.118.78.77');
});

it('Can open the store window', async () => {
Expand Down
2 changes: 1 addition & 1 deletion how-to/automation-testing/selenium/scripts/dos.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const DOS = {
securedAPIDefaultPermission: 'allow',
systemApps: {
workspace: {
version: '17.0.6'
version: '17.0.8'
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion how-to/automation-testing/selenium/selenium.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ async function runMochaTests() {
}

// The version of the chromedriver in the package.json should match the runtime version from the app manifest.
// e.g. if the manifest runtime version is 34.118.78.76 then the chromedriver version should be "118.0.0"
// e.g. if the manifest runtime version is 34.118.78.77 then the chromedriver version should be "118.0.0"
const testManifestUrl =
'https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json';
const chromeDriverPort = 5678;
Expand Down
2 changes: 1 addition & 1 deletion how-to/automation-testing/selenium/test/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describe('Register with Home', () => {
it('The runtime version should be set', async () => {
const fin = await OpenFinProxy.fin();
const version = await fin.System.getVersion();
expect(version).to.equal('34.118.78.76');
expect(version).to.equal('34.118.78.77');
});

it('The identity should be set', async () => {
Expand Down
2 changes: 1 addition & 1 deletion how-to/automation-testing/wdio/scripts/dos.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const DOS = {
securedAPIDefaultPermission: 'allow',
systemApps: {
workspace: {
version: '17.0.6'
version: '17.0.8'
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion how-to/automation-testing/wdio/test/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describe('Register with Home', () => {
it('The runtime version should be set', async () => {
const fin = await OpenFinProxy.fin();
const version = await fin.System.getVersion();
expect(version).to.equal('34.118.78.76');
expect(version).to.equal('34.118.78.77');
});

it('The identity should be set', async () => {
Expand Down
2 changes: 1 addition & 1 deletion how-to/automation-testing/wdio/wdio.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const fsPromises = require('fs/promises');
const path = require('path');

// The version of the chromedriver in the package.json should match the runtime version from the app manifest.
// e.g. if the manifest runtime version is 34.118.78.76 then the chromedriver version should be '118.0.0'
// e.g. if the manifest runtime version is 34.118.78.77 then the chromedriver version should be '118.0.0'
const manifestUrl =
'https://built-on-openfin.github.io/workspace-starter/workspace/vnext/register-with-home/manifest.fin.json';
const chromeDriverPort = 5843;
Expand Down
7 changes: 6 additions & 1 deletion how-to/customize-home-templates/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,12 @@ module.exports = {
'@typescript-eslint/prefer-function-type': ['error'],
'@typescript-eslint/prefer-includes': ['error'],
'@typescript-eslint/prefer-namespace-keyword': ['error'],
'@typescript-eslint/prefer-nullish-coalescing': ['error'],
'@typescript-eslint/prefer-nullish-coalescing': [
'error',
{
ignoreConditionalTests: true
}
],
'@typescript-eslint/prefer-optional-chain': ['error'],
'@typescript-eslint/prefer-readonly': ['error'],
'@typescript-eslint/prefer-readonly-parameter-types': ['off'],
Expand Down
2 changes: 1 addition & 1 deletion how-to/customize-home-templates/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ To run this sample you can:
- Clone this repo and follow the instructions below. This will let you customize the sample to learn more about our APIs.
- Launch the Github hosted version of this sample to interact with it by going to the following link:

[Github Workspace Starter Customize Home Templates](https://start.openfin.co/?manifest=https%3A%2F%2Fbuilt-on-openfin.github.io%2Fworkspace-starter%2Fworkspace%2Fv17.0.6%2Fcustomize-home-templates%2Fmanifest.fin.json)
[Github Workspace Starter Customize Home Templates](https://start.openfin.co/?manifest=https%3A%2F%2Fbuilt-on-openfin.github.io%2Fworkspace-starter%2Fworkspace%2Fv17.0.8%2Fcustomize-home-templates%2Fmanifest.fin.json)

## Getting Started

Expand Down
8 changes: 4 additions & 4 deletions how-to/customize-home-templates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
],
"license": "SEE LICENSE IN LICENSE.MD",
"dependencies": {
"@openfin/workspace": "17.0.6",
"@openfin/workspace-platform": "17.0.6",
"@openfin/workspace": "17.0.8",
"@openfin/workspace-platform": "17.0.8",
"chart.js": "^4.4.1",
"csstype": "^3.1.3",
"luxon": "^3.4.4",
"node-emoji": "1.11.0"
},
"devDependencies": {
"@openfin/core": "34.78.76",
"@openfin/node-adapter": "34.78.76",
"@openfin/core": "34.78.77",
"@openfin/node-adapter": "34.78.77",
"@types/luxon": "^3.3.8",
"@types/node-emoji": "^1.8.2",
"eslint": "8.56.0",
Expand Down
2 changes: 1 addition & 1 deletion how-to/customize-home-templates/public/common/dos.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"desktopSettings": {
"systemApps": {
"workspace": {
"version": "17.0.6",
"version": "17.0.8",
"customConfig": {
"hotkeys": {
"toggleHomeVisibility": "CommandOrControl+Space"
Expand Down
4 changes: 2 additions & 2 deletions how-to/customize-home-templates/public/manifest.fin.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"licenseKey": "openfin-demo-license-key",
"runtime": {
"arguments": "--v=1 --inspect",
"version": "34.118.78.76"
"version": "34.118.78.77"
},
"platform": {
"uuid": "customize-home-templates",
Expand Down Expand Up @@ -34,7 +34,7 @@
"company": "OpenFin",
"description": "A way of showing examples of what OpenFin can do.",
"icon": "http://localhost:8080/favicon.ico",
"name": "Customize Home Templates - v17.0.6",
"name": "Customize Home Templates - v17.0.8",
"target": ["desktop", "start-menu"]
},
"supportInformation": {
Expand Down
1 change: 1 addition & 0 deletions how-to/hints-and-tips/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ This section is where we will add small hints and tips that isn't specific to an
| --------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
| [Channel API](./docs/channel-api.md) | This section covers things related to the Channel API and it's use. |
| [User Engagement - Idleness and Visibility](./docs/visible-idle-detection.md) | This document covers how you can detect if the user is currently active and when they show or hide your content. |
| [User Engagement - Responding to the resize of a view](./docs/resize-detection.md) | This document covers how you can detect if the user has resized the view in some way. |
| [Version Info](./docs/version-info.md) | This document covers how you can look up information related to your application, the rvm, the runtime or the workspace components. |
| [Preload Scripts](./docs/preload-scripts.md) | This document covers how you can configure preload scripts for your platform with some hints and tips. |
| [Protocol Links](./docs/protocol-support.md) | This document covers how you can configure protocol support for your OpenFin platform e.g. mailto:, msteams: etc. |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
> **_:information_source: OpenFin Workspace:_** [OpenFin Workspace](https://www.openfin.co/workspace/) is a commercial product and this repo is for evaluation purposes (See [LICENSE.MD](../LICENSE.MD)). Use of the OpenFin Container and OpenFin Workspace components is only granted pursuant to a license from OpenFin (see [manifest](../public/manifest.fin.json)). Please [**contact us**](https://www.openfin.co/workspace/poc/) if you would like to request a developer evaluation key or to discuss a production license.
> **_:information_source: OpenFin Workspace:_** [OpenFin Workspace](https://www.openfin.co/workspace/) is a commercial product and this repo is for evaluation purposes (See [LICENSE.MD](../../../LICENSE.MD)). Use of the OpenFin Container and OpenFin Workspace components is only granted pursuant to a license from OpenFin. Please [**contact us**](https://www.openfin.co/workspace/poc/) if you would like to request a developer evaluation key or to discuss a production license.
[<- Back to Table Of Contents](../README.md)

Expand Down
2 changes: 1 addition & 1 deletion how-to/hints-and-tips/docs/channel-api.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
> **_:information_source: OpenFin Workspace:_** [OpenFin Workspace](https://www.openfin.co/workspace/) is a commercial product and this repo is for evaluation purposes (See [LICENSE.MD](../LICENSE.MD)). Use of the OpenFin Container and OpenFin Workspace components is only granted pursuant to a license from OpenFin (see [manifest](../public/manifest.fin.json)). Please [**contact us**](https://www.openfin.co/workspace/poc/) if you would like to request a developer evaluation key or to discuss a production license.
> **_:information_source: OpenFin Workspace:_** [OpenFin Workspace](https://www.openfin.co/workspace/) is a commercial product and this repo is for evaluation purposes (See [LICENSE.MD](../../../LICENSE.MD)). Use of the OpenFin Container and OpenFin Workspace components is only granted pursuant to a license from OpenFin. Please [**contact us**](https://www.openfin.co/workspace/poc/) if you would like to request a developer evaluation key or to discuss a production license.
[<- Back to Table Of Contents](../README.md)

Expand Down
Loading

0 comments on commit 7e66ea2

Please sign in to comment.