Revert "feat: display offline indicators in all views"

This reverts commit 71b2fa8e21.
This commit is contained in:
Carlos Valente
2025-12-20 15:20:38 +01:00
committed by Carlos Valente
parent 1054ec0a5e
commit 1d7ee163a0
3 changed files with 6 additions and 44 deletions
+4 -11
View File
@@ -5,9 +5,7 @@ import { OntimeView, OntimeViewPresettable, URLPreset } from 'ontime-types';
import ViewNavigationMenu from './common/components/navigation-menu/ViewNavigationMenu';
import { PresetContext } from './common/context/PresetContext';
import { useClientPath } from './common/hooks/useClientPath';
import { useIsOnline } from './common/hooks/useSocket';
import useUrlPresets from './common/hooks-query/useUrlPresets';
import { cx } from './common/utils/styleUtils';
import { getRouteFromPreset } from './common/utils/urlPresets';
import Log from './features/log/Log';
import Loader from './views/common/loader/Loader';
@@ -16,8 +14,6 @@ import ViewLoader from './views/ViewLoader';
import { getIsNavigationLocked, sessionScope } from './externals';
import { initializeSentry } from './sentry.config';
import style from './views/ViewLoader.module.scss';
const Timer = lazy(() => import('./views/timer/Timer'));
const Countdown = lazy(() => import('./views/countdown/Countdown'));
const Backstage = lazy(() => import('./views/backstage/Backstage'));
@@ -179,7 +175,6 @@ const PresetViewMap: Record<OntimeViewPresettable, ComponentType> = {
function PresetView() {
const { data, status } = useUrlPresets();
const { alias } = useParams();
const { isOnline } = useIsOnline();
const preset: URLPreset | undefined = useMemo(() => {
if (status === 'pending' || !alias) return;
@@ -203,10 +198,10 @@ function PresetView() {
*/
if (!preset) {
return (
<div className={cx([style.viewLoader, !isOnline && style.isOffline])}>
<>
<ViewNavigationMenu isNavigationLocked={!showNav} suppressSettings />
<NotFound />
</div>
</>
);
}
@@ -219,10 +214,8 @@ function PresetView() {
const Component = PresetViewMap[preset.target as OntimeViewPresettable];
return (
<PresetContext value={preset}>
<div className={cx([style.viewLoader, !isOnline && style.isOffline])}>
<ViewNavigationMenu isNavigationLocked={getIsNavigationLocked()} suppressSettings />
{Component ? <Component /> : <NotFound />}
</div>
<ViewNavigationMenu isNavigationLocked={getIsNavigationLocked()} suppressSettings />
{Component ? <Component /> : <NotFound />}
</PresetContext>
);
}
@@ -1,27 +0,0 @@
@use '../theme/ontimeStyles' as *;
@use '../theme/ontimeColours' as *;
.viewLoader {
width: 100%;
height: 100%;
position: relative;
}
.isOffline {
&::after {
content: 'Disconnected';
position: absolute;
bottom: 0;
left: 0;
width: 100%;
padding-block: 0.25rem;
background-color: $red-700;
color: $ui-white;
text-align: center;
font-size: $aux-text-size;
font-weight: 600;
z-index: $zindex-sudo;
pointer-events: none;
font-family: $ontime-font-family;
}
}
+2 -6
View File
@@ -2,18 +2,13 @@ import { PropsWithChildren } from 'react';
import { overrideStylesURL } from '../common/api/constants';
import { useRuntimeStylesheet } from '../common/hooks/useRuntimeStylesheet';
import { useIsOnline } from '../common/hooks/useSocket';
import useViewSettings from '../common/hooks-query/useViewSettings';
import { cx } from '../common/utils/styleUtils';
import Loader from './common/loader/Loader';
import style from './ViewLoader.module.scss';
export default function ViewLoader({ children }: PropsWithChildren) {
const { data } = useViewSettings();
const { shouldRender } = useRuntimeStylesheet(data.overrideStyles ? overrideStylesURL : undefined);
const { isOnline } = useIsOnline();
// eventually we would want to leverage suspense here
// while the feature is not ready, we simply trigger a loader
@@ -23,5 +18,6 @@ export default function ViewLoader({ children }: PropsWithChildren) {
return <Loader />;
}
return <div className={cx([style.viewLoader, !isOnline && style.isOffline])}>{children}</div>;
// eslint-disable-next-line react/jsx-no-useless-fragment -- ensuring JSX return
return <>{children}</>;
}