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
76 changes: 65 additions & 11 deletions src/components/availability/availability.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { GroupResponses } from "@/components/availability/group-responses";
import { AvailabilityHeader } from "@/components/availability/header/availability-header";
import { PersonalAvailability } from "@/components/availability/personal-availability";
import {
deduplicateRooms,
groupRawRoomsByKey,
RoomRecommendationSettings,
} from "@/components/availability/room-recommendations";
Expand Down Expand Up @@ -45,6 +46,8 @@ import { useAvailabilityStore } from "@/store/useAvailabilityStore";
import { MobilePersonalAvailabilitySidebar } from "../nav/mobile-personal-availability";
import { PersonalAvailabilitySidebar } from "../nav/personal-availability-sidebar";
import { MobileGroupResponses } from "./mobile-group-responses";
import { MobileRoomRecommendations } from "./mobile-room-recommendations";
import { MobileRoomWheelPicker } from "./mobile-room-wheel-picker";
import { MobileScheduleSettings } from "./mobile-schedule-settings";

const LG_UP_MEDIA = "(min-width: 1024px)";
Expand Down Expand Up @@ -239,6 +242,7 @@ export function Availability({
} = useRoomRecommendations(availabilityDates);

const [selectedRoomIds, setSelectedRoomIds] = useState<string[]>([]);
const [isMobileRoomsDrawerOpen, setIsMobileRoomsDrawerOpen] = useState(false);

const showRoomPreviews =
availabilityView === "group" || availabilityView === "schedule";
Expand All @@ -254,6 +258,17 @@ export function Availability({
[studyRooms],
);

const mobileRoomCount = useMemo(
() => deduplicateRooms(studyRooms).length,
[studyRooms],
);

useEffect(() => {
if (availabilityView !== "group") {
setIsMobileRoomsDrawerOpen(false);
}
}, [availabilityView]);

const handleImportSlotsFromMeeting = useCallback(
({
meetingAvailabilities,
Expand Down Expand Up @@ -430,13 +445,23 @@ export function Availability({
}, [router, returnToPath, setAvailabilityView, user]);

const handleMobileOpenAttendees = useCallback(() => {
setIsMobileRoomsDrawerOpen(false);
setIsMobileDrawerOpen(true);
}, [setIsMobileDrawerOpen]);

const handleMobileSchedule = useCallback(() => {
setAvailabilityView("schedule");
}, [setAvailabilityView]);

const handleMobileOpenRooms = useCallback(() => {
setIsMobileDrawerOpen(false);
setIsMobileRoomsDrawerOpen(true);
}, [setIsMobileDrawerOpen]);

const handleCloseMobileRooms = useCallback(() => {
setIsMobileRoomsDrawerOpen(false);
}, []);

return (
<StudyRoomHoverProvider
showRoomPreviews={showRoomPreviews}
Expand Down Expand Up @@ -582,17 +607,46 @@ export function Availability({
onOpenAttendees={handleMobileOpenAttendees}
/>
) : (
<MobileGroupResponses
isOwner={isMeetingOwner}
respondedMembersCount={Math.max(
0,
members.length - pendingMembers.length,
)}
pendingMembersCount={pendingMembers.length}
onAddAvailability={handleMobileAddAvailability}
onOpenAttendees={handleMobileOpenAttendees}
onSchedule={handleMobileSchedule}
/>
<>
{hasSearchedRooms &&
studyRooms.length > 0 &&
!isMobileRoomsDrawerOpen && (
<MobileRoomWheelPicker
rawRooms={studyRooms}
rawRoomsByKey={rawRoomsByKey}
filters={roomFilters}
selectedRoomIds={selectedRoomIds}
onSelectedRoomIdsChange={setSelectedRoomIds}
/>
)}
<MobileGroupResponses
isOwner={isMeetingOwner}
respondedMembersCount={Math.max(
0,
members.length - pendingMembers.length,
)}
pendingMembersCount={pendingMembers.length}
roomCount={mobileRoomCount}
hasSearchedRooms={hasSearchedRooms}
onAddAvailability={handleMobileAddAvailability}
onOpenAttendees={handleMobileOpenAttendees}
onOpenRooms={handleMobileOpenRooms}
onSchedule={handleMobileSchedule}
/>
<MobileRoomRecommendations
open={isMobileRoomsDrawerOpen}
onClose={handleCloseMobileRooms}
rawRooms={studyRooms}
hasSearched={hasSearchedRooms}
filters={roomFilters}
onFiltersChange={setRoomFilters}
onShowBestRooms={handleShowBestRooms}
isLoading={isRoomsLoading}
errorMessage={studyRoomsError}
selectedRoomIds={selectedRoomIds}
onSelectedRoomIdsChange={setSelectedRoomIds}
/>
</>
)}
</div>
</div>
Expand Down
18 changes: 18 additions & 0 deletions src/components/availability/mobile-group-responses.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"use client";

import {
Apartment,
CalendarMonthOutlined,
EditCalendarOutlined,
PeopleAltOutlined,
Expand All @@ -20,23 +21,40 @@ export interface MobileGroupResponsesProps {
isOwner: boolean;
respondedMembersCount: number;
pendingMembersCount: number;
roomCount: number;
hasSearchedRooms: boolean;
onAddAvailability: () => void;
onOpenAttendees: () => void;
onOpenRooms: () => void;
onSchedule: () => void;
}

export function MobileGroupResponses({
isOwner,
respondedMembersCount,
pendingMembersCount,
roomCount,
hasSearchedRooms,
onAddAvailability,
onOpenAttendees,
onOpenRooms,
onSchedule,
}: MobileGroupResponsesProps) {
const roomsLabel = hasSearchedRooms ? `${roomCount} Rooms` : "Rooms";

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

P3: Rooms label uses a hardcoded plural "Rooms", causing "1 Rooms" when roomCount is 1 instead of "1 Room".

Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At src/components/availability/mobile-group-responses.tsx, line 43:

<comment>Rooms label uses a hardcoded plural "Rooms", causing "1 Rooms" when roomCount is 1 instead of "1 Room".</comment>

<file context>
@@ -20,23 +21,40 @@ export interface MobileGroupResponsesProps {
+	onOpenRooms,
 	onSchedule,
 }: MobileGroupResponsesProps) {
+	const roomsLabel = hasSearchedRooms ? `${roomCount} Rooms` : "Rooms";
+
 	return (
</file context>


return (
<div>
<MobileIsland>
<div className="flex w-full min-w-0">
<Button color="inherit" sx={actionButtonSx} onClick={onOpenRooms}>
<Stack spacing={0.5} alignItems="center">
<Apartment fontSize="small" />
<Typography variant="caption">{roomsLabel}</Typography>
</Stack>
</Button>

<Divider orientation="vertical" flexItem />

<Button color="inherit" sx={actionButtonSx} onClick={onOpenAttendees}>
<Stack spacing={0.5} alignItems="center">
<PeopleAltOutlined fontSize="small" />
Expand Down
36 changes: 36 additions & 0 deletions src/components/availability/mobile-room-recommendations.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
"use client";

import {
RoomRecommendationSettings,
type StudyRoomApiEntry,
} from "@/components/availability/room-recommendations";
import { MuiBottomSheet } from "@/components/ui/mui/mui-bottom-sheet";
import type { RoomFilters } from "@/lib/types/studyrooms";

const mobileSheetPaperSx = { px: 2, py: 1 } as const;

export interface MobileRoomRecommendationsProps {
open: boolean;
onClose: () => void;
rawRooms: StudyRoomApiEntry[];
hasSearched: boolean;
filters: RoomFilters;
onFiltersChange: (filters: RoomFilters) => void;
onShowBestRooms: () => void;
isLoading: boolean;
errorMessage: string | null;
selectedRoomIds: string[];
onSelectedRoomIdsChange: (ids: string[]) => void;
}

export function MobileRoomRecommendations({
open,
onClose,
...roomProps
}: MobileRoomRecommendationsProps) {
return (
<MuiBottomSheet open={open} onClose={onClose} paperSx={mobileSheetPaperSx}>
<RoomRecommendationSettings layout="sheet" {...roomProps} />
</MuiBottomSheet>
);
}
Loading
Loading