neoris/openvidu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frontend: update delete room dialog to clarify error handling and enhance policy options

Browse Source
This commit is contained in:
juancarmore 2025-09-03 12:12:43 +02:00
parent ceab629906
commit 87594dfe17
3 changed files with 36 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/projects/shared-meet-components/src/lib/components/dialogs/delete-room-dialog/delete-room-dialog.component.html
View File

@ -6,7 +6,7 @@
<mat-dialog-content>
<div class="dialog-message" [innerHTML]="data.message"></div>
<p>Please choose how to handle this situation:</p>
<p>Please choose how to handle room deletion errors:</p>
<div class="policy-options-container">
@if (data.showWithMeetingPolicy) {

24
frontend/projects/shared-meet-components/src/lib/components/dialogs/delete-room-dialog/delete-room-dialog.component.ts
View File

@ -33,28 +33,38 @@ export class DeleteRoomDialogComponent {
readonly dialogRef = inject(MatDialogRef<DeleteRoomDialogComponent>);
meetingPolicyOptions = [
{
value: MeetRoomDeletionPolicyWithMeeting.FORCE,
label: 'Force',
description:
'The meeting will be ended immediately, and the room will be deleted without waiting for participants to leave.'
},
{
value: MeetRoomDeletionPolicyWithMeeting.WHEN_MEETING_ENDS,
label: 'When meeting ends',
description: 'The room will be deleted when the meeting ends.'
},
{
value: MeetRoomDeletionPolicyWithMeeting.FORCE,
label: 'Force',
description:
'The meeting will be ended immediately, and the room will be deleted without waiting for participants to leave.'
value: MeetRoomDeletionPolicyWithMeeting.FAIL,
label: 'Fail',
description: 'The deletion will fail if there is an active meeting.'
}
];
recordingPolicyOptions = [
{
value: MeetRoomDeletionPolicyWithRecordings.FORCE,
label: 'Force',
description: 'The room and its recordings will be deleted immediately.'
},
{
value: MeetRoomDeletionPolicyWithRecordings.CLOSE,
label: 'Close',
description: 'The room will be closed instead of deleted, maintaining its recordings.'
},
{
value: MeetRoomDeletionPolicyWithRecordings.FORCE,
label: 'Force',
description: 'The room and its recordings will be deleted immediately.'
value: MeetRoomDeletionPolicyWithRecordings.FAIL,
label: 'Fail',
description: 'The deletion will fail if the room has recordings.'
}
];

55
frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.ts
View File

@ -335,7 +335,7 @@ export class RoomsComponent implements OnInit {
const errorCode = error.error?.error;
if (errorCode && this.isValidMeetRoomDeletionErrorCode(errorCode)) {
const errorMessage = this.extractGenericMessage(error.error.message);
this.showDeletionErrorDialogWithOptions(roomId, errorCode, errorMessage);
this.showDeletionErrorDialogWithOptions(roomId, errorMessage);
} else {
this.notificationService.showSnackbar('Failed to delete room');
this.log.e('Error deleting room:', error);
@ -375,15 +375,7 @@ export class RoomsComponent implements OnInit {
this.notificationService.showSnackbar(this.extractGenericMessage(message));
}
private showDeletionErrorDialogWithOptions(
roomId: string,
errorCode: MeetRoomDeletionErrorCode,
errorMessage: string
) {
// Determine available policy options based on error code
const showWithMeetingPolicy = errorCode !== MeetRoomDeletionErrorCode.ROOM_HAS_RECORDINGS;
const showWithRecordingsPolicy = errorCode !== MeetRoomDeletionErrorCode.ROOM_HAS_ACTIVE_MEETING;
private showDeletionErrorDialogWithOptions(roomId: string, errorMessage: string) {
const deleteWithPoliciesCallback = async (
meetingPolicy: MeetRoomDeletionPolicyWithMeeting,
recordingPolicy: MeetRoomDeletionPolicyWithRecordings
@ -406,8 +398,8 @@ export class RoomsComponent implements OnInit {
title: 'Error Deleting Room',
message: errorMessage,
confirmText: 'Delete with Options',
showWithMeetingPolicy,
showWithRecordingsPolicy,
showWithMeetingPolicy: true,
showWithRecordingsPolicy: true,
confirmCallback: deleteWithPoliciesCallback
};
this.dialog.open(DeleteRoomDialogComponent, {
@ -430,13 +422,22 @@ export class RoomsComponent implements OnInit {
this.notificationService.showSnackbar(message);
} catch (error: any) {
// Check if it's a structured error with failed rooms
const failed = error.error?.failed;
const failed = error.error?.failed as { roomId: string; error: string; message: string }[];
const successful = error.error?.successful;
const message = error.error?.message;
const errorMessage = error.error?.message;
if (failed && successful) {
this.handleSuccessfulBulkDeletion(successful);
this.showBulkDeletionErrorDialogWithOptions(failed, message);
const hasRoomDeletionError = failed.some((result) =>
this.isValidMeetRoomDeletionErrorCode(result.error)
);
if (hasRoomDeletionError) {
this.showBulkDeletionErrorDialogWithOptions(failed, errorMessage);
} else {
this.notificationService.showSnackbar(errorMessage);
this.log.e('Error in bulk delete:', failed);
}
} else {
this.notificationService.showSnackbar('Failed to delete rooms');
this.log.e('Error in bulk delete:', error);
@ -499,25 +500,6 @@ export class RoomsComponent implements OnInit {
}[],
errorMessage: string
) {
// Determine available policy options based on error codes
const showWithMeetingPolicy = failedResults.some(
(result) =>
this.isValidMeetRoomDeletionErrorCode(result.error) &&
result.error !== MeetRoomDeletionErrorCode.ROOM_HAS_RECORDINGS
);
const showWithRecordingsPolicy = failedResults.some(
(result) =>
this.isValidMeetRoomDeletionErrorCode(result.error) &&
result.error !== MeetRoomDeletionErrorCode.ROOM_HAS_ACTIVE_MEETING
);
if (!showWithMeetingPolicy && !showWithRecordingsPolicy) {
// Generic error
this.notificationService.showSnackbar(errorMessage);
this.log.e('Error in bulk delete:', failedResults);
return;
}
const roomIds = failedResults.map((r) => r.roomId);
const bulkDeleteWithPoliciesCallback = async (
@ -555,11 +537,10 @@ export class RoomsComponent implements OnInit {
message: `${errorMessage}. They have active meetings and/or recordings:
<p>${roomIds.join(', ')}</p>`,
confirmText: 'Delete with Options',
showWithMeetingPolicy,
showWithRecordingsPolicy,
showWithMeetingPolicy: true,
showWithRecordingsPolicy: true,
confirmCallback: bulkDeleteWithPoliciesCallback
};
this.dialog.open(DeleteRoomDialogComponent, {
data: dialogOptions,
disableClose: true