merge branch release50 into release51

bbc · Jul 13, 2023 · 5278800 · 5278800
2 parents b8e36d6 + 3385217
commit 5278800
Show file tree

Hide file tree

Showing 8 changed files with 148 additions and 20 deletions.
diff --git a/.github/workflows/node.yaml b/.github/workflows/node.yaml
@@ -164,6 +164,7 @@ jobs:
         if: ${{ steps.do-publish.outputs.tag }}
         run: |
           echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
+          git checkout .yarnrc.yml
           yarn lerna publish from-package --tag-version-prefix='' --dist-tag ${{ steps.do-publish.outputs.tag }} --yes --no-verify-access
         env:
           CI: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.0.0-release50.5](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.4...9.0.0-release50.5) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver-packages
+
+
+
+
+
+## [9.0.0-release50.4](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.3...9.0.0-release50.4) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver-packages
+
+
+
+
+
+## [9.0.0-release50.3](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.2...9.0.0-release50.3) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver-packages
+
+
+
+
+
+## [9.0.0-release50.2](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.1...9.0.0-release50.2) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver-packages
+
+
+
+
+
+## [9.0.0-release50.1](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.0...9.0.0-release50.1) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver-packages
+
+
+
+
+
 ## [9.0.0-release50.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/3.5.1...9.0.0-release50.0) (2023-07-03)
 
 

diff --git a/packages/quick-tsr/CHANGELOG.md b/packages/quick-tsr/CHANGELOG.md
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.0.0-release50.5](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.4...9.0.0-release50.5) (2023-07-03)
+
+**Note:** Version bump only for package quick-tsr
+
+## [9.0.0-release50.4](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.3...9.0.0-release50.4) (2023-07-03)
+
+**Note:** Version bump only for package quick-tsr
+
+## [9.0.0-release50.3](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.2...9.0.0-release50.3) (2023-07-03)
+
+**Note:** Version bump only for package quick-tsr
+
+## [9.0.0-release50.2](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.1...9.0.0-release50.2) (2023-07-03)
+
+**Note:** Version bump only for package quick-tsr
+
+## [9.0.0-release50.1](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.0...9.0.0-release50.1) (2023-07-03)
+
+**Note:** Version bump only for package quick-tsr
+
 ## [9.0.0-release50.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/3.5.1...9.0.0-release50.0) (2023-07-03)
 
 ### Bug Fixes

diff --git a/packages/timeline-state-resolver-types/CHANGELOG.md b/packages/timeline-state-resolver-types/CHANGELOG.md
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.0.0-release50.5](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.4...9.0.0-release50.5) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver-types
+
+## [9.0.0-release50.4](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.3...9.0.0-release50.4) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver-types
+
+## [9.0.0-release50.3](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.2...9.0.0-release50.3) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver-types
+
+## [9.0.0-release50.2](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.1...9.0.0-release50.2) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver-types
+
+## [9.0.0-release50.1](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.0...9.0.0-release50.1) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver-types
+
 ## [9.0.0-release50.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/3.5.1...9.0.0-release50.0) (2023-07-03)
 
 ### ⚠ BREAKING CHANGES

diff --git a/packages/timeline-state-resolver-types/src/generated/httpSend.ts b/packages/timeline-state-resolver-types/src/generated/httpSend.ts
@@ -46,16 +46,7 @@ export enum TimelineContentTypeHTTPParamType {
 
 export type SomeMappingHttpSend = Record<string, never>
 
-export interface SendCommandPayload {
-	type: string
-	url: string
-	params: {
-		[k: string]: unknown
-	}
-	paramsType?: string
-	temporalPriority?: number
-	queueId?: string
-}
+export type SendCommandPayload = HTTPSendCommandContent
 
 export enum HttpSendActions {
 	Resync = 'resync',

diff --git a/packages/timeline-state-resolver/CHANGELOG.md b/packages/timeline-state-resolver/CHANGELOG.md
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.0.0-release50.5](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/9.0.0-release50.4...9.0.0-release50.5) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver
+
+## [9.0.0-release50.4](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/9.0.0-release50.3...9.0.0-release50.4) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver
+
+## [9.0.0-release50.3](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/9.0.0-release50.2...9.0.0-release50.3) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver
+
+## [9.0.0-release50.2](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/9.0.0-release50.1...9.0.0-release50.2) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver
+
+## [9.0.0-release50.1](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/9.0.0-release50.0...9.0.0-release50.1) (2023-07-03)
+
+**Note:** Version bump only for package timeline-state-resolver
+
 ## [9.0.0-release50.0](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/3.5.1...9.0.0-release50.0) (2023-07-03)
 
 ### ⚠ BREAKING CHANGES

diff --git a/packages/timeline-state-resolver/src/integrations/httpSend/$schemas/actions.json b/packages/timeline-state-resolver/src/integrations/httpSend/$schemas/actions.json
@@ -12,18 +12,54 @@
 			"destructive": false,
 			"payload": {
 				"type": "object",
+				"tsType": "HTTPSendCommandContent",
 				"properties": {
 					"type": {
-						"type": "string"
+						"type": "string",
+						"title": "TimelineContentTypeHTTP",
+						"ui:title": "Type",
+						"ui:summaryTitle": "Type",
+						"default": "",
+						"enum": ["get", "post", "put", "delete"],
+						"tsEnumNames": ["GET", "POST", "PUT", "DELETE"]
 					},
-					"url": { "type": "string" },
-					"params": { "type": "object" },
-					"paramsType": { "type": "string" },
-					"temporalPriority": { "type": "number" },
-					"queueId": { "type": "string" }
+					"url": {
+						"type": "string",
+						"ui:title": "Url",
+						"ui:summaryTitle": "URL",
+						"default": ""
+					},
+					"params": {
+						"type": "object",
+						"ui:title": "Params",
+						"ui:displayType": "json",
+						"additionalProperties": true
+					},
+					"paramsType": {
+						"type": "string",
+						"title": "TimelineContentTypeHTTPParamType",
+						"ui:title": "Params type",
+						"default": "json",
+						"enum": ["json", "form"],
+						"tsEnumNames": ["JSON", "FORM"]
+					},
+					"headers": {
+						"type": "object",
+						"additionalProperties": { "type": "string" }
+					},
+					"temporalPriority": {
+						"type": "integer",
+						"ui:title": "Temporal Priority",
+						"default": 0
+					},
+					"queueId": {
+						"type": "string",
+						"description": "Commands in the same queue will be sent in order (will wait for the previous to finish before sending next",
+						"ui:title": "Send Queue Id"
+					}
 				},
-				"additionalProperties": false,
-				"required": ["type", "url", "params"]
+				"required": ["type", "url", "params"],
+				"additionalProperties": false
 			}
 		}
 	]

diff --git a/packages/timeline-state-resolver/src/integrations/httpSend/index.ts b/packages/timeline-state-resolver/src/integrations/httpSend/index.ts
@@ -155,7 +155,7 @@ export class HTTPSendDevice extends DeviceWithState<HTTPSendState, DeviceOptions
 				response: t('Failed to send command: Missing url'),
 			}
 		}
-		if (Object.values<TimelineContentTypeHTTP>(TimelineContentTypeHTTP).includes(cmd.type as TimelineContentTypeHTTP)) {
+		if (Object.values<TimelineContentTypeHTTP>(TimelineContentTypeHTTP).includes(cmd.type)) {
 			return {
 				result: ActionExecutionResultCode.Error,
 				response: t('Failed to send command: type is invalid'),
@@ -174,7 +174,7 @@ export class HTTPSendDevice extends DeviceWithState<HTTPSendState, DeviceOptions
 			}
 		}
 
-		await this._commandReceiver(time, cmd as HTTPSendCommandContent, 'makeReady', '')
+		await this._commandReceiver(time, cmd, 'makeReady', '')
 
 		return {
 			result: ActionExecutionResultCode.Ok,