Major: Unified Activity System with Multi-VIP Support & Enhanced Search/Filtering
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>
This commit is contained in:
2026-01-31 16:35:24 +01:00
parent 868f7efc23
commit d2754db377
63 changed files with 7345 additions and 667 deletions

View File

@@ -0,0 +1,152 @@
import { test, expect } from '@playwright/test';
test.describe('Inline Driver Selector', () => {
test.beforeEach(async ({ page }) => {
test.setTimeout(120000);
// Login
await page.goto('http://localhost:5173/login');
await page.locator('button:has-text("Sign in with Auth0")').click();
await page.waitForTimeout(2000);
await page.locator('input[name="username"]').fill('test@test.com');
await page.locator('input[name="password"]').fill('P@ssw0rd!');
await page.locator('button[type="submit"][data-action-button-primary="true"]').click();
await page.waitForURL('**/dashboard', { timeout: 30000 });
console.log('✅ Logged in successfully');
});
test('should display and click driver selector on schedule page', async ({ page }) => {
console.log('\n🔍 Testing inline driver selector');
// Navigate to Schedule page
await page.goto('http://localhost:5173/events');
await page.waitForLoadState('networkidle');
await page.screenshot({ path: 'test-results/driver-selector-01-schedule-page.png', fullPage: true });
// Find the first event row
const firstRow = page.locator('tbody tr').first();
await expect(firstRow).toBeVisible();
// Find driver cell in the first row
const driverCell = firstRow.locator('td').nth(2); // Driver is 3rd column (0-indexed)
console.log('📋 Driver cell text:', await driverCell.textContent());
await page.screenshot({ path: 'test-results/driver-selector-02-before-click.png', fullPage: true });
// Click on the driver selector button
const driverButton = driverCell.locator('button');
await expect(driverButton).toBeVisible({ timeout: 5000 });
console.log('🖱️ Clicking driver selector button');
await driverButton.click();
await page.waitForTimeout(500);
await page.screenshot({ path: 'test-results/driver-selector-03-after-click.png', fullPage: true });
// Check if modal appeared
const modal = page.locator('text=Assign Driver');
const isModalVisible = await modal.isVisible({ timeout: 3000 }).catch(() => false);
if (isModalVisible) {
console.log('✅ Modal is visible');
await page.screenshot({ path: 'test-results/driver-selector-04-modal-visible.png', fullPage: true });
// Check drivers list
const driversList = await page.locator('button').filter({ hasText: /John Smith|Jane Doe|Unassigned/ }).all();
console.log(`✅ Found ${driversList.length} driver options in modal`);
// Try to click "Unassigned"
const unassignedOption = page.locator('button:has-text("Unassigned")').last();
await unassignedOption.click();
await page.waitForTimeout(1500);
console.log('✅ Clicked Unassigned option');
await page.screenshot({ path: 'test-results/driver-selector-05-after-selection.png', fullPage: true });
} else {
console.log('❌ Modal NOT visible after click');
// Debug: Take screenshot
await page.screenshot({ path: 'test-results/driver-selector-debug-no-modal.png', fullPage: true });
}
});
test('should show conflict dialog when assigning conflicting driver', async ({ page }) => {
console.log('\n🔍 Testing conflict detection');
await page.goto('http://localhost:5173/events');
await page.waitForLoadState('networkidle');
await page.screenshot({ path: 'test-results/driver-selector-conflict-01-schedule.png', fullPage: true });
// Get the first two events (they have the same time, so assigning same driver creates conflict)
const rows = await page.locator('tbody tr').all();
console.log(`📊 Found ${rows.length} events`);
if (rows.length >= 2) {
// Assign a driver to the first event
console.log('🔹 Assigning driver to first event');
const firstDriverCell = rows[0].locator('td').nth(2);
await firstDriverCell.locator('button').click();
await page.waitForTimeout(500);
// Select Amanda Washington
const amandaOption = page.locator('button').filter({ hasText: 'Amanda Washington' });
await expect(amandaOption).toBeVisible();
await amandaOption.click();
await page.waitForTimeout(2000);
console.log('✅ Assigned Amanda Washington to first event');
await page.screenshot({ path: 'test-results/driver-selector-conflict-02-first-assigned.png', fullPage: true });
// Now try to assign the same driver to the second event (same time = conflict!)
console.log('🔹 Trying to assign same driver to second event');
const secondDriverCell = rows[1].locator('td').nth(2);
await secondDriverCell.locator('button').click();
await page.waitForTimeout(500);
await page.screenshot({ path: 'test-results/driver-selector-conflict-03-modal.png', fullPage: true });
// Select Amanda Washington again
const amandaOption2 = page.locator('button').filter({ hasText: 'Amanda Washington' });
await amandaOption2.click();
await page.waitForTimeout(1500);
await page.screenshot({ path: 'test-results/driver-selector-conflict-04-after-select.png', fullPage: true });
// Check for conflict dialog
const conflictDialog = page.locator('text=Scheduling Conflict Detected');
const hasConflict = await conflictDialog.isVisible({ timeout: 3000 }).catch(() => false);
if (hasConflict) {
console.log('✅ Conflict dialog appeared!');
await page.screenshot({ path: 'test-results/driver-selector-conflict-05-dialog.png', fullPage: true });
// Verify conflict details are shown
const conflictTitle = await page.locator('.bg-yellow-50').first().textContent();
console.log(`📋 Conflict details: ${conflictTitle}`);
// Click "Assign Anyway"
const assignAnywayButton = page.locator('button:has-text("Assign Anyway")');
await assignAnywayButton.click();
await page.waitForTimeout(1500);
console.log('✅ Clicked Assign Anyway - driver should now be double-booked');
await page.screenshot({ path: 'test-results/driver-selector-conflict-06-assigned.png', fullPage: true });
// Verify both events now show Amanda Washington
const firstEventDriver = await rows[0].locator('td').nth(2).textContent();
const secondEventDriver = await rows[1].locator('td').nth(2).textContent();
console.log(`✅ First event driver: ${firstEventDriver?.trim()}`);
console.log(`✅ Second event driver: ${secondEventDriver?.trim()}`);
} else {
console.log('⚠️ No conflict dialog appeared - events may not have overlapping times');
await page.screenshot({ path: 'test-results/driver-selector-no-conflict.png', fullPage: true });
}
} else {
console.log('⚠️ Not enough events found - skipping conflict test');
}
});
});