Merge branch 'release53' into bbc-release53

Author: PeterC89

.github/workflows/node.yaml

@@ -252,7 +252,7 @@ jobs:
           echo "image=$image" >> $GITHUB_OUTPUT
       - name: Trivy scanning
         if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
-        uses: aquasecurity/trivy-action@0.30.0
+        uses: aquasecurity/trivy-action@0.32.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
@@ -405,7 +405,7 @@ jobs:
           echo "image=$image" >> $GITHUB_OUTPUT
       - name: Trivy scanning
         if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
-        uses: aquasecurity/trivy-action@0.30.0
+        uses: aquasecurity/trivy-action@0.32.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
@@ -480,7 +480,7 @@ jobs:
           CI: true
 
   test-packages:
-    name: Test Package
+    name: Test Package (main)
     runs-on: ubuntu-latest
     timeout-minutes: 15
 
@@ -551,8 +551,8 @@ jobs:
         env:
           CI: true
       - name: Send coverage
-        if: (matrix.node-version == '18.x' || matrix.send-coverage == true) && ((github.event_name == 'pull_request') && ((!startsWith(github.head_ref, 'release'))) || ((github.event_name == 'push') && (!startsWith(github.ref_name, 'release'))))
-        uses: codecov/codecov-action@v4
+        if: (matrix.node-version == '22.x' || matrix.send-coverage == true) && (((github.event_name == 'pull_request') && (!startsWith(github.head_ref, 'release'))) || ((github.event_name == 'push') && (!startsWith(github.ref_name, 'release'))))
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 

.github/workflows/trivy.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Run Trivy vulnerability scanner (json)
-        uses: aquasecurity/trivy-action@0.30.0
+        uses: aquasecurity/trivy-action@0.32.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
@@ -26,7 +26,7 @@ jobs:
           output: "${{ matrix.image }}-trivy-scan-results.json"
 
       - name: Run Trivy vulnerability scanner (table)
-        uses: aquasecurity/trivy-action@0.30.0
+        uses: aquasecurity/trivy-action@0.32.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
@@ -44,7 +44,7 @@ jobs:
           echo $CODE_BLOCK >> $GITHUB_STEP_SUMMARY
 
       - name: Run Trivy in GitHub SBOM mode and submit results to Dependency Graph
-        uses: aquasecurity/trivy-action@0.30.0
+        uses: aquasecurity/trivy-action@0.32.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:

README.md

@@ -8,7 +8,7 @@ The _Core_ is a _Meteor/Node.JS_-based web server that serves the web GUIs as we
 
 ## General Sofie System Information
 
-- [_Sofie_ Documentation](https://sofie-automation.github.io/sofie-core//)
+- [_Sofie_ Documentation](https://sofie-automation.github.io/sofie-core/)
 - [_Sofie_ Releases](https://sofie-automation.github.io/sofie-core//releases)
 - [Contribution Guidelines](CONTRIBUTING.md)
 - [License](LICENSE)

meteor/CHANGELOG.md

@@ -163,7 +163,7 @@ export namespace MosIntegration {
 
 		const rundownExternalId = parseMosString(Action.RunningOrderID)
 
-		logger.info(`mosRoStoryInsert after "${Action.StoryID}" Stories: ${Stories.map((s) => s.ID)}`)
+		logger.info(`mosRoStoryInsert before "${Action.StoryID}" Stories: ${Stories.map((s) => s.ID)}`)
 		logger.debug(Action, Stories)
 
 		await runIngestOperation(studioId, IngestJobs.MosInsertStory, {

meteor/server/api/ingest/mosDevice/mosIntegration.ts

@@ -1244,7 +1244,7 @@ __metadata:
   resolution: "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A."
   dependencies:
     "@mos-connection/model": "npm:^4.2.2"
-    timeline-state-resolver-types: "npm:9.3.0-release52.2"
+    timeline-state-resolver-types: "npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0"
     tslib: "npm:^2.8.1"
     type-fest: "npm:^4.33.0"
   languageName: node
@@ -9983,12 +9983,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"timeline-state-resolver-types@npm:9.3.0-release52.2":
-  version: 9.3.0-release52.2
-  resolution: "timeline-state-resolver-types@npm:9.3.0-release52.2"
+"timeline-state-resolver-types@npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0":
+  version: 9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0
+  resolution: "timeline-state-resolver-types@npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0"
   dependencies:
     tslib: "npm:^2.6.3"
-  checksum: 10/2f50474e96d6f10d085788b59c2a8a2bedcf8511646424afcb9c2b421798e689894028629f0c55d0b76dc5f543cba06367c7be93c2662608a3804f60c108ded2
+  checksum: 10/15c09f1d9ff815506471a1d1ee0405d39c6565d6fd8cf8478a9dac92c34004360d22f77b3d06371fa69b283b14a75d15c31b65b91185c9df6c5ca82ca285eebe
   languageName: node
   linkType: hard
 

meteor/yarn.lock

@@ -3,6 +3,56 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.52.0](https://github.com/Sofie-Automation/sofie-core/compare/v1.52.0-in-testing.1...v1.52.0) (2025-06-30)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
+# [1.52.0-in-testing.1](https://github.com/Sofie-Automation/sofie-core/compare/v1.51.7...v1.52.0-in-testing.1) (2025-06-05)
+
+
+### Bug Fixes
+
+* add `getCurrentTime` to `SyncIngestUpdateToPartInstanceContext` ([bb35893](https://github.com/Sofie-Automation/sofie-core/commit/bb358938937433af7157d7f821400badf6f10c2b))
+
+
+
+# [1.52.0-in-testing.0](https://github.com/Sofie-Automation/sofie-core/compare/v1.51.6...v1.52.0-in-testing.0) (2025-02-04)
+
+
+### Bug Fixes
+
+* review comments ([752a30a](https://github.com/Sofie-Automation/sofie-core/commit/752a30a69ea4a864239a438b278c3b53d06a12a2))
+
+
+### Features
+
+* add in-out words to the VT type ([7bec461](https://github.com/Sofie-Automation/sofie-core/commit/7bec4619836cb92ab85331afe130d0ed54ca976e))
+* add RemoteSpeak source layer type ([a9b98e7](https://github.com/Sofie-Automation/sofie-core/commit/a9b98e7a544f5dab90c6cc17713abbdc5b930744))
+* add segment timing countdownType ([9aaa2dd](https://github.com/Sofie-Automation/sofie-core/commit/9aaa2dd48e841177f32a8d16a2e6c37706c6c2ae))
+* allow adlib-actions to remove pieces from the current partInstance ([902e7ff](https://github.com/Sofie-Automation/sofie-core/commit/902e7fffe6cc23c48f7bd86e23595d83f74d84fa))
+* allow drag from mos-plugin to part ([d51ba2f](https://github.com/Sofie-Automation/sofie-core/commit/d51ba2fe8b8effa6037f379534b357d5320cc3c7))
+* config package manager from blueprints ([685364d](https://github.com/Sofie-Automation/sofie-core/commit/685364d5fd4af690a55292ba99ff8ecff386f893))
+* configure Core system/studio settings via blueprints ([ef14c8f](https://github.com/Sofie-Automation/sofie-core/commit/ef14c8f4f139be273ce8a8a3c21e6cc0f580d297))
+* configure peripheral device settings from blueprints ([878214b](https://github.com/Sofie-Automation/sofie-core/commit/878214bf983ed12fe82822b47b9c629727d4c20d))
+* customizable package status messages ([2ac7cb1](https://github.com/Sofie-Automation/sofie-core/commit/2ac7cb1eb95edc8f901168066396110b2cd71faa))
+* exclude pieces from part keepalive ([74bea6c](https://github.com/Sofie-Automation/sofie-core/commit/74bea6cf3a978410bc5e79b325a6fe8b0b190ba9))
+* list routesets from blueprints adlib action ([c228251](https://github.com/Sofie-Automation/sofie-core/commit/c22825130793c843f7290d3ee844b805bf2788f1))
+* meteor 3.0.4 ([8670727](https://github.com/Sofie-Automation/sofie-core/commit/8670727bba5ac9cffe0e5d36b4bd45d6664482be))
+* modify datastore in `onRundownActivate` SOFIE-3310 ([#1240](https://github.com/Sofie-Automation/sofie-core/issues/1240)) ([8a0759f](https://github.com/Sofie-Automation/sofie-core/commit/8a0759f610497e37493e8a798aa0dd13f4f57119))
+* move next part should respect quickloop bounds ([8f0153e](https://github.com/Sofie-Automation/sofie-core/commit/8f0153e294a4f4842e333cc3c4e2bacbf6c4c236))
+* processIngestData & userEditOperations ([e69a4fc](https://github.com/Sofie-Automation/sofie-core/commit/e69a4fc2f4e3d1e6c6b287e34a3b2f55080ce0c4))
+* quickloop improvements ([f1f77fa](https://github.com/Sofie-Automation/sofie-core/commit/f1f77fa11b50fe93afc50631988d7c2aa6306f13))
+* routeset config defined in blueprints ([e839b97](https://github.com/Sofie-Automation/sofie-core/commit/e839b97c0205df38e5bc7ab816a9c79406a7d767))
+* update meteor to 3.1 and node to 22 ([61b6854](https://github.com/Sofie-Automation/sofie-core/commit/61b6854261a03f04e81416b9d37ee995e3a10108))
+
+
+
+
+
 # [1.52.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.51.6...v1.52.0-in-testing.0) (2025-02-04)
 
 ### Bug Fixes

packages/blueprints-integration/CHANGELOG.md

@@ -64,6 +64,11 @@ export interface IBlueprintActionTriggerMode {
 		label: ITranslatableMessage
 		/** An optional, longer description that will not be immediately visible to the user */
 		description?: ITranslatableMessage
+		/** An icon to be displayed to the user next to the label
+		 *
+		 * This can either be a relative URL to an image in the Blueprints assets or a `data:` URL
+		 */
+		icon?: string
 	}
 }
 

packages/blueprints-integration/src/action.ts

@@ -20,6 +20,9 @@ export interface IOnSetAsNextContext extends IShowStyleUserContext, IEventContex
 	/** Information about the current loop, if there is one */
 	readonly quickLoopInfo: BlueprintQuickLookInfo | null
 
+	/** Whether the part being set as next was selected as a result of user's actions */
+	readonly manuallySelected: boolean
+
 	/**
 	 * Data fetching
 	 */

packages/blueprints-integration/src/context/onSetAsNextContext.ts

@@ -21,10 +21,16 @@ export interface UserEditingDefinitionAction {
 	id: string
 	/** Label to show to the user for this operation */
 	label: ITranslatableMessage
-	/** Icon to show when this action is 'active' */
-	svgIcon?: string
-	/** Icon to show when this action is 'disabled' */
-	svgIconInactive?: string
+	/** Icon to show when this action is 'active'
+	 *
+	 * This can either be a relative URL to an image in the Blueprints assets or a `data:` URL
+	 */
+	icon?: string
+	/** Icon to show when this action is 'disabled'
+	 *
+	 * This can either be a relative URL to an image in the Blueprints assets or a `data:` URL
+	 */
+	iconInactive?: string
 	/** Whether this action should be indicated as being active */
 	isActive?: boolean
 }