Skip to content

Add frontend waitlist support for events #2111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steeevin88 merged 2 commits into from
Apr 28, 2026
+204 −4
Merged

Add frontend waitlist support for events #2111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbe6ac4
Add frontend waitlist support for events
miiiyyi Apr 28, 2026
c7270bf
Fix waitlist frontend lint issues
miiiyyi Apr 28, 2026
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
25 changes: 25 additions & 0 deletions src/APIFunctions/SCEvents.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,28 @@ export async function registerForSCEvent(eventId, token, payload) {

return status;
}

export async function joinWaitlistForSCEvent(eventId, token) {
const status = new ApiResponse();

try {
const res = await fetch(`${SCEVENTS_API_URL}/events/${eventId}/waitlist`, {
method: 'POST',
headers: {
Authorization: `Bearer ${token}`,
},
});

const body = await res.json();
status.responseData = body;

if (!res.ok) {
status.error = true;
}
} catch (err) {
status.error = true;
status.responseData = err;
}

return status;
}
72 changes: 68 additions & 4 deletions src/Pages/Events/CalendarView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState, useMemo, useEffect, useRef } from 'react';
import { Link } from 'react-router-dom';
import { getEventAttendanceSummary } from '../../APIFunctions/SCEvents';
import { getEventAttendanceSummary, joinWaitlistForSCEvent } from '../../APIFunctions/SCEvents';

// ─── tiny helpers ────────────────────────────────────────────────────────────

Expand Down Expand Up @@ -281,6 +281,9 @@ function EventPopup({ event, onClose, isAdminView, user }) {
const [attendeeCount, setAttendeeCount] = useState(null);
const [attendanceLoading, setAttendanceLoading] = useState(false);
const [attendanceLoaded, setAttendanceLoaded] = useState(false);
const [waitlistSubmitting, setWaitlistSubmitting] = useState(false);
const [waitlistMessage, setWaitlistMessage] = useState('');
const [waitlistError, setWaitlistError] = useState('');
const canEditEvent =
Array.isArray(event.admins) &&
userId &&
Expand All @@ -292,6 +295,13 @@ function EventPopup({ event, onClose, isAdminView, user }) {
? Math.max(maxAttendees - attendeeCount, 0)
: null;
const registrationCta = getRegistrationCta(event);
const isFull = hasCapacityLimit && typeof remainingSpots === 'number' && remainingSpots <= 0;
const shouldShowWaitlistJoin =
!canEditEvent &&
event.status === 'published' &&
!registrationCta.disabled &&
isFull &&
!!event.waitlist_enabled;

useEffect(() => {
function onKey(e) {
Expand Down Expand Up @@ -342,6 +352,41 @@ function EventPopup({ event, onClose, isAdminView, user }) {
};
}, [eventId, authToken]);

async function handleJoinWaitlist() {
setWaitlistError('');
setWaitlistMessage('');

if (!authToken) {
setWaitlistError('You must be logged in to join the waitlist.');
return;
}

if (!eventId) {
setWaitlistError('Missing event id.');
return;
}

setWaitlistSubmitting(true);
const response = await joinWaitlistForSCEvent(eventId, authToken);
setWaitlistSubmitting(false);

if (response.error) {
let msg = '';
const data = response.responseData;

if (data && typeof data === 'object' && data.error) {
msg = String(data.error);
} else if (typeof data === 'string' && data.trim()) {
msg = data.trim();
}

setWaitlistError(msg || 'Failed to join waitlist.');
return;
}

setWaitlistMessage('Joined waitlist successfully.');
}

return (
<div className="fixed inset-0 z-50 flex items-center justify-center bg-slate-950/70 p-4">
<div
Expand Down Expand Up @@ -424,7 +469,7 @@ function EventPopup({ event, onClose, isAdminView, user }) {
<p className="text-center text-xs text-slate-400">
{attendeeCount} {attendeeCount === 1 ? 'person' : 'people'} registered
{event.waitlist_enabled && (
<span className="ml-1 text-amber-300">· waitlist enabled</span>
<span className="ml-1 text-amber-300">· waitlist available</span>
)}
</p>
)}
Expand All @@ -433,7 +478,7 @@ function EventPopup({ event, onClose, isAdminView, user }) {
<p className="text-center text-xs text-slate-400">
{remainingSpots} spot{remainingSpots !== 1 ? 's' : ''} left
{event.waitlist_enabled && (
<span className="ml-1 text-amber-300">· waitlist enabled</span>
<span className="ml-1 text-amber-300">· waitlist available</span>
)}
</p>
)}
Expand Down Expand Up @@ -483,7 +528,18 @@ function EventPopup({ event, onClose, isAdminView, user }) {
</div>
)}

{!canEditEvent && event.status === 'published' && !registrationCta.disabled && (
{shouldShowWaitlistJoin && (
<button
type="button"
onClick={handleJoinWaitlist}
disabled={waitlistSubmitting}
className="inline-flex w-full items-center justify-center rounded-xl bg-gradient-to-r from-amber-500 to-orange-500 px-6 py-2.5 text-sm font-semibold text-white transition-all duration-200 hover:from-amber-400 hover:to-orange-400 disabled:cursor-not-allowed disabled:opacity-70"
>
{waitlistSubmitting ? 'Joining waitlist...' : 'Join waitlist'}
</button>
)}

{!shouldShowWaitlistJoin && !canEditEvent && event.status === 'published' && !registrationCta.disabled && (
<Link
to={`/events/${event.id}/register`}
className="inline-flex w-full items-center justify-center rounded-xl bg-gradient-to-r from-sky-500 to-indigo-500 px-6 py-2.5 text-sm font-semibold text-white transition-all duration-200 hover:from-sky-400 hover:to-indigo-400 focus:outline-none focus:ring-2 focus:ring-sky-500"
Expand All @@ -492,6 +548,14 @@ function EventPopup({ event, onClose, isAdminView, user }) {
{registrationCta.label}
</Link>
)}

{waitlistError && (
<p className="text-center text-xs text-red-300">{waitlistError}</p>
)}

{waitlistMessage && (
<p className="text-center text-xs text-emerald-300">{waitlistMessage}</p>
)}
</div>
</div>
</div>
Expand Down
53 changes: 53 additions & 0 deletions src/Pages/Events/CreateEventPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ export default function CreateEventPage() {
const [visibility, setVisibility] = useState('public');
const [minimumVisibleRole, setMinimumVisibleRole] = useState('');
const [maxAttendees, setMaxAttendees] = useState(UNLIMITED_ATTENDEES);
const [waitlistEnabled, setWaitlistEnabled] = useState(false);
const [waitlistSize, setWaitlistSize] = useState(10);
const [questions, setQuestions] = useState(defaultQuestions);
const [submitError, setSubmitError] = useState('');
const [submitting, setSubmitting] = useState(false);
Expand Down Expand Up @@ -184,6 +186,10 @@ export default function CreateEventPage() {
if (maxAttendees !== UNLIMITED_ATTENDEES && (maxAttendees === '' || maxAttendees <= 0)) {
setSubmitError('Please enter a valid max attendees, or check "No limit".');
}
if (waitlistEnabled && (!waitlistSize || Number(waitlistSize) <= 0)) {
setSubmitError('Please enter a valid waitlist size.');
return;
}

const payload = {
id: eventId,
Expand All @@ -200,6 +206,8 @@ export default function CreateEventPage() {
status,
visibility,
minimum_visible_role: visibility === 'private' ? minimumVisibleRole : '',
waitlist_enabled: waitlistEnabled,
waitlist_size: waitlistEnabled ? Number(waitlistSize) : 0,
};

setSubmitting(true);
Expand Down Expand Up @@ -364,6 +372,51 @@ export default function CreateEventPage() {
</div>
</div>

<div>
<div className="label">
<span className="label-text">Waitlist</span>
</div>

<div className="flex items-center gap-4">
<div className="max-w-xs">
{waitlistEnabled ? (
<input
type="number"
min="1"
className="w-full input input-bordered"
value={waitlistSize}
onChange={(e) => setWaitlistSize(e.target.value ? parseInt(e.target.value, 10) : '')}
placeholder="e.g. 20"
/>
) : (
<input
type="text"
className="w-full input input-bordered"
value=""
disabled
placeholder="e.g. 20"
/>
)}
</div>

<label className="flex gap-2 items-center text-sm cursor-pointer label">
<input
type="checkbox"
className="checkbox checkbox-sm"
checked={waitlistEnabled}
onChange={(e) => setWaitlistEnabled(e.target.checked)}
/>
<span className="label-text font-medium">Enable waitlist</span>
</label>
</div>

{waitlistEnabled && (
<p className="mt-2 text-xs text-gray-500 dark:text-gray-400">
Maximum number of users allowed on the waitlist.
</p>
)}
</div>

<div className="grid gap-4 sm:grid-cols-2">
<label className="w-full form-control">
<div className="label">
Expand Down
58 changes: 58 additions & 0 deletions src/Pages/Events/EditEventPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ export default function EditEventPage() {
const [visibility, setVisibility] = useState('public');
const [minimumVisibleRole, setMinimumVisibleRole] = useState('');
const [maxAttendees, setMaxAttendees] = useState(UNLIMITED_ATTENDEES);
const [waitlistEnabled, setWaitlistEnabled] = useState(false);
const [waitlistSize, setWaitlistSize] = useState(10);
const [questions, setQuestions] = useState([]);
const [eventAdmins, setEventAdmins] = useState([]);

Expand Down Expand Up @@ -93,6 +95,10 @@ export default function EditEventPage() {
setMaxAttendees(
typeof evt.max_attendees === 'number' ? evt.max_attendees : UNLIMITED_ATTENDEES,
);
setWaitlistEnabled(!!evt.waitlist_enabled);
setWaitlistSize(
typeof evt.waitlist_size === 'number' && evt.waitlist_size > 0 ? evt.waitlist_size : 10,
);
setQuestions(evt.registration_form || []);
setEventAdmins(evt.admins || []);
}
Expand Down Expand Up @@ -182,6 +188,11 @@ export default function EditEventPage() {
return;
}

if (waitlistEnabled && (!waitlistSize || Number(waitlistSize) <= 0)) {
setSubmitError('Please enter a valid waitlist size.');
return;
}

const payload = {
name: eventName.trim(),
date,
Expand All @@ -194,6 +205,8 @@ export default function EditEventPage() {
status,
visibility,
minimum_visible_role: visibility === 'private' ? minimumVisibleRole : '',
waitlist_enabled: waitlistEnabled,
waitlist_size: waitlistEnabled ? Number(waitlistSize) : 0,
};

setSubmitting(true);
Expand Down Expand Up @@ -371,6 +384,51 @@ export default function EditEventPage() {
/>
</div>

<div>
<div className="label">
<span className="label-text">Waitlist</span>
</div>

<div className="flex items-center gap-4">
<div className="max-w-xs">
{waitlistEnabled ? (
<input
type="number"
min="1"
className="w-full input input-bordered"
value={waitlistSize}
onChange={(e) => setWaitlistSize(e.target.value ? parseInt(e.target.value, 10) : '')}
placeholder="e.g. 20"
/>
) : (
<input
type="text"
className="w-full input input-bordered"
value=""
disabled
placeholder="e.g. 20"
/>
)}
</div>

<label className="flex gap-2 items-center text-sm cursor-pointer label">
<input
type="checkbox"
className="checkbox checkbox-sm"
checked={waitlistEnabled}
onChange={(e) => setWaitlistEnabled(e.target.checked)}
/>
<span className="label-text font-medium">Enable waitlist</span>
</label>
</div>

{waitlistEnabled && (
<p className="mt-2 text-xs text-gray-500 dark:text-gray-400">
Maximum number of users allowed on the waitlist.
</p>
)}
</div>

<div className="grid gap-4 sm:grid-cols-2">
<label className="w-full form-control">
<div className="label">
Expand Down
Loading