chore: expose setAsNext ignoreQuickLoop param

Mint de Wit · Mint de Wit · commit a5c82838d9bc · 2024-11-06T14:33:15.000Z
diff --git a/meteor/server/api/userActions.ts b/meteor/server/api/userActions.ts
@@ -190,7 +190,8 @@ class ServerUserActionAPI
 		eventTime: Time,
 		rundownPlaylistId: RundownPlaylistId,
 		partDelta: number,
-		segmentDelta: number
+		segmentDelta: number,
+		ignoreQuickLoop: boolean | null
 	) {
 		return ServerClientAPI.runUserActionInLogForPlaylistOnWorker(
 			this,
@@ -207,6 +208,7 @@ class ServerUserActionAPI
 				playlistId: rundownPlaylistId,
 				partDelta: partDelta,
 				segmentDelta: segmentDelta,
+				ignoreQuickLoop: ignoreQuickLoop ?? undefined,
 			}
 		)
 	}
diff --git a/packages/blueprints-integration/src/context/adlibActionContext.ts b/packages/blueprints-integration/src/context/adlibActionContext.ts
@@ -31,7 +31,7 @@ export interface IActionExecutionContext
 	// getNextShowStyleConfig(): Readonly<{ [key: string]: ConfigItemValue }>
 
 	/** Move the next part through the rundown. Can move by either a number of parts, or segments in either direction. */
-	moveNextPart(partDelta: number, segmentDelta: number): Promise<void>
+	moveNextPart(partDelta: number, segmentDelta: number, ignoreQuickloop?: boolean): Promise<void>
 	/** Set flag to perform take after executing the current action. Returns state of the flag after each call. */
 	takeAfterExecuteAction(take: boolean): Promise<boolean>
 	/** Inform core that a take out of the current partinstance should be blocked until the specified time */
diff --git a/packages/blueprints-integration/src/context/onSetAsNextContext.ts b/packages/blueprints-integration/src/context/onSetAsNextContext.ts
@@ -76,5 +76,5 @@ export interface IOnSetAsNextContext extends IShowStyleUserContext, IEventContex
 	 * Multiple calls of this inside one call to `onSetAsNext` will replace earlier calls.
 	 * @returns Whether a new Part was found using the provided offset
 	 */
-	moveNextPart(partDelta: number, segmentDelta: number): Promise<boolean>
+	moveNextPart(partDelta: number, segmentDelta: number, ignoreQuickLoop: boolean): Promise<boolean>
 }
diff --git a/packages/blueprints-integration/src/triggers.ts b/packages/blueprints-integration/src/triggers.ts
@@ -230,6 +230,13 @@ export interface IMoveNextAction extends ITriggeredActionBase {
 	 * @memberof IMoveNextAction
 	 */
 	parts: number
+	/**
+	 * When moving the next part it should ignore any of the boundaries set by the QuickLoop feature
+	 *
+	 * @type {boolean}
+	 * @memberof IMoveNextAction
+	 */
+	ignoreQuickLoop: boolean
 }
 
 export interface ICreateSnapshotForDebugAction extends ITriggeredActionBase {
diff --git a/packages/corelib/src/worker/studio.ts b/packages/corelib/src/worker/studio.ts
@@ -231,6 +231,7 @@ export interface StopPiecesOnSourceLayersProps extends RundownPlayoutPropsBase {
 export interface MoveNextPartProps extends RundownPlayoutPropsBase {
 	partDelta: number
 	segmentDelta: number
+	ignoreQuickLoop?: boolean
 }
 export type ActivateHoldProps = RundownPlayoutPropsBase
 export type DeactivateHoldProps = RundownPlayoutPropsBase
diff --git a/packages/job-worker/src/blueprints/context/OnSetAsNextContext.ts b/packages/job-worker/src/blueprints/context/OnSetAsNextContext.ts
@@ -121,7 +121,7 @@ export class OnSetAsNextContext
 		return this.partAndPieceInstanceService.removePieceInstances('next', pieceInstanceIds)
 	}
 
-	async moveNextPart(partDelta: number, segmentDelta: number): Promise<boolean> {
+	async moveNextPart(partDelta: number, segmentDelta: number, ignoreQuickLoop?: boolean): Promise<boolean> {
 		if (typeof partDelta !== 'number') throw new Error('partDelta must be a number')
 		if (typeof segmentDelta !== 'number') throw new Error('segmentDelta must be a number')
 
@@ -132,7 +132,13 @@ export class OnSetAsNextContext
 		}
 
 		this.pendingMoveNextPart = {
-			selectedPart: selectNewPartWithOffsets(this.jobContext, this.playoutModel, partDelta, segmentDelta),
+			selectedPart: selectNewPartWithOffsets(
+				this.jobContext,
+				this.playoutModel,
+				partDelta,
+				segmentDelta,
+				ignoreQuickLoop
+			),
 		}
 
 		return !!this.pendingMoveNextPart.selectedPart
diff --git a/packages/job-worker/src/blueprints/context/adlibActions.ts b/packages/job-worker/src/blueprints/context/adlibActions.ts
@@ -158,8 +158,14 @@ export class ActionExecutionContext extends ShowStyleUserContext implements IAct
 		return this.partAndPieceInstanceService.queuePart(rawPart, rawPieces)
 	}
 
-	async moveNextPart(partDelta: number, segmentDelta: number): Promise<void> {
-		const selectedPart = selectNewPartWithOffsets(this._context, this._playoutModel, partDelta, segmentDelta)
+	async moveNextPart(partDelta: number, segmentDelta: number, ignoreQuickloop?: boolean): Promise<void> {
+		const selectedPart = selectNewPartWithOffsets(
+			this._context,
+			this._playoutModel,
+			partDelta,
+			segmentDelta,
+			ignoreQuickloop
+		)
 		if (selectedPart) await setNextPartFromPart(this._context, this._playoutModel, selectedPart, true)
 	}
 
diff --git a/packages/job-worker/src/playout/setNextJobs.ts b/packages/job-worker/src/playout/setNextJobs.ts
@@ -68,7 +68,13 @@ export async function handleMoveNextPart(context: JobContext, data: MoveNextPart
 			}
 		},
 		async (playoutModel) => {
-			const selectedPart = selectNewPartWithOffsets(context, playoutModel, data.partDelta, data.segmentDelta)
+			const selectedPart = selectNewPartWithOffsets(
+				context,
+				playoutModel,
+				data.partDelta,
+				data.segmentDelta,
+				data.ignoreQuickLoop
+			)
 			if (!selectedPart) return null
 
 			await setNextPartFromPart(context, playoutModel, selectedPart, true)
diff --git a/packages/meteor-lib/src/api/userActions.ts b/packages/meteor-lib/src/api/userActions.ts
@@ -58,7 +58,8 @@ export interface NewUserActionAPI {
 		eventTime: Time,
 		rundownPlaylistId: RundownPlaylistId,
 		partDelta: number,
-		segmentDelta: number
+		segmentDelta: number,
+		ignoreQuickLoop?: boolean
 	): Promise<ClientAPI.ClientResponse<PartId | null>>
 	prepareForBroadcast(
 		userEvent: string,
diff --git a/packages/meteor-lib/src/triggers/actionFactory.ts b/packages/meteor-lib/src/triggers/actionFactory.ts
@@ -554,15 +554,16 @@ export function createAction(
 				)
 			}
 		case PlayoutActions.moveNext:
-			return createUserActionWithCtx(triggersContext, action, UserAction.MOVE_NEXT, async (e, ts, ctx) =>
-				triggersContext.MeteorCall.userAction.moveNext(
+			return createUserActionWithCtx(triggersContext, action, UserAction.MOVE_NEXT, async (e, ts, ctx) => {
+				return triggersContext.MeteorCall.userAction.moveNext(
 					e,
 					ts,
 					ctx.rundownPlaylistId.get(),
 					action.parts ?? 0,
-					action.segments ?? 0
+					action.segments ?? 0,
+					action.ignoreQuickLoop
 				)
-			)
+			})
 		case PlayoutActions.reloadRundownPlaylistData:
 			if (isActionTriggeredFromUiContext(triggersContext, action)) {
 				return createRundownPlaylistSoftResyncAction(action.filterChain as IGUIContextFilterLink[])
diff --git a/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/ActionSelector.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/ActionSelector.tsx
@@ -66,6 +66,9 @@ function getArguments(t: TFunction, action: SomeAction): string[] {
 			if (action.parts) {
 				result.push(t('Parts: {{delta}}', { delta: (action.parts > 0 ? '+' : '') + action.parts }))
 			}
+			if (action.ignoreQuickLoop) {
+				result.push(t('Ignore QuickLoop'))
+			}
 			break
 		case PlayoutActions.reloadRundownPlaylistData:
 			break
@@ -318,6 +321,18 @@ function getActionParametersEditor(
 							})
 						}
 					/>
+
+					<ToggleSwitchControl
+						classNames={'form-control'}
+						value={!!action.ignoreQuickLoop}
+						label={t('Ignore QuickLoop')}
+						handleUpdate={(newVal) => {
+							onChange({
+								...action,
+								ignoreQuickLoop: newVal,
+							})
+						}}
+					/>
 				</div>
 			)
 		case PlayoutActions.reloadRundownPlaylistData:
diff --git a/packages/webui/src/client/ui/Shelf/DashboardActionButtonGroup.tsx b/packages/webui/src/client/ui/Shelf/DashboardActionButtonGroup.tsx
@@ -41,11 +41,18 @@ export const DashboardActionButtonGroup = withTranslation()(
 			}
 		}
 
-		moveNext = (e: any, horizontalDelta: number, verticalDelta: number) => {
+		moveNext = (e: any, horizontalDelta: number, verticalDelta: number, ignoreQuickLoop?: boolean) => {
 			const { t } = this.props
 			if (this.props.studioMode) {
 				doUserAction(t, e, UserAction.MOVE_NEXT, (e, ts) =>
-					MeteorCall.userAction.moveNext(e, ts, this.props.playlist._id, horizontalDelta, verticalDelta)
+					MeteorCall.userAction.moveNext(
+						e,
+						ts,
+						this.props.playlist._id,
+						horizontalDelta,
+						verticalDelta,
+						ignoreQuickLoop
+					)
 				)
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,8 @@ class ServerUserActionAPI`
`190`	`190`	`eventTime: Time,`
`191`	`191`	`rundownPlaylistId: RundownPlaylistId,`
`192`	`192`	`partDelta: number,`
`193`		`- segmentDelta: number`
	`193`	`+ segmentDelta: number,`
	`194`	`+ ignoreQuickLoop: boolean \| null`
`194`	`195`	`) {`
`195`	`196`	`return ServerClientAPI.runUserActionInLogForPlaylistOnWorker(`
`196`	`197`	`this,`
`@@ -207,6 +208,7 @@ class ServerUserActionAPI`
`207`	`208`	`playlistId: rundownPlaylistId,`
`208`	`209`	`partDelta: partDelta,`
`209`	`210`	`segmentDelta: segmentDelta,`
	`211`	`+ ignoreQuickLoop: ignoreQuickLoop ?? undefined,`
`210`	`212`	`}`
`211`	`213`	`)`
`212`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,5 +76,5 @@ export interface IOnSetAsNextContext extends IShowStyleUserContext, IEventContex`
`76`	`76`	* Multiple calls of this inside one call to `onSetAsNext` will replace earlier calls.
`77`	`77`	`* @returns Whether a new Part was found using the provided offset`
`78`	`78`	`*/`
`79`		`- moveNextPart(partDelta: number, segmentDelta: number): Promise<boolean>`
	`79`	`+ moveNextPart(partDelta: number, segmentDelta: number, ignoreQuickLoop: boolean): Promise<boolean>`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,7 @@ export interface StopPiecesOnSourceLayersProps extends RundownPlayoutPropsBase {`
`231`	`231`	`export interface MoveNextPartProps extends RundownPlayoutPropsBase {`
`232`	`232`	`partDelta: number`
`233`	`233`	`segmentDelta: number`
	`234`	`+ ignoreQuickLoop?: boolean`
`234`	`235`	`}`
`235`	`236`	`export type ActivateHoldProps = RundownPlayoutPropsBase`
`236`	`237`	`export type DeactivateHoldProps = RundownPlayoutPropsBase`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ export class OnSetAsNextContext`
`121`	`121`	`return this.partAndPieceInstanceService.removePieceInstances('next', pieceInstanceIds)`
`122`	`122`	`}`
`123`	`123`
`124`		`- async moveNextPart(partDelta: number, segmentDelta: number): Promise<boolean> {`
	`124`	`+ async moveNextPart(partDelta: number, segmentDelta: number, ignoreQuickLoop?: boolean): Promise<boolean> {`
`125`	`125`	`if (typeof partDelta !== 'number') throw new Error('partDelta must be a number')`
`126`	`126`	`if (typeof segmentDelta !== 'number') throw new Error('segmentDelta must be a number')`
`127`	`127`
`@@ -132,7 +132,13 @@ export class OnSetAsNextContext`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`this.pendingMoveNextPart = {`
`135`		`- selectedPart: selectNewPartWithOffsets(this.jobContext, this.playoutModel, partDelta, segmentDelta),`
	`135`	`+ selectedPart: selectNewPartWithOffsets(`
	`136`	`+ this.jobContext,`
	`137`	`+ this.playoutModel,`
	`138`	`+ partDelta,`
	`139`	`+ segmentDelta,`
	`140`	`+ ignoreQuickLoop`
	`141`	`+ ),`
`136`	`142`	`}`
`137`	`143`
`138`	`144`	`return !!this.pendingMoveNextPart.selectedPart`