fix: review comments

Julusian · Julusian · commit 752a30a69ea4 · 2024-10-08T12:50:31.000+01:00
diff --git a/meteor/server/api/userActions.ts b/meteor/server/api/userActions.ts
@@ -1125,7 +1125,7 @@ class ServerUserActionAPI
 			async () => {
 				check(studioId, String)
 				check(routeSetId, String)
-				check(state, Boolean)
+				check(state, Match.OneOf('toggle', Boolean))
 
 				const access = await StudioContentWriteAccess.routeSet(this, studioId)
 				return ServerPlayoutAPI.switchRouteSet(access, routeSetId, state)
diff --git a/meteor/server/migration/1_42_0.ts b/meteor/server/migration/1_42_0.ts
diff --git a/meteor/server/migration/X_X_X.ts b/meteor/server/migration/X_X_X.ts
@@ -19,7 +19,10 @@ export const addSteps = addMigrationSteps(CURRENT_SYSTEM_VERSION, [
 		id: `convert routesets to ObjectWithOverrides`,
 		canBeRunAutomatically: true,
 		validate: async () => {
-			const studios = await Studios.findFetchAsync({ routeSets: { $exists: true } })
+			const studios = await Studios.findFetchAsync({
+				routeSets: { $exists: true },
+				routeSetsWithOverrides: { $exists: false },
+			})
 
 			for (const studio of studios) {
 				//@ts-expect-error routeSets is not typed as ObjectWithOverrides
@@ -31,15 +34,16 @@ export const addSteps = addMigrationSteps(CURRENT_SYSTEM_VERSION, [
 			return false
 		},
 		migrate: async () => {
-			const studios = await Studios.findFetchAsync({ routeSets: { $exists: true } })
+			const studios = await Studios.findFetchAsync({
+				routeSets: { $exists: true },
+				routeSetsWithOverrides: { $exists: false },
+			})
 
 			for (const studio of studios) {
-				//@ts-expect-error routeSets is not typed as ObjectWithOverrides
-				if (!studio.routeSets) continue
-				//@ts-expect-error routeSets is not typed as ObjectWithOverrides
-				const oldRouteSets = studio.routeSets as any as Record<string, StudioRouteSet>
+				//@ts-expect-error routeSets is typed as Record<string, StudioRouteSet>
+				const oldRouteSets = studio.routeSets
 
-				const newRouteSets = convertObjectIntoOverrides(oldRouteSets)
+				const newRouteSets = convertObjectIntoOverrides<StudioRouteSet>(oldRouteSets || {})
 
 				await Studios.updateAsync(studio._id, {
 					$set: {
@@ -56,7 +60,10 @@ export const addSteps = addMigrationSteps(CURRENT_SYSTEM_VERSION, [
 		id: `convert routeSetExclusivityGroups to ObjectWithOverrides`,
 		canBeRunAutomatically: true,
 		validate: async () => {
-			const studios = await Studios.findFetchAsync({ routeSetExclusivityGroups: { $exists: true } })
+			const studios = await Studios.findFetchAsync({
+				routeSetExclusivityGroups: { $exists: true },
+				routeSetExclusivityGroupsWithOverrides: { $exists: false },
+			})
 
 			for (const studio of studios) {
 				//@ts-expect-error routeSetExclusivityGroups is not typed as ObjectWithOverrides
@@ -68,18 +75,18 @@ export const addSteps = addMigrationSteps(CURRENT_SYSTEM_VERSION, [
 			return false
 		},
 		migrate: async () => {
-			const studios = await Studios.findFetchAsync({ routeSetExclusivityGroups: { $exists: true } })
+			const studios = await Studios.findFetchAsync({
+				routeSetExclusivityGroups: { $exists: true },
+				routeSetExclusivityGroupsWithOverrides: { $exists: false },
+			})
 
 			for (const studio of studios) {
-				//@ts-expect-error routeSetExclusivityGroups is not typed as ObjectWithOverrides
-				if (!studio.routeSetExclusivityGroups) return
-				//@ts-expect-error routeSetExclusivityGroups is not typed as ObjectWithOverrides
-				const oldRouteSetExclusivityGroups = studio.routeSetExclusivityGroups as any as Record<
-					string,
-					StudioRouteSetExclusivityGroup
-				>
+				//@ts-expect-error routeSets is typed as Record<string, StudioRouteSetExclusivityGroup>
+				const oldRouteSetExclusivityGroups = studio.routeSetExclusivityGroups
 
-				const newRouteSetExclusivityGroups = convertObjectIntoOverrides(oldRouteSetExclusivityGroups)
+				const newRouteSetExclusivityGroups = convertObjectIntoOverrides<StudioRouteSetExclusivityGroup>(
+					oldRouteSetExclusivityGroups || {}
+				)
 
 				await Studios.updateAsync(studio._id, {
 					$set: {
diff --git a/meteor/server/migration/migrations.ts b/meteor/server/migration/migrations.ts
@@ -12,8 +12,7 @@ addSteps1_40_0()
 import { addSteps as addSteps1_41_0 } from './1_41_0'
 addSteps1_41_0()
 
-import { addSteps as addSteps1_42_0 } from './1_42_0'
-addSteps1_42_0()
+// Note: There where no migrations for Release 42
 
 import { addSteps as addSteps1_44_0 } from './1_44_0'
 addSteps1_44_0()
diff --git a/packages/blueprints-integration/src/context/adlibActionContext.ts b/packages/blueprints-integration/src/context/adlibActionContext.ts
@@ -39,7 +39,7 @@ export interface IActionExecutionContext
 	queuePart(part: IBlueprintPart, pieces: IBlueprintPiece[]): Promise<IBlueprintPartInstance>
 
 	/** Switch RouteSet State*/
-	switchRouteSet(routeSetId: string, state: boolean): Promise<void>
+	switchRouteSet(routeSetId: string, state: boolean | 'toggle'): Promise<void>
 	/** Misc actions */
 	// updateAction(newManifest: Pick<IBlueprintAdLibActionManifest, 'description' | 'payload'>): void // only updates itself. to allow for the next one to do something different
 	// executePeripheralDeviceAction(deviceId: string, functionName: string, args: any[]): Promise<any>
diff --git a/packages/blueprints-integration/src/triggers.ts b/packages/blueprints-integration/src/triggers.ts
@@ -198,7 +198,7 @@ export interface ISwitchRouteSetAction extends ITriggeredActionBase {
 	action: PlayoutActions.switchRouteSet
 	filterChain: (IRundownPlaylistFilterLink | IGUIContextFilterLink)[]
 	routeSetId: string
-	state: boolean
+	state: boolean | 'toggle'
 }
 
 export interface ITakeAction extends ITriggeredActionBase {
diff --git a/packages/job-worker/src/blueprints/context/adlibActions.ts b/packages/job-worker/src/blueprints/context/adlibActions.ts
@@ -184,7 +184,7 @@ export class ActionExecutionContext extends ShowStyleUserContext implements IAct
 		partInstance.blockTakeUntil(time)
 	}
 
-	async switchRouteSet(routeSetId: string, state: boolean): Promise<void> {
+	async switchRouteSet(routeSetId: string, state: boolean | 'toggle'): Promise<void> {
 		this._playoutModel.switchRouteSet(routeSetId, state)
 	}
 
diff --git a/packages/job-worker/src/playout/model/PlayoutModel.ts b/packages/job-worker/src/playout/model/PlayoutModel.ts
@@ -196,7 +196,7 @@ export interface PlayoutModel extends PlayoutModelReadonly, StudioPlayoutModelBa
 	 * @param routeSetId
 	 * @param isActive
 	 */
-	switchRouteSet(routeSetId: string, isActive: boolean): void
+	switchRouteSet(routeSetId: string, isActive: boolean | 'toggle'): void
 
 	/**
 	 * Clear the currently selected PartInstances, so that nothing is selected for playback
diff --git a/packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts b/packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts
@@ -480,7 +480,7 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 		return partInstance
 	}
 
-	switchRouteSet(routeSetId: string, isActive: boolean): void {
+	switchRouteSet(routeSetId: string, isActive: boolean | 'toggle'): void {
 		this.#baselineHelper.updateRouteSetActive(routeSetId, isActive)
 	}
 
diff --git a/packages/job-worker/src/playout/upgrade.ts b/packages/job-worker/src/playout/upgrade.ts
@@ -1,4 +1,10 @@
-import { BlueprintMapping, BlueprintMappings, JSONBlobParse, TSR } from '@sofie-automation/blueprints-integration'
+import {
+	BlueprintMapping,
+	BlueprintMappings,
+	JSONBlobParse,
+	StudioRouteBehavior,
+	TSR,
+} from '@sofie-automation/blueprints-integration'
 import {
 	MappingsExt,
 	StudioIngestDevice,
@@ -70,23 +76,23 @@ export async function handleBlueprintUpgradeForStudio(context: JobContext, _data
 		])
 	)
 	const routeSets = Object.fromEntries(
-		Object.entries<unknown>(result.routeSets ?? {}).map((dev) => [
+		Object.entries<Partial<StudioRouteSet>>(result.routeSets ?? {}).map((dev) => [
 			dev[0],
 			literal<Complete<StudioRouteSet>>({
-				name: (dev[1] as StudioRouteSet).name ?? '',
-				active: (dev[1] as StudioRouteSet).active ?? false,
-				defaultActive: (dev[1] as StudioRouteSet).defaultActive ?? false,
-				behavior: (dev[1] as StudioRouteSet).behavior ?? {},
-				exclusivityGroup: (dev[1] as StudioRouteSet).exclusivityGroup ?? undefined,
-				routes: (dev[1] as StudioRouteSet).routes,
+				name: dev[1].name ?? '',
+				active: dev[1].active ?? false,
+				defaultActive: dev[1].defaultActive ?? false,
+				behavior: dev[1].behavior ?? StudioRouteBehavior.TOGGLE,
+				exclusivityGroup: dev[1].exclusivityGroup ?? undefined,
+				routes: dev[1].routes ?? [],
 			}),
 		])
 	)
 	const routeSetExclusivityGroups = Object.fromEntries(
-		Object.entries<unknown>(result.routeSetExclusivityGroups ?? {}).map((dev) => [
+		Object.entries<Partial<StudioRouteSetExclusivityGroup>>(result.routeSetExclusivityGroups ?? {}).map((dev) => [
 			dev[0],
 			literal<Complete<StudioRouteSetExclusivityGroup>>({
-				name: (dev[1] as StudioRouteSetExclusivityGroup).name,
+				name: dev[1].name ?? '',
 			}),
 		])
 	)
diff --git a/packages/job-worker/src/studio/model/StudioBaselineHelper.ts b/packages/job-worker/src/studio/model/StudioBaselineHelper.ts
@@ -86,7 +86,6 @@ export class StudioBaselineHelper {
 	updateRouteSetActive(routeSetId: string, isActive: boolean | 'toggle'): void {
 		const studio = this.#context.studio
 		const saveOverrides = (newOps: SomeObjectOverrideOp[]) => {
-			// this.#overridesRouteSetBuffer = { defaults: this.#overridesRouteSetBuffer.defaults, overrides: newOps }
 			this.#overridesRouteSetBuffer.overrides = newOps
 			this.#routeSetChanged = true
 		}
diff --git a/packages/meteor-lib/src/triggers/actionFactory.ts b/packages/meteor-lib/src/triggers/actionFactory.ts
@@ -604,7 +604,7 @@ export function createAction(
 					ts,
 					ctx.studioId.get(),
 					action.routeSetId,
-					'toggle'
+					action.state
 				)
 			)
 		case ClientActions.showEntireCurrentSegment:
diff --git a/packages/webui/src/client/ui/Settings/ShowStyleBaseSettings.tsx b/packages/webui/src/client/ui/Settings/ShowStyleBaseSettings.tsx
@@ -150,7 +150,6 @@ export default translateWithTracker<IProps, IState, ITrackedProps>((props: IProp
 									</Route>
 									<Route path={`${this.props.match.path}/action-triggers`}>
 										<TriggeredActionsEditor
-											studioId={protectString('fakeStudio')} // A studioId is needed to enable the preview renders
 											showStyleBaseId={showStyleBase._id}
 											sourceLayers={this.props.sourceLayers}
 											outputLayers={this.props.outputLayers}
diff --git a/packages/webui/src/client/ui/Settings/SystemManagement.tsx b/packages/webui/src/client/ui/Settings/SystemManagement.tsx
@@ -38,12 +38,7 @@ export default function SystemManagement(): JSX.Element | null {
 
 			<div className="row">
 				<div className="col c12 r1-c12">
-					<TriggeredActionsEditor
-						studioId={null}
-						showStyleBaseId={null}
-						sourceLayers={emptyObject}
-						outputLayers={emptyObject}
-					/>
+					<TriggeredActionsEditor showStyleBaseId={null} sourceLayers={emptyObject} outputLayers={emptyObject} />
 				</div>
 			</div>
 
diff --git a/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.tsx
@@ -22,13 +22,7 @@ import classNames from 'classnames'
 import { catchError, fetchFrom } from '../../../../lib/lib'
 import { NotificationCenter, Notification, NoticeLevel } from '../../../../lib/notifications/notifications'
 import { doModalDialog } from '../../../../lib/ModalDialog'
-import {
-	PartId,
-	RundownId,
-	ShowStyleBaseId,
-	StudioId,
-	TriggeredActionId,
-} from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { PartId, RundownId, ShowStyleBaseId, TriggeredActionId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { RundownPlaylists, Rundowns, TriggeredActions } from '../../../../collections'
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { SourceLayers, OutputLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
@@ -46,7 +40,6 @@ export interface PreviewContext {
 }
 
 interface IProps {
-	studioId: StudioId | null
 	showStyleBaseId: ShowStyleBaseId | null
 	sourceLayers: SourceLayers
 	outputLayers: OutputLayers
@@ -81,7 +74,7 @@ export const TriggeredActionsEditor: React.FC<IProps> = function TriggeredAction
 		},
 	})
 
-	const { studioId, showStyleBaseId, sourceLayers, outputLayers } = props
+	const { showStyleBaseId, sourceLayers, outputLayers } = props
 
 	useSubscription(MeteorPubSub.triggeredActions, showStyleBaseId ? [showStyleBaseId] : null)
 	useSubscription(CorelibPubSub.rundownsWithShowStyleBases, showStyleBaseId ? [showStyleBaseId] : [])
@@ -392,12 +385,12 @@ export const TriggeredActionsEditor: React.FC<IProps> = function TriggeredAction
 
 	return (
 		<div>
-			{sorensen && previewContext.rundownPlaylist && showStyleBaseId && studioId && (
+			{sorensen && previewContext.rundownPlaylist && showStyleBaseId && (
 				<ErrorBoundary>
 					<TriggersHandler
 						sorensen={sorensen}
 						simulateTriggerBinding={true}
-						studioId={studioId}
+						studioId={previewContext.rundownPlaylist.studioId}
 						showStyleBaseId={showStyleBaseId}
 						currentRundownId={previewContext.currentRundownId}
 						rundownPlaylistId={previewContext.rundownPlaylist._id}
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
@@ -566,7 +566,6 @@ export const ActionSelector = function ActionSelector({
 					{...attributes.popper}
 				>
 					<div>
-						<p>ACT</p>
 						<DropdownInputControl
 							classNames="input text-input input-m"
 							value={action.action}

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ export interface ISwitchRouteSetAction extends ITriggeredActionBase {`
`198`	`198`	`action: PlayoutActions.switchRouteSet`
`199`	`199`	`filterChain: (IRundownPlaylistFilterLink \| IGUIContextFilterLink)[]`
`200`	`200`	`routeSetId: string`
`201`		`- state: boolean`
	`201`	`+ state: boolean \| 'toggle'`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`export interface ITakeAction extends ITriggeredActionBase {`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ export class ActionExecutionContext extends ShowStyleUserContext implements IAct`
`184`	`184`	`partInstance.blockTakeUntil(time)`
`185`	`185`	`}`
`186`	`186`
`187`		`- async switchRouteSet(routeSetId: string, state: boolean): Promise<void> {`
	`187`	`+ async switchRouteSet(routeSetId: string, state: boolean \| 'toggle'): Promise<void> {`
`188`	`188`	`this._playoutModel.switchRouteSet(routeSetId, state)`
`189`	`189`	`}`
`190`	`190`
Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,7 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou`
`480`	`480`	`return partInstance`
`481`	`481`	`}`
`482`	`482`
`483`		`- switchRouteSet(routeSetId: string, isActive: boolean): void {`
	`483`	`+ switchRouteSet(routeSetId: string, isActive: boolean \| 'toggle'): void {`
`484`	`484`	`this.#baselineHelper.updateRouteSetActive(routeSetId, isActive)`
`485`	`485`	`}`
`486`	`486`