Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified .husky/pre-commit
100644 → 100755
Empty file.
6 changes: 6 additions & 0 deletions packages/webui/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { generateEslintConfig } from '@sofie-automation/code-standard-preset/eslint/main.mjs'
import pluginReact from 'eslint-plugin-react'
import importExtensionsPlugin from 'eslint-plugin-import-extensions'
import globals from 'globals'

const tmpRules = {
Expand All @@ -11,6 +12,8 @@ const tmpRules = {
'@typescript-eslint/unbound-method': 'off',
'@typescript-eslint/no-misused-promises': 'off',
'@typescript-eslint/no-unnecessary-type-assertion': 'off',
'import-extensions/require-extensions': ['error', { expectedExtensions: ['js'] }],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These shouldn't be added here, as these are permanent additions, not Temporary rules to be removed over time

'import-extensions/require-index': ['error', { expectedExtensions: ['js'] }],
}

const extendedRules = await generateEslintConfig({
Expand All @@ -20,6 +23,9 @@ const extendedRules = await generateEslintConfig({
})
extendedRules.push(
{
plugins: {
'import-extensions': importExtensionsPlugin,
},
settings: {
react: {
version: 'detect',
Expand Down
1 change: 1 addition & 0 deletions packages/webui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
"@welldone-software/why-did-you-render": "^4.3.2",
"@xmldom/xmldom": "^0.8.10",
"babel-jest": "^29.7.0",
"eslint-plugin-import-extensions": "^0.1.5",
"globals": "^15.14.0",
"sass": "^1.83.4",
"sinon": "^14.0.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IntInputControl } from './IntInput'
import { IntInputControl } from './IntInput.js'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { faPlus, faTrash } from '@fortawesome/free-solid-svg-icons'
import { useMemo } from 'react'
Expand Down
2 changes: 1 addition & 1 deletion packages/webui/src/client/lib/Moment.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Moment, { MomentProps } from 'react-moment'
import moment from 'moment'
import { useCurrentTime } from './lib'
import { useCurrentTime } from './lib.js'

/**
* Use instead of <Moment fromNow></Moment>, its result is synced with getCurrentTime()
Expand Down
2 changes: 1 addition & 1 deletion packages/webui/src/client/lib/__tests__/lib.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useCurrentTime } from '../lib' // Adjust the import path as needed
import { useCurrentTime } from '../lib.js' // Adjust the import path as needed
import { act, renderHook } from '@testing-library/react'

describe('useCurrentTime Hook', () => {
Expand Down
Empty file.
4 changes: 2 additions & 2 deletions packages/webui/src/client/ui/RundownView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
maintainFocusOnPartInstance,
scrollToPartInstance,
getHeaderHeight,
} from '../lib/viewPort'
} from '../lib/viewPort.js'
import { AfterBroadcastForm } from './AfterBroadcastForm.js'
import { RundownRightHandControls } from './RundownView/RundownRightHandControls.js'
import { PeripheralDevicesAPI } from '../lib/clientAPI.js'
Expand All @@ -38,7 +38,7 @@ import {
} from './RundownView/RundownNotifier.js'
import { NotificationCenterPanel } from '../lib/notifications/NotificationCenterPanel.js'
import { NotificationCenter, NoticeLevel, Notification } from '../lib/notifications/notifications.js'
import { SupportPopUp } from './SupportPopUp'
import { SupportPopUp } from './SupportPopUp.js'
import { KeyboardFocusIndicator } from '../lib/KeyboardFocusIndicator.js'
import { PeripheralDeviceType } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
import { doUserAction, UserAction } from '../lib/clientUserAction.js'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import { DEFAULT_TSR_ACTION_TIMEOUT_TIME } from '@sofie-automation/shared-lib/di
import { PeripheralDeviceType } from '@sofie-automation/shared-lib/dist/peripheralDevice/peripheralDeviceAPI'
import React, { memo, useCallback } from 'react'
import { useTranslation } from 'react-i18next'
import { PeripheralDevices } from '../../collections'
import { callPeripheralDeviceAction } from '../../lib/clientAPI'
import { doModalDialog } from '../../lib/ModalDialog'
import { NotificationCenter, NoticeLevel, Notification } from '../../lib/notifications/notifications'
import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
import { i18nTranslator } from '../i18n'
import { PeripheralDevices } from '../../collections/index.js'
import { callPeripheralDeviceAction } from '../../lib/clientAPI.js'
import { doModalDialog } from '../../lib/ModalDialog.js'
import { NotificationCenter, NoticeLevel, Notification } from '../../lib/notifications/notifications.js'
import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData.js'
import { i18nTranslator } from '../i18n.js'

export const CasparCGRestartButtons = memo(function CasparCGRestartButtons({ studioId }: { studioId: StudioId }) {
const { t } = useTranslation()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/Sho
import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
import { useContext } from 'react'
import { ErrorBoundary } from '../../lib/ErrorBoundary'
import { PreviewPopUpContextProvider } from '../PreviewPopUp/PreviewPopUpContext'
import { Shelf } from '../Shelf/Shelf'
import { UserPermissionsContext } from '../UserPermissions'
import { RundownSorensenContext } from './RundownSorensenContext'
import { RundownTimingProvider } from './RundownTiming/RundownTimingProvider'
import { Settings } from '../../lib/Settings'
import { ErrorBoundary } from '../../lib/ErrorBoundary.js'
import { PreviewPopUpContextProvider } from '../PreviewPopUp/PreviewPopUpContext.js'
import { Shelf } from '../Shelf/Shelf.js'
import { UserPermissionsContext } from '../UserPermissions.js'
import { RundownSorensenContext } from './RundownSorensenContext.js'
import { RundownTimingProvider } from './RundownTiming/RundownTimingProvider.js'
import { Settings } from '../../lib/Settings.js'
import { RundownLayoutShelfBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'

interface RundownDetachedShelfProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,39 @@ import React, { useCallback, useContext, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import * as CoreIcon from '@nrk/core-icons/jsx'
import ClassNames from 'classnames'
import Escape from '../../../lib/Escape'
import Escape from '../../../lib/Escape.js'
import Tooltip from 'rc-tooltip'
import { NavLink } from 'react-router-dom'
import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
import { Rundown, getRundownNrcsName } from '@sofie-automation/corelib/dist/dataModel/Rundown'
import { ContextMenu, MenuItem, ContextMenuTrigger } from '@jstarpl/react-contextmenu'
import { PieceUi } from '../../SegmentTimeline/SegmentTimelineContainer'
import { RundownSystemStatus } from '../RundownSystemStatus'
import { getHelpMode } from '../../../lib/localStorage'
import { reloadRundownPlaylistClick } from '../RundownNotifier'
import { useRundownViewEventBusListener } from '../../../lib/lib'
import { PieceUi } from '../../SegmentTimeline/SegmentTimelineContainer.js'
import { RundownSystemStatus } from '../RundownSystemStatus.js'
import { getHelpMode } from '../../../lib/localStorage.js'
import { reloadRundownPlaylistClick } from '../RundownNotifier.js'
import { useRundownViewEventBusListener } from '../../../lib/lib.js'
import { RundownLayoutRundownHeader } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
import { contextMenuHoldToDisplayTime } from '../../../lib/lib'
import { contextMenuHoldToDisplayTime } from '../../../lib/lib.js'
import {
ActivateRundownPlaylistEvent,
DeactivateRundownPlaylistEvent,
IEventContext,
RundownViewEvents,
} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
import { RundownLayoutsAPI } from '../../../lib/rundownLayouts'
import { RundownLayoutsAPI } from '../../../lib/rundownLayouts.js'
import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
import { BucketAdLibItem } from '../../Shelf/RundownViewBuckets'
import { IAdLibListItem } from '../../Shelf/AdLibListItem'
import { ShelfDashboardLayout } from '../../Shelf/ShelfDashboardLayout'
import { BucketAdLibItem } from '../../Shelf/RundownViewBuckets.js'
import { IAdLibListItem } from '../../Shelf/AdLibListItem.js'
import { ShelfDashboardLayout } from '../../Shelf/ShelfDashboardLayout.js'
import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
import { RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
import { UserPermissionsContext } from '../../UserPermissions'
import * as RundownResolver from '../../../lib/RundownResolver'
import { UserPermissionsContext } from '../../UserPermissions.js'
import * as RundownResolver from '../../../lib/RundownResolver.js'
import Navbar from 'react-bootstrap/Navbar'
import { WarningDisplay } from '../WarningDisplay'
import { TimingDisplay } from './TimingDisplay'
import { checkRundownTimes, useRundownPlaylistOperations } from './useRundownPlaylistOperations'
import { WarningDisplay } from '../WarningDisplay.js'
import { TimingDisplay } from './TimingDisplay.js'
import { checkRundownTimes, useRundownPlaylistOperations } from './useRundownPlaylistOperations.js'

interface IRundownHeaderProps {
playlist: DBRundownPlaylist
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { RundownPlaylists, Rundowns } from '../../../collections'
import { RundownPlaylists, Rundowns } from '../../../collections/index.js'
import {
ReloadRundownPlaylistResponse,
TriggerReloadDataResponse,
} from '@sofie-automation/meteor-lib/dist/api/userActions'
import _ from 'underscore'
import { RundownPlaylistCollectionUtil } from '../../../collections/rundownPlaylistUtil'
import { RundownPlaylistCollectionUtil } from '../../../collections/rundownPlaylistUtil.js'
import * as i18next from 'i18next'
import { UserPermissions } from '../../UserPermissions'
import { NoticeLevel, Notification, NotificationCenter } from '../../../lib/notifications/notifications'
import { UserPermissions } from '../../UserPermissions.js'
import { NoticeLevel, Notification, NotificationCenter } from '../../../lib/notifications/notifications.js'
import { RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
import { getRundownNrcsName } from '@sofie-automation/corelib/dist/dataModel/Rundown'
import { UserAction } from '@sofie-automation/meteor-lib/dist/userAction'
import { Tracker } from 'meteor/tracker'
import { doUserAction } from '../../../lib/clientUserAction'
import { MeteorCall } from '../../../lib/meteorApi'
import { doModalDialog } from '../../../lib/ModalDialog'
import { doUserAction } from '../../../lib/clientUserAction.js'
import { MeteorCall } from '../../../lib/meteorApi.js'
import { doModalDialog } from '../../../lib/ModalDialog.js'

export function handleRundownPlaylistReloadResponse(
t: i18next.TFunction,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import { DBRundownPlaylist, RundownHoldState } from '@sofie-automation/corelib/d
import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
import { RundownLayoutRundownHeader } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
import { useTranslation } from 'react-i18next'
import * as RundownResolver from '../../../lib/RundownResolver'
import { AutoNextStatus } from '../RundownTiming/AutoNextStatus'
import { CurrentPartOrSegmentRemaining } from '../RundownTiming/CurrentPartOrSegmentRemaining'
import { NextBreakTiming } from '../RundownTiming/NextBreakTiming'
import { PlaylistEndTiming } from '../RundownTiming/PlaylistEndTiming'
import { PlaylistStartTiming } from '../RundownTiming/PlaylistStartTiming'
import { RundownName } from '../RundownTiming/RundownName'
import { TimeOfDay } from '../RundownTiming/TimeOfDay'
import { useTiming } from '../RundownTiming/withTiming'
import * as RundownResolver from '../../../lib/RundownResolver.js'
import { AutoNextStatus } from '../RundownTiming/AutoNextStatus.js'
import { CurrentPartOrSegmentRemaining } from '../RundownTiming/CurrentPartOrSegmentRemaining.js'
import { NextBreakTiming } from '../RundownTiming/NextBreakTiming.js'
import { PlaylistEndTiming } from '../RundownTiming/PlaylistEndTiming.js'
import { PlaylistStartTiming } from '../RundownTiming/PlaylistStartTiming.js'
import { RundownName } from '../RundownTiming/RundownName.js'
import { TimeOfDay } from '../RundownTiming/TimeOfDay.js'
import { useTiming } from '../RundownTiming/withTiming.js'

interface ITimingDisplayProps {
rundownPlaylist: DBRundownPlaylist
Expand Down
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
import { SerializedUserError, UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/error'
import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
import { UserAction } from '@sofie-automation/meteor-lib/dist/userAction'
import { doUserAction } from '../../../lib/clientUserAction'
import { MeteorCall } from '../../../lib/meteorApi'
import { doModalDialog } from '../../../lib/ModalDialog'
import { doUserAction } from '../../../lib/clientUserAction.js'
import { MeteorCall } from '../../../lib/meteorApi.js'
import { doModalDialog } from '../../../lib/ModalDialog.js'
import { useTranslation } from 'react-i18next'
import React, { useContext, useEffect, useMemo } from 'react'
import { UserPermissions, UserPermissionsContext } from '../../UserPermissions'
import { UserPermissions, UserPermissionsContext } from '../../UserPermissions.js'
import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
import { logger } from '../../../lib/logging'
import { logger } from '../../../lib/logging.js'
import * as i18next from 'i18next'
import { NoticeLevel, Notification, NotificationCenter } from '../../../lib/notifications/notifications'
import { NoticeLevel, Notification, NotificationCenter } from '../../../lib/notifications/notifications.js'
import { Meteor } from 'meteor/meteor'
import { Tracker } from 'meteor/tracker'
import RundownViewEventBus, { RundownViewEvents } from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
import { handleRundownPlaylistReloadResponse } from './RundownReloadResponse'
import { scrollToPartInstance } from '../../../lib/viewPort'
import { hashSingleUseToken } from '../../../lib/lib'
import { handleRundownPlaylistReloadResponse } from './RundownReloadResponse.js'
import { scrollToPartInstance } from '../../../lib/viewPort.js'
import { hashSingleUseToken } from '../../../lib/lib.js'
import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
import { getCurrentTime } from '../../../lib/systemTime'
import { getCurrentTime } from '../../../lib/systemTime.js'
import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
import { REHEARSAL_MARGIN } from '../WarningDisplay'
import { REHEARSAL_MARGIN } from '../WarningDisplay.js'
import { RundownPlaylistTiming } from '@sofie-automation/blueprints-integration'

class RundownPlaylistOperationsService {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/Rund
import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
import { useContext } from 'react'
import { isEventInInputField } from '../../lib/lib'
import { isModalShowing } from '../../lib/ModalDialog'
import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
import { RundownPlaylistClientUtil } from '../../lib/rundownPlaylistUtil'
import { SorensenContext } from '../../lib/SorensenContext'
import { TriggersHandler } from '../../lib/triggers/TriggersHandler'
import { UIParts } from '../Collections'
import { UserPermissionsContext } from '../UserPermissions'
import { isEventInInputField } from '../../lib/lib.js'
import { isModalShowing } from '../../lib/ModalDialog.js'
import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData.js'
import { RundownPlaylistClientUtil } from '../../lib/rundownPlaylistUtil.js'
import { SorensenContext } from '../../lib/SorensenContext.js'
import { TriggersHandler } from '../../lib/triggers/TriggersHandler.js'
import { UIParts } from '../Collections.js'
import { UserPermissionsContext } from '../UserPermissions.js'

interface RundownSorensenContextProps {
playlist: DBRundownPlaylist
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from 'react'
import { RundownTimingProvider } from './RundownTiming/RundownTimingProvider'
import StudioContext from './StudioContext'
import { RundownPlaylistOperationsContextProvider } from './RundownHeader/useRundownPlaylistOperations'
import { PreviewPopUpContextProvider } from '../PreviewPopUp/PreviewPopUpContext'
import { SelectedElementProvider } from './SelectedElementsContext'
import { RundownTimingProvider } from './RundownTiming/RundownTimingProvider.js'
import StudioContext from './StudioContext.js'
import { RundownPlaylistOperationsContextProvider } from './RundownHeader/useRundownPlaylistOperations.js'
import { PreviewPopUpContextProvider } from '../PreviewPopUp/PreviewPopUpContext.js'
import { SelectedElementProvider } from './SelectedElementsContext.js'
import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
import { Settings } from '../../lib/Settings'
import { Settings } from '../../lib/Settings.js'
import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ import {
useSubscriptionIfEnabledReadyOnce,
useSubscriptions,
useTracker,
} from '../../lib/ReactMeteorData/react-meteor-data'
} from '../../lib/ReactMeteorData/react-meteor-data.js'
import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
import { meteorSubscribe } from '../../lib/meteorApi'
import { meteorSubscribe } from '../../lib/meteorApi.js'
import { PartInstanceId, RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
import { RundownPlaylists, Rundowns } from '../../collections'
import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
import { RundownPlaylists, Rundowns } from '../../collections/index.js'
import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil.js'
import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
import { useRundownAndShowStyleIdsForPlaylist } from '../util/useRundownAndShowStyleIdsForPlaylist'
import { useRundownAndShowStyleIdsForPlaylist } from '../util/useRundownAndShowStyleIdsForPlaylist.js'

export function useRundownViewSubscriptions(playlistId: RundownPlaylistId): boolean {
const requiredSubsReady: boolean[] = []
Expand Down
4 changes: 2 additions & 2 deletions packages/webui/src/client/ui/RundownView/WarningDisplay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel
import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
import React, { useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { ModalDialog } from '../../lib/ModalDialog'
import { useCurrentTime } from '../../lib/lib'
import { ModalDialog } from '../../lib/ModalDialog.js'
import { useCurrentTime } from '../../lib/lib.js'

export const REHEARSAL_MARGIN = 1 * 60 * 1000

Expand Down
Loading
Loading