Merge pull request Sofie-Automation#1318 from bbc/upstream/remove-unused-keyboardmap-and-settings

chore: remove unused keyboardmap and settings

Author: jstarpl

meteor/server/migration/1_40_0.ts

@@ -24,8 +24,6 @@ interface ISettingsOld {
 	allowRundownResetOnAir: boolean
 	/** Default duration to use to render parts when no duration is provided */
 	defaultDisplayDuration: number
-	/** If true, allows creation of new playlists in the Lobby Gui (rundown list). If false; only pre-existing playlists are allowed. */
-	allowMultiplePlaylistsInGUI: boolean
 	/** How many segments of history to show when scrolling back in time (0 = show current segment only) */
 	followOnAirSegmentsHistory: number
 	/** Clean up stuff that are older than this [ms] */

packages/meteor-lib/src/KeyboardLayout.ts

@@ -1,5 +1,3 @@
-import { KeyboardLayouts } from './KeyboardLayout'
-
 /**
  * This is an object specifying installation-wide, User Interface settings.
  * There are default values for these settings that will be used, unless overriden
@@ -21,8 +19,6 @@ export interface ISettings {
 	enableUserAccounts: boolean
 	/** Default duration to use to render parts when no duration is provided */
 	defaultDisplayDuration: number
-	/** If true, allows creation of new playlists in the Lobby Gui (rundown list). If false; only pre-existing playlists are allowed. */
-	allowMultiplePlaylistsInGUI: boolean
 	/** How many segments of history to show when scrolling back in time (0 = show current segment only) */
 	followOnAirSegmentsHistory: number
 	/** Clean up stuff that are older than this [ms] */
@@ -38,12 +34,6 @@ export interface ISettings {
 	/** Default value used to toggle Shelf options when the 'display' URL argument is not provided. */
 	defaultShelfDisplayOptions: string
 
-	/** The KeyboardPreview is a feature that is not implemented in the main Fork, and is kept here for compatibility */
-	enableKeyboardPreview: boolean
-
-	/** Keyboard map layout (what physical layout to use for the keyboard) */
-	keyboardMapLayout: KeyboardLayouts.Names
-
 	/**
 	 * CSS class applied to the body of the page. Used to include custom implementations that differ from the main Fork.
 	 * I.e. custom CSS etc. Leave undefined if no custom implementation is needed
@@ -71,14 +61,11 @@ export const DEFAULT_SETTINGS = Object.freeze<ISettings>({
 	allowGrabbingTimeline: true,
 	enableUserAccounts: false,
 	defaultDisplayDuration: 3000,
-	allowMultiplePlaylistsInGUI: false,
 	poisonKey: 'Escape',
 	followOnAirSegmentsHistory: 0,
 	maximumDataAge: 1000 * 60 * 60 * 24 * 100, // 100 days
 	enableNTPTimeChecker: null,
 	defaultShelfDisplayOptions: 'buckets,layout,shelfLayout,inspector',
-	enableKeyboardPreview: false,
-	keyboardMapLayout: KeyboardLayouts.Names.STANDARD_102_TKL,
 	useCountdownToFreezeFrame: true,
 	confirmKeyCode: 'Enter',
 })

packages/meteor-lib/src/Settings.ts

@@ -42,7 +42,6 @@ export enum RundownLayoutElementType {
 	FILTER = 'filter',
 	EXTERNAL_FRAME = 'external_frame',
 	ADLIB_REGION = 'adlib_region',
-	KEYBOARD_PREVIEW = 'keyboard_preview', // This is used by TV2
 	PIECE_COUNTDOWN = 'piece_countdown',
 	NEXT_INFO = 'next_info',
 	PLAYLIST_START_TIMER = 'playlist_start_timer',
@@ -256,10 +255,6 @@ export interface RundownLayoutFilter extends RundownLayoutFilterBase {
 	default: boolean
 }
 
-export interface RundownLayoutKeyboardPreview extends RundownLayoutElementBase {
-	type: RundownLayoutElementType.KEYBOARD_PREVIEW
-}
-
 export enum DashboardPanelUnit {
 	/** Dashboard panels are defined in absolute (em) units */
 	EM = 'em',
@@ -304,7 +299,6 @@ export type DashboardLayoutShowStyleDisplay = DashboardPanel<RundownLayoutShowSt
 export type DashboardLayoutSegmentName = DashboardPanel<RundownLayoutSegmentName>
 export type DashboardLayoutPartName = DashboardPanel<RundownLayoutPartName>
 export type DashboardLayoutColoredBox = DashboardPanel<RundownLayoutColoredBox>
-export type DashboardLayoutKeyboardPreview = DashboardPanel<RundownLayoutKeyboardPreview>
 export type DashboardLayoutMiniRundown = DashboardPanel<RundownLayoutMiniRundown>
 export type DashboardLayoutFilter = DashboardPanel<
 	RundownLayoutFilterBase & {

packages/meteor-lib/src/collections/RundownLayouts.ts

@@ -22,7 +22,6 @@ import {
 	RundownLayoutEndWords,
 	RundownLayoutExternalFrame,
 	RundownLayoutFilterBase,
-	RundownLayoutKeyboardPreview,
 	RundownLayoutMiniRundown,
 	RundownLayoutNextBreakTiming,
 	RundownLayoutNextInfo,
@@ -55,7 +54,6 @@ import { PieceInstances } from '../collections'
 import { ReadonlyDeep } from 'type-fest'
 import { TFunction } from 'i18next'
 import _ from 'underscore'
-import { Settings } from './Settings'
 import { UIPartInstances } from '../ui/Collections'
 
 export interface LayoutDescriptor {
@@ -309,9 +307,6 @@ export namespace RundownLayoutsAPI {
 		RundownLayoutElementType.PIECE_COUNTDOWN,
 		RundownLayoutElementType.NEXT_INFO,
 	]
-	if (Settings.enableKeyboardPreview) {
-		rundownLayoutSupportedFilters.push(RundownLayoutElementType.KEYBOARD_PREVIEW)
-	}
 	registry.registerShelfLayout(RundownLayoutType.RUNDOWN_LAYOUT, {
 		filtersTitle: 'Tabs',
 		supportedFilters: rundownLayoutSupportedFilters,
@@ -325,9 +320,6 @@ export namespace RundownLayoutsAPI {
 		RundownLayoutElementType.TEXT_LABEL,
 		RundownLayoutElementType.MINI_RUNDOWN,
 	]
-	if (Settings.enableKeyboardPreview) {
-		rundownLayoutSupportedFilters.push(RundownLayoutElementType.KEYBOARD_PREVIEW)
-	}
 	registry.registerShelfLayout(RundownLayoutType.DASHBOARD_LAYOUT, {
 		filtersTitle: 'Panels',
 		supportedFilters: dashboardLayoutSupportedFilters,
@@ -452,10 +444,6 @@ export namespace RundownLayoutsAPI {
 		return element.type === RundownLayoutElementType.FILTER
 	}
 
-	export function isKeyboardMap(element: RundownLayoutElementBase): element is RundownLayoutKeyboardPreview {
-		return element.type === RundownLayoutElementType.KEYBOARD_PREVIEW
-	}
-
 	export function isNextInfo(element: RundownLayoutElementBase): element is RundownLayoutNextInfo {
 		return element.type === RundownLayoutElementType.NEXT_INFO
 	}