Merge pull request Sofie-Automation#1409 from bbc/upstream/show-global-adlibs-on-hidden-sourcelayers

fix: don't hide global adlibs from hidden sourceLayers

Author: nytamin

packages/meteor-lib/src/uiTypes/Adlib.ts

@@ -9,7 +9,6 @@ export interface AdLibPieceUi extends Omit<AdLibPiece, 'timelineObjectsString'>
 	sourceLayer?: ISourceLayer
 	outputLayer?: IOutputLayer
 	isGlobal?: boolean
-	isHidden?: boolean
 	isSticky?: boolean
 	isAction?: boolean
 	isClearSourceLayer?: boolean
@@ -21,7 +20,6 @@ export interface AdLibPieceUi extends Omit<AdLibPiece, 'timelineObjectsString'>
 export interface IAdLibListItem extends AdLibPieceUi {
 	sourceLayer?: ISourceLayer
 	outputLayer?: IOutputLayer
-	isHidden?: boolean
 	invalid?: boolean
 	floated?: boolean
 }

packages/webui/src/client/ui/Shelf/AdLibListView.tsx

@@ -163,10 +163,8 @@ export function AdLibListView(props: Readonly<IListViewPropsHeader>): JSX.Elemen
 		const uniquenessIds0 = new Set<string>()
 		return {
 			rundownAdLibs: props.rundownAdLibs
-				? props.rundownAdLibs.filter(
-						(item) =>
-							!item.isHidden &&
-							matchFilter(item, props.showStyleBase, liveSegment, props.filter, props.searchFilter, uniquenessIds0)
+				? props.rundownAdLibs.filter((item) =>
+						matchFilter(item, props.showStyleBase, liveSegment, props.filter, props.searchFilter, uniquenessIds0)
 				  )
 				: ([] as AdLibPieceUi[]),
 			rundownAdLibsUniqueIds: uniquenessIds0,

packages/webui/src/client/ui/Shelf/AdLibPanel.tsx

@@ -46,7 +46,7 @@ import RundownViewEventBus, {
 import { translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { i18nTranslator } from '../i18n'
 import { AdLibPieceUi, AdlibSegmentUi } from '../../lib/shelf'
-import { getShelfFollowsOnAir, getShowHiddenSourceLayers } from '../../lib/localStorage'
+import { getShelfFollowsOnAir } from '../../lib/localStorage'
 import { sortAdlibs } from '@sofie-automation/meteor-lib/dist/adlibs'
 import { AdLibPanelToolbar } from './AdLibPanelToolbar'
 import { AdLibListView } from './AdLibListView'
@@ -505,8 +505,6 @@ export function fetchAndFilter(props: IFetchAndFilterProps): AdLibFetchAndFilter
 						currentRundownId
 					)
 
-					const showHiddenSourceLayers = getShowHiddenSourceLayers()
-
 					rundownBaselineAdLibs = rundownBaselineAdLibs
 						.concat(globalAdLibActions)
 						.sort((a, b) => a._rank - b._rank)
@@ -515,14 +513,8 @@ export function fetchAndFilter(props: IFetchAndFilterProps): AdLibFetchAndFilter
 							const uiAdLib: AdLibPieceUi = _.clone(item)
 							uiAdLib.isGlobal = true
 
-							const sourceLayer = (uiAdLib.sourceLayer =
-								(item.sourceLayerId && sourceLayerLookup[item.sourceLayerId]) || undefined)
 							uiAdLib.outputLayer = (item.outputLayerId && outputLayerLookup[item.outputLayerId]) || undefined
 
-							if (sourceLayer && sourceLayer.isHidden && !showHiddenSourceLayers) {
-								uiAdLib.isHidden = true
-							}
-
 							// always add them to the list
 							return uiAdLib
 						})