-
Notifications
You must be signed in to change notification settings - Fork 0
E11: WhatsApp-first operations — templates, copy buttons, and wa.me deep links #105
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.
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
Taleef7
merged 3 commits into
main
from
copilot/implement-epic-e11-whatsapp-first-operations
Feb 25, 2026
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,14 @@ | ||
| // E8 T8.4 S8.2: Admin sessions overview — list all sessions, update status, reschedule | ||
| // Closes #57 #53 | ||
| // E8 T8.4 S8.2 E11 T11.2: Admin sessions overview — list all sessions, update status, reschedule, WhatsApp actions | ||
| // Closes #57 #53 #75 | ||
|
|
||
| export const dynamic = 'force-dynamic' | ||
|
|
||
| import { createAdminClient } from '@/lib/supabase/admin' | ||
| import { SESSION_STATUS_LABELS, SESSION_STATUS_COLOURS, formatSessionTime, type SessionStatus } from '@/lib/utils/session' | ||
| import { SessionStatusForm, RescheduleForm } from './SessionActions' | ||
| import Link from 'next/link' | ||
| import { CopyMessageButton } from '@/components/CopyMessageButton' | ||
| import { templates } from '@/lib/whatsapp/templates' | ||
|
|
||
| const ADMIN_TIMEZONE = 'Asia/Karachi' | ||
|
|
||
|
|
@@ -21,15 +23,15 @@ type SessionRow = { | |
| meet_link: string | null | ||
| request_id: string | ||
| tutor_user_id: string | ||
| schedule_pattern: { duration_mins?: number } | null | ||
| schedule_pattern: { duration_mins?: number; timezone?: string } | null | ||
| tutor_profiles: { | ||
| user_profiles: { display_name: string } | null | ||
| user_profiles: { display_name: string; whatsapp_number: string | null } | null | ||
| } | null | ||
| requests: { | ||
| id: string | ||
| level: string | ||
| subjects: { name: string } | null | ||
| user_profiles: { display_name: string } | null | ||
| user_profiles: { display_name: string; whatsapp_number: string | null } | null | ||
| } | null | ||
| } | null | ||
| } | ||
|
|
@@ -44,12 +46,12 @@ export default async function AdminSessionsPage() { | |
| matches!sessions_match_id_fkey ( | ||
| meet_link, request_id, tutor_user_id, schedule_pattern, | ||
| tutor_profiles!matches_tutor_user_id_fkey ( | ||
| user_profiles!tutor_user_id ( display_name ) | ||
| user_profiles!tutor_user_id ( display_name, whatsapp_number ) | ||
| ), | ||
| requests!matches_request_id_fkey ( | ||
| id, level, | ||
| subjects ( name ), | ||
| user_profiles!requests_created_by_user_id_fkey ( display_name ) | ||
| user_profiles!requests_created_by_user_id_fkey ( display_name, whatsapp_number ) | ||
| ) | ||
| )` | ||
| ) | ||
|
|
@@ -140,12 +142,42 @@ function SessionCard({ | |
| const tutorProfile = match?.tutor_profiles | ||
| const studentName = | ||
| (req?.user_profiles as { display_name: string } | null)?.display_name ?? '—' | ||
| const studentWhatsApp = | ||
| (req?.user_profiles as { display_name: string; whatsapp_number: string | null } | null) | ||
| ?.whatsapp_number ?? null | ||
| const tutorName = | ||
| (tutorProfile?.user_profiles as { display_name: string } | null)?.display_name ?? '—' | ||
| const tutorWhatsApp = | ||
| (tutorProfile?.user_profiles as { display_name: string; whatsapp_number: string | null } | null) | ||
| ?.whatsapp_number ?? null | ||
| const subjectName = (req?.subjects as { name: string } | null)?.name ?? '—' | ||
| const levelLabel = req?.level ?? '' | ||
| const timeDisplay = formatSessionTime(session.scheduled_start_utc, adminTimezone) | ||
| const scheduleTz = match?.schedule_pattern?.timezone ?? adminTimezone | ||
| // Format session time in the schedule/student timezone for WhatsApp messages | ||
| const waTimeDisplay = formatSessionTime(session.scheduled_start_utc, scheduleTz) | ||
| const requestId = match?.request_id ?? '' | ||
| const durationMins = match?.schedule_pattern?.duration_mins ?? 60 | ||
| const meetLink = match?.meet_link ?? '' | ||
|
Comment on lines
155
to
+161
|
||
|
|
||
| // Template strings for WhatsApp buttons (use waTimeDisplay so tz label matches the time) | ||
| const rem1hMsg = meetLink | ||
| ? templates.rem1h({ | ||
| level: levelLabel, | ||
| subject: subjectName, | ||
| tutorName, | ||
| time: waTimeDisplay, | ||
| tz: scheduleTz, | ||
| meetLink, | ||
| }) | ||
| : null | ||
|
|
||
| const lateJoinMsg = meetLink | ||
| ? templates.lateJoin({ name: studentName, time: waTimeDisplay, meetLink }) | ||
| : null | ||
|
|
||
| const studentNoShowMsg = templates.studentNoShow({ name: studentName, time: waTimeDisplay }) | ||
| const tutorNoShowMsg = templates.tutorNoShow({ name: studentName }) | ||
|
|
||
| return ( | ||
| <div className="rounded-xl border border-zinc-200 bg-white p-4 shadow-sm dark:border-zinc-700 dark:bg-zinc-900"> | ||
|
|
@@ -192,6 +224,41 @@ function SessionCard({ | |
| /> | ||
| </div> | ||
| )} | ||
|
|
||
| {/* WhatsApp message buttons */} | ||
| <div className="mt-3 flex flex-wrap gap-2 border-t border-zinc-100 pt-3 dark:border-zinc-800"> | ||
| {rem1hMsg && ( | ||
| <CopyMessageButton | ||
| message={rem1hMsg} | ||
| whatsappNumber={studentWhatsApp ?? undefined} | ||
| label="Copy 1-hour reminder" | ||
| /> | ||
| )} | ||
| {lateJoinMsg && ( | ||
| <CopyMessageButton | ||
| message={lateJoinMsg} | ||
| whatsappNumber={studentWhatsApp ?? undefined} | ||
| label="Copy late join follow-up" | ||
| /> | ||
| )} | ||
| <CopyMessageButton | ||
| message={studentNoShowMsg} | ||
| whatsappNumber={studentWhatsApp ?? undefined} | ||
| label="Copy student no-show notice" | ||
| /> | ||
| <CopyMessageButton | ||
| message={tutorNoShowMsg} | ||
| whatsappNumber={studentWhatsApp ?? undefined} | ||
| label="Copy tutor no-show apology" | ||
| /> | ||
| {tutorWhatsApp && rem1hMsg && ( | ||
| <CopyMessageButton | ||
| message={rem1hMsg} | ||
| whatsappNumber={tutorWhatsApp} | ||
| label="Copy 1-hour reminder (tutor)" | ||
| /> | ||
| )} | ||
| </div> | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The tutor availability check template is pre-filled with placeholder slots (
[Day] [Time] [TZ]), which still requires manual editing before sending. If the goal is one-click “no manual typing,” consider passing real candidate slots (e.g., from request availability / schedule) or adding small UI inputs to setslot1/slot2before copying.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated in
b138922. The slot placeholders are now[e.g. Mon 5:00 PM PKT]/[e.g. Wed 5:00 PM PKT]so it's immediately clear what format to use when editing before sending. Tutor name, level, and subject are still auto-filled from the DB.