Remove public event feature (#1645)

apps/client/src/views/common/schedule/Schedule.tsx

@@ -7,12 +7,11 @@ import ScheduleItem from './ScheduleItem';
 import './Schedule.scss';
 
 interface ScheduleProps {
-  isProduction?: boolean;
   className?: string;
 }
 
-export default function Schedule({ isProduction, className }: ScheduleProps) {
-  const { events, isBackstage, containerRef } = useSchedule();
+export default function Schedule({ className }: ScheduleProps) {
+  const { events, containerRef } = useSchedule();
 
   if (events?.length < 1) {
     return null;
@@ -21,7 +20,7 @@ export default function Schedule({ isProduction, className }: ScheduleProps) {
   return (
     <ul className={cx(['schedule', className])} ref={containerRef}>
       {events.map((event) => {
-        const { timeStart, timeEnd, delay } = getScheduledTimes(event, isProduction);
+        const { timeStart, timeEnd, delay } = getScheduledTimes(event);
 
         return (
           <ScheduleItem
@@ -29,8 +28,7 @@ export default function Schedule({ isProduction, className }: ScheduleProps) {
             timeStart={timeStart}
             timeEnd={timeEnd}
             title={event.title}
-            colour={isBackstage ? event.colour : undefined}
-            backstageEvent={!event.isPublic}
+            colour={event.colour}
             skip={event.skip}
             delay={delay}
           />

apps/client/src/views/common/schedule/ScheduleContext.tsx

@@ -19,7 +19,6 @@ interface ScheduleContextState {
   selectedEventId: string | null;
   numPages: number;
   visiblePage: number;
-  isBackstage: boolean;
   containerRef: RefObject<HTMLUListElement>;
 }
 
@@ -27,20 +26,12 @@ const ScheduleContext = createContext<ScheduleContextState | undefined>(undefine
 
 interface ScheduleProviderProps {
   selectedEventId: string | null;
-  isBackstage?: boolean;
 }
 
-export const ScheduleProvider = ({
-  children,
-  selectedEventId,
-  isBackstage = false,
-}: PropsWithChildren<ScheduleProviderProps>) => {
+export const ScheduleProvider = ({ children, selectedEventId }: PropsWithChildren<ScheduleProviderProps>) => {
   const { cycleInterval, stopCycle } = useScheduleOptions();
   const { data: events } = usePartialRundown((event: OntimeEntry) => {
-    if (isBackstage) {
-      return isOntimeEvent(event);
-    }
-    return isOntimeEvent(event) && event.isPublic && !event.skip;
+    return isOntimeEvent(event);
   });
 
   const [firstIndex, setFirstIndex] = useState(-1);
@@ -150,7 +141,6 @@ export const ScheduleProvider = ({
         selectedEventId,
         numPages,
         visiblePage,
-        isBackstage,
         containerRef,
       }}
     >

apps/client/src/views/common/schedule/ScheduleExport.tsx

@@ -7,16 +7,15 @@ import ScheduleNav from './ScheduleNav';
 
 interface ScheduleExportProps {
   selectedId: MaybeString;
-  isBackstage?: boolean;
 }
 
 export default memo(ScheduleExport);
 function ScheduleExport(props: ScheduleExportProps) {
-  const { selectedId, isBackstage } = props;
+  const { selectedId } = props;
   return (
-    <ScheduleProvider selectedEventId={selectedId} isBackstage={isBackstage}>
+    <ScheduleProvider selectedEventId={selectedId}>
       <ScheduleNav className='schedule-nav-container' />
-      <Schedule isProduction={isBackstage} className='schedule-container' />
+      <Schedule className='schedule-container' />
     </ScheduleProvider>
   );
 }

apps/client/src/views/common/schedule/ScheduleItem.tsx

@@ -16,14 +16,13 @@ interface ScheduleItemProps {
   timeStart: number;
   timeEnd: number;
   title: string;
-  backstageEvent: boolean;
   colour?: string;
   skip?: boolean;
   delay: number;
 }
 
 export default function ScheduleItem(props: ScheduleItemProps) {
-  const { timeStart, timeEnd, title, backstageEvent, colour, skip, delay } = props;
+  const { timeStart, timeEnd, title, colour, skip, delay } = props;
   const { showProjected } = useScheduleOptions();
 
   if (showProjected) {
@@ -33,7 +32,6 @@ export default function ScheduleItem(props: ScheduleItemProps) {
         timeEnd={timeEnd}
         title={title}
         colour={colour}
-        backstageEvent={backstageEvent}
         skip={skip}
         delay={delay}
       />
@@ -47,7 +45,6 @@ export default function ScheduleItem(props: ScheduleItemProps) {
         timeEnd={timeEnd}
         title={title}
         colour={colour}
-        backstageEvent={backstageEvent}
         skip={skip}
         delay={delay}
       />
@@ -63,7 +60,6 @@ export default function ScheduleItem(props: ScheduleItemProps) {
         <SuperscriptTime time={start} />
         →
         <SuperscriptTime time={end} />
-        {backstageEvent && '*'}
       </div>
       <div className='entry-title'>{title}</div>
     </li>
@@ -71,7 +67,7 @@ export default function ScheduleItem(props: ScheduleItemProps) {
 }
 
 function DelayedScheduleItem(props: ScheduleItemProps) {
-  const { timeStart, timeEnd, title, backstageEvent, colour, skip, delay } = props;
+  const { timeStart, timeEnd, title, colour, skip, delay } = props;
 
   const start = formatTime(timeStart, formatOptions);
   const end = formatTime(timeEnd, formatOptions);
@@ -86,13 +82,11 @@ function DelayedScheduleItem(props: ScheduleItemProps) {
           <SuperscriptTime time={start} />
           →
           <SuperscriptTime time={end} />
-          {backstageEvent && '*'}
         </span>
         <span className='entry-times--delay'>
           <SuperscriptTime time={delayedStart} />
           →
           <SuperscriptTime time={delayedEnd} />
-          {backstageEvent && '*'}
         </span>
       </div>
       <div className='entry-title'>{title}</div>
@@ -101,7 +95,7 @@ function DelayedScheduleItem(props: ScheduleItemProps) {
 }
 
 function ProjectedScheduleItem(props: ScheduleItemProps) {
-  const { timeStart, timeEnd, title, backstageEvent, colour, skip, delay } = props;
+  const { timeStart, timeEnd, title, colour, skip, delay } = props;
 
   return (
     <li className={cx(['entry', skip && 'entry--skip'])}>
@@ -110,7 +104,6 @@ function ProjectedScheduleItem(props: ScheduleItemProps) {
         <ProjectedTime time={timeStart} delay={delay} />
         →
         <ProjectedTime time={timeEnd} delay={delay} />
-        {backstageEvent && '*'}
       </div>
       <div className='entry-title'>{title}</div>
     </li>

apps/client/src/views/common/schedule/schedule.utils.ts

@@ -3,17 +3,10 @@ import { OntimeEvent } from 'ontime-types';
 /**
  * Gather rules for how to present scheduled times
  */
-export function getScheduledTimes(event: OntimeEvent, isProduction?: boolean) {
-  if (isProduction) {
-    return {
-      timeStart: event.timeStart,
-      timeEnd: event.timeEnd,
-      delay: event.skip ? 0 : event.delay,
-    };
-  }
+export function getScheduledTimes(event: OntimeEvent) {
   return {
     timeStart: event.timeStart,
     timeEnd: event.timeEnd,
-    delay: 0,
+    delay: event.skip ? 0 : event.delay,
   };
 }