Skip to content

Commit 1e21321

Browse files
JulusianJulusian
committed
Merge remote-tracking branch 'nrk/release52' into upstream/update-dependencies
# Conflicts: # meteor/package.json # meteor/yarn.lock # packages/meteor-lib/package.json # packages/mos-gateway/package.json # packages/shared-lib/package.json # packages/webui/package.json # packages/yarn.lock
2 parents e6eed83 + b51ee26 commit 1e21321

File tree

182 files changed

+3696
-523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+3696
-523
lines changed

‎meteor/CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
### [1.51.6](///compare/v1.51.5...v1.51.6) (2025-01-14)
6+
7+
8+
### Features
9+
10+
* add more logging 8c16ce8
11+
12+
13+
### Bug Fixes
14+
15+
* Include previousPartInstance in check to orphan segments rather than remove them. 51b7104
16+
* only run onPart/PiecePlaybackStarted/Stopped on current, next or previous parts a9fe401
17+
* **PoGw:** filter log output to ensure that message field in JSONL output is never an object 0d2b844
18+
* set nextPartInstance to null if it's referring to a Segment that has been removed b1045f9
19+
* updatePartInstancesSegmentIds: take into account when multiple segments have been merged into one. b769157
20+
521
### [1.51.5](///compare/v1.51.4...v1.51.5) (2025-01-07)
622

723

‎meteor/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@babel/runtime": "^7.26.0",
4141
"@koa/cors": "^5.0.0",
4242
"@koa/router": "^13.1.0",
43-
"@mos-connection/helper": "^4.2.0",
43+
"@mos-connection/helper": "^4.2.2",
4444
"@slack/webhook": "^7.0.4",
4545
"@sofie-automation/blueprints-integration": "portal:../packages/blueprints-integration",
4646
"@sofie-automation/corelib": "portal:../packages/corelib",

‎meteor/server/api/rest/v1/typeConversion.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ export function studioSettingsFrom(apiStudioSettings: APIStudioSettings): Comple
367367
enableQuickLoop: apiStudioSettings.enableQuickLoop,
368368
forceQuickLoopAutoNext: forceQuickLoopAutoNextFrom(apiStudioSettings.forceQuickLoopAutoNext),
369369
fallbackPartDuration: apiStudioSettings.fallbackPartDuration ?? DEFAULT_FALLBACK_PART_DURATION,
370+
enableUserEdits: apiStudioSettings.enableUserEdits,
370371
allowAdlibTestingSegment: apiStudioSettings.allowAdlibTestingSegment,
371372
allowHold: apiStudioSettings.allowHold ?? true, // Backwards compatible
372373
allowPieceDirectPlay: apiStudioSettings.allowPieceDirectPlay ?? true, // Backwards compatible
@@ -391,6 +392,7 @@ export function APIStudioSettingsFrom(settings: IStudioSettings): Complete<APISt
391392
enableQuickLoop: settings.enableQuickLoop,
392393
forceQuickLoopAutoNext: APIForceQuickLoopAutoNextFrom(settings.forceQuickLoopAutoNext),
393394
fallbackPartDuration: settings.fallbackPartDuration,
395+
enableUserEdits: settings.enableUserEdits,
394396
allowAdlibTestingSegment: settings.allowAdlibTestingSegment,
395397
allowHold: settings.allowHold,
396398
allowPieceDirectPlay: settings.allowPieceDirectPlay,

‎meteor/server/lib/rest/v1/studios.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ export interface APIStudioSettings {
216216
forceQuickLoopAutoNext?: 'disabled' | 'enabled_when_valid_duration' | 'enabled_forcing_min_duration'
217217
minimumTakeSpan?: number
218218
fallbackPartDuration?: number
219+
enableUserEdits?: boolean
219220
allowAdlibTestingSegment?: boolean
220221
allowHold?: boolean
221222
allowPieceDirectPlay?: boolean

‎meteor/yarn.lock‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -888,23 +888,23 @@ __metadata:
888888
languageName: node
889889
linkType: hard
890890

891-
"@mos-connection/helper@npm:^4.2.0":
892-
version: 4.2.0
893-
resolution: "@mos-connection/helper@npm:4.2.0"
891+
"@mos-connection/helper@npm:^4.2.2":
892+
version: 4.2.2
893+
resolution: "@mos-connection/helper@npm:4.2.2"
894894
dependencies:
895-
"@mos-connection/model": "npm:4.2.0"
895+
"@mos-connection/model": "npm:4.2.2"
896896
iconv-lite: "npm:^0.6.3"
897897
tslib: "npm:^2.5.3"
898898
xml-js: "npm:^1.6.11"
899899
xmlbuilder: "npm:^15.1.1"
900-
checksum: 10c0/3cbea09a34e23c5af66632467f4876f3b60d009896904584315d80585cefd265d928a262d7cbab35f7734f919ec2194865abed75a3be41ea8903cc3128638000
900+
checksum: 10c0/778fe6327be5c0a632f0844ad05f2c29174f1ceab19de9ce85591ddbf1250884381a215511e8e0cff35612a873135cabe588e921382382439cd3b7296ffdb255
901901
languageName: node
902902
linkType: hard
903903

904-
"@mos-connection/model@npm:4.2.0, @mos-connection/model@npm:^4.2.0":
905-
version: 4.2.0
906-
resolution: "@mos-connection/model@npm:4.2.0"
907-
checksum: 10c0/b965e0bb91744d35a0577c3ddb5269e8f42f32a9c9a4f6ec657fdb28c927fa7878440d960bb1886f8b7564f0194ed485fd390e51de449abe11034e0116b7565d
904+
"@mos-connection/model@npm:4.2.2, @mos-connection/model@npm:^4.2.2":
905+
version: 4.2.2
906+
resolution: "@mos-connection/model@npm:4.2.2"
907+
checksum: 10c0/3c6998417db60a59320a529f107c91b41e399f8ae6aa3107a1f0ae68370897baa3ef9580d33107cbf9c5924979e490a422b315e347392101f4c5fa03efe039fe
908908
languageName: node
909909
linkType: hard
910910

@@ -1172,7 +1172,7 @@ __metadata:
11721172
version: 0.0.0-use.local
11731173
resolution: "@sofie-automation/meteor-lib@portal:../packages/meteor-lib::locator=automation-core%40workspace%3A."
11741174
dependencies:
1175-
"@mos-connection/helper": "npm:^4.2.0"
1175+
"@mos-connection/helper": "npm:^4.2.2"
11761176
"@sofie-automation/blueprints-integration": "npm:1.52.0-in-development"
11771177
"@sofie-automation/corelib": "npm:1.52.0-in-development"
11781178
"@sofie-automation/shared-lib": "npm:1.52.0-in-development"
@@ -1190,7 +1190,7 @@ __metadata:
11901190
version: 0.0.0-use.local
11911191
resolution: "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A."
11921192
dependencies:
1193-
"@mos-connection/model": "npm:^4.2.0"
1193+
"@mos-connection/model": "npm:^4.2.2"
11941194
timeline-state-resolver-types: "npm:9.2.0-nightly-release52-20241219-123204-90290cef1.0"
11951195
tslib: "npm:^2.8.1"
11961196
type-fest: "npm:^4.32.0"
@@ -2219,7 +2219,7 @@ __metadata:
22192219
"@babel/runtime": "npm:^7.26.0"
22202220
"@koa/cors": "npm:^5.0.0"
22212221
"@koa/router": "npm:^13.1.0"
2222-
"@mos-connection/helper": "npm:^4.2.0"
2222+
"@mos-connection/helper": "npm:^4.2.2"
22232223
"@shopify/jest-koa-mocks": "npm:^5.3.1"
22242224
"@slack/webhook": "npm:^7.0.4"
22252225
"@sofie-automation/blueprints-integration": "portal:../packages/blueprints-integration"

‎packages/blueprints-integration/CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.51.6](https://github.com/nrkno/sofie-core/compare/v1.51.5...v1.51.6) (2025-01-14)
7+
8+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
9+
10+
11+
12+
13+
614
## [1.51.5](https://github.com/nrkno/sofie-core/compare/v1.51.4...v1.51.5) (2025-01-07)
715

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

‎packages/blueprints-integration/src/content.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ export interface VTContent extends BaseContent {
5555
/** Duration of extra content past sourceDuration. Not planned to play back but present on the media and playable. */
5656
postrollDuration?: number
5757
editable?: VTEditableParameters
58+
/** This is for the VT's in out words */
59+
firstWords?: string
60+
lastWords?: string
61+
fullScript?: string
5862
}
5963

6064
export interface GraphicsContent extends BaseContent {

‎packages/blueprints-integration/src/documents/part.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { UserEditingDefinition } from '../userEditing'
1+
import { UserEditingDefinition, UserEditingProperties } from '../userEditing'
22
import type { NoteSeverity } from '../lib'
33
import type { ITranslatableMessage } from '../translations'
44

@@ -88,6 +88,12 @@ export interface IBlueprintMutatablePart<TPrivateData = unknown, TPublicData = u
8888
* User editing definitions for this part
8989
*/
9090
userEditOperations?: UserEditingDefinition[]
91+
92+
/**
93+
* Properties that are user editable from the properties panel in the Sofie UI, if the user saves changes to these
94+
* it will trigger a user edit operation of type DefaultUserOperationEditProperties
95+
*/
96+
userEditProperties?: UserEditingProperties
9197
}
9298

9399
export interface HackPartMediaObjectSubscription {

‎packages/blueprints-integration/src/documents/piece.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { UserEditingDefinition } from '../userEditing'
1+
import { UserEditingDefinition, UserEditingProperties } from '../userEditing'
22
import type { IBlueprintPieceGeneric } from './pieceGeneric'
33

44
/** Special types of pieces. Some are not always used in all circumstances */
@@ -35,6 +35,12 @@ export interface IBlueprintPiece<TPrivateData = unknown, TPublicData = unknown>
3535
* User editing definitions for this piece
3636
*/
3737
userEditOperations?: UserEditingDefinition[]
38+
39+
/**
40+
* Properties that are user editable from the properties panel in the Sofie UI, if the user saves changes to these
41+
* it will trigger a user edit operation of type DefaultUserOperationEditProperties
42+
*/
43+
userEditProperties?: UserEditingProperties
3844
}
3945
export interface IBlueprintPieceDB<TPrivateData = unknown, TPublicData = unknown>
4046
extends IBlueprintPiece<TPrivateData, TPublicData> {

‎packages/blueprints-integration/src/documents/segment.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { UserEditingDefinition } from '../userEditing'
1+
import { UserEditingDefinition, UserEditingProperties } from '../userEditing'
22

33
export enum SegmentDisplayMode {
44
Timeline = 'timeline',
@@ -52,6 +52,12 @@ export interface IBlueprintSegment<TPrivateData = unknown, TPublicData = unknown
5252
* User editing definitions for this segment
5353
*/
5454
userEditOperations?: UserEditingDefinition[]
55+
56+
/**
57+
* Properties that are user editable from the properties panel in the Sofie UI, if the user saves changes to these
58+
* it will trigger a user edit operation of type DefaultUserOperationEditProperties
59+
*/
60+
userEditProperties?: UserEditingProperties
5561
}
5662
/** The Segment sent from Core */
5763
export interface IBlueprintSegmentDB<TPrivateData = unknown, TPublicData = unknown>

0 commit comments

Comments
 (0)