refactor(EAV-296): rename isCurrent to isActive

Author: ianshade

meteor/server/api/deviceTriggers/StudioDeviceTriggerManager.ts

@@ -170,7 +170,7 @@ export class StudioDeviceTriggerManager {
 								sourceLayerType: undefined,
 								sourceLayerName: undefined,
 								styleClassNames: triggeredAction.styleClassNames,
-								isCurrent: undefined,
+								isActive: undefined,
 								isNext: undefined,
 							}),
 						})
@@ -185,7 +185,7 @@ export class StudioDeviceTriggerManager {
 							addedPreviewIds.push(adLibPreviewId)
 
 							this.tagsService.observeTallyTags(adLib)
-							const { isCurrent, isNext } = this.tagsService.getTallyStateFromTags(adLib)
+							const { isActive, isNext } = this.tagsService.getTallyStateFromTags(adLib)
 							return DeviceTriggerMountedActionAdlibsPreview.upsertAsync(adLibPreviewId, {
 								$set: literal<PreviewWrappedAdLib>({
 									...adLib,
@@ -204,7 +204,7 @@ export class StudioDeviceTriggerManager {
 										  }
 										: undefined,
 									styleClassNames: triggeredAction.styleClassNames,
-									isCurrent,
+									isActive,
 									isNext,
 								}),
 							})

meteor/server/api/deviceTriggers/TagsService.ts

@@ -9,6 +9,7 @@ import {
 } from '@sofie-automation/corelib/dist/playout/processAndPrune'
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { IWrappedAdLib } from '@sofie-automation/meteor-lib/dist/triggers/actionFilterChainCompilers'
+import { areSetsEqual, doSetsIntersect } from '@sofie-automation/corelib/dist/lib'
 
 export class TagsService {
 	protected onAirPiecesTags: Set<string> = new Set()
@@ -28,14 +29,14 @@ export class TagsService {
 		}
 	}
 
-	public getTallyStateFromTags(adLib: IWrappedAdLib): { isCurrent: boolean; isNext: boolean } {
-		let isCurrent = false
+	public getTallyStateFromTags(adLib: IWrappedAdLib): { isActive: boolean; isNext: boolean } {
+		let isActive = false
 		let isNext = false
 		if ('currentPieceTags' in adLib && adLib.currentPieceTags) {
-			isCurrent = adLib.currentPieceTags.every((tag) => this.onAirPiecesTags.has(tag))
+			isActive = adLib.currentPieceTags.every((tag) => this.onAirPiecesTags.has(tag))
 			isNext = adLib.currentPieceTags.every((tag) => this.nextPiecesTags.has(tag))
 		}
-		return { isCurrent, isNext }
+		return { isActive, isNext }
 	}
 
 	/**
@@ -113,24 +114,16 @@ export class TagsService {
 
 	private shouldUpdateTriggers(activePieceInstancesTags: Set<string>, nextPieceInstancesTags: Set<string>) {
 		return (
-			(!this.areSetsEqual(this.onAirPiecesTags, activePieceInstancesTags) ||
-				!this.areSetsEqual(this.nextPiecesTags, nextPieceInstancesTags)) &&
-			(this.doSetsIntersect(activePieceInstancesTags, this.tagsObservedByTriggers) ||
-				this.doSetsIntersect(nextPieceInstancesTags, this.tagsObservedByTriggers) ||
-				this.doSetsIntersect(this.onAirPiecesTags, this.tagsObservedByTriggers) ||
-				this.doSetsIntersect(this.nextPiecesTags, this.tagsObservedByTriggers))
+			(!areSetsEqual(this.onAirPiecesTags, activePieceInstancesTags) ||
+				!areSetsEqual(this.nextPiecesTags, nextPieceInstancesTags)) &&
+			(doSetsIntersect(activePieceInstancesTags, this.tagsObservedByTriggers) ||
+				doSetsIntersect(nextPieceInstancesTags, this.tagsObservedByTriggers) ||
+				doSetsIntersect(this.onAirPiecesTags, this.tagsObservedByTriggers) ||
+				doSetsIntersect(this.nextPiecesTags, this.tagsObservedByTriggers))
 		)
 	}
 
-	protected areSetsEqual<T>(a: Set<T>, b: Set<T>): boolean {
-		return a.size === b.size && [...a].every((value) => b.has(value))
-	}
-
-	protected doSetsIntersect<T>(a: Set<T>, b: Set<T>): boolean {
-		return [...a].some((value) => b.has(value))
-	}
-
-	protected processAndPrunePieceInstanceTimings(
+	private processAndPrunePieceInstanceTimings(
 		partInstanceTimings: DBPartInstance['timings'] | undefined,
 		pieceInstances: Array<Pick<PieceInstance, PieceInstanceFields>>,
 		sourceLayers: SourceLayers

meteor/server/api/deviceTriggers/__tests__/TagsService.test.ts

@@ -145,7 +145,7 @@ describe('TagsService', () => {
 
 		testee.updatePieceInstances(cache, showStyleBaseId)
 		const result = testee.getTallyStateFromTags({} as IWrappedAdLib)
-		expect(result).toEqual({ isCurrent: false, isNext: false })
+		expect(result).toEqual({ isActive: false, isNext: false })
 	})
 
 	test('adlib that is neither on air or next', () => {
@@ -156,7 +156,7 @@ describe('TagsService', () => {
 		const result = testee.getTallyStateFromTags({
 			currentPieceTags: [tag3],
 		} as IWrappedAdLib)
-		expect(result).toEqual({ isCurrent: false, isNext: false })
+		expect(result).toEqual({ isActive: false, isNext: false })
 	})
 
 	test('adlib that is both on air and next', () => {
@@ -168,7 +168,7 @@ describe('TagsService', () => {
 			currentPieceTags: [tag2],
 		} as IWrappedAdLib)
 
-		expect(result).toEqual({ isCurrent: true, isNext: true })
+		expect(result).toEqual({ isActive: true, isNext: true })
 	})
 
 	test('adlib that is only on air', () => {
@@ -179,7 +179,7 @@ describe('TagsService', () => {
 		const result = testee.getTallyStateFromTags({
 			currentPieceTags: [tag0],
 		} as IWrappedAdLib)
-		expect(result).toEqual({ isCurrent: true, isNext: false })
+		expect(result).toEqual({ isActive: true, isNext: false })
 	})
 
 	test('adlib that is only next', () => {
@@ -190,7 +190,7 @@ describe('TagsService', () => {
 		const result = testee.getTallyStateFromTags({
 			currentPieceTags: [tag1],
 		} as IWrappedAdLib)
-		expect(result).toEqual({ isCurrent: false, isNext: true })
+		expect(result).toEqual({ isActive: false, isNext: true })
 	})
 
 	test('updatePieceInstances returns true if observed tags are present in pieces', () => {

packages/corelib/src/lib.ts

@@ -469,3 +469,11 @@ export function generateTranslation(
 		namespaces,
 	}
 }
+
+export function areSetsEqual<T>(a: Set<T>, b: Set<T>): boolean {
+	return a.size === b.size && [...a].every((value) => b.has(value))
+}
+
+export function doSetsIntersect<T>(a: Set<T>, b: Set<T>): boolean {
+	return [...a].some((value) => b.has(value))
+}

packages/shared-lib/src/input-gateway/deviceTriggerPreviews.ts

@@ -61,6 +61,6 @@ export type PreviewWrappedAdLib = Omit<IWrappedAdLibBase, '_id'> & {
 		  }
 		| undefined
 	styleClassNames: string | undefined
-	isCurrent: boolean | undefined
+	isActive: boolean | undefined
 	isNext: boolean | undefined
 }