Some checks failed
CI/CD Pipeline / Backend Tests (push) Has been cancelled
CI/CD Pipeline / Frontend Tests (push) Has been cancelled
CI/CD Pipeline / Build Docker Images (push) Has been cancelled
CI/CD Pipeline / Security Scan (push) Has been cancelled
CI/CD Pipeline / Deploy to Staging (push) Has been cancelled
CI/CD Pipeline / Deploy to Production (push) Has been cancelled
## Overview
Complete architectural overhaul merging dual event systems into a unified activity model
with multi-VIP support, enhanced search capabilities, and improved UX throughout.
## Database & Schema Changes
### Unified Activity Model (Breaking Change)
- Merged Event/EventTemplate/EventAttendance into single ScheduleEvent model
- Dropped duplicate tables: Event, EventAttendance, EventTemplate
- Single source of truth for all activities (transport, meals, meetings, events)
- Migration: 20260131180000_drop_duplicate_event_tables
### Multi-VIP Support (Breaking Change)
- Changed schema from single vipId to vipIds array (String[])
- Enables multiple VIPs per activity (ridesharing, group events)
- Migration: 20260131122613_multi_vip_support
- Updated all backend services to handle multi-VIP queries
### Seed Data Updates
- Rebuilt seed.ts with unified activity model
- Added multi-VIP rideshare examples (3 VIPs in SUV, 4 VIPs in van)
- Includes mix of transport + non-transport activities
- Balanced VIP test data (50% OFFICE_OF_DEVELOPMENT, 50% ADMIN)
## Backend Changes
### Services Cleanup
- Removed deprecated common-events endpoints
- Updated EventsService for multi-VIP support
- Enhanced VipsService with multi-VIP activity queries
- Updated DriversService, VehiclesService for unified model
- Added add-vips-to-event.dto for bulk VIP assignment
### Abilities & Permissions
- Updated ability.factory.ts: Event → ScheduleEvent subject
- Enhanced guards for unified activity permissions
- Maintained RBAC (Administrator, Coordinator, Driver roles)
### DTOs
- Updated create-event.dto: vipId → vipIds array
- Updated update-event.dto: vipId → vipIds array
- Added add-vips-to-event.dto for bulk operations
- Removed obsolete event-template DTOs
## Frontend Changes
### UI/UX Improvements
**Renamed "Schedule" → "Activities" Throughout**
- More intuitive terminology for coordinators
- Updated navigation, page titles, buttons
- Changed "Schedule Events" to "Activities" in Admin Tools
**Activities Page Enhancements**
- Added comprehensive search bar (searches: title, location, description, VIP names, driver, vehicle)
- Added sortable columns: Title, Type, VIPs, Start Time, Status
- Visual sort indicators (↑↓ arrows)
- Real-time result count when searching
- Empty state with helpful messaging
**Admin Tools Updates**
- Balanced VIP test data: 10 OFFICE_OF_DEVELOPMENT + 10 ADMIN
- More BSA-relevant organizations (Coca-Cola, AT&T, Walmart vs generic orgs)
- BSA leadership titles (National President, Chief Scout Executive, Regional Directors)
- Relabeled "Schedule Events" → "Activities"
### Component Updates
**EventList.tsx (Activities Page)**
- Added search state management with real-time filtering
- Implemented multi-field sorting with direction toggle
- Enhanced empty states for search + no data scenarios
- Filter tabs + search work together seamlessly
**VIPSchedule.tsx**
- Updated for multi-VIP schema (vipIds array)
- Shows complete itinerary timeline per VIP
- Displays all activities for selected VIP
- Groups by day with formatted dates
**EventForm.tsx**
- Updated to handle vipIds array instead of single vipId
- Multi-select VIP assignment
- Maintains backward compatibility
**AdminTools.tsx**
- New balanced VIP test data (10/10 split)
- BSA-context organizations
- Updated button labels ("Add Test Activities")
### Routing & Navigation
- Removed /common-events routes
- Updated navigation menu labels
- Maintained protected route structure
- Cleaner URL structure
## New Features
### Multi-VIP Activity Support
- Activities can have multiple VIPs (ridesharing, group events)
- Efficient seat utilization tracking (3/6 seats, 4/12 seats)
- Better coordination for shared transport
### Advanced Search & Filtering
- Full-text search across multiple fields
- Instant filtering as you type
- Search + type filters work together
- Clear visual feedback (result counts)
### Sortable Data Tables
- Click column headers to sort
- Toggle ascending/descending
- Visual indicators for active sort
- Sorts persist with search/filter
### Enhanced Admin Tools
- One-click test data generation
- Realistic BSA Jamboree scenario data
- Balanced department representation
- Complete 3-day itineraries per VIP
## Testing & Validation
### Playwright E2E Tests
- Added e2e/ directory structure
- playwright.config.ts configured
- PLAYWRIGHT_GUIDE.md documentation
- Ready for comprehensive E2E testing
### Manual Testing Performed
- Multi-VIP activity creation ✓
- Search across all fields ✓
- Column sorting (all fields) ✓
- Filter tabs + search combination ✓
- Admin Tools data generation ✓
- Database migrations ✓
## Breaking Changes & Migration
**Database Schema Changes**
1. Run migrations: `npx prisma migrate deploy`
2. Reseed database: `npx prisma db seed`
3. Existing data incompatible (dev environment - safe to nuke)
**API Changes**
- POST /events now requires vipIds array (not vipId string)
- GET /events returns vipIds array
- GET /vips/:id/schedule updated for multi-VIP
- Removed /common-events/* endpoints
**Frontend Type Changes**
- ScheduleEvent.vipIds: string[] (was vipId: string)
- EventFormData updated accordingly
- All pages handle array-based VIP assignment
## File Changes Summary
**Added:**
- backend/prisma/migrations/20260131180000_drop_duplicate_event_tables/
- backend/src/events/dto/add-vips-to-event.dto.ts
- frontend/src/components/InlineDriverSelector.tsx
- frontend/e2e/ (Playwright test structure)
- Documentation: NAVIGATION_UX_IMPROVEMENTS.md, PLAYWRIGHT_GUIDE.md
**Modified:**
- 30+ backend files (schema, services, DTOs, abilities)
- 20+ frontend files (pages, components, types)
- Admin tools, seed data, navigation
**Removed:**
- Event/EventAttendance/EventTemplate database tables
- Common events frontend pages
- Obsolete event template DTOs
## Next Steps
**Pending (Phase 3):**
- Activity Templates for bulk event creation
- Operations Dashboard (today's activities + conflicts)
- Complete workflow testing with real users
- Additional E2E test coverage
## Notes
- Development environment - no production data affected
- Database can be reset anytime: `npx prisma migrate reset`
- All servers tested and running successfully
- HMR working correctly for frontend changes
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
307 lines
11 KiB
TypeScript
307 lines
11 KiB
TypeScript
import { useQuery } from '@tanstack/react-query';
|
|
import { api } from '@/lib/api';
|
|
import { Users, Car, Calendar, Plane, Clock } from 'lucide-react';
|
|
import { VIP, Driver, ScheduleEvent } from '@/types';
|
|
import { formatDateTime } from '@/lib/utils';
|
|
|
|
interface Flight {
|
|
id: string;
|
|
vipId: string;
|
|
vip?: {
|
|
name: string;
|
|
organization: string | null;
|
|
};
|
|
flightNumber: string;
|
|
flightDate: string;
|
|
segment: number;
|
|
departureAirport: string;
|
|
arrivalAirport: string;
|
|
scheduledDeparture: string | null;
|
|
scheduledArrival: string | null;
|
|
actualDeparture: string | null;
|
|
actualArrival: string | null;
|
|
status: string | null;
|
|
}
|
|
|
|
export function Dashboard() {
|
|
const { data: vips } = useQuery<VIP[]>({
|
|
queryKey: ['vips'],
|
|
queryFn: async () => {
|
|
const { data } = await api.get('/vips');
|
|
return data;
|
|
},
|
|
});
|
|
|
|
const { data: drivers } = useQuery<Driver[]>({
|
|
queryKey: ['drivers'],
|
|
queryFn: async () => {
|
|
const { data } = await api.get('/drivers');
|
|
return data;
|
|
},
|
|
});
|
|
|
|
const { data: events } = useQuery<ScheduleEvent[]>({
|
|
queryKey: ['events'],
|
|
queryFn: async () => {
|
|
const { data } = await api.get('/events');
|
|
return data;
|
|
},
|
|
});
|
|
|
|
const { data: flights } = useQuery<Flight[]>({
|
|
queryKey: ['flights'],
|
|
queryFn: async () => {
|
|
const { data } = await api.get('/flights');
|
|
return data;
|
|
},
|
|
});
|
|
|
|
const today = new Date();
|
|
today.setHours(0, 0, 0, 0);
|
|
const tomorrow = new Date(today);
|
|
tomorrow.setDate(tomorrow.getDate() + 1);
|
|
|
|
const eventsToday = events?.filter((e) => {
|
|
const eventDate = new Date(e.startTime);
|
|
return eventDate >= today && eventDate < tomorrow && e.status !== 'CANCELLED';
|
|
}).length || 0;
|
|
|
|
const flightsToday = flights?.filter((f) => {
|
|
const flightDate = new Date(f.flightDate);
|
|
return flightDate >= today && flightDate < tomorrow;
|
|
}).length || 0;
|
|
|
|
const upcomingEvents = events
|
|
?.filter((e) => e.status === 'SCHEDULED' && new Date(e.startTime) >= today)
|
|
.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
|
|
.slice(0, 5) || [];
|
|
|
|
const upcomingFlights = flights
|
|
?.filter((f) => {
|
|
const flightDate = new Date(f.flightDate);
|
|
return flightDate >= today && f.status !== 'cancelled';
|
|
})
|
|
.sort((a, b) => new Date(a.flightDate).getTime() - new Date(b.flightDate).getTime())
|
|
.slice(0, 5) || [];
|
|
|
|
const stats = [
|
|
{
|
|
name: 'Total VIPs',
|
|
value: vips?.length || 0,
|
|
icon: Users,
|
|
color: 'bg-blue-500',
|
|
},
|
|
{
|
|
name: 'Active Drivers',
|
|
value: drivers?.length || 0,
|
|
icon: Car,
|
|
color: 'bg-green-500',
|
|
},
|
|
{
|
|
name: 'Events Today',
|
|
value: eventsToday,
|
|
icon: Clock,
|
|
color: 'bg-purple-500',
|
|
},
|
|
{
|
|
name: 'Flights Today',
|
|
value: flightsToday,
|
|
icon: Plane,
|
|
color: 'bg-indigo-500',
|
|
},
|
|
];
|
|
|
|
return (
|
|
<div>
|
|
<h1 className="text-2xl sm:text-3xl font-bold text-gray-900 mb-6 md:mb-8">Dashboard</h1>
|
|
|
|
{/* Stats Grid */}
|
|
<div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-4 mb-6 md:mb-8">
|
|
{stats.map((stat) => {
|
|
const Icon = stat.icon;
|
|
return (
|
|
<div
|
|
key={stat.name}
|
|
className="bg-white overflow-hidden shadow rounded-lg"
|
|
>
|
|
<div className="p-5">
|
|
<div className="flex items-center">
|
|
<div className={`flex-shrink-0 ${stat.color} rounded-md p-3`}>
|
|
<Icon className="h-6 w-6 text-white" />
|
|
</div>
|
|
<div className="ml-5 w-0 flex-1">
|
|
<dl>
|
|
<dt className="text-sm font-medium text-gray-500 truncate">
|
|
{stat.name}
|
|
</dt>
|
|
<dd className="text-3xl font-semibold text-gray-900">
|
|
{stat.value}
|
|
</dd>
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
})}
|
|
</div>
|
|
|
|
{/* Recent VIPs */}
|
|
<div className="bg-white shadow rounded-lg p-6 mb-8">
|
|
<h2 className="text-lg font-medium text-gray-900 mb-4">Recent VIPs</h2>
|
|
{vips && vips.length > 0 ? (
|
|
<div className="overflow-x-auto">
|
|
<table className="min-w-full divide-y divide-gray-200">
|
|
<thead>
|
|
<tr>
|
|
<th className="px-6 py-3 bg-gray-50 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
|
Name
|
|
</th>
|
|
<th className="px-6 py-3 bg-gray-50 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
|
Organization
|
|
</th>
|
|
<th className="px-6 py-3 bg-gray-50 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
|
Arrival Mode
|
|
</th>
|
|
<th className="px-6 py-3 bg-gray-50 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
|
Events
|
|
</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody className="bg-white divide-y divide-gray-200">
|
|
{vips.slice(0, 5).map((vip) => (
|
|
<tr key={vip.id}>
|
|
<td className="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900">
|
|
{vip.name}
|
|
</td>
|
|
<td className="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
|
|
{vip.organization || '-'}
|
|
</td>
|
|
<td className="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
|
|
{vip.arrivalMode}
|
|
</td>
|
|
<td className="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
|
|
{vip.events?.length || 0}
|
|
</td>
|
|
</tr>
|
|
))}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
) : (
|
|
<p className="text-sm text-gray-500 text-center py-4">
|
|
No VIPs yet. Add your first VIP to get started.
|
|
</p>
|
|
)}
|
|
</div>
|
|
|
|
{/* Upcoming Flights */}
|
|
<div className="bg-white shadow rounded-lg p-6 mb-8">
|
|
<h2 className="text-lg font-medium text-gray-900 mb-4">
|
|
Upcoming Flights
|
|
</h2>
|
|
{upcomingFlights.length > 0 ? (
|
|
<div className="space-y-4">
|
|
{upcomingFlights.map((flight) => (
|
|
<div
|
|
key={flight.id}
|
|
className="border-l-4 border-indigo-500 pl-4 py-2"
|
|
>
|
|
<div className="flex justify-between items-start">
|
|
<div>
|
|
<h3 className="text-sm font-medium text-gray-900 flex items-center gap-2">
|
|
<Plane className="h-4 w-4" />
|
|
{flight.flightNumber}
|
|
</h3>
|
|
<p className="text-sm text-gray-500">
|
|
{flight.vip?.name} • {flight.departureAirport} → {flight.arrivalAirport}
|
|
</p>
|
|
{flight.scheduledDeparture && (
|
|
<p className="text-xs text-gray-400 mt-1">
|
|
Departs: {formatDateTime(flight.scheduledDeparture)}
|
|
</p>
|
|
)}
|
|
</div>
|
|
<div className="text-right">
|
|
<span className="text-xs text-gray-500 block">
|
|
{new Date(flight.flightDate).toLocaleDateString('en-US', {
|
|
month: 'short',
|
|
day: 'numeric',
|
|
year: 'numeric',
|
|
})}
|
|
</span>
|
|
<span className={`inline-block mt-1 px-2 py-1 text-xs rounded-full ${
|
|
flight.status?.toLowerCase() === 'scheduled' ? 'bg-blue-100 text-blue-800' :
|
|
flight.status?.toLowerCase() === 'boarding' ? 'bg-yellow-100 text-yellow-800' :
|
|
flight.status?.toLowerCase() === 'departed' ? 'bg-purple-100 text-purple-800' :
|
|
flight.status?.toLowerCase() === 'landed' ? 'bg-green-100 text-green-800' :
|
|
flight.status?.toLowerCase() === 'delayed' ? 'bg-orange-100 text-orange-800' :
|
|
'bg-gray-100 text-gray-800'
|
|
}`}>
|
|
{flight.status || 'Unknown'}
|
|
</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
))}
|
|
</div>
|
|
) : (
|
|
<p className="text-sm text-gray-500 text-center py-4">
|
|
No upcoming flights tracked.
|
|
</p>
|
|
)}
|
|
</div>
|
|
|
|
{/* Upcoming Events */}
|
|
<div className="bg-white shadow rounded-lg p-6">
|
|
<h2 className="text-lg font-medium text-gray-900 mb-4">
|
|
Upcoming Events
|
|
</h2>
|
|
{upcomingEvents.length > 0 ? (
|
|
<div className="space-y-4">
|
|
{upcomingEvents.map((event) => (
|
|
<div
|
|
key={event.id}
|
|
className="border-l-4 border-primary pl-4 py-2"
|
|
>
|
|
<div className="flex justify-between items-start">
|
|
<div>
|
|
<h3 className="text-sm font-medium text-gray-900">
|
|
{event.title}
|
|
</h3>
|
|
<p className="text-sm text-gray-500">
|
|
{event.vips && event.vips.length > 0
|
|
? event.vips.map(vip => vip.name).join(', ')
|
|
: 'No VIPs assigned'} • {event.driver?.name || 'No driver assigned'}
|
|
</p>
|
|
{event.location && (
|
|
<p className="text-xs text-gray-400 mt-1">{event.location}</p>
|
|
)}
|
|
</div>
|
|
<div className="text-right">
|
|
<span className="text-xs text-gray-500 block">
|
|
{formatDateTime(event.startTime)}
|
|
</span>
|
|
<span className={`inline-block mt-1 px-2 py-1 text-xs rounded-full ${
|
|
event.type === 'TRANSPORT' ? 'bg-blue-100 text-blue-800' :
|
|
event.type === 'MEETING' ? 'bg-purple-100 text-purple-800' :
|
|
event.type === 'MEAL' ? 'bg-green-100 text-green-800' :
|
|
'bg-gray-100 text-gray-800'
|
|
}`}>
|
|
{event.type}
|
|
</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
))}
|
|
</div>
|
|
) : (
|
|
<p className="text-sm text-gray-500 text-center py-4">
|
|
No upcoming events scheduled.
|
|
</p>
|
|
)}
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|