wip: missed merge changes

meteor/server/api/deviceTriggers/observer.ts

@@ -45,9 +45,6 @@ Meteor.startup(async () => {
 		logger.debug(`Creating observer for studio "${studioId}"`)
 		const manager = new StudioDeviceTriggerManager(studioId)
 		const observer = new StudioObserver(studioId, (showStyleBaseId, cache) => {
-			workInQueue(async () => {
-				await manager.updateTriggers(cache, showStyleBaseId)
-			})
 			logger.silly(`Studio observer updating triggers for "${studioId}":"${showStyleBaseId}"`)
 			workInQueue(async () => manager.updateTriggers(cache, showStyleBaseId))
 

meteor/server/collections/index.ts

@@ -33,7 +33,7 @@ import { ObserveChangesForHash } from './lib'
 import { logger } from '../logging'
 import { allowOnlyFields, rejectFields } from '../security/allowDeny'
 import { checkUserIdHasOneOfPermissions } from '../security/auth'
-import type { DBNotificationObj } from '@sofie-automation/corelib/dist/dataModel/Notifications'
+import { DBNotificationObj } from '@sofie-automation/corelib/dist/dataModel/Notifications'
 
 export * from './bucket'
 export * from './packages-media'

package.json

@@ -28,6 +28,7 @@
 		"validate:release": "yarn install && run install-and-build && run validate:versions && run validate:release:packages && run validate:release:meteor",
 		"validate:release:meteor": "cd meteor && yarn validate:prod-dependencies && yarn license-validate && yarn lint && yarn test",
 		"validate:release:packages": "cd packages && run validate:dependencies && run test",
+		"validate:versions": "node scripts/checkForMultipleVersions.mjs",
 		"meteor": "cd meteor && meteor",
 		"docs:serve": "cd packages && run docs:serve",
 		"reset": "node scripts/reset.mjs",

packages/blueprints-integration/CHANGELOG.md

@@ -7,69 +7,128 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+
+
+
+
 ## [1.51.4](https://github.com/nrkno/sofie-core/compare/v1.51.3...v1.51.4) (2024-12-04)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+
+
+
+
 ## [1.51.3](https://github.com/nrkno/sofie-core/compare/v1.51.2...v1.51.3) (2024-11-21)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+
+
+
+
 ## [1.51.2](https://github.com/nrkno/sofie-core/compare/v1.51.1...v1.51.2) (2024-11-21)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+
+
+
+
 ## [1.51.1](https://github.com/nrkno/sofie-core/compare/v1.51.1-2...v1.51.1) (2024-11-13)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+
+
+
+
 ## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+
+
+
+
 ## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+
+
+
+
 ## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+
+
+
+
 ## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+
+
+
+
 ## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+
+
+
+
 # [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+
+
+
+
 # [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+
+
+
+
 # [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+
+
+
+
 # [1.51.0-in-testing.2](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.1...v1.51.0-in-testing.2) (2024-09-24)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+
+
+
+
 # [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
 
+
 ### Features
 
-- stringify piece NoraContent payload SOFIE-3398 ([#1248](https://github.com/nrkno/sofie-core/issues/1248)) ([0613f74](https://github.com/nrkno/sofie-core/commit/0613f740c1e2f740d7d9c39bc72178e301f5f72f))
+* stringify piece NoraContent payload SOFIE-3398 ([#1248](https://github.com/nrkno/sofie-core/issues/1248)) ([0613f74](https://github.com/nrkno/sofie-core/commit/0613f740c1e2f740d7d9c39bc72178e301f5f72f))
 
 # [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
 
+
 ### Features
 
-- stringify piece NoraContent payload SOFIE-3398 ([#1248](https://github.com/nrkno/sofie-core/issues/1248)) ([0613f74](https://github.com/nrkno/sofie-core/commit/0613f740c1e2f740d7d9c39bc72178e301f5f72f))
+* stringify piece NoraContent payload SOFIE-3398 ([#1248](https://github.com/nrkno/sofie-core/issues/1248)) ([0613f74](https://github.com/nrkno/sofie-core/commit/0613f740c1e2f740d7d9c39bc72178e301f5f72f))
+
 
 # [1.51.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.50.4...v1.51.0-in-testing.0) (2024-08-19)
 
@@ -139,6 +198,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 - typed publications in gateways/peripheraldevices SOFIE-1183 ([#1056](https://github.com/nrkno/sofie-core/issues/1056)) ([0c3c1bf](https://github.com/nrkno/sofie-core/commit/0c3c1bfd2bb779034976dc34e49aa6e664ea874b))
 - update meteor to 2.12 SOFIE-2368 ([#931](https://github.com/nrkno/sofie-core/issues/931)) ([d7dfb71](https://github.com/nrkno/sofie-core/commit/d7dfb71d19405267cab5e2abc39794a80acb30b1))
 
+
 ## [1.50.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.4...v1.50.5) (2024-09-19)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
@@ -1572,4 +1632,4 @@ All notable changes to this project will be documented in this file. See [standa
 
 ### Bug Fixes
 
-- remove worksOn and replace with just a simple triggerLabel: string ([4bf45f2](https://github.com/nrkno/tv-automation-server-core/commit/4bf45f2fd433143274fd52cef6fc5e029b8fc89c))
+- remove worksOn and replace with just a simple triggerLabel: string ([4bf45f2](https://github.com/nrkno/tv-automation-server-core/commit/4bf45f2fd433143274fd52cef6fc5e029b8fc89c))

packages/documentation/docs/for-developers/url-query-parameters.md

@@ -21,4 +21,3 @@ Appending query parameter(s) to the URL will allow you to modify the behaviour o
 | `speak=1` | Experimental feature that starts playing an audible countdown 10 seconds before each planned _Take_. _Default value is `0`._ | 
 | `vibrate=1` | Experimental feature that triggers the vibration API in the web browser 3 seconds before each planned _Take_. _Default value is `0`._ | 
 | `zoom=1,...` | Sets the scaling of the entire GUI. _The unit is a percentage where `100` is the default scaling._ | 
-

packages/job-worker/src/jobs/studio.ts

@@ -48,11 +48,25 @@ export function convertStudioToJobStudio(studio: DBStudio): JobStudio {
 			'routeSetExclusivityGroupsWithOverrides',
 			'packageContainersWithOverrides'
 		),
-		mappings: applyAndValidateOverrides(studio.mappingsWithOverrides).obj,
-		blueprintConfig: applyAndValidateOverrides(studio.blueprintConfigWithOverrides).obj,
-		settings: applyAndValidateOverrides(studio.settingsWithOverrides).obj,
-		routeSets: applyAndValidateOverrides(studio.routeSetsWithOverrides).obj,
-		routeSetExclusivityGroups: applyAndValidateOverrides(studio.routeSetExclusivityGroupsWithOverrides).obj,
+		// Note: checking for the overrides properties to exist first,
+		// because if they might not exist when migrating from an older version
+		// and this would crash the job-worker, creating a catch-22 situation.
+
+		mappings: studio.mappingsWithOverrides
+			? applyAndValidateOverrides(studio.mappingsWithOverrides).obj
+			: (studio as any).mappings || {},
+		blueprintConfig: studio.blueprintConfigWithOverrides
+			? applyAndValidateOverrides(studio.blueprintConfigWithOverrides).obj
+			: (studio as any).blueprintConfig || {},
+		settings: studio.settingsWithOverrides
+			? applyAndValidateOverrides(studio.settingsWithOverrides).obj
+			: (studio as any).settings || {},
+		routeSets: studio.routeSetsWithOverrides
+			? applyAndValidateOverrides(studio.routeSetsWithOverrides).obj
+			: (studio as any).routeSets || {},
+		routeSetExclusivityGroups: studio.routeSetExclusivityGroupsWithOverrides
+			? applyAndValidateOverrides(studio.routeSetExclusivityGroupsWithOverrides).obj
+			: (studio as any).routeSetExclusivityGroups || {},
 		// packageContainers: applyAndValidateOverrides(studio.packageContainersWithOverrides).obj,
 	}
 }

packages/mos-gateway/CHANGELOG.md

@@ -7,64 +7,123 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package mos-gateway
 
+
+
+
+
 ## [1.51.4](https://github.com/nrkno/sofie-core/compare/v1.51.3...v1.51.4) (2024-12-04)
 
 **Note:** Version bump only for package mos-gateway
 
+
+
+
+
 ## [1.51.3](https://github.com/nrkno/sofie-core/compare/v1.51.2...v1.51.3) (2024-11-21)
 
+
 ### Bug Fixes
 
-- change CMD in GHA Dockerfile ([b13ba2d](https://github.com/nrkno/sofie-core/commit/b13ba2d60afb5a95314fcd217b4e63b4b5f241fa))
+* change CMD in GHA Dockerfile ([b13ba2d](https://github.com/nrkno/sofie-core/commit/b13ba2d60afb5a95314fcd217b4e63b4b5f241fa))
+
+
+
+
 
 ## [1.51.2](https://github.com/nrkno/sofie-core/compare/v1.51.1...v1.51.2) (2024-11-21)
 
 **Note:** Version bump only for package mos-gateway
 
+
+
+
+
 ## [1.51.1](https://github.com/nrkno/sofie-core/compare/v1.51.1-2...v1.51.1) (2024-11-13)
 
 **Note:** Version bump only for package mos-gateway
 
+
+
+
+
 ## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
 
 **Note:** Version bump only for package mos-gateway
 
+
+
+
+
 ## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
 
 **Note:** Version bump only for package mos-gateway
 
+
+
+
+
 ## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
 
 **Note:** Version bump only for package mos-gateway
 
+
+
+
+
 ## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
 
 **Note:** Version bump only for package mos-gateway
 
+
+
+
+
 ## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
 
 **Note:** Version bump only for package mos-gateway
 
+
+
+
+
 # [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
 
 **Note:** Version bump only for package mos-gateway
 
+
+
+
+
 # [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
 
 **Note:** Version bump only for package mos-gateway
 
+
+
+
+
 # [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
 
 **Note:** Version bump only for package mos-gateway
 
+
+
+
+
 # [1.51.0-in-testing.2](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.1...v1.51.0-in-testing.2) (2024-09-24)
 
 **Note:** Version bump only for package mos-gateway
 
+
+
+
+
 # [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
 
+
 # [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
 
+
 **Note:** Version bump only for package mos-gateway
 
 # [1.51.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.50.4...v1.51.0-in-testing.0) (2024-08-19)
@@ -81,6 +140,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package mos-gateway
 
+
 ## [1.50.5-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.4-LSG-updates...v1.50.5-LSG-updates) (2024-08-08)
 
 ## [1.50.4-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.3-LSG-updates...v1.50.4-LSG-updates) (2024-07-30)
@@ -2303,4 +2363,4 @@ All notable changes to this project will be documented in this file. See [standa
 - implemented Mos-connection (it works now) ([27bf4c0](https://github.com/nrkno/tv-automation-mos-gateway/commit/27bf4c0))
 - kill process when init fails ([fe05191](https://github.com/nrkno/tv-automation-mos-gateway/commit/fe05191))
 - updated core-integration dep, introducing autoSubscribe ([6cc8604](https://github.com/nrkno/tv-automation-mos-gateway/commit/6cc8604))
-- updated dependency of core-integration ([676761e](https://github.com/nrkno/tv-automation-mos-gateway/commit/676761e))
+- updated dependency of core-integration ([676761e](https://github.com/nrkno/tv-automation-mos-gateway/commit/676761e))