chore: fixes

Author: Julusian

meteor/package.json

@@ -7,7 +7,7 @@
 	},
 	"scripts": {
 		"preinstall": "node -v",
-		"debug": "meteor run",
+		"debug": "meteor run --exclude-archs \"web.browser.legacy,web.browser,web.cordova\"",
 		"libs:syncVersions": "node scripts/libs-sync-version.js",
 		"libs:syncVersionsAndChangelogs": "node scripts/libs-sync-version-and-changelog.js",
 		"inject-git-hash": "node ./scripts/generate-version-file.js",

meteor/server/api/userActions.ts

@@ -401,7 +401,7 @@ class ServerUserActionAPI
 		userEvent: string,
 		eventTime: Time,
 		rundownPlaylistId: RundownPlaylistId,
-		actionDocId: AdLibActionId | RundownBaselineAdLibActionId,
+		actionDocId: AdLibActionId | RundownBaselineAdLibActionId | BucketAdLibActionId,
 		actionId: string,
 		userData: ActionUserData,
 		triggerMode: string | null
@@ -561,7 +561,7 @@ class ServerUserActionAPI
 		eventTime: Time,
 		rundownPlaylistId: RundownPlaylistId,
 		partInstanceId: PartInstanceId,
-		bucketAdlibId: PieceId,
+		bucketAdlibId: BucketAdLibId,
 		queue: boolean | null
 	) {
 		return ServerClientAPI.runUserActionInLogForPlaylistOnWorker(

packages/job-worker/src/__mocks__/_setupMocks.ts

@@ -7,9 +7,9 @@ import './_extendJest.js'
 // Mock random ids to be predictable. Imports have to be relative, not via package nmmes for some reason..
 jest.mock('nanoid')
 
-jest.mock('../lib/time', (...args) => require('./time').setup(args), {
+jest.mock('../lib/time.js', (...args) => require('./time').setup(args), {
 	virtual: true,
 })
 
-jest.mock('../events/integration/rabbitMQ', (...args) => require('./rabbitMQ').setup(args), { virtual: true })
-jest.mock('../events/integration/slack', (...args) => require('./slack').setup(args), { virtual: true })
+jest.mock('../events/integration/rabbitMQ.js', (...args) => require('./rabbitMQ').setup(args), { virtual: true })
+jest.mock('../events/integration/slack.js', (...args) => require('./slack').setup(args), { virtual: true })

packages/meteor-lib/src/api/userActions.ts

@@ -122,7 +122,7 @@ export interface NewUserActionAPI {
 		userEvent: string,
 		eventTime: Time,
 		rundownPlaylistId: RundownPlaylistId,
-		actionDocId: AdLibActionId | RundownBaselineAdLibActionId,
+		actionDocId: AdLibActionId | RundownBaselineAdLibActionId | BucketAdLibActionId,
 		actionId: string,
 		userData: ActionUserData,
 		triggerMode?: string
@@ -168,7 +168,7 @@ export interface NewUserActionAPI {
 		eventTime: Time,
 		rundownPlaylistId: RundownPlaylistId,
 		partInstanceId: PartInstanceId,
-		bucketAdlibId: PieceId,
+		bucketAdlibId: BucketAdLibId,
 		queue?: boolean
 	): Promise<ClientAPI.ClientResponse<void>>
 	activateHold(

packages/webui/src/client/ui/Shelf/RundownViewBuckets.tsx

@@ -30,7 +30,7 @@ import RundownViewEventBus, {
 	IEventContext,
 } from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
 import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
-import { BucketId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { BucketAdLibId, BucketId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { DashboardLayoutExternalFrame } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { BucketAdLibItem, BucketAdLibUi, BucketAdLibActionUi } from '@sofie-automation/meteor-lib/dist/uiTypes/Bucket'
 
@@ -361,11 +361,12 @@ export const RundownViewBuckets = withTranslation()(
 								clb
 							)
 						} else {
+							const bucketAdLibId = bucketAdLib._id as BucketAdLibId
 							doUserAction(
 								t,
 								e.context,
 								UserAction.REMOVE_BUCKET_ADLIB,
-								(e, ts) => MeteorCall.userAction.bucketsRemoveBucketAdLib(e, ts, bucketAdLib._id),
+								(e, ts) => MeteorCall.userAction.bucketsRemoveBucketAdLib(e, ts, bucketAdLibId),
 								clb
 							)
 						}