Replace native dialogs with app modals for Events link and unlink.
Deploy Ladill Meet / deploy (push) Successful in 49s
Deploy Ladill Meet / deploy (push) Successful in 49s
Link opens an in-page modal on conference and webinar show pages; unlink uses the shared confirm-dialog component. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -7,10 +7,8 @@ use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
|
||||
use App\Models\Room;
|
||||
use App\Services\Integrations\EventsClient;
|
||||
use App\Services\Integrations\EventsLinkService;
|
||||
use App\Support\EventsSourceLink;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class EventsLinkController extends Controller
|
||||
{
|
||||
@@ -21,7 +19,7 @@ class EventsLinkController extends Controller
|
||||
protected EventsClient $eventsClient,
|
||||
) {}
|
||||
|
||||
public function show(Request $request, Room $room): View|RedirectResponse
|
||||
public function show(Request $request, Room $room): RedirectResponse
|
||||
{
|
||||
$this->authorizeAbility($request, 'meetings.manage');
|
||||
$this->authorizeOwner($request, $room);
|
||||
@@ -33,16 +31,9 @@ class EventsLinkController extends Controller
|
||||
->withErrors(['events' => 'Ladill Events linking is not configured. Set MEET_API_KEY_EVENTS in Meet (and the matching EVENTS_API_KEY_MEET in Events), then try again.']);
|
||||
}
|
||||
|
||||
$events = $this->links->linkableEvents($request->user());
|
||||
$expectedType = $room->isConference() ? 'town_hall' : 'webinar';
|
||||
|
||||
return view('meet.events.link', [
|
||||
'room' => $room,
|
||||
'events' => $events,
|
||||
'expectedType' => $expectedType,
|
||||
'eventsAppUrl' => EventsSourceLink::baseUrl(),
|
||||
'isLinked' => EventsSourceLink::isLinked($room),
|
||||
]);
|
||||
return redirect()
|
||||
->route($room->isWebinar() ? 'meet.webinars.show' : 'meet.conferences.show', $room)
|
||||
->with('open_events_link_modal', true);
|
||||
}
|
||||
|
||||
public function store(Request $request, Room $room): RedirectResponse
|
||||
@@ -51,11 +42,21 @@ class EventsLinkController extends Controller
|
||||
$this->authorizeOwner($request, $room);
|
||||
abort_unless($room->isWebinar() || $room->isConference(), 404);
|
||||
|
||||
$validated = $request->validate([
|
||||
$validator = \Illuminate\Support\Facades\Validator::make($request->all(), [
|
||||
'event_id' => ['required', 'integer', 'min:1'],
|
||||
'virtual_session_id' => ['nullable', 'string', 'max:64'],
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
return redirect()
|
||||
->route($room->isWebinar() ? 'meet.webinars.show' : 'meet.conferences.show', $room)
|
||||
->withErrors($validator)
|
||||
->withInput()
|
||||
->with('open_events_link_modal', true);
|
||||
}
|
||||
|
||||
$validated = $validator->validated();
|
||||
|
||||
try {
|
||||
$this->links->link(
|
||||
$room,
|
||||
@@ -64,7 +65,11 @@ class EventsLinkController extends Controller
|
||||
$validated['virtual_session_id'] ?? null,
|
||||
);
|
||||
} catch (\RuntimeException $e) {
|
||||
return back()->withErrors(['events' => $e->getMessage()])->withInput();
|
||||
return redirect()
|
||||
->route($room->isWebinar() ? 'meet.webinars.show' : 'meet.conferences.show', $room)
|
||||
->withErrors(['events' => $e->getMessage()])
|
||||
->withInput()
|
||||
->with('open_events_link_modal', true);
|
||||
}
|
||||
|
||||
$route = $room->isWebinar() ? 'meet.webinars.show' : 'meet.conferences.show';
|
||||
|
||||
Reference in New Issue
Block a user