Merge pull request #1378 from bbc/upstream/allow-removing-pieceinstances-from-current-part

nytamin · web-flow · commit 4175fd00d848 · 2025-02-04T13:23:25.000+01:00
feat: allow adlib-actions to remove pieces from the current partInstance
diff --git a/packages/blueprints-integration/src/context/onSetAsNextContext.ts b/packages/blueprints-integration/src/context/onSetAsNextContext.ts
@@ -67,8 +67,8 @@ export interface IOnSetAsNextContext extends IShowStyleUserContext, IEventContex
 	/**
 	 * Destructive actions
 	 */
-	/** Remove piecesInstances by id. Returns ids of piecesInstances that were removed. Note: For now we only allow removing from the next, but this might change to include current if there is justification */
-	removePieceInstances(part: 'next', pieceInstanceIds: string[]): Promise<string[]>
+	/** Remove piecesInstances by id. Returns ids of piecesInstances that were removed. */
+	removePieceInstances(part: 'current' | 'next', pieceInstanceIds: string[]): Promise<string[]>
 
 	/**
 	 * Move the next part through the rundown. Can move by either a number of parts, or segments in either direction.
diff --git a/packages/blueprints-integration/src/context/partsAndPieceActionContext.ts b/packages/blueprints-integration/src/context/partsAndPieceActionContext.ts
@@ -68,6 +68,6 @@ export interface IPartAndPieceActionContext {
 	stopPiecesOnLayers(sourceLayerIds: string[], timeOffset?: number): Promise<string[]>
 	/** Stop piecesInstances by id. Returns ids of piecesInstances that were removed */
 	stopPieceInstances(pieceInstanceIds: string[], timeOffset?: number): Promise<string[]>
-	/** Remove piecesInstances by id. Returns ids of piecesInstances that were removed. Note: For now we only allow removing from the next, but this might change to include current if there is justification */
-	removePieceInstances(part: 'next', pieceInstanceIds: string[]): Promise<string[]>
+	/** Remove piecesInstances by id. Returns ids of piecesInstances that were removed. */
+	removePieceInstances(part: 'current' | 'next', pieceInstanceIds: string[]): Promise<string[]>
 }
diff --git a/packages/job-worker/src/blueprints/__tests__/context-OnSetAsNextContext.test.ts b/packages/job-worker/src/blueprints/__tests__/context-OnSetAsNextContext.test.ts
@@ -113,6 +113,10 @@ describe('Test blueprint api context', () => {
 			await context.removePieceInstances('next', ['pieceInstanceId'])
 			expect(mockActionService.removePieceInstances).toHaveBeenCalledTimes(1)
 			expect(mockActionService.removePieceInstances).toHaveBeenCalledWith('next', ['pieceInstanceId'])
+
+			await context.removePieceInstances('current', ['pieceInstanceId'])
+			expect(mockActionService.removePieceInstances).toHaveBeenCalledTimes(2)
+			expect(mockActionService.removePieceInstances).toHaveBeenCalledWith('current', ['pieceInstanceId'])
 		})
 
 		test('updatePartInstance', async () => {
diff --git a/packages/job-worker/src/blueprints/__tests__/context-OnTakeContext.test.ts b/packages/job-worker/src/blueprints/__tests__/context-OnTakeContext.test.ts
@@ -129,6 +129,10 @@ describe('Test blueprint api context', () => {
 			await context.removePieceInstances('next', ['pieceInstanceId'])
 			expect(mockActionService.removePieceInstances).toHaveBeenCalledTimes(1)
 			expect(mockActionService.removePieceInstances).toHaveBeenCalledWith('next', ['pieceInstanceId'])
+
+			await context.removePieceInstances('current', ['pieceInstanceId'])
+			expect(mockActionService.removePieceInstances).toHaveBeenCalledTimes(2)
+			expect(mockActionService.removePieceInstances).toHaveBeenCalledWith('current', ['pieceInstanceId'])
 		})
 
 		test('updatePartInstance', async () => {
diff --git a/packages/job-worker/src/blueprints/__tests__/context-adlibActions.test.ts b/packages/job-worker/src/blueprints/__tests__/context-adlibActions.test.ts
@@ -139,6 +139,10 @@ describe('Test blueprint api context', () => {
 			await context.removePieceInstances('next', ['pieceInstanceId'])
 			expect(mockActionService.removePieceInstances).toHaveBeenCalledTimes(1)
 			expect(mockActionService.removePieceInstances).toHaveBeenCalledWith('next', ['pieceInstanceId'])
+
+			await context.removePieceInstances('current', ['pieceInstanceId'])
+			expect(mockActionService.removePieceInstances).toHaveBeenCalledTimes(2)
+			expect(mockActionService.removePieceInstances).toHaveBeenCalledWith('current', ['pieceInstanceId'])
 		})
 
 		test('updatePartInstance', async () => {
diff --git a/packages/job-worker/src/blueprints/context/OnSetAsNextContext.ts b/packages/job-worker/src/blueprints/context/OnSetAsNextContext.ts
@@ -117,8 +117,8 @@ export class OnSetAsNextContext
 		return this.partAndPieceInstanceService.updatePartInstance(part, props)
 	}
 
-	async removePieceInstances(_part: 'next', pieceInstanceIds: string[]): Promise<string[]> {
-		return this.partAndPieceInstanceService.removePieceInstances('next', pieceInstanceIds)
+	async removePieceInstances(part: 'current' | 'next', pieceInstanceIds: string[]): Promise<string[]> {
+		return this.partAndPieceInstanceService.removePieceInstances(part, pieceInstanceIds)
 	}
 
 	async moveNextPart(partDelta: number, segmentDelta: number, ignoreQuickLoop?: boolean): Promise<boolean> {
diff --git a/packages/job-worker/src/blueprints/context/OnTakeContext.ts b/packages/job-worker/src/blueprints/context/OnTakeContext.ts
@@ -117,7 +117,7 @@ export class OnTakeContext extends ShowStyleUserContext implements IOnTakeContex
 	async stopPieceInstances(pieceInstanceIds: string[], timeOffset?: number | undefined): Promise<string[]> {
 		return this.partAndPieceInstanceService.stopPieceInstances(pieceInstanceIds, timeOffset)
 	}
-	async removePieceInstances(part: 'next', pieceInstanceIds: string[]): Promise<string[]> {
+	async removePieceInstances(part: 'current' | 'next', pieceInstanceIds: string[]): Promise<string[]> {
 		return this.partAndPieceInstanceService.removePieceInstances(part, pieceInstanceIds)
 	}
 
diff --git a/packages/job-worker/src/blueprints/context/adlibActions.ts b/packages/job-worker/src/blueprints/context/adlibActions.ts
@@ -183,7 +183,7 @@ export class ActionExecutionContext extends ShowStyleUserContext implements IAct
 		return this.partAndPieceInstanceService.stopPieceInstances(pieceInstanceIds, timeOffset)
 	}
 
-	async removePieceInstances(part: 'next', pieceInstanceIds: string[]): Promise<string[]> {
+	async removePieceInstances(part: 'current' | 'next', pieceInstanceIds: string[]): Promise<string[]> {
 		return this.partAndPieceInstanceService.removePieceInstances(part, pieceInstanceIds)
 	}
 
diff --git a/packages/job-worker/src/blueprints/context/services/PartAndPieceInstanceActionService.ts b/packages/job-worker/src/blueprints/context/services/PartAndPieceInstanceActionService.ts
@@ -95,7 +95,15 @@ export class PartAndPieceInstanceActionService {
 		this.showStyleCompound = showStyle
 	}
 
-	private _getPartInstance(part: 'current' | 'next'): PlayoutPartInstanceModel | null {
+	#trackStateChange(part: 'current' | 'next', change: ActionPartChange): void {
+		if (part === 'current') {
+			this.currentPartState = Math.max(this.currentPartState, change)
+		} else {
+			this.nextPartState = Math.max(this.nextPartState, change)
+		}
+	}
+
+	#getPartInstance(part: 'current' | 'next'): PlayoutPartInstanceModel | null {
 		switch (part) {
 			case 'current':
 				return this._playoutModel.currentPartInstance
@@ -109,16 +117,16 @@ export class PartAndPieceInstanceActionService {
 	}
 
 	async getPartInstance(part: 'current' | 'next'): Promise<IBlueprintPartInstance | undefined> {
-		const partInstance = this._getPartInstance(part)
+		const partInstance = this.#getPartInstance(part)
 
 		return partInstance ? convertPartInstanceToBlueprints(partInstance.partInstance) : undefined
 	}
 	async getPieceInstances(part: 'current' | 'next'): Promise<IBlueprintPieceInstance[]> {
-		const partInstance = this._getPartInstance(part)
+		const partInstance = this.#getPartInstance(part)
 		return partInstance?.pieceInstances?.map((p) => convertPieceInstanceToBlueprints(p.pieceInstance)) ?? []
 	}
 	async getResolvedPieceInstances(part: 'current' | 'next'): Promise<IBlueprintResolvedPieceInstance[]> {
-		const partInstance = this._getPartInstance(part)
+		const partInstance = this.#getPartInstance(part)
 		if (!partInstance) {
 			return []
 		}
@@ -244,7 +252,7 @@ export class PartAndPieceInstanceActionService {
 	}
 
 	async insertPiece(part: 'current' | 'next', rawPiece: IBlueprintPiece): Promise<IBlueprintPieceInstance> {
-		const partInstance = this._getPartInstance(part)
+		const partInstance = this.#getPartInstance(part)
 		if (!partInstance) {
 			throw new Error('Cannot insert piece when no active part')
 		}
@@ -270,11 +278,7 @@ export class PartAndPieceInstanceActionService {
 		// Do the work
 		const newPieceInstance = partInstance.insertAdlibbedPiece(piece, undefined)
 
-		if (part === 'current') {
-			this.currentPartState = Math.max(this.currentPartState, ActionPartChange.SAFE_CHANGE)
-		} else {
-			this.nextPartState = Math.max(this.nextPartState, ActionPartChange.SAFE_CHANGE)
-		}
+		this.#trackStateChange(part, ActionPartChange.SAFE_CHANGE)
 
 		return convertPieceInstanceToBlueprints(newPieceInstance.pieceInstance)
 	}
@@ -330,8 +334,8 @@ export class PartAndPieceInstanceActionService {
 
 		// setupPieceInstanceInfiniteProperties(pieceInstance)
 
-		this.nextPartState = Math.max(this.nextPartState, updatesNextPart)
-		this.currentPartState = Math.max(this.currentPartState, updatesCurrentPart)
+		this.#trackStateChange('next', updatesNextPart)
+		this.#trackStateChange('current', updatesCurrentPart)
 
 		return convertPieceInstanceToBlueprints(pieceInstance.pieceInstance)
 	}
@@ -340,7 +344,7 @@ export class PartAndPieceInstanceActionService {
 		part: 'current' | 'next',
 		props: Partial<IBlueprintMutatablePart>
 	): Promise<IBlueprintPartInstance> {
-		const partInstance = this._getPartInstance(part)
+		const partInstance = this.#getPartInstance(part)
 		if (!partInstance) {
 			throw new Error('PartInstance could not be found')
 		}
@@ -351,14 +355,7 @@ export class PartAndPieceInstanceActionService {
 			throw new Error('Some valid properties must be defined')
 		}
 
-		this.nextPartState = Math.max(
-			this.nextPartState,
-			part === 'next' ? ActionPartChange.SAFE_CHANGE : ActionPartChange.NONE
-		)
-		this.currentPartState = Math.max(
-			this.currentPartState,
-			part === 'current' ? ActionPartChange.SAFE_CHANGE : ActionPartChange.NONE
-		)
+		this.#trackStateChange(part, ActionPartChange.SAFE_CHANGE)
 
 		return convertPartInstanceToBlueprints(partInstance.partInstance)
 	}
@@ -450,8 +447,8 @@ export class PartAndPieceInstanceActionService {
 		)
 	}
 
-	async removePieceInstances(_part: 'next', pieceInstanceIds: string[]): Promise<string[]> {
-		const partInstance = this._getPartInstance('next')
+	async removePieceInstances(part: 'current' | 'next', pieceInstanceIds: string[]): Promise<string[]> {
+		const partInstance = this.#getPartInstance(part)
 		if (!partInstance) {
 			throw new Error('Cannot remove pieceInstances when no selected partInstance')
 		}
@@ -466,7 +463,7 @@ export class PartAndPieceInstanceActionService {
 			}
 		}
 
-		this.nextPartState = Math.max(this.nextPartState, ActionPartChange.SAFE_CHANGE)
+		this.#trackStateChange(part, ActionPartChange.SAFE_CHANGE)
 
 		return unprotectStringArray(removedPieceInstanceIds)
 	}
@@ -505,7 +502,7 @@ export class PartAndPieceInstanceActionService {
 		)
 
 		if (stoppedIds.length > 0) {
-			this.currentPartState = Math.max(this.currentPartState, ActionPartChange.SAFE_CHANGE)
+			this.#trackStateChange('current', ActionPartChange.SAFE_CHANGE)
 		}
 
 		return unprotectStringArray(stoppedIds)
diff --git a/packages/job-worker/src/blueprints/context/services/__tests__/PartAndPieceInstanceActionService.test.ts b/packages/job-worker/src/blueprints/context/services/__tests__/PartAndPieceInstanceActionService.test.ts
@@ -1610,7 +1610,7 @@ describe('Test blueprint api context', () => {
 				})
 			})
 
-			test('good', async () => {
+			test('good - from next', async () => {
 				const { jobContext, playlistId, allPartInstances } = await setupMyDefaultRundown()
 
 				const partInstance = allPartInstances[0]
@@ -1638,6 +1638,37 @@ describe('Test blueprint api context', () => {
 					expect(service.nextPartState).toEqual(ActionPartChange.SAFE_CHANGE)
 				})
 			})
+
+			test('good - from current', async () => {
+				const { jobContext, playlistId, allPartInstances } = await setupMyDefaultRundown()
+
+				const partInstance = allPartInstances[0]
+				await setPartInstances(jobContext, playlistId, partInstance, undefined)
+
+				await wrapWithPlayoutModel(jobContext, playlistId, async (playoutModel) => {
+					const { service } = await getTestee(jobContext, playoutModel)
+
+					const beforePieceInstancesCounts = getPieceInstanceCounts(playoutModel)
+					expect(beforePieceInstancesCounts.previous).toEqual(0)
+					expect(beforePieceInstancesCounts.current).not.toEqual(0)
+					expect(beforePieceInstancesCounts.next).toEqual(0)
+					expect(beforePieceInstancesCounts.other).toEqual(0)
+
+					// Find the instance, and create its backing piece
+					const targetPieceInstance = playoutModel.currentPartInstance!.pieceInstances[0]
+					expect(targetPieceInstance).toBeTruthy()
+
+					await expect(
+						service.removePieceInstances('current', [
+							unprotectString(targetPieceInstance.pieceInstance._id),
+						])
+					).resolves.toEqual([unprotectString(targetPieceInstance.pieceInstance._id)])
+
+					// Ensure it was all removed
+					expect(playoutModel.findPieceInstance(targetPieceInstance.pieceInstance._id)).toBeFalsy()
+					expect(service.currentPartState).toEqual(ActionPartChange.SAFE_CHANGE)
+				})
+			})
 		})
 
 		describe('updatePartInstance', () => {

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,6 @@ export interface IPartAndPieceActionContext {`
`68`	`68`	`stopPiecesOnLayers(sourceLayerIds: string[], timeOffset?: number): Promise<string[]>`
`69`	`69`	`/** Stop piecesInstances by id. Returns ids of piecesInstances that were removed */`
`70`	`70`	`stopPieceInstances(pieceInstanceIds: string[], timeOffset?: number): Promise<string[]>`
`71`		`- /** Remove piecesInstances by id. Returns ids of piecesInstances that were removed. Note: For now we only allow removing from the next, but this might change to include current if there is justification */`
`72`		`- removePieceInstances(part: 'next', pieceInstanceIds: string[]): Promise<string[]>`
	`71`	`+ /** Remove piecesInstances by id. Returns ids of piecesInstances that were removed. */`
	`72`	`+ removePieceInstances(part: 'current' \| 'next', pieceInstanceIds: string[]): Promise<string[]>`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,8 @@ export class OnSetAsNextContext`
`117`	`117`	`return this.partAndPieceInstanceService.updatePartInstance(part, props)`
`118`	`118`	`}`
`119`	`119`
`120`		`- async removePieceInstances(_part: 'next', pieceInstanceIds: string[]): Promise<string[]> {`
`121`		`- return this.partAndPieceInstanceService.removePieceInstances('next', pieceInstanceIds)`
	`120`	`+ async removePieceInstances(part: 'current' \| 'next', pieceInstanceIds: string[]): Promise<string[]> {`
	`121`	`+ return this.partAndPieceInstanceService.removePieceInstances(part, pieceInstanceIds)`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`async moveNextPart(partDelta: number, segmentDelta: number, ignoreQuickLoop?: boolean): Promise<boolean> {`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ export class OnTakeContext extends ShowStyleUserContext implements IOnTakeContex`
`117`	`117`	`async stopPieceInstances(pieceInstanceIds: string[], timeOffset?: number \| undefined): Promise<string[]> {`
`118`	`118`	`return this.partAndPieceInstanceService.stopPieceInstances(pieceInstanceIds, timeOffset)`
`119`	`119`	`}`
`120`		`- async removePieceInstances(part: 'next', pieceInstanceIds: string[]): Promise<string[]> {`
	`120`	`+ async removePieceInstances(part: 'current' \| 'next', pieceInstanceIds: string[]): Promise<string[]> {`
`121`	`121`	`return this.partAndPieceInstanceService.removePieceInstances(part, pieceInstanceIds)`
`122`	`122`	`}`
`123`	`123`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ export class ActionExecutionContext extends ShowStyleUserContext implements IAct`
`183`	`183`	`return this.partAndPieceInstanceService.stopPieceInstances(pieceInstanceIds, timeOffset)`
`184`	`184`	`}`
`185`	`185`
`186`		`- async removePieceInstances(part: 'next', pieceInstanceIds: string[]): Promise<string[]> {`
	`186`	`+ async removePieceInstances(part: 'current' \| 'next', pieceInstanceIds: string[]): Promise<string[]> {`
`187`	`187`	`return this.partAndPieceInstanceService.removePieceInstances(part, pieceInstanceIds)`
`188`	`188`	`}`
`189`	`189`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,15 @@ export class PartAndPieceInstanceActionService {`
`95`	`95`	`this.showStyleCompound = showStyle`
`96`	`96`	`}`
`97`	`97`
`98`		`- private _getPartInstance(part: 'current' \| 'next'): PlayoutPartInstanceModel \| null {`
	`98`	`+ #trackStateChange(part: 'current' \| 'next', change: ActionPartChange): void {`
	`99`	`+ if (part === 'current') {`
	`100`	`+ this.currentPartState = Math.max(this.currentPartState, change)`
	`101`	`+ } else {`
	`102`	`+ this.nextPartState = Math.max(this.nextPartState, change)`
	`103`	`+ }`
	`104`	`+ }`
	`105`	`+`
	`106`	`+ #getPartInstance(part: 'current' \| 'next'): PlayoutPartInstanceModel \| null {`
`99`	`107`	`switch (part) {`
`100`	`108`	`case 'current':`
`101`	`109`	`return this._playoutModel.currentPartInstance`
`@@ -109,16 +117,16 @@ export class PartAndPieceInstanceActionService {`
`109`	`117`	`}`
`110`	`118`
`111`	`119`	`async getPartInstance(part: 'current' \| 'next'): Promise<IBlueprintPartInstance \| undefined> {`
`112`		`- const partInstance = this._getPartInstance(part)`
	`120`	`+ const partInstance = this.#getPartInstance(part)`
`113`	`121`
`114`	`122`	`return partInstance ? convertPartInstanceToBlueprints(partInstance.partInstance) : undefined`
`115`	`123`	`}`
`116`	`124`	`async getPieceInstances(part: 'current' \| 'next'): Promise<IBlueprintPieceInstance[]> {`
`117`		`- const partInstance = this._getPartInstance(part)`
	`125`	`+ const partInstance = this.#getPartInstance(part)`
`118`	`126`	`return partInstance?.pieceInstances?.map((p) => convertPieceInstanceToBlueprints(p.pieceInstance)) ?? []`
`119`	`127`	`}`
`120`	`128`	`async getResolvedPieceInstances(part: 'current' \| 'next'): Promise<IBlueprintResolvedPieceInstance[]> {`
`121`		`- const partInstance = this._getPartInstance(part)`
	`129`	`+ const partInstance = this.#getPartInstance(part)`
`122`	`130`	`if (!partInstance) {`
`123`	`131`	`return []`
`124`	`132`	`}`
`@@ -244,7 +252,7 @@ export class PartAndPieceInstanceActionService {`
`244`	`252`	`}`
`245`	`253`
`246`	`254`	`async insertPiece(part: 'current' \| 'next', rawPiece: IBlueprintPiece): Promise<IBlueprintPieceInstance> {`
`247`		`- const partInstance = this._getPartInstance(part)`
	`255`	`+ const partInstance = this.#getPartInstance(part)`
`248`	`256`	`if (!partInstance) {`
`249`	`257`	`throw new Error('Cannot insert piece when no active part')`
`250`	`258`	`}`
`@@ -270,11 +278,7 @@ export class PartAndPieceInstanceActionService {`
`270`	`278`	`// Do the work`
`271`	`279`	`const newPieceInstance = partInstance.insertAdlibbedPiece(piece, undefined)`
`272`	`280`
`273`		`- if (part === 'current') {`
`274`		`- this.currentPartState = Math.max(this.currentPartState, ActionPartChange.SAFE_CHANGE)`
`275`		`- } else {`
`276`		`- this.nextPartState = Math.max(this.nextPartState, ActionPartChange.SAFE_CHANGE)`
`277`		`- }`
	`281`	`+ this.#trackStateChange(part, ActionPartChange.SAFE_CHANGE)`
`278`	`282`
`279`	`283`	`return convertPieceInstanceToBlueprints(newPieceInstance.pieceInstance)`
`280`	`284`	`}`
`@@ -330,8 +334,8 @@ export class PartAndPieceInstanceActionService {`
`330`	`334`
`331`	`335`	`// setupPieceInstanceInfiniteProperties(pieceInstance)`
`332`	`336`
`333`		`- this.nextPartState = Math.max(this.nextPartState, updatesNextPart)`
`334`		`- this.currentPartState = Math.max(this.currentPartState, updatesCurrentPart)`
	`337`	`+ this.#trackStateChange('next', updatesNextPart)`
	`338`	`+ this.#trackStateChange('current', updatesCurrentPart)`
`335`	`339`
`336`	`340`	`return convertPieceInstanceToBlueprints(pieceInstance.pieceInstance)`
`337`	`341`	`}`
`@@ -340,7 +344,7 @@ export class PartAndPieceInstanceActionService {`
`340`	`344`	`part: 'current' \| 'next',`
`341`	`345`	`props: Partial<IBlueprintMutatablePart>`
`342`	`346`	`): Promise<IBlueprintPartInstance> {`
`343`		`- const partInstance = this._getPartInstance(part)`
	`347`	`+ const partInstance = this.#getPartInstance(part)`
`344`	`348`	`if (!partInstance) {`
`345`	`349`	`throw new Error('PartInstance could not be found')`
`346`	`350`	`}`
`@@ -351,14 +355,7 @@ export class PartAndPieceInstanceActionService {`
`351`	`355`	`throw new Error('Some valid properties must be defined')`
`352`	`356`	`}`
`353`	`357`
`354`		`- this.nextPartState = Math.max(`
`355`		`- this.nextPartState,`
`356`		`- part === 'next' ? ActionPartChange.SAFE_CHANGE : ActionPartChange.NONE`
`357`		`- )`
`358`		`- this.currentPartState = Math.max(`
`359`		`- this.currentPartState,`
`360`		`- part === 'current' ? ActionPartChange.SAFE_CHANGE : ActionPartChange.NONE`
`361`		`- )`
	`358`	`+ this.#trackStateChange(part, ActionPartChange.SAFE_CHANGE)`
`362`	`359`
`363`	`360`	`return convertPartInstanceToBlueprints(partInstance.partInstance)`
`364`	`361`	`}`
`@@ -450,8 +447,8 @@ export class PartAndPieceInstanceActionService {`
`450`	`447`	`)`
`451`	`448`	`}`
`452`	`449`
`453`		`- async removePieceInstances(_part: 'next', pieceInstanceIds: string[]): Promise<string[]> {`
`454`		`- const partInstance = this._getPartInstance('next')`
	`450`	`+ async removePieceInstances(part: 'current' \| 'next', pieceInstanceIds: string[]): Promise<string[]> {`
	`451`	`+ const partInstance = this.#getPartInstance(part)`
`455`	`452`	`if (!partInstance) {`
`456`	`453`	`throw new Error('Cannot remove pieceInstances when no selected partInstance')`
`457`	`454`	`}`
`@@ -466,7 +463,7 @@ export class PartAndPieceInstanceActionService {`
`466`	`463`	`}`
`467`	`464`	`}`
`468`	`465`
`469`		`- this.nextPartState = Math.max(this.nextPartState, ActionPartChange.SAFE_CHANGE)`
	`466`	`+ this.#trackStateChange(part, ActionPartChange.SAFE_CHANGE)`
`470`	`467`
`471`	`468`	`return unprotectStringArray(removedPieceInstanceIds)`
`472`	`469`	`}`
`@@ -505,7 +502,7 @@ export class PartAndPieceInstanceActionService {`
`505`	`502`	`)`
`506`	`503`
`507`	`504`	`if (stoppedIds.length > 0) {`
`508`		`- this.currentPartState = Math.max(this.currentPartState, ActionPartChange.SAFE_CHANGE)`
	`505`	`+ this.#trackStateChange('current', ActionPartChange.SAFE_CHANGE)`
`509`	`506`	`}`
`510`	`507`
`511`	`508`	`return unprotectStringArray(stoppedIds)`