Merge branch 'release50'

Author: jstarpl

meteor/client/ui/Prompter/PrompterView.tsx

@@ -321,7 +321,7 @@ export class PrompterViewInner extends MeteorReactComponent<Translated<IProps &
 	}
 	scrollToPartInstance(partInstanceId: PartInstanceId): void {
 		const scrollMargin = this.calculateScrollPosition()
-		const target = document.querySelector(`#partInstance_${partInstanceId}`)
+		const target = document.querySelector(`[data-part-instance-id="${partInstanceId}"]`)
 
 		if (target) {
 			Velocity(document.body, 'finish')
@@ -408,63 +408,60 @@ export class PrompterViewInner extends MeteorReactComponent<Translated<IProps &
 	private checkCurrentTakeMarkers = () => {
 		const playlist = this.props.rundownPlaylist
 
-		if (playlist !== undefined) {
-			const positionTop = window.scrollY
-			const positionBottom = positionTop + window.innerHeight
+		if (playlist === undefined) return
+		const positionTop = window.scrollY
+		const positionBottom = positionTop + window.innerHeight
 
-			let currentPartElement: Element | null = null
-			let currentPartElementAfter: Element | null = null
-			let nextPartElementAfter: Element | null = null
+		let currentPartElement: Element | null = null
+		let currentPartElementAfter: Element | null = null
+		let nextPartElementAfter: Element | null = null
 
-			const anchors: Array<Element> = Array.from(document.querySelectorAll('.scroll-anchor'))
+		const anchors: Array<Element> = Array.from(document.querySelectorAll('.scroll-anchor'))
 
-			for (let index = 0; index < anchors.length; index++) {
-				const current = anchors[index]
-				const next = index + 1 < anchors.length ? anchors[index + 1] : null
+		for (let index = 0; index < anchors.length; index++) {
+			const current = anchors[index]
+			const next = index + 1 < anchors.length ? anchors[index + 1] : null
 
-				if (playlist.currentPartInfo && current.classList.contains(`live`)) {
-					currentPartElement = current
-					currentPartElementAfter = next
-				}
-				if (playlist.nextPartInfo && current.classList.contains(`next`)) {
-					nextPartElementAfter = next
-				}
+			if (playlist.currentPartInfo && current.classList.contains(`live`)) {
+				currentPartElement = current
+				currentPartElementAfter = next
+			}
+			if (playlist.nextPartInfo && current.classList.contains(`next`)) {
+				nextPartElementAfter = next
 			}
+		}
 
-			const currentPositionStart = currentPartElement
-				? currentPartElement.getBoundingClientRect().top + positionTop
-				: null
-			const currentPositionEnd = currentPartElementAfter
-				? currentPartElementAfter.getBoundingClientRect().top + positionTop
-				: null
-
-			const nextPositionEnd = nextPartElementAfter
-				? nextPartElementAfter.getBoundingClientRect().top + positionTop
-				: null
-
-			const takeIndicator = document.querySelector('.take-indicator')
-			if (takeIndicator) {
-				if (currentPositionEnd && currentPositionEnd < positionTop) {
-					// Display take "^" indicator
-					takeIndicator.classList.remove('hidden')
-					takeIndicator.classList.add('top')
-				} else if (currentPositionStart && currentPositionStart > positionBottom) {
-					// Display take "v" indicator
-					takeIndicator.classList.remove('hidden', 'top')
-				} else {
-					takeIndicator.classList.add('hidden')
-				}
+		const currentPositionStart = currentPartElement
+			? currentPartElement.getBoundingClientRect().top + positionTop
+			: null
+		const currentPositionEnd = currentPartElementAfter
+			? currentPartElementAfter.getBoundingClientRect().top + positionTop
+			: null
+
+		const nextPositionEnd = nextPartElementAfter ? nextPartElementAfter.getBoundingClientRect().top + positionTop : null
+
+		const takeIndicator = document.querySelector('.take-indicator')
+		if (takeIndicator) {
+			if (currentPositionEnd && currentPositionEnd < positionTop) {
+				// Display take "^" indicator
+				takeIndicator.classList.remove('hidden')
+				takeIndicator.classList.add('top')
+			} else if (currentPositionStart && currentPositionStart > positionBottom) {
+				// Display take "v" indicator
+				takeIndicator.classList.remove('hidden', 'top')
+			} else {
+				takeIndicator.classList.add('hidden')
 			}
+		}
 
-			const nextIndicator = document.querySelector('.next-indicator')
-			if (nextIndicator) {
-				if (nextPositionEnd && nextPositionEnd < positionTop) {
-					// Display next "^" indicator
-					nextIndicator.classList.remove('hidden')
-					nextIndicator.classList.add('top')
-				} else {
-					nextIndicator.classList.add('hidden')
-				}
+		const nextIndicator = document.querySelector('.next-indicator')
+		if (nextIndicator) {
+			if (nextPositionEnd && nextPositionEnd < positionTop) {
+				// Display next "^" indicator
+				nextIndicator.classList.remove('hidden')
+				nextIndicator.classList.add('top')
+			} else {
+				nextIndicator.classList.add('hidden')
 			}
 		}
 	}
@@ -737,24 +734,32 @@ export const Prompter = translateWithTracker<PropsWithChildren<IPrompterProps>,
 			// Go through the anchors and use the first one that we find:
 			for (const scrollAnchor of scrollAnchors) {
 				const anchor = document.getElementById(scrollAnchor.anchorId)
-				if (anchor) {
-					const { top } = anchor.getBoundingClientRect()
-
-					if (scrollAnchor.offset !== null) {
-						window.scrollBy({
-							top: top - scrollAnchor.offset,
-						})
-						// We've scrolled, exit the function!
-						return
-					} else {
-						// Note: config.margin does not have to be taken into account here,
-						// the css margins magically does it for us.
-						window.scrollBy({
-							top: top - readPosition,
-						})
-						// We've scrolled, exit the function!
-						return
-					}
+				if (!anchor) continue
+
+				const { top } = anchor.getBoundingClientRect()
+
+				if (scrollAnchor.offset !== null) {
+					this.props.config.debug &&
+						logger.debug(
+							`Selected anchor ${scrollAnchor.anchorId} as anchor element in view, restoring position ${scrollAnchor.offset}`
+						)
+
+					window.scrollBy({
+						top: top - scrollAnchor.offset,
+					})
+					// We've scrolled, exit the function!
+					return
+				} else {
+					this.props.config.debug &&
+						logger.debug(`Selected anchor ${scrollAnchor.anchorId} as anchor element outside of view, jumping to it`)
+
+					// Note: config.margin does not have to be taken into account here,
+					// the css margins magically does it for us.
+					window.scrollBy({
+						top: top - readPosition,
+					})
+					// We've scrolled, exit the function!
+					return
 				}
 			}
 			// None of the anchors where found at this point.
@@ -766,6 +771,7 @@ export const Prompter = translateWithTracker<PropsWithChildren<IPrompterProps>,
 					.join(', ')}`
 			)
 
+			// TODO: In the past 4 months this has been here, this hasn't logged a single line, should we keep it?
 			// Below is for troubleshooting, see if the anchor is in prompterData:
 			if (!this.props.prompterData) {
 				logger.error(`Read anchor troubleshooting: no prompterData`)
@@ -847,9 +853,9 @@ export const Prompter = translateWithTracker<PropsWithChildren<IPrompterProps>,
 		}
 
 		private getPartStatus(prompterData: PrompterData, part: PrompterDataPart) {
-			if (prompterData.currentPartInstanceId === part.id) {
+			if (prompterData.currentPartInstanceId === part.partInstanceId) {
 				return 'live'
-			} else if (prompterData.nextPartInstanceId === part.id) {
+			} else if (prompterData.nextPartInstanceId === part.partInstanceId) {
 				return 'next'
 			} else {
 				return null
@@ -881,9 +887,10 @@ export const Prompter = translateWithTracker<PropsWithChildren<IPrompterProps>,
 				segment.parts.forEach((part) => {
 					lines.push(
 						<div
-							id={`partInstance_${part.id}`}
+							id={`part_${part.id}`}
 							data-obj-id={segment.id + '_' + part.id}
-							key={'partInstance_' + part.id}
+							data-part-instance-id={part.partInstanceId}
+							key={'part_' + part.id}
 							className={ClassNames('prompter-part', 'scroll-anchor', this.getPartStatus(prompterData, part))}
 						>
 							{part.title || 'N/A'}

meteor/client/ui/Prompter/prompter.ts

@@ -35,7 +35,8 @@ export interface PrompterDataSegment {
 	parts: PrompterDataPart[]
 }
 export interface PrompterDataPart {
-	id: PartInstanceId
+	id: PartId
+	partInstanceId: PartInstanceId
 	title: string | undefined
 	pieces: PrompterDataPiece[]
 }
@@ -183,7 +184,8 @@ export namespace PrompterAPI {
 			for (let partIndex = 0; partIndex < partInstances.length; partIndex++) {
 				const partInstance = partInstances[partIndex]
 				const partData: PrompterDataPart = {
-					id: partInstance._id,
+					id: partInstance.part._id,
+					partInstanceId: partInstance._id,
 					title: partInstance.part.prompterTitle || partInstance.part.title,
 					pieces: [],
 				}

meteor/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "automation-core",
-	"version": "1.50.4",
+	"version": "1.50.5",
 	"private": true,
 	"engines": {
 		"node": ">=14.19.1"

meteor/yarn.lock

@@ -2180,7 +2180,7 @@ __metadata:
   resolution: "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A."
   dependencies:
     "@mos-connection/model": ^3.0.4
-    timeline-state-resolver-types: 9.0.1
+    timeline-state-resolver-types: 9.0.2
     tslib: ^2.4.0
     type-fest: ^2.19.0
   languageName: node
@@ -12451,12 +12451,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"timeline-state-resolver-types@npm:9.0.1":
-  version: 9.0.1
-  resolution: "timeline-state-resolver-types@npm:9.0.1"
+"timeline-state-resolver-types@npm:9.0.2":
+  version: 9.0.2
+  resolution: "timeline-state-resolver-types@npm:9.0.2"
   dependencies:
     tslib: ^2.5.1
-  checksum: b814088e1118f0c5f80459958c5008e9bc9cf4484f5d0f3858e4bcb5146685f42a8328ef4e4764c1f95e1670b33109a8dd74c4582d6204a3f61b57efb216e013
+  checksum: be24c805246cea986f19c051c3fa71d9730bbc5baa17dba83d910e0aa139a758571ece15ac96da833a815186705a146bf051a2985dc5abaf034bd9fed2a067e0
   languageName: node
   linkType: hard
 

packages/blueprints-integration/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.50.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.4...v1.50.5) (2024-09-19)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
+
 ## [1.50.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.3...v1.50.4) (2024-08-08)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration

packages/blueprints-integration/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sofie-automation/blueprints-integration",
-	"version": "1.50.4",
+	"version": "1.50.5",
 	"description": "Library to define the interaction between core and the blueprints.",
 	"main": "dist/index.js",
 	"typings": "dist/index.d.ts",
@@ -38,7 +38,7 @@
 		"/LICENSE"
 	],
 	"dependencies": {
-		"@sofie-automation/shared-lib": "1.50.4",
+		"@sofie-automation/shared-lib": "1.50.5",
 		"tslib": "^2.4.0",
 		"type-fest": "^2.19.0"
 	},

packages/corelib/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sofie-automation/corelib",
-	"version": "1.50.4",
+	"version": "1.50.5",
 	"private": true,
 	"description": "Internal library for some types shared by core and workers",
 	"main": "dist/index.js",
@@ -39,8 +39,8 @@
 		"/LICENSE"
 	],
 	"dependencies": {
-		"@sofie-automation/blueprints-integration": "1.50.4",
-		"@sofie-automation/shared-lib": "1.50.4",
+		"@sofie-automation/blueprints-integration": "1.50.5",
+		"@sofie-automation/shared-lib": "1.50.5",
 		"fast-clone": "^1.5.13",
 		"i18next": "^21.9.1",
 		"influx": "^5.9.3",

packages/corelib/src/playout/__tests__/infinites.test.ts

@@ -438,6 +438,41 @@ describe('Infinites', () => {
 			// don't expect virtual Pieces in the results, but 'one' should be pruned too
 			expect(resolvedInstances).toEqual([])
 		})
+		test('stop onSegmentChange continuation with planned onSegmentEnd start=0', () => {
+			const pieceInstances = [
+				createPieceInstance('one', { start: 0 }, 'one', PieceLifespan.OutOnSegmentChange, false, {
+					fromPreviousPart: true,
+					fromPreviousPlayhead: true,
+					infiniteInstanceId: protectString('one_a'),
+					infiniteInstanceIndex: 1,
+					infinitePieceId: protectString('one_b'),
+				}),
+				createPieceInstance('two', { start: 0 }, 'one', PieceLifespan.OutOnSegmentEnd, false, {
+					fromPreviousPart: false,
+					infiniteInstanceId: protectString('two_a'),
+					infiniteInstanceIndex: 0,
+					infinitePieceId: protectString('two_b'),
+				}),
+			]
+
+			// Set the first as adlibbed during the previous part
+			pieceInstances[0].dynamicallyInserted = 1
+
+			// Pieces should have preroll
+			pieceInstances[0].piece.prerollDuration = 200
+			pieceInstances[1].piece.prerollDuration = 200
+
+			const resolvedInstances = runAndTidyResult(pieceInstances, 500)
+
+			expect(resolvedInstances).toEqual([
+				{
+					_id: 'two',
+					end: undefined,
+					priority: 2,
+					start: 0,
+				},
+			])
+		})
 	})
 	describe('getPlayheadTrackingInfinitesForPart', () => {
 		function runAndTidyResult(

packages/corelib/src/playout/processAndPrune.ts

@@ -15,10 +15,14 @@ function getPieceStartTimeAsReference(newPieceStart: number | 'now', newPiece: P
 }
 
 function getPieceStartTimeWithinPart(p: PieceInstance): 'now' | number {
-	if (p.piece.enable.start === 'now' || !p.dynamicallyInserted) {
-		return p.piece.enable.start
-	} else {
+	// If the piece is dynamically inserted, then its preroll should be factored into its start time, but not for any infinite continuations
+	const isStartOfAdlib =
+		!!p.dynamicallyInserted && !(p.infinite?.fromPreviousPart || p.infinite?.fromPreviousPlayhead)
+
+	if (isStartOfAdlib && p.piece.enable.start !== 'now') {
 		return p.piece.enable.start + (p.piece.prerollDuration ?? 0)
+	} else {
+		return p.piece.enable.start
 	}
 }
 

packages/documentation/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sofie-documentation",
-	"version": "1.50.4",
+	"version": "1.50.5",
 	"private": true,
 	"scripts": {
 		"docusaurus": "docusaurus",