only block calendar loading if tasks are actually being queried

Author: chpy04

src/frontend/src/pages/CalendarPage/CalendarPage.tsx

@@ -349,7 +349,7 @@ const NewCalendarPage: React.FC<NewCalendarPageProps> = ({
     conflictingReviewEventsLoading ||
     !conflictingReviewEvents ||
     tasksIsLoading ||
-    !filteredTasks
+    (showTasks && !filteredTasks)
   )
     return <LoadingIndicator />;
 
@@ -904,18 +904,18 @@ const NewCalendarPage: React.FC<NewCalendarPageProps> = ({
                   >
                     Filters
                   </Button>
-                  <FormControlLabel
-                    control={<Switch size="small" checked={showEvents} onChange={(e) => setShowEvents(e.target.checked)} />}
-                    label={<Typography sx={{ fontSize: 12, color: 'white', whiteSpace: 'nowrap' }}>Events</Typography>}
-                    sx={{ mr: 0 }}
-                  />
                   <FormControlLabel
                     control={
                       <Switch size="small" checked={allEventsMode} onChange={(e) => setAllEventsMode(e.target.checked)} />
                     }
                     label={<Typography sx={{ fontSize: 12, color: 'white', whiteSpace: 'nowrap' }}>Show All</Typography>}
                     sx={{ mr: 0 }}
                   />
+                  <FormControlLabel
+                    control={<Switch size="small" checked={showEvents} onChange={(e) => setShowEvents(e.target.checked)} />}
+                    label={<Typography sx={{ fontSize: 12, color: 'white', whiteSpace: 'nowrap' }}>Events</Typography>}
+                    sx={{ mr: 0 }}
+                  />
                   <FormControlLabel
                     control={<Switch size="small" checked={showTasks} onChange={(e) => setShowTasks(e.target.checked)} />}
                     label={<Typography sx={{ fontSize: 12, color: 'white', whiteSpace: 'nowrap' }}>Tasks</Typography>}