Skip to content

Commit e955a70

Browse files
nytaminnytamin
committed
Merge branch 'main' of github.com:Sofie-Automation/sofie-core
# Conflicts: # .github/workflows/prune-container-images.yml
2 parents 5863794 + 2b2dfe1 commit e955a70

File tree

26 files changed

+308
-142
lines changed

26 files changed

+308
-142
lines changed

‎.github/workflows/node.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ jobs:
239239
echo "image=$image" >> $GITHUB_OUTPUT
240240
- name: Trivy scanning
241241
if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
242-
uses: aquasecurity/trivy-action@0.29.0
242+
uses: aquasecurity/trivy-action@0.30.0
243243
env:
244244
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
245245
with:
@@ -390,7 +390,7 @@ jobs:
390390
echo "image=$image" >> $GITHUB_OUTPUT
391391
- name: Trivy scanning
392392
if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
393-
uses: aquasecurity/trivy-action@0.29.0
393+
uses: aquasecurity/trivy-action@0.30.0
394394
env:
395395
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
396396
with:

‎.github/workflows/prune-container-images.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
jobs:
99
prune-container-images:
1010
if: ${{ github.repository_owner == 'Sofie-Automation' }}
11-
1211
uses: Sofie-Automation/sofie-github-workflows/.github/workflows/prune-container-images.yml@main
1312
strategy:
1413
max-parallel: 1

‎.github/workflows/trivy.yml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Run Trivy vulnerability scanner (json)
20-
uses: aquasecurity/trivy-action@0.29.0
20+
uses: aquasecurity/trivy-action@0.30.0
2121
env:
2222
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
2323
with:
@@ -26,7 +26,7 @@ jobs:
2626
output: "${{ matrix.image }}-trivy-scan-results.json"
2727

2828
- name: Run Trivy vulnerability scanner (table)
29-
uses: aquasecurity/trivy-action@0.29.0
29+
uses: aquasecurity/trivy-action@0.30.0
3030
env:
3131
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
3232
with:
@@ -44,7 +44,7 @@ jobs:
4444
echo $CODE_BLOCK >> $GITHUB_STEP_SUMMARY
4545
4646
- name: Run Trivy in GitHub SBOM mode and submit results to Dependency Graph
47-
uses: aquasecurity/trivy-action@0.29.0
47+
uses: aquasecurity/trivy-action@0.30.0
4848
env:
4949
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
5050
with:
@@ -63,32 +63,32 @@ jobs:
6363
echo "SUMMARY=$summary" >> $GITHUB_ENV
6464
echo ${{ env.SUMMARY }}
6565
66-
- name: Send Slack Notification
67-
uses: slackapi/slack-github-action@v2.0.0
68-
with:
69-
webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
70-
webhook-type: incoming-webhook
71-
payload: |
72-
text: "Trivy scan results"
73-
blocks:
74-
- type: "header"
75-
text:
76-
type: "plain_text"
77-
text: "Trivy scan results for sofie-core-${{ matrix.image }}:latest"
78-
- type: "section"
79-
text:
80-
type: "mrkdwn"
81-
text: ":thisisfine: ${{ env.SUMMARY }}"
82-
- type: "section"
83-
text:
84-
type: "mrkdwn"
85-
text: "Read the full scan results on Github"
86-
accessory:
87-
type: "button"
88-
text:
89-
type: "plain_text"
90-
text: ":github: Scan results"
91-
emoji: true
92-
value: "workflow_run"
93-
url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
94-
action_id: "button-action"
66+
# - name: Send Slack Notification
67+
# uses: slackapi/slack-github-action@v2.1.0
68+
# with:
69+
# webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
70+
# webhook-type: incoming-webhook
71+
# payload: |
72+
# text: "Trivy scan results"
73+
# blocks:
74+
# - type: "header"
75+
# text:
76+
# type: "plain_text"
77+
# text: "Trivy scan results for sofie-core-${{ matrix.image }}:latest"
78+
# - type: "section"
79+
# text:
80+
# type: "mrkdwn"
81+
# text: ":thisisfine: ${{ env.SUMMARY }}"
82+
# - type: "section"
83+
# text:
84+
# type: "mrkdwn"
85+
# text: "Read the full scan results on Github"
86+
# accessory:
87+
# type: "button"
88+
# text:
89+
# type: "plain_text"
90+
# text: ":github: Scan results"
91+
# emoji: true
92+
# value: "workflow_run"
93+
# url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
94+
# action_id: "button-action"

‎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.7](///compare/v1.51.6...v1.51.7) (2025-05-06)
6+
7+
8+
### Features
9+
10+
* **Shelf:** increase contrast on non-selected Shelf Tabs 5e64dce
11+
* **Shelf:** make the Shelf tabs narrower e0823da
12+
13+
14+
### Bug Fixes
15+
16+
* Infinite Pieces are not de-nowified ebeb762
17+
* solution in b1045f99 was actually wrong, we should protect the Segment from being removed if it's nexted, it's going to be removed later 74136f1
18+
* update timeline-state-resolver to a test version fbe3a55
19+
* **updateNext:** do the flow for no nextPartInstance or oprhaned === 'deleted' first b480cc8
20+
521
### [1.51.6](///compare/v1.51.5...v1.51.6) (2025-01-14)
622

723

‎meteor/client/styles/shelf/shelf.scss‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,33 +128,61 @@
128128
}
129129

130130
.rundown-view__shelf__tabs__tab {
131+
position: relative;
131132
display: block;
132133
background: none;
133134
border: none;
134-
position: relative;
135135
flex: 1 1;
136136
max-width: 7em;
137-
min-width: 13em;
137+
min-width: min-content;
138138
overflow: hidden;
139139
text-overflow: ellipsis;
140140
white-space: nowrap;
141141
text-align: center;
142-
color: #8f8f8f;
143142
line-height: $inspector-shelf-tabs-height;
144143
cursor: pointer;
145144
user-select: none;
145+
padding-inline: 1.5em;
146146

147147
outline-offset: -5px;
148148

149+
// this is a setup that ensures that the min-content is calculated with this font-weight,
150+
// while we display the button with differing font-weights depending on state
151+
font-weight: 500;
152+
color: transparent;
153+
149154
&:hover {
150-
color: #fff;
151-
transition: 0.3s;
155+
// color: #fff;
156+
// transition: 0.3s;
157+
158+
> .rundown-view__shelf__tabs__tab-label {
159+
color: #fff;
160+
transition: 0.3s;
161+
}
162+
}
163+
164+
> .rundown-view__shelf__tabs__tab-label {
165+
position: absolute;
166+
top: 0;
167+
left: 0;
168+
right: 0;
169+
line-height: inherit;
170+
font-weight: 300;
171+
color: #b0b0b0;
152172
}
153173

154174
&.selected {
155-
color: #fff;
156-
font-weight: 500;
157-
text-shadow: 0 0 5px #000;
175+
// color: #fff;
176+
// font-weight: 500;
177+
// text-shadow: 0 0 5px #000;
178+
// transition: 0s;
179+
180+
> .rundown-view__shelf__tabs__tab-label {
181+
color: #fff;
182+
font-weight: 500;
183+
text-shadow: 0 0 5px #000;
184+
transition: 0s;
185+
}
158186

159187
&::after {
160188
content: ' ';

‎meteor/client/ui/Shelf/ShelfRundownLayout.tsx‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ export function ShelfRundownLayout(props: Readonly<IShelfRundownLayoutProps>): J
5252
tabIndex={0}
5353
role="tab"
5454
>
55+
<div className="rundown-view__shelf__tabs__tab-label">{t('AdLib')}</div>
5556
{t('AdLib')}
5657
</button>
5758
<button
@@ -62,6 +63,7 @@ export function ShelfRundownLayout(props: Readonly<IShelfRundownLayoutProps>): J
6263
tabIndex={0}
6364
role="tab"
6465
>
66+
<div className="rundown-view__shelf__tabs__tab-label">{t('Global AdLib')}</div>
6567
{t('Global AdLib')}
6668
</button>
6769
</>
@@ -79,21 +81,23 @@ export function ShelfRundownLayout(props: Readonly<IShelfRundownLayoutProps>): J
7981
tabIndex={0}
8082
role="tab"
8183
>
84+
<div className="rundown-view__shelf__tabs__tab-label">{panel.name}</div>
8285
{panel.name}
8386
</button>
8487
))
8588
)}
89+
<button
90+
className={ClassNames('rundown-view__shelf__tabs__tab', {
91+
selected: (props.selectedTab || SHELF_DEFAULT_TAB) === ShelfTabs.SYSTEM_HOTKEYS,
92+
})}
93+
onClick={() => onSwitchTab(ShelfTabs.SYSTEM_HOTKEYS)}
94+
tabIndex={0}
95+
role="tab"
96+
>
97+
<div className="rundown-view__shelf__tabs__tab-label">{t('Shortcuts')}</div>
98+
{t('Shortcuts')}
99+
</button>
86100
</OverflowingContainer>
87-
<button
88-
className={ClassNames('rundown-view__shelf__tabs__tab', {
89-
selected: (props.selectedTab || SHELF_DEFAULT_TAB) === ShelfTabs.SYSTEM_HOTKEYS,
90-
})}
91-
onClick={() => onSwitchTab(ShelfTabs.SYSTEM_HOTKEYS)}
92-
tabIndex={0}
93-
role="tab"
94-
>
95-
{t('Shortcuts')}
96-
</button>
97101
</div>
98102
<div className="rundown-view__shelf__panel super-dark" role="tabpanel">
99103
{!rundownLayout ? (

‎meteor/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "automation-core",
3-
"version": "1.51.6",
3+
"version": "1.51.7",
44
"private": true,
55
"engines": {
66
"node": ">=14.19.1"
@@ -100,7 +100,7 @@
100100
"react-router-dom": "^5.3.4",
101101
"react-timer-hoc": "^2.3.0",
102102
"semver": "^7.5.4",
103-
"superfly-timeline": "9.0.2",
103+
"superfly-timeline": "9.1.2",
104104
"threadedclass": "^1.2.2",
105105
"timecode": "0.0.4",
106106
"type-fest": "^3.13.1",

‎meteor/yarn.lock‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,7 +1321,7 @@ __metadata:
13211321
version: 0.0.0-use.local
13221322
resolution: "@sofie-automation/blueprints-integration@portal:../packages/blueprints-integration::locator=automation-core%40workspace%3A."
13231323
dependencies:
1324-
"@sofie-automation/shared-lib": 1.51.6
1324+
"@sofie-automation/shared-lib": 1.51.7
13251325
tslib: ^2.6.2
13261326
type-fest: ^3.13.1
13271327
languageName: node
@@ -1362,8 +1362,8 @@ __metadata:
13621362
version: 0.0.0-use.local
13631363
resolution: "@sofie-automation/corelib@portal:../packages/corelib::locator=automation-core%40workspace%3A."
13641364
dependencies:
1365-
"@sofie-automation/blueprints-integration": 1.51.6
1366-
"@sofie-automation/shared-lib": 1.51.6
1365+
"@sofie-automation/blueprints-integration": 1.51.7
1366+
"@sofie-automation/shared-lib": 1.51.7
13671367
fast-clone: ^1.5.13
13681368
i18next: ^21.10.0
13691369
influx: ^5.9.3
@@ -1394,9 +1394,9 @@ __metadata:
13941394
resolution: "@sofie-automation/job-worker@portal:../packages/job-worker::locator=automation-core%40workspace%3A."
13951395
dependencies:
13961396
"@slack/webhook": ^6.1.0
1397-
"@sofie-automation/blueprints-integration": 1.51.6
1398-
"@sofie-automation/corelib": 1.51.6
1399-
"@sofie-automation/shared-lib": 1.51.6
1397+
"@sofie-automation/blueprints-integration": 1.51.7
1398+
"@sofie-automation/corelib": 1.51.7
1399+
"@sofie-automation/shared-lib": 1.51.7
14001400
amqplib: ^0.10.3
14011401
deepmerge: ^4.3.1
14021402
elastic-apm-node: ^3.51.0
@@ -1405,7 +1405,7 @@ __metadata:
14051405
node-fetch: ^2.7.0
14061406
p-lazy: ^3.1.0
14071407
p-timeout: ^4.1.0
1408-
superfly-timeline: 9.0.2
1408+
superfly-timeline: 9.1.2
14091409
threadedclass: ^1.2.2
14101410
tslib: ^2.6.2
14111411
type-fest: ^3.13.1
@@ -1418,7 +1418,7 @@ __metadata:
14181418
resolution: "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A."
14191419
dependencies:
14201420
"@mos-connection/model": ^4.1.1
1421-
timeline-state-resolver-types: 9.2.0
1421+
timeline-state-resolver-types: 9.2.2
14221422
tslib: ^2.6.2
14231423
type-fest: ^3.13.1
14241424
languageName: node
@@ -2794,7 +2794,7 @@ __metadata:
27942794
semver: ^7.5.4
27952795
sinon: ^14.0.2
27962796
standard-version: ^9.5.0
2797-
superfly-timeline: 9.0.2
2797+
superfly-timeline: 9.1.2
27982798
threadedclass: ^1.2.2
27992799
timecode: 0.0.4
28002800
ts-jest: ^29.1.2
@@ -11570,12 +11570,12 @@ __metadata:
1157011570
languageName: node
1157111571
linkType: hard
1157211572

11573-
"superfly-timeline@npm:9.0.2":
11574-
version: 9.0.2
11575-
resolution: "superfly-timeline@npm:9.0.2"
11573+
"superfly-timeline@npm:9.1.2":
11574+
version: 9.1.2
11575+
resolution: "superfly-timeline@npm:9.1.2"
1157611576
dependencies:
1157711577
tslib: ^2.6.0
11578-
checksum: d628d467d5384f5667bc10b877478c5b8b0a91774b5d5c5e9d9d3134b8f1b760225f2fbbb0f9ccd3e55f930c9f3719f81b9347b94ea853fbc0a18bc121d97665
11578+
checksum: c195d3e65fd3d63223dd2a008facb32850b71da0355b258c0a08e1417bd447b144e01088f28e8e71fe8c240885c2bc5f73e8df7c84f131e963521510edf8bde2
1157911579
languageName: node
1158011580
linkType: hard
1158111581

@@ -11748,12 +11748,12 @@ __metadata:
1174811748
languageName: node
1174911749
linkType: hard
1175011750

11751-
"timeline-state-resolver-types@npm:9.2.0":
11752-
version: 9.2.0
11753-
resolution: "timeline-state-resolver-types@npm:9.2.0"
11751+
"timeline-state-resolver-types@npm:9.2.2":
11752+
version: 9.2.2
11753+
resolution: "timeline-state-resolver-types@npm:9.2.2"
1175411754
dependencies:
1175511755
tslib: ^2.6.2
11756-
checksum: aa51cff0d18b16c613705583f5a1c087e44df59b4b5a7e0fe2f31e52f492686a326bb3a63493b828b166dc8196d58d1470e2adcb730439e8c9ef522e796aea4e
11756+
checksum: 39404ec6c2781fe1139971a4050e485821c5316227c3b46b5784e46b47bc5cadde9cd33e135572fa1963f1b77022b2591adac40fab9a6465450e55cf230568c6
1175711757
languageName: node
1175811758
linkType: hard
1175911759

‎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.7](https://github.com/nrkno/sofie-core/compare/v1.51.6...v1.51.7) (2025-05-06)
7+
8+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
9+
10+
11+
12+
13+
614
## [1.51.6](https://github.com/nrkno/sofie-core/compare/v1.51.5...v1.51.6) (2025-01-14)
715

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

0 commit comments

Comments
 (0)