Fix Time detail overlay data

sjkneisler · Apr 30, 2024 · fa1ec21 · fa1ec21
1 parent ba756ff
commit fa1ec21
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/src/components/AggregateWeekyCalendar.tsx b/app/src/components/AggregateWeekyCalendar.tsx
@@ -24,6 +24,7 @@ export const AggregateWeeklyCalendar: React.FC<{
   labels?: string[];
   labelProps?: TypographyProps[];
   granularity: ScheduleGranularity;
+  timezone: string;
 }> = ({
   availability,
   labels = [
@@ -37,6 +38,7 @@ export const AggregateWeeklyCalendar: React.FC<{
   ],
   labelProps = [],
   granularity,
+  timezone,
 }) => {
   const [currentHover, setCurrentHover] = useState<DragPosition | null>(null);
   const [schedule] = useContext(ScheduleContext);
@@ -72,7 +74,7 @@ export const AggregateWeeklyCalendar: React.FC<{
           return (
             shiftAvailabilityByTimezone(
               user.availability.weekly,
-              getTimezoneOffset(user.timezone || getCurrentTimezone()),
+              getTimezoneOffset(timezone || getCurrentTimezone()),
             )[currentHover.day][currentHover.time] === Availability.Green
           );
         })
@@ -82,7 +84,7 @@ export const AggregateWeeklyCalendar: React.FC<{
           return (
             shiftAvailabilityByTimezone(
               user.availability.weekly,
-              getTimezoneOffset(user.timezone || getCurrentTimezone()),
+              getTimezoneOffset(timezone || getCurrentTimezone()),
             )[currentHover.day][currentHover.time] === Availability.Yellow
           );
         })
@@ -92,7 +94,7 @@ export const AggregateWeeklyCalendar: React.FC<{
           return (
             shiftAvailabilityByTimezone(
               user.availability.weekly,
-              getTimezoneOffset(user.timezone || getCurrentTimezone()),
+              getTimezoneOffset(timezone || getCurrentTimezone()),
             )[currentHover.day][currentHover.time] === Availability.Red
           );
         })
@@ -133,7 +135,7 @@ export const AggregateWeeklyCalendar: React.FC<{
           <HoursGuide />
         </div>
       </div>
-      {currentHover && userAvailabilities && (
+      {currentHover && userAvailabilities && schedule.users.length > 0 && (
         <TimeDetailOverlay
           startTime={currentHover}
           userAvailabilities={userAvailabilities}

diff --git a/app/src/pages/AggregateExceptionsCalendar.tsx b/app/src/pages/AggregateExceptionsCalendar.tsx
@@ -204,6 +204,7 @@ export const AggregateExceptionsCalendar: React.FC = () => {
           labels={dayLabels}
           labelProps={dayLabelProps}
           granularity={schedule.granularity}
+          timezone={timezone}
         />
       </Stack>
     </PageContainer>

diff --git a/app/src/pages/CampaignView.tsx b/app/src/pages/CampaignView.tsx
@@ -146,6 +146,7 @@ export const CampaignView: React.FC = () => {
         <AggregateWeeklyCalendar
           availability={showAvailability}
           granularity={schedule.granularity}
+          timezone={timezone}
         />
       </Stack>
     </PageContainer>