Skip to content

Commit f82db0c

Browse files
JulusianJulusian
committed
Merge remote-tracking branch 'nrk/release52' into bbc-release52
2 parents c51b6e4 + f46056a commit f82db0c

File tree

25 files changed

+8555
-5094
lines changed

25 files changed

+8555
-5094
lines changed

‎.yarnrc.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
compressionLevel: mixed
2+
3+
enableGlobalCache: false
4+
15
nodeLinker: node-modules

‎meteor/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"watch-types": "run check-types --watch"
3838
},
3939
"dependencies": {
40-
"@babel/runtime": "^7.26.0",
40+
"@babel/runtime": "^7.26.7",
4141
"@koa/cors": "^5.0.0",
4242
"@koa/router": "^13.1.0",
4343
"@mos-connection/helper": "^4.2.2",
@@ -52,7 +52,7 @@
5252
"body-parser": "^1.20.3",
5353
"deep-extend": "0.6.0",
5454
"deepmerge": "^4.3.1",
55-
"elastic-apm-node": "^4.10.0",
55+
"elastic-apm-node": "^4.11.0",
5656
"i18next": "^21.10.0",
5757
"indexof": "0.0.1",
5858
"koa": "^2.15.3",
@@ -69,12 +69,12 @@
6969
"superfly-timeline": "9.0.2",
7070
"threadedclass": "^1.2.2",
7171
"timecode": "0.0.4",
72-
"type-fest": "^4.32.0",
72+
"type-fest": "^4.33.0",
7373
"underscore": "^1.13.7",
7474
"winston": "^3.17.0"
7575
},
7676
"devDependencies": {
77-
"@babel/core": "^7.26.0",
77+
"@babel/core": "^7.26.7",
7878
"@babel/plugin-transform-modules-commonjs": "^7.26.3",
7979
"@shopify/jest-koa-mocks": "^5.3.1",
8080
"@sofie-automation/code-standard-preset": "~2.4.7",
@@ -88,7 +88,7 @@
8888
"@types/koa-static": "^4.0.4",
8989
"@types/koa__cors": "^5.0.0",
9090
"@types/koa__router": "^12.0.4",
91-
"@types/node": "^22.10.7",
91+
"@types/node": "^22.10.10",
9292
"@types/request": "^2.48.12",
9393
"@types/semver": "^7.5.8",
9494
"@types/underscore": "^1.13.0",

‎meteor/yarn.lock‎

Lines changed: 1862 additions & 1225 deletions
Large diffs are not rendered by default.

‎packages/blueprints-integration/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"dependencies": {
4141
"@sofie-automation/shared-lib": "1.52.0-in-development",
4242
"tslib": "^2.8.1",
43-
"type-fest": "^4.32.0"
43+
"type-fest": "^4.33.0"
4444
},
4545
"lint-staged": {
4646
"*.{css,json,md,scss}": [

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ export enum DefaultUserOperationsTypes {
129129
REVERT_PART = '__sofie-revert-part',
130130
REVERT_RUNDOWN = '__sofie-revert-rundown',
131131
UPDATE_PROPS = '__sofie-update-props',
132+
IMPORT_MOS_ITEM = '__sofie-import-mos',
132133
}
133134

134135
export interface DefaultUserOperationRevertRundown {
@@ -153,11 +154,19 @@ export interface DefaultUserOperationEditProperties {
153154
}
154155
}
155156

157+
export type DefaultUserOperationImportMOSItem = {
158+
id: DefaultUserOperationsTypes.IMPORT_MOS_ITEM
159+
160+
payloadType: string
161+
payload: any
162+
}
163+
156164
export type DefaultUserOperations =
157165
| DefaultUserOperationRevertRundown
158166
| DefaultUserOperationRevertSegment
159167
| DefaultUserOperationRevertPart
160168
| DefaultUserOperationEditProperties
169+
| DefaultUserOperationImportMOSItem
161170

162171
export interface UserOperationChange<TCustomBlueprintOperations extends { id: string } = never> {
163172
/** Indicate that this change is from user operations */

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ import type { JSONBlob } from '@sofie-automation/shared-lib/dist/lib/JSONBlob'
22
import type { ITranslatableMessage } from './translations'
33
import { JSONSchema } from '@sofie-automation/shared-lib/dist/lib/JSONSchemaTypes'
44
import { SourceLayerType } from './content'
5+
import { DefaultUserOperationsTypes } from './ingest'
56

67
/**
78
* Description of a user performed editing operation allowed on an document
89
*/
9-
export type UserEditingDefinition = UserEditingDefinitionAction | UserEditingDefinitionForm
10+
export type UserEditingDefinition =
11+
| UserEditingDefinitionAction
12+
| UserEditingDefinitionForm
13+
| UserEditingDefinitionSofieDefault
1014

1115
/**
1216
* A simple 'action' that can be performed
@@ -40,11 +44,22 @@ export interface UserEditingDefinitionForm {
4044
currentValues: Record<string, any>
4145
}
4246

47+
/**
48+
* A built in Sofie User operation
49+
*/
50+
export interface UserEditingDefinitionSofieDefault {
51+
type: UserEditingType.SOFIE
52+
/** Id of this operation */
53+
id: DefaultUserOperationsTypes
54+
}
55+
4356
export enum UserEditingType {
4457
/** Action */
4558
ACTION = 'action',
4659
/** Form */
4760
FORM = 'form',
61+
/** Operation for the Built-in Sofie Rich Editing UI */
62+
SOFIE = 'sofie',
4863
}
4964

5065
export interface UserEditingSourceLayer {

‎packages/corelib/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
"@sofie-automation/shared-lib": "1.52.0-in-development",
4444
"fast-clone": "^1.5.13",
4545
"i18next": "^21.10.0",
46-
"influx": "^5.9.3",
46+
"influx": "^5.9.7",
4747
"nanoid": "^3.3.8",
4848
"object-path": "^0.11.8",
4949
"prom-client": "^15.1.3",
5050
"timecode": "0.0.4",
5151
"tslib": "^2.8.1",
52-
"type-fest": "^4.32.0",
52+
"type-fest": "^4.33.0",
5353
"underscore": "^1.13.7"
5454
},
5555
"peerDependencies": {

‎packages/corelib/src/dataModel/UserEditingDefinitions.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@ import type {
33
JSONBlob,
44
JSONSchema,
55
UserEditingSourceLayer,
6+
DefaultUserOperationsTypes,
67
} from '@sofie-automation/blueprints-integration'
78
import type { ITranslatableMessage } from '../TranslatableMessage'
89

9-
export type CoreUserEditingDefinition = CoreUserEditingDefinitionAction | CoreUserEditingDefinitionForm
10+
export type CoreUserEditingDefinition =
11+
| CoreUserEditingDefinitionAction
12+
| CoreUserEditingDefinitionForm
13+
| CoreUserEditingDefinitionSofie
1014

1115
export interface CoreUserEditingDefinitionAction {
1216
type: UserEditingType.ACTION
@@ -83,3 +87,9 @@ export interface CoreUserEditingProperties {
8387
/** Translation namespaces to use when rendering this form */
8488
translationNamespaces: string[]
8589
}
90+
91+
export interface CoreUserEditingDefinitionSofie {
92+
type: UserEditingType.SOFIE
93+
/** Id of this operation */
94+
id: DefaultUserOperationsTypes
95+
}

‎packages/job-worker/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@
4646
"@sofie-automation/shared-lib": "1.52.0-in-development",
4747
"amqplib": "^0.10.5",
4848
"deepmerge": "^4.3.1",
49-
"elastic-apm-node": "^4.10.0",
49+
"elastic-apm-node": "^4.11.0",
5050
"mongodb": "^6.12.0",
5151
"p-lazy": "^3.1.0",
5252
"p-timeout": "^4.1.0",
5353
"superfly-timeline": "9.0.2",
5454
"threadedclass": "^1.2.2",
5555
"tslib": "^2.8.1",
56-
"type-fest": "^4.32.0",
56+
"type-fest": "^4.33.0",
5757
"underscore": "^1.13.7"
5858
},
5959
"prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",

‎packages/job-worker/src/blueprints/context/lib.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
CoreUserEditingDefinitionAction,
1515
CoreUserEditingDefinitionForm,
1616
CoreUserEditingProperties,
17+
CoreUserEditingDefinitionSofie,
1718
} from '@sofie-automation/corelib/dist/dataModel/UserEditingDefinitions'
1819
import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
1920
import { assertNever, clone, Complete, literal, omit } from '@sofie-automation/corelib/dist/lib'
@@ -58,6 +59,7 @@ import {
5859
UserEditingDefinitionAction,
5960
UserEditingDefinitionForm,
6061
UserEditingProperties,
62+
UserEditingDefinitionSofieDefault,
6163
UserEditingType,
6264
} from '@sofie-automation/blueprints-integration/dist/userEditing'
6365
import type { PlayoutMutatablePart } from '../../playout/model/PlayoutPartInstanceModel'
@@ -537,6 +539,11 @@ function translateUserEditsToBlueprint(
537539
schema: clone(userEdit.schema),
538540
currentValues: clone(userEdit.currentValues),
539541
} satisfies Complete<UserEditingDefinitionForm>
542+
case UserEditingType.SOFIE:
543+
return {
544+
type: UserEditingType.SOFIE,
545+
id: userEdit.id,
546+
} satisfies Complete<UserEditingDefinitionSofieDefault>
540547
default:
541548
assertNever(userEdit)
542549
return undefined
@@ -595,6 +602,11 @@ export function translateUserEditsFromBlueprint(
595602
currentValues: clone(userEdit.currentValues),
596603
translationNamespaces: unprotectStringArray(blueprintIds),
597604
} satisfies Complete<CoreUserEditingDefinitionForm>
605+
case UserEditingType.SOFIE:
606+
return {
607+
type: UserEditingType.SOFIE,
608+
id: userEdit.id,
609+
} satisfies Complete<CoreUserEditingDefinitionSofie>
598610
default:
599611
assertNever(userEdit)
600612
return undefined

0 commit comments

Comments
 (0)