Allow adding conference speakers after creation on details page.
Deploy Ladill Meet / deploy (push) Successful in 35s
Deploy Ladill Meet / deploy (push) Successful in 35s
Hosts can assign team speakers and invite panelists by email from the conference show page, with presenter refs synced to live sessions. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -7,7 +7,9 @@ use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
|
|||||||
use App\Models\Member;
|
use App\Models\Member;
|
||||||
use App\Models\Room;
|
use App\Models\Room;
|
||||||
use App\Models\Template;
|
use App\Models\Template;
|
||||||
|
use App\Models\User;
|
||||||
use App\Services\Meet\CalendarService;
|
use App\Services\Meet\CalendarService;
|
||||||
|
use App\Services\Meet\ConferenceService;
|
||||||
use App\Services\Meet\InvitationService;
|
use App\Services\Meet\InvitationService;
|
||||||
use App\Services\Meet\RoomService;
|
use App\Services\Meet\RoomService;
|
||||||
use App\Services\Meet\SessionService;
|
use App\Services\Meet\SessionService;
|
||||||
@@ -28,6 +30,7 @@ class ConferenceController extends Controller
|
|||||||
protected InvitationService $invitations,
|
protected InvitationService $invitations,
|
||||||
protected CalendarService $calendar,
|
protected CalendarService $calendar,
|
||||||
protected TownHallService $townHalls,
|
protected TownHallService $townHalls,
|
||||||
|
protected ConferenceService $conferences,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function index(Request $request): View
|
public function index(Request $request): View
|
||||||
@@ -152,13 +155,83 @@ class ConferenceController extends Controller
|
|||||||
|
|
||||||
$room->load(['sessions.participants', 'invitations', 'sessions.recordings', 'sessions.aiSummaries', 'sessionFiles']);
|
$room->load(['sessions.participants', 'invitations', 'sessions.recordings', 'sessions.aiSummaries', 'sessionFiles']);
|
||||||
|
|
||||||
$presenterRefs = (array) $room->setting('presenter_refs', []);
|
$presenterRefs = $this->conferences->presenterRefs($room);
|
||||||
$speakers = Member::owned($this->ownerRef($request))
|
$speakers = Member::owned($this->ownerRef($request))
|
||||||
->where('organization_id', $room->organization_id)
|
->where('organization_id', $room->organization_id)
|
||||||
->whereIn('user_ref', $presenterRefs)
|
->whereIn('user_ref', $presenterRefs)
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
return view('meet.conferences.show', compact('room', 'speakers'));
|
$speakerUsers = User::query()
|
||||||
|
->whereIn('public_id', $presenterRefs)
|
||||||
|
->get()
|
||||||
|
->keyBy('public_id');
|
||||||
|
|
||||||
|
$members = Member::owned($this->ownerRef($request))
|
||||||
|
->where('organization_id', $room->organization_id)
|
||||||
|
->where('user_ref', '!=', $this->ownerRef($request))
|
||||||
|
->orderBy('user_ref')
|
||||||
|
->get();
|
||||||
|
|
||||||
|
$memberUsers = User::query()
|
||||||
|
->whereIn('public_id', $members->pluck('user_ref'))
|
||||||
|
->get()
|
||||||
|
->keyBy('public_id');
|
||||||
|
|
||||||
|
$canManageSpeakers = app(\App\Services\Meet\MeetPermissions::class)
|
||||||
|
->can($this->member($request), 'meetings.manage');
|
||||||
|
|
||||||
|
return view('meet.conferences.show', compact(
|
||||||
|
'room',
|
||||||
|
'speakers',
|
||||||
|
'speakerUsers',
|
||||||
|
'members',
|
||||||
|
'memberUsers',
|
||||||
|
'presenterRefs',
|
||||||
|
'canManageSpeakers',
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updateSpeakers(Request $request, Room $room): RedirectResponse
|
||||||
|
{
|
||||||
|
$this->authorizeAbility($request, 'meetings.manage');
|
||||||
|
$this->authorizeOwner($request, $room);
|
||||||
|
abort_unless($room->isConference(), 404);
|
||||||
|
|
||||||
|
$validated = $request->validate([
|
||||||
|
'presenter_refs' => ['nullable', 'array'],
|
||||||
|
'presenter_refs.*' => ['string', 'max:64'],
|
||||||
|
'invite_emails' => ['nullable', 'string', 'max:2000'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$allowedRefs = Member::owned($this->ownerRef($request))
|
||||||
|
->where('organization_id', $room->organization_id)
|
||||||
|
->pluck('user_ref')
|
||||||
|
->all();
|
||||||
|
|
||||||
|
$presenterRefs = collect($validated['presenter_refs'] ?? [])
|
||||||
|
->filter()
|
||||||
|
->unique()
|
||||||
|
->intersect($allowedRefs)
|
||||||
|
->values()
|
||||||
|
->all();
|
||||||
|
|
||||||
|
$this->conferences->syncPresenterRefs($room, $presenterRefs);
|
||||||
|
|
||||||
|
$inviteCount = 0;
|
||||||
|
if ($emails = trim((string) ($validated['invite_emails'] ?? ''))) {
|
||||||
|
$invites = collect(preg_split('/[\s,;]+/', $emails))
|
||||||
|
->filter()
|
||||||
|
->map(fn ($email) => ['email' => $email, 'role' => 'panelist'])
|
||||||
|
->all();
|
||||||
|
$inviteCount = count($invites);
|
||||||
|
$this->invitations->inviteToRoom($room, $invites, $request->user());
|
||||||
|
}
|
||||||
|
|
||||||
|
$message = $inviteCount > 0
|
||||||
|
? 'Speakers updated and '.$inviteCount.' invitation(s) sent.'
|
||||||
|
: 'Speakers updated.';
|
||||||
|
|
||||||
|
return redirect()->route('meet.conferences.show', $room)->with('success', $message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function start(Request $request, Room $room): RedirectResponse
|
public function start(Request $request, Room $room): RedirectResponse
|
||||||
|
|||||||
@@ -10,6 +10,28 @@ use App\Models\User;
|
|||||||
|
|
||||||
class ConferenceService
|
class ConferenceService
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @param list<string> $presenterRefs
|
||||||
|
*/
|
||||||
|
public function syncPresenterRefs(Room $room, array $presenterRefs): Room
|
||||||
|
{
|
||||||
|
$presenterRefs = array_values(array_unique(array_filter($presenterRefs)));
|
||||||
|
$settings = array_merge($room->settings ?? [], ['presenter_refs' => $presenterRefs]);
|
||||||
|
$room->update(['settings' => $settings]);
|
||||||
|
|
||||||
|
$session = $room->activeSession();
|
||||||
|
if ($session) {
|
||||||
|
$merged = collect($session->presenter_refs ?? [])
|
||||||
|
->merge($presenterRefs)
|
||||||
|
->unique()
|
||||||
|
->values()
|
||||||
|
->all();
|
||||||
|
$session->update(['presenter_refs' => $merged]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $room->fresh();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return list<string>
|
* @return list<string>
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -54,27 +54,73 @@
|
|||||||
@if ($room->setting('green_room'))
|
@if ($room->setting('green_room'))
|
||||||
<p class="mt-3 text-sm text-violet-700">Green room is on — when you start, you and assigned speakers rehearse before going live to the audience.</p>
|
<p class="mt-3 text-sm text-violet-700">Green room is on — when you start, you and assigned speakers rehearse before going live to the audience.</p>
|
||||||
@endif
|
@endif
|
||||||
|
</div>
|
||||||
|
|
||||||
@if ($speakers->isNotEmpty())
|
<div class="mt-6 rounded-2xl border border-slate-200 bg-white p-6">
|
||||||
<div class="mt-4">
|
<h2 class="text-sm font-medium text-slate-700">Speakers</h2>
|
||||||
<h3 class="text-sm font-medium text-slate-700">Assigned speakers</h3>
|
<p class="mt-1 text-xs text-slate-500">Team members on stage and external speakers invited by email. You are always the host.</p>
|
||||||
<ul class="mt-2 space-y-1 text-sm text-slate-600">
|
|
||||||
@foreach ($speakers as $speaker)
|
@if ($speakers->isNotEmpty() || $room->invitations->where('role', 'panelist')->isNotEmpty())
|
||||||
<li>{{ $speaker->user_ref }}</li>
|
<div class="mt-4 space-y-3">
|
||||||
@endforeach
|
@if ($speakers->isNotEmpty())
|
||||||
</ul>
|
<div>
|
||||||
|
<h3 class="text-xs font-semibold uppercase tracking-wide text-slate-500">Assigned speakers</h3>
|
||||||
|
<ul class="mt-2 space-y-1 text-sm text-slate-600">
|
||||||
|
@foreach ($speakers as $speaker)
|
||||||
|
@php $user = $speakerUsers->get($speaker->user_ref); @endphp
|
||||||
|
<li>{{ $user?->name ?? $speaker->user_ref }}</li>
|
||||||
|
@endforeach
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if ($room->invitations->where('role', 'panelist')->isNotEmpty())
|
||||||
|
<div>
|
||||||
|
<h3 class="text-xs font-semibold uppercase tracking-wide text-slate-500">Invited speakers</h3>
|
||||||
|
<ul class="mt-2 space-y-1 text-sm text-slate-600">
|
||||||
|
@foreach ($room->invitations->where('role', 'panelist') as $invite)
|
||||||
|
<li>
|
||||||
|
{{ $invite->display_name ?? $invite->email }}
|
||||||
|
<span class="text-slate-400">· {{ ucfirst($invite->status) }}</span>
|
||||||
|
</li>
|
||||||
|
@endforeach
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
@else
|
||||||
|
<p class="mt-3 text-sm text-slate-500">No speakers assigned yet.</p>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@if ($room->invitations->where('role', 'panelist')->isNotEmpty())
|
@if ($canManageSpeakers)
|
||||||
<div class="mt-4">
|
<form method="POST" action="{{ route('meet.conferences.speakers.update', $room) }}" class="mt-5 space-y-4 border-t border-slate-100 pt-5">
|
||||||
<h3 class="text-sm font-medium text-slate-700">Invited speakers</h3>
|
@csrf
|
||||||
<ul class="mt-2 space-y-1 text-sm text-slate-600">
|
|
||||||
@foreach ($room->invitations->where('role', 'panelist') as $invite)
|
<div>
|
||||||
<li>{{ $invite->email }}</li>
|
<label class="block text-sm font-medium text-slate-700">Invite speakers by email</label>
|
||||||
@endforeach
|
<input type="text" name="invite_emails" value="{{ old('invite_emails') }}" placeholder="speaker@example.com, another@example.com"
|
||||||
</ul>
|
class="mt-1 w-full rounded-lg border-slate-300 text-sm">
|
||||||
</div>
|
<p class="mt-1 text-xs text-slate-500">Comma-separated. Invitations are sent as speaker (panelist) roles.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if ($members->isNotEmpty())
|
||||||
|
<div>
|
||||||
|
<label class="block text-sm font-medium text-slate-700">Assigned speakers</label>
|
||||||
|
<div class="mt-2 max-h-40 space-y-2 overflow-y-auto rounded-lg border border-slate-200 p-3">
|
||||||
|
@foreach ($members as $member)
|
||||||
|
@php $user = $memberUsers->get($member->user_ref); @endphp
|
||||||
|
<label class="flex items-center gap-2 text-sm">
|
||||||
|
<input type="checkbox" name="presenter_refs[]" value="{{ $member->user_ref }}"
|
||||||
|
@checked(in_array($member->user_ref, old('presenter_refs', $presenterRefs))) class="rounded border-slate-300">
|
||||||
|
<span>{{ $user?->name ?? $member->user_ref }}</span>
|
||||||
|
</label>
|
||||||
|
@endforeach
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<button type="submit" class="btn-primary btn-primary-sm">Save speakers</button>
|
||||||
|
</form>
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -138,6 +138,7 @@ Route::middleware(['auth', 'platform.session'])->group(function () {
|
|||||||
Route::get('/conferences/create', [ConferenceController::class, 'create'])->name('meet.conferences.create');
|
Route::get('/conferences/create', [ConferenceController::class, 'create'])->name('meet.conferences.create');
|
||||||
Route::post('/conferences', [ConferenceController::class, 'store'])->name('meet.conferences.store');
|
Route::post('/conferences', [ConferenceController::class, 'store'])->name('meet.conferences.store');
|
||||||
Route::get('/conferences/{room}', [ConferenceController::class, 'show'])->name('meet.conferences.show');
|
Route::get('/conferences/{room}', [ConferenceController::class, 'show'])->name('meet.conferences.show');
|
||||||
|
Route::post('/conferences/{room}/speakers', [ConferenceController::class, 'updateSpeakers'])->name('meet.conferences.speakers.update');
|
||||||
Route::post('/conferences/{room}/start', [ConferenceController::class, 'start'])->name('meet.conferences.start');
|
Route::post('/conferences/{room}/start', [ConferenceController::class, 'start'])->name('meet.conferences.start');
|
||||||
|
|
||||||
Route::get('/rooms', [SpaceController::class, 'index'])->name('meet.spaces.index');
|
Route::get('/rooms', [SpaceController::class, 'index'])->name('meet.spaces.index');
|
||||||
|
|||||||
@@ -723,6 +723,55 @@ class MeetWebTest extends TestCase
|
|||||||
->assertSee('NextGen Summit');
|
->assertSee('NextGen Summit');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_host_can_add_speakers_after_conference_created(): void
|
||||||
|
{
|
||||||
|
$speaker = User::create([
|
||||||
|
'public_id' => 'speaker-user-001',
|
||||||
|
'name' => 'Keynote Speaker',
|
||||||
|
'email' => 'speaker@example.com',
|
||||||
|
]);
|
||||||
|
|
||||||
|
Member::create([
|
||||||
|
'owner_ref' => $this->user->public_id,
|
||||||
|
'organization_id' => $this->organization->id,
|
||||||
|
'user_ref' => $speaker->public_id,
|
||||||
|
'role' => 'member',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$room = Room::create([
|
||||||
|
'owner_ref' => $this->user->public_id,
|
||||||
|
'organization_id' => $this->organization->id,
|
||||||
|
'host_user_ref' => $this->user->public_id,
|
||||||
|
'title' => 'Product launch',
|
||||||
|
'type' => 'town_hall',
|
||||||
|
'status' => 'scheduled',
|
||||||
|
'scheduled_at' => now()->addDay(),
|
||||||
|
'timezone' => 'UTC',
|
||||||
|
'settings' => array_merge(config('meet.default_settings'), [
|
||||||
|
'green_room' => true,
|
||||||
|
'stage_mode' => true,
|
||||||
|
'presenter_refs' => [],
|
||||||
|
]),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->actingAs($this->user)
|
||||||
|
->post(route('meet.conferences.speakers.update', $room), [
|
||||||
|
'presenter_refs' => [$speaker->public_id],
|
||||||
|
'invite_emails' => 'guest-speaker@example.com',
|
||||||
|
])
|
||||||
|
->assertRedirect(route('meet.conferences.show', $room))
|
||||||
|
->assertSessionHas('success');
|
||||||
|
|
||||||
|
$room->refresh();
|
||||||
|
$this->assertContains($speaker->public_id, $room->setting('presenter_refs'));
|
||||||
|
|
||||||
|
$this->assertDatabaseHas('meet_invitations', [
|
||||||
|
'room_id' => $room->id,
|
||||||
|
'email' => 'guest-speaker@example.com',
|
||||||
|
'role' => 'panelist',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
public function test_host_can_create_space_room(): void
|
public function test_host_can_create_space_room(): void
|
||||||
{
|
{
|
||||||
$this->actingAs($this->user)
|
$this->actingAs($this->user)
|
||||||
|
|||||||
Reference in New Issue
Block a user