Skip to content

Commit 829af33

Browse files
JulusianJulusian
committed
wip: missed merge changes
1 parent 3772401 commit 829af33

File tree

10 files changed

+407
-59
lines changed

10 files changed

+407
-59
lines changed

‎meteor/server/api/deviceTriggers/observer.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ Meteor.startup(async () => {
4545
logger.debug(`Creating observer for studio "${studioId}"`)
4646
const manager = new StudioDeviceTriggerManager(studioId)
4747
const observer = new StudioObserver(studioId, (showStyleBaseId, cache) => {
48-
workInQueue(async () => {
49-
await manager.updateTriggers(cache, showStyleBaseId)
50-
})
5148
logger.silly(`Studio observer updating triggers for "${studioId}":"${showStyleBaseId}"`)
5249
workInQueue(async () => manager.updateTriggers(cache, showStyleBaseId))
5350

‎meteor/server/collections/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { ObserveChangesForHash } from './lib'
3333
import { logger } from '../logging'
3434
import { allowOnlyFields, rejectFields } from '../security/allowDeny'
3535
import { checkUserIdHasOneOfPermissions } from '../security/auth'
36-
import type { DBNotificationObj } from '@sofie-automation/corelib/dist/dataModel/Notifications'
36+
import { DBNotificationObj } from '@sofie-automation/corelib/dist/dataModel/Notifications'
3737

3838
export * from './bucket'
3939
export * from './packages-media'

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"validate:release": "yarn install && run install-and-build && run validate:versions && run validate:release:packages && run validate:release:meteor",
2929
"validate:release:meteor": "cd meteor && yarn validate:prod-dependencies && yarn license-validate && yarn lint && yarn test",
3030
"validate:release:packages": "cd packages && run validate:dependencies && run test",
31+
"validate:versions": "node scripts/checkForMultipleVersions.mjs",
3132
"meteor": "cd meteor && meteor",
3233
"docs:serve": "cd packages && run docs:serve",
3334
"reset": "node scripts/reset.mjs",

‎packages/blueprints-integration/CHANGELOG.md‎

Lines changed: 63 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,69 +7,128 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
77

88
**Note:** Version bump only for package @sofie-automation/blueprints-integration
99

10+
11+
12+
13+
1014
## [1.51.4](https://github.com/nrkno/sofie-core/compare/v1.51.3...v1.51.4) (2024-12-04)
1115

1216
**Note:** Version bump only for package @sofie-automation/blueprints-integration
1317

18+
19+
20+
21+
1422
## [1.51.3](https://github.com/nrkno/sofie-core/compare/v1.51.2...v1.51.3) (2024-11-21)
1523

1624
**Note:** Version bump only for package @sofie-automation/blueprints-integration
1725

26+
27+
28+
29+
1830
## [1.51.2](https://github.com/nrkno/sofie-core/compare/v1.51.1...v1.51.2) (2024-11-21)
1931

2032
**Note:** Version bump only for package @sofie-automation/blueprints-integration
2133

34+
35+
36+
37+
2238
## [1.51.1](https://github.com/nrkno/sofie-core/compare/v1.51.1-2...v1.51.1) (2024-11-13)
2339

2440
**Note:** Version bump only for package @sofie-automation/blueprints-integration
2541

42+
43+
44+
45+
2646
## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
2747

2848
**Note:** Version bump only for package @sofie-automation/blueprints-integration
2949

50+
51+
52+
53+
3054
## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
3155

3256
**Note:** Version bump only for package @sofie-automation/blueprints-integration
3357

58+
59+
60+
61+
3462
## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
3563

3664
**Note:** Version bump only for package @sofie-automation/blueprints-integration
3765

66+
67+
68+
69+
3870
## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
3971

4072
**Note:** Version bump only for package @sofie-automation/blueprints-integration
4173

74+
75+
76+
77+
4278
## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
4379

4480
**Note:** Version bump only for package @sofie-automation/blueprints-integration
4581

82+
83+
84+
85+
4686
# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
4787

4888
**Note:** Version bump only for package @sofie-automation/blueprints-integration
4989

90+
91+
92+
93+
5094
# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
5195

5296
**Note:** Version bump only for package @sofie-automation/blueprints-integration
5397

98+
99+
100+
101+
54102
# [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)
55103

56104
**Note:** Version bump only for package @sofie-automation/blueprints-integration
57105

106+
107+
108+
109+
58110
# [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)
59111

60112
**Note:** Version bump only for package @sofie-automation/blueprints-integration
61113

114+
115+
116+
117+
62118
# [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)
63119

120+
64121
### Features
65122

66-
- stringify piece NoraContent payload SOFIE-3398 ([#1248](https://github.com/nrkno/sofie-core/issues/1248)) ([0613f74](https://github.com/nrkno/sofie-core/commit/0613f740c1e2f740d7d9c39bc72178e301f5f72f))
123+
* stringify piece NoraContent payload SOFIE-3398 ([#1248](https://github.com/nrkno/sofie-core/issues/1248)) ([0613f74](https://github.com/nrkno/sofie-core/commit/0613f740c1e2f740d7d9c39bc72178e301f5f72f))
67124

68125
# [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)
69126

127+
70128
### Features
71129

72-
- stringify piece NoraContent payload SOFIE-3398 ([#1248](https://github.com/nrkno/sofie-core/issues/1248)) ([0613f74](https://github.com/nrkno/sofie-core/commit/0613f740c1e2f740d7d9c39bc72178e301f5f72f))
130+
* stringify piece NoraContent payload SOFIE-3398 ([#1248](https://github.com/nrkno/sofie-core/issues/1248)) ([0613f74](https://github.com/nrkno/sofie-core/commit/0613f740c1e2f740d7d9c39bc72178e301f5f72f))
131+
73132

74133
# [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)
75134

@@ -139,6 +198,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
139198
- 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))
140199
- 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))
141200

201+
142202
## [1.50.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.4...v1.50.5) (2024-09-19)
143203

144204
**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
15721632

15731633
### Bug Fixes
15741634

1575-
- remove worksOn and replace with just a simple triggerLabel: string ([4bf45f2](https://github.com/nrkno/tv-automation-server-core/commit/4bf45f2fd433143274fd52cef6fc5e029b8fc89c))
1635+
- 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‎

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

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

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,25 @@ export function convertStudioToJobStudio(studio: DBStudio): JobStudio {
4848
'routeSetExclusivityGroupsWithOverrides',
4949
'packageContainersWithOverrides'
5050
),
51-
mappings: applyAndValidateOverrides(studio.mappingsWithOverrides).obj,
52-
blueprintConfig: applyAndValidateOverrides(studio.blueprintConfigWithOverrides).obj,
53-
settings: applyAndValidateOverrides(studio.settingsWithOverrides).obj,
54-
routeSets: applyAndValidateOverrides(studio.routeSetsWithOverrides).obj,
55-
routeSetExclusivityGroups: applyAndValidateOverrides(studio.routeSetExclusivityGroupsWithOverrides).obj,
51+
// Note: checking for the overrides properties to exist first,
52+
// because if they might not exist when migrating from an older version
53+
// and this would crash the job-worker, creating a catch-22 situation.
54+
55+
mappings: studio.mappingsWithOverrides
56+
? applyAndValidateOverrides(studio.mappingsWithOverrides).obj
57+
: (studio as any).mappings || {},
58+
blueprintConfig: studio.blueprintConfigWithOverrides
59+
? applyAndValidateOverrides(studio.blueprintConfigWithOverrides).obj
60+
: (studio as any).blueprintConfig || {},
61+
settings: studio.settingsWithOverrides
62+
? applyAndValidateOverrides(studio.settingsWithOverrides).obj
63+
: (studio as any).settings || {},
64+
routeSets: studio.routeSetsWithOverrides
65+
? applyAndValidateOverrides(studio.routeSetsWithOverrides).obj
66+
: (studio as any).routeSets || {},
67+
routeSetExclusivityGroups: studio.routeSetExclusivityGroupsWithOverrides
68+
? applyAndValidateOverrides(studio.routeSetExclusivityGroupsWithOverrides).obj
69+
: (studio as any).routeSetExclusivityGroups || {},
5670
// packageContainers: applyAndValidateOverrides(studio.packageContainersWithOverrides).obj,
5771
}
5872
}

‎packages/mos-gateway/CHANGELOG.md‎

Lines changed: 62 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,64 +7,123 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
77

88
**Note:** Version bump only for package mos-gateway
99

10+
11+
12+
13+
1014
## [1.51.4](https://github.com/nrkno/sofie-core/compare/v1.51.3...v1.51.4) (2024-12-04)
1115

1216
**Note:** Version bump only for package mos-gateway
1317

18+
19+
20+
21+
1422
## [1.51.3](https://github.com/nrkno/sofie-core/compare/v1.51.2...v1.51.3) (2024-11-21)
1523

24+
1625
### Bug Fixes
1726

18-
- change CMD in GHA Dockerfile ([b13ba2d](https://github.com/nrkno/sofie-core/commit/b13ba2d60afb5a95314fcd217b4e63b4b5f241fa))
27+
* change CMD in GHA Dockerfile ([b13ba2d](https://github.com/nrkno/sofie-core/commit/b13ba2d60afb5a95314fcd217b4e63b4b5f241fa))
28+
29+
30+
31+
1932

2033
## [1.51.2](https://github.com/nrkno/sofie-core/compare/v1.51.1...v1.51.2) (2024-11-21)
2134

2235
**Note:** Version bump only for package mos-gateway
2336

37+
38+
39+
40+
2441
## [1.51.1](https://github.com/nrkno/sofie-core/compare/v1.51.1-2...v1.51.1) (2024-11-13)
2542

2643
**Note:** Version bump only for package mos-gateway
2744

45+
46+
47+
48+
2849
## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
2950

3051
**Note:** Version bump only for package mos-gateway
3152

53+
54+
55+
56+
3257
## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
3358

3459
**Note:** Version bump only for package mos-gateway
3560

61+
62+
63+
64+
3665
## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
3766

3867
**Note:** Version bump only for package mos-gateway
3968

69+
70+
71+
72+
4073
## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
4174

4275
**Note:** Version bump only for package mos-gateway
4376

77+
78+
79+
80+
4481
## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
4582

4683
**Note:** Version bump only for package mos-gateway
4784

85+
86+
87+
88+
4889
# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
4990

5091
**Note:** Version bump only for package mos-gateway
5192

93+
94+
95+
96+
5297
# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
5398

5499
**Note:** Version bump only for package mos-gateway
55100

101+
102+
103+
104+
56105
# [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)
57106

58107
**Note:** Version bump only for package mos-gateway
59108

109+
110+
111+
112+
60113
# [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)
61114

62115
**Note:** Version bump only for package mos-gateway
63116

117+
118+
119+
120+
64121
# [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)
65122

123+
66124
# [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)
67125

126+
68127
**Note:** Version bump only for package mos-gateway
69128

70129
# [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
81140

82141
**Note:** Version bump only for package mos-gateway
83142

143+
84144
## [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)
85145

86146
## [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
23032363
- implemented Mos-connection (it works now) ([27bf4c0](https://github.com/nrkno/tv-automation-mos-gateway/commit/27bf4c0))
23042364
- kill process when init fails ([fe05191](https://github.com/nrkno/tv-automation-mos-gateway/commit/fe05191))
23052365
- updated core-integration dep, introducing autoSubscribe ([6cc8604](https://github.com/nrkno/tv-automation-mos-gateway/commit/6cc8604))
2306-
- updated dependency of core-integration ([676761e](https://github.com/nrkno/tv-automation-mos-gateway/commit/676761e))
2366+
- updated dependency of core-integration ([676761e](https://github.com/nrkno/tv-automation-mos-gateway/commit/676761e))

0 commit comments

Comments
 (0)