Skip to content

Commit

Permalink
Merge branch 'master' into fix-context-data-and-intents-consolidated-…
Browse files Browse the repository at this point in the history
…update-branch-2.1
  • Loading branch information
kriswest committed Jul 18, 2023
2 parents 329372d + 2fd647b commit 40ca808
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/meetings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
fi
- name: Report unknowns on issue comment
if: (github.event.action == 'closed' || (github.event.action == 'labeled' && github.event.label.name == 'indexed')) && env.UNKNOWNS_COMMENT != ''
uses: peter-evans/create-or-update-comment@v1
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa #v3.0.2
with:
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.issue.number }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
node-version: ${{ matrix.node }}

- name: Install dependencies
uses: bahmutov/npm-install@v1
uses: bahmutov/npm-install@c5482d70ec8706408996e31ac94075030694993f #v1.8.32

- name: Lint
run: yarn lint
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:

- name: Check package version
id: check-version
uses: PostHog/check-package-version@v2
uses: PostHog/check-package-version@adccce0ed9759513476413668bd2a5c995450bde #v2.0.0

- name: Package version info
run: |
Expand All @@ -88,7 +88,7 @@ jobs:
- name: Install dependencies
if: steps.check-version.outputs.is-new-version == 'true'
uses: bahmutov/npm-install@v1
uses: bahmutov/npm-install@c5482d70ec8706408996e31ac94075030694993f #v1.8.32

- name: Publish
if: steps.check-version.outputs.is-new-version == 'true'
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
* Deprecated the `name` field in AppD records, to match deprecation of API signatures and metadata objects using `name` (see ([#722](https://github.com/finos/FDC3/pull/722))
)) in 2.0 ([#928])(https://github.com/finos/FDC3/pull/928))
* Deprecated `IntentMetadata.displayName` and the appD record's `interop.intents.listensFor[].displayName` field in favour of using intent names for display (which are required to be recognizable) as it can be set differently for each application in the appD ([#926](https://github.com/finos/FDC3/pull/926))
* Deprecated the `customConfig` field in an AppD record due to the lack of a standard API to retrieve it. To be replaced with an `applicationConfig` element with a Desktop Agent API call to retrieve it in a future version (see [#1006](https://github.com/finos/FDC3/issues/1006) for more details). Also deprecates the `customCOnfig` element of an Intent configuration due to a lack of documented use cases. ([#982](https://github.com/finos/FDC3/pull/982))

### Fixed

Expand Down
16 changes: 12 additions & 4 deletions src/app-directory/specification/appd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -433,10 +433,15 @@ components:
The name of the company that owns the application. The publisher has
control over their namespace/app/signature.
customConfig:
deprecated: true
type: array
description: >-
An optional set of name value pairs that can be used to deliver
custom data from an App Directory to a launcher.
custom data from an App Directory to a launcher. Deprecated due to a
lack of a standard means of retrieval via the Desktop Agent API. To
be replaced in a future version with an `applicationConfig` element
and standard API to retrieve it. See issue
[#1006](https://github.com/finos/FDC3/issues/1006) for details.
items:
$ref: '#/components/schemas/NameValuePair'
hostManifests:
Expand Down Expand Up @@ -611,7 +616,7 @@ components:
type: object # keys should be constrained to valid language tags '^[a-z]{2}(-[a-zA-Z0-9]{2,8}){0,1}$' - not possible to express in OpenAPI without moving to v3.1.0 and the javascript/jsonschema version
description: >
Provides localized alternatives to any field of the AppD record, which may also refer to an alternative
version of the application that is also localized (e.g. by providing customConfig or an alternative URL).
version of the application that is also localized (e.g. by providing an alternative URL).
The keys to this object should be language tags as defined by IETF RFC 5646, e.g. en, en-GB or fr-FR.
additionalProperties:
x-additionalPropertiesName: Language tag
Expand Down Expand Up @@ -641,10 +646,11 @@ components:
or a combination that indicates a channel that returns a particular context type
(e.g. "channel<fdc3.instrument>").
customConfig:
deprecated: true
type: object
description: >-
Custom configuration for the intent that may be required for a
particular desktop agent.
particular desktop agent. Deprecated due to a lack of defined use cases.
Interop:
type: object
description: |
Expand Down Expand Up @@ -773,10 +779,11 @@ components:
A comma separated list of the types of contexts the intent offered by the application can process.
where the first part of the context type is the namespace e.g."fdc3.contact, org.symphony.contact"
customConfig:
deprecated: true
type: object
description: >-
Custom configuration for the intent that may be required for a
particular desktop agent.
particular desktop agent. Deprecated due to a lack of defined use cases.
ApplicationV1:
description: >
(Deprecated v1 API version) Defines an application retrieved from an FDC3 App Directory, which can
Expand Down Expand Up @@ -863,6 +870,7 @@ components:
items:
$ref: '#/components/schemas/IconV1'
customConfig:
deprecated: true
type: array
description: >-
An optional set of name value pairs that can be used to deliver
Expand Down
16 changes: 12 additions & 4 deletions website/static/schemas/next/app-directory.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -433,10 +433,15 @@ components:
The name of the company that owns the application. The publisher has
control over their namespace/app/signature.
customConfig:
deprecated: true
type: array
description: >-
An optional set of name value pairs that can be used to deliver
custom data from an App Directory to a launcher.
custom data from an App Directory to a launcher. Deprecated due to a
lack of a standard means of retrieval via the Desktop Agent API. To
be replaced in a future version with an `applicationConfig` element
and standard API to retrieve it. See issue
[#1006](https://github.com/finos/FDC3/issues/1006) for details.
items:
$ref: '#/components/schemas/NameValuePair'
hostManifests:
Expand Down Expand Up @@ -611,7 +616,7 @@ components:
type: object # keys should be constrained to valid language tags '^[a-z]{2}(-[a-zA-Z0-9]{2,8}){0,1}$' - not possible to express in OpenAPI without moving to v3.1.0 and the javascript/jsonschema version
description: >
Provides localized alternatives to any field of the AppD record, which may also refer to an alternative
version of the application that is also localized (e.g. by providing customConfig or an alternative URL).
version of the application that is also localized (e.g. by providing an alternative URL).
The keys to this object should be language tags as defined by IETF RFC 5646, e.g. en, en-GB or fr-FR.
additionalProperties:
x-additionalPropertiesName: Language tag
Expand Down Expand Up @@ -641,10 +646,11 @@ components:
or a combination that indicates a channel that returns a particular context type
(e.g. "channel<fdc3.instrument>").
customConfig:
deprecated: true
type: object
description: >-
Custom configuration for the intent that may be required for a
particular desktop agent.
particular desktop agent. Deprecated due to a lack of defined use cases.
Interop:
type: object
description: |
Expand Down Expand Up @@ -773,10 +779,11 @@ components:
A comma separated list of the types of contexts the intent offered by the application can process.
where the first part of the context type is the namespace e.g."fdc3.contact, org.symphony.contact"
customConfig:
deprecated: true
type: object
description: >-
Custom configuration for the intent that may be required for a
particular desktop agent.
particular desktop agent. Deprecated due to a lack of defined use cases.
ApplicationV1:
description: >
(Deprecated v1 API version) Defines an application retrieved from an FDC3 App Directory, which can
Expand Down Expand Up @@ -863,6 +870,7 @@ components:
items:
$ref: '#/components/schemas/IconV1'
customConfig:
deprecated: true
type: array
description: >-
An optional set of name value pairs that can be used to deliver
Expand Down

0 comments on commit 40ca808

Please sign in to comment.