Skip to content

Commit fb99a01

Browse files
committed
fix(core): RundownPlaylist filters for Action Triggers a bit too persistent
1 parent d117426 commit fb99a01

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

packages/meteor-lib/src/triggers/actionFilterChainCompilers.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -643,10 +643,7 @@ export function compileAdLibFilter(
643643

644644
if (!matchAll) {
645645
if (!activationStateMatches || !nameMatches || !studioMatches || !rehearsalMatches) {
646-
adLibPieceTypeFilter.skip = true
647-
adLibActionTypeFilter.skip = true
648-
clearAdLibs.length = 0
649-
stickyAdLibs.length = 0
646+
return []
650647
}
651648
}
652649
}

packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/SwitchFilterType.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@ export function SwitchFilterType({
2020
<ButtonGroup size="sm" className={className}>
2121
{allowedTypes.includes('view') ? (
2222
<Button
23-
variant={selectedType === 'view' ? "primary" : "outline-secondary"}
23+
variant={selectedType === 'view' ? 'primary' : 'outline-secondary'}
2424
onClick={() => onChangeType('view')}
2525
>
2626
{t('View')}
2727
</Button>
2828
) : null}
2929
{allowedTypes.includes('rundownPlaylist') ? (
3030
<Button
31-
variant={selectedType === 'rundownPlaylist' ? "primary" : "outline-secondary"}
31+
variant={selectedType === 'rundownPlaylist' ? 'primary' : 'outline-secondary'}
3232
onClick={() => onChangeType('rundownPlaylist')}
3333
>
3434
{t('Rundown')}
3535
</Button>
3636
) : null}
3737
{allowedTypes.includes('adLib') ? (
3838
<Button
39-
variant={selectedType === 'adLib' ? "primary" : "outline-secondary"}
39+
variant={selectedType === 'adLib' ? 'primary' : 'outline-secondary'}
4040
onClick={() => onChangeType('adLib')}
4141
>
4242
{t('AdLib')}

0 commit comments

Comments
 (0)