Skip to content

Commit 6b778ca

Browse files
PeterC89PeterC89
committed
Merge remote-tracking branch 'origin/release53' into bbc-release53
2 parents 204ca61 + af14bcd commit 6b778ca

File tree

12 files changed

+148
-52
lines changed

12 files changed

+148
-52
lines changed

‎.github/workflows/audit.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
continue-on-error: true
1212
timeout-minutes: 15
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
with:
1616
persist-credentials: false
1717
- name: Use Node.js
@@ -41,7 +41,7 @@ jobs:
4141
continue-on-error: true
4242
timeout-minutes: 15
4343
steps:
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v5
4545
with:
4646
persist-credentials: false
4747
- name: Use Node.js
@@ -84,7 +84,7 @@ jobs:
8484
- live-status-gateway
8585

8686
steps:
87-
- uses: actions/checkout@v4
87+
- uses: actions/checkout@v5
8888
with:
8989
persist-credentials: false
9090
- name: Use Node.js
@@ -117,7 +117,7 @@ jobs:
117117
timeout-minutes: 15
118118

119119
steps:
120-
- uses: actions/checkout@v4
120+
- uses: actions/checkout@v5
121121
with:
122122
persist-credentials: false
123123
- name: Use Node.js

‎.github/workflows/node.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
continue-on-error: true
1717
timeout-minutes: 15
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
with:
2121
persist-credentials: false
2222
- name: Use Node.js
@@ -57,7 +57,7 @@ jobs:
5757
runs-on: ubuntu-latest
5858
timeout-minutes: 30
5959
steps:
60-
- uses: actions/checkout@v4
60+
- uses: actions/checkout@v5
6161
with:
6262
persist-credentials: false
6363
- name: Use Node.js
@@ -104,7 +104,7 @@ jobs:
104104
runs-on: ubuntu-latest
105105
timeout-minutes: 30
106106
steps:
107-
- uses: actions/checkout@v4
107+
- uses: actions/checkout@v5
108108
with:
109109
persist-credentials: false
110110
- name: Determine if images should be published to DockerHub
@@ -284,7 +284,7 @@ jobs:
284284
gateway-name: [playout-gateway, mos-gateway, "live-status-gateway"]
285285

286286
steps:
287-
- uses: actions/checkout@v4
287+
- uses: actions/checkout@v5
288288
with:
289289
persist-credentials: false
290290
- name: Determine if images should be published to DockerHub
@@ -449,7 +449,7 @@ jobs:
449449
- live-status-gateway-api
450450

451451
steps:
452-
- uses: actions/checkout@v4
452+
- uses: actions/checkout@v5
453453
with:
454454
persist-credentials: false
455455
- name: Use Node.js
@@ -521,7 +521,7 @@ jobs:
521521
send-coverage: true
522522

523523
steps:
524-
- uses: actions/checkout@v4
524+
- uses: actions/checkout@v5
525525
with:
526526
persist-credentials: false
527527
- name: Use Node.js ${{ matrix.node-version }}
@@ -561,7 +561,7 @@ jobs:
561561
runs-on: ubuntu-latest
562562
timeout-minutes: 15
563563
steps:
564-
- uses: actions/checkout@v4
564+
- uses: actions/checkout@v5
565565
with:
566566
persist-credentials: false
567567
- name: Use Node.js
@@ -591,7 +591,7 @@ jobs:
591591
runs-on: ubuntu-latest
592592
timeout-minutes: 15
593593
steps:
594-
- uses: actions/checkout@v4
594+
- uses: actions/checkout@v5
595595
with:
596596
persist-credentials: false
597597
- name: Use Node.js
@@ -627,7 +627,7 @@ jobs:
627627
timeout-minutes: 15
628628

629629
steps:
630-
- uses: actions/checkout@v4
630+
- uses: actions/checkout@v5
631631
with:
632632
persist-credentials: false
633633
- name: Use Node.js
@@ -684,7 +684,7 @@ jobs:
684684
- build-core
685685

686686
steps:
687-
- uses: actions/checkout@v4
687+
- uses: actions/checkout@v5
688688
with:
689689
persist-credentials: false
690690
- name: Use Node.js
@@ -761,7 +761,7 @@ jobs:
761761
continue-on-error: true
762762
timeout-minutes: 15
763763
steps:
764-
- uses: actions/checkout@v4
764+
- uses: actions/checkout@v5
765765
with:
766766
persist-credentials: false
767767
- name: Use Node.js

‎.github/workflows/prerelease-libs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- live-status-gateway-api
2222

2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
with:
2626
persist-credentials: false
2727
- name: Use Node.js
@@ -61,7 +61,7 @@ jobs:
6161
node-version: [22.x]
6262

6363
steps:
64-
- uses: actions/checkout@v4
64+
- uses: actions/checkout@v5
6565
with:
6666
persist-credentials: false
6767
- name: Use Node.js ${{ matrix.node-version }}
@@ -93,7 +93,7 @@ jobs:
9393
- test-packages
9494

9595
steps:
96-
- uses: actions/checkout@v4
96+
- uses: actions/checkout@v5
9797
with:
9898
persist-credentials: false
9999
- name: Use Node.js

‎.github/workflows/prune-tags.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
timeout-minutes: 15
2424
steps:
2525
- name: Checkout repo with all tags
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727
with:
2828
fetch-depth: 0
2929

‎.github/workflows/sonar.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
timeout-minutes: 15
1717

1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
with:
2121
# Disabling shallow clone is recommended for improving relevancy of reporting
2222
fetch-depth: 0

‎packages/blueprints-integration/src/api/studio.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ export interface BlueprintResultApplyStudioConfig {
155155
/** Parent device settings */
156156
parentDevices: Record<string, BlueprintParentDeviceSettings>
157157
/** Playout-gateway subdevices */
158-
playoutDevices: Record<string, TSR.DeviceOptionsAny>
158+
playoutDevices: Record<string, { parentDeviceName?: string; options: TSR.DeviceOptionsAny }>
159159
/** Ingest-gateway subdevices, the types here depend on the gateway you use */
160-
ingestDevices: Record<string, BlueprintMosDeviceConfig | unknown>
160+
ingestDevices: Record<string, { parentDeviceName?: string; options: BlueprintMosDeviceConfig | unknown }>
161161
/** Input-gateway subdevices */
162-
inputDevices: Record<string, unknown>
162+
inputDevices: Record<string, { parentDeviceName?: string; options: unknown }>
163163
/** Route Sets */
164164
routeSets?: Record<string, StudioRouteSet>
165165
/** Route Set Exclusivity Groups */

‎packages/job-worker/src/playout/upgrade.ts‎

Lines changed: 46 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import { CommonContext } from '../blueprints/context/index.js'
3030
import { JobContext } from '../jobs/index.js'
3131
import { FixUpBlueprintConfigContext } from '@sofie-automation/corelib/dist/fixUpBlueprintConfig/context'
3232
import { DEFAULT_MINIMUM_TAKE_SPAN } from '@sofie-automation/shared-lib/dist/core/constants'
33+
import { PERIPHERAL_SUBTYPE_PROCESS, PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
3334

3435
/**
3536
* Run the Blueprint applyConfig for the studio
@@ -58,37 +59,60 @@ export async function handleBlueprintUpgradeForStudio(context: JobContext, _data
5859
dev[0],
5960
literal<Complete<StudioDeviceSettings>>({
6061
name: dev[1].name ?? '',
61-
options: dev[1],
62+
options: dev[1].options ?? {},
6263
}),
6364
])
6465
)
66+
67+
const peripheralDevices = (await context.directCollections.PeripheralDevices.findFetch(
68+
{ subType: PERIPHERAL_SUBTYPE_PROCESS, 'studioAndConfigId.studioId': context.studioId },
69+
{ projection: { _id: 1, studioAndConfigId: 1 } }
70+
)) as Array<Pick<PeripheralDevice, '_id' | 'studioAndConfigId'>>
71+
6572
const playoutDevices = Object.fromEntries(
66-
Object.entries<TSR.DeviceOptionsAny>(result.playoutDevices ?? {}).map((dev) => [
67-
dev[0],
68-
literal<Complete<StudioPlayoutDevice>>({
69-
peripheralDeviceId: undefined,
70-
options: dev[1],
71-
}),
72-
])
73+
Object.entries<{ parentDeviceName?: string; options: TSR.DeviceOptionsAny }>(result.playoutDevices ?? {}).map(
74+
(dev) => {
75+
return [
76+
dev[0],
77+
literal<Complete<StudioPlayoutDevice>>({
78+
peripheralDeviceId: peripheralDevices.find(
79+
(p) => p.studioAndConfigId?.configId === dev[1].parentDeviceName
80+
)?._id,
81+
options: dev[1].options,
82+
}),
83+
]
84+
}
85+
)
7386
)
87+
7488
const ingestDevices = Object.fromEntries(
75-
Object.entries<unknown>(result.ingestDevices ?? {}).map((dev) => [
76-
dev[0],
77-
literal<Complete<StudioIngestDevice>>({
78-
peripheralDeviceId: undefined,
79-
options: dev[1],
80-
}),
81-
])
89+
Object.entries<{ parentDeviceName?: string; options: unknown }>(result.ingestDevices ?? {}).map((dev) => {
90+
return [
91+
dev[0],
92+
literal<Complete<StudioIngestDevice>>({
93+
peripheralDeviceId: peripheralDevices.find(
94+
(p) => p.studioAndConfigId?.configId === dev[1].parentDeviceName
95+
)?._id,
96+
options: dev[1].options,
97+
}),
98+
]
99+
})
82100
)
101+
83102
const inputDevices = Object.fromEntries(
84-
Object.entries<unknown>(result.inputDevices ?? {}).map((dev) => [
85-
dev[0],
86-
literal<Complete<StudioInputDevice>>({
87-
peripheralDeviceId: undefined,
88-
options: dev[1],
89-
}),
90-
])
103+
Object.entries<{ parentDeviceName?: string; options: unknown }>(result.inputDevices ?? {}).map((dev) => {
104+
return [
105+
dev[0],
106+
literal<Complete<StudioInputDevice>>({
107+
peripheralDeviceId: peripheralDevices.find(
108+
(p) => p.studioAndConfigId?.configId === dev[1].parentDeviceName
109+
)?._id,
110+
options: dev[1].options,
111+
}),
112+
]
113+
})
91114
)
115+
92116
const routeSets = Object.fromEntries(
93117
Object.entries<Partial<StudioRouteSet>>(result.routeSets ?? {}).map((dev) => [
94118
dev[0],

‎packages/webui/src/client/styles/prompter.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,13 +291,13 @@ body.prompter-scrollbar {
291291
&.heavy-light {
292292
font-weight: 600;
293293

294-
&.heavy {
294+
&.light {
295295
// color: $general-late-color;
296296
background-color: #ffe900;
297297
color: #000;
298298
}
299299

300-
&.light {
300+
&.heavy {
301301
background-color: $general-fast-color;
302302
color: #fff;
303303
text-shadow:

‎packages/webui/src/client/ui/AfterBroadcastForm.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const DEFAULT_STATE = {
3030

3131
export function AfterBroadcastForm({ playlist }: Readonly<{ playlist: DBRundownPlaylist }>): JSX.Element {
3232
const { t } = useTranslation()
33-
const shouldDeactivateRundown = isLoopRunning(playlist)
33+
const shouldDeactivateRundown = !isLoopRunning(playlist)
3434
const [problems, setProblems] = useState<ProblemType>(DEFAULT_STATE.problems)
3535
const [description, setDescription] = useState<string[]>(DEFAULT_STATE.description.slice())
3636
const [userName, setUserName] = useState<string>(DEFAULT_STATE.userName)

‎packages/webui/src/client/ui/ClockView/PresenterScreen.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,9 @@ export function usePresenterScreenSubscriptions(props: PresenterScreenProps): vo
392392

393393
useSubscription(CorelibPubSub.segments, rundownIds, {})
394394
useSubscription(CorelibPubSub.parts, rundownIds, null)
395+
useSubscription(MeteorPubSub.uiParts, playlist?._id ?? null)
395396
useSubscription(MeteorPubSub.uiPartInstances, playlist?.activationId ?? null)
397+
useSubscription(CorelibPubSub.pieces, rundownIds, null)
396398
useSubscriptions(
397399
MeteorPubSub.uiShowStyleBase,
398400
showStyleBaseIds.map((id) => [id])

0 commit comments

Comments
 (0)