Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "Breakout rooms",
"comment": "Add prompt notification for assigned breakout room changes when auto move is false",
"packageName": "@azure/communication-react",
"email": "miguelgamis@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "Breakout rooms",
"comment": "Add prompt notification for assigned breakout room changes when auto move is false",
"packageName": "@azure/communication-react",
"email": "miguelgamis@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,13 @@ export const notificationStackSelector: NotificationStackSelector = createSelect
timestamp: latestNotifications['assignedBreakoutRoomChanged'].timestamp
});
}
if (latestNotifications['assignedBreakoutRoomChangedPromptJoin'] && assignedBreakoutRoom) {
activeNotifications.push({
type: 'assignedBreakoutRoomChangedPromptJoin',
timestamp: latestNotifications['assignedBreakoutRoomChangedPromptJoin'].timestamp,
onClickPrimaryButton: () => assignedBreakoutRoom.join()
});
}
if (latestNotifications['assignedBreakoutRoomClosed']) {
activeNotifications.push({
type: 'assignedBreakoutRoomClosed',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,12 @@ export class BreakoutRoomsSubscriber {
callState.breakoutRooms?.breakoutRoomDisplayName &&
callState.breakoutRooms.breakoutRoomDisplayName !== breakoutRoom.displayName
) {
const target: NotificationTarget =
breakoutRoom.autoMoveParticipantToBreakoutRoom === false
? 'assignedBreakoutRoomChangedPromptJoin'
: 'assignedBreakoutRoomChanged';
this._context.setLatestNotification(this._callIdRef.callId, {
target: 'assignedBreakoutRoomChanged',
target,
timestamp: new Date(Date.now())
});
} else if (
Expand All @@ -102,12 +106,14 @@ export class BreakoutRoomsSubscriber {
this._context.deleteLatestNotification('assignedBreakoutRoomOpened', this._callIdRef.callId);
this._context.deleteLatestNotification('assignedBreakoutRoomOpenedPromptJoin', this._callIdRef.callId);
this._context.deleteLatestNotification('assignedBreakoutRoomChanged', this._callIdRef.callId);
this._context.deleteLatestNotification('assignedBreakoutRoomChangedPromptJoin', this._callIdRef.callId);
this._context.deleteLatestNotification('breakoutRoomJoined', this._callIdRef.callId);
} else if (breakoutRoom.state === 'closed') {
// This scenario covers the case where the breakout room is closed
this._context.deleteLatestNotification('assignedBreakoutRoomOpened', this._callIdRef.callId);
this._context.deleteLatestNotification('assignedBreakoutRoomOpenedPromptJoin', this._callIdRef.callId);
this._context.deleteLatestNotification('assignedBreakoutRoomChanged', this._callIdRef.callId);
this._context.deleteLatestNotification('assignedBreakoutRoomChangedPromptJoin', this._callIdRef.callId);
this._context.deleteLatestNotification('breakoutRoomJoined', this._callIdRef.callId);
this._context.deleteLatestNotification('breakoutRoomClosingSoon', this._callIdRef.callId);
clearTimeout(this._breakoutRoomClosingSoonTimeoutId);
Expand All @@ -129,6 +135,7 @@ export class BreakoutRoomsSubscriber {
this._context.deleteLatestNotification('assignedBreakoutRoomOpened', this._callIdRef.callId);
this._context.deleteLatestNotification('assignedBreakoutRoomOpenedPromptJoin', this._callIdRef.callId);
this._context.deleteLatestNotification('assignedBreakoutRoomChanged', this._callIdRef.callId);
this._context.deleteLatestNotification('assignedBreakoutRoomChangedPromptJoin', this._callIdRef.callId);

// Send latest notification for breakoutRoomJoined on behalf of the call that was joined.
this._context.setLatestNotification(call.id, {
Expand Down
1 change: 1 addition & 0 deletions packages/calling-stateful-client/src/CallClientState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1232,6 +1232,7 @@ export type NotificationTarget =
| 'assignedBreakoutRoomOpened'
| 'assignedBreakoutRoomOpenedPromptJoin'
| 'assignedBreakoutRoomChanged'
| 'assignedBreakoutRoomChangedPromptJoin'
| 'assignedBreakoutRoomClosed'
| 'breakoutRoomJoined'
| 'breakoutRoomClosingSoon'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4231,6 +4231,7 @@ export type NotificationStackSelector = (state: CallClientState, props: CallingB
// @public
export interface NotificationStackStrings {
assignedBreakoutRoomChanged?: NotificationStrings;
assignedBreakoutRoomChangedPromptJoin?: NotificationStrings;
assignedBreakoutRoomClosed?: NotificationStrings;
assignedBreakoutRoomOpened?: NotificationStrings;
assignedBreakoutRoomOpenedPromptJoin?: NotificationStrings;
Expand Down Expand Up @@ -4307,7 +4308,7 @@ export interface NotificationStyles {
}

// @public (undocumented)
export type NotificationTarget = 'assignedBreakoutRoomOpened' | 'assignedBreakoutRoomOpenedPromptJoin' | 'assignedBreakoutRoomChanged' | 'assignedBreakoutRoomClosed' | 'breakoutRoomJoined' | 'breakoutRoomClosingSoon' | 'capabilityTurnVideoOnPresent' | 'capabilityTurnVideoOnAbsent' | 'capabilityUnmuteMicPresent' | 'capabilityUnmuteMicAbsent' | 'togetherModeStarted' | 'togetherModeEnded';
export type NotificationTarget = 'assignedBreakoutRoomOpened' | 'assignedBreakoutRoomOpenedPromptJoin' | 'assignedBreakoutRoomChanged' | 'assignedBreakoutRoomChangedPromptJoin' | 'assignedBreakoutRoomClosed' | 'breakoutRoomJoined' | 'breakoutRoomClosingSoon' | 'capabilityTurnVideoOnPresent' | 'capabilityTurnVideoOnAbsent' | 'capabilityUnmuteMicPresent' | 'capabilityUnmuteMicAbsent' | 'togetherModeStarted' | 'togetherModeEnded';

// @public
export type NotificationType = keyof NotificationStackStrings;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3836,6 +3836,7 @@ export type NotificationStackSelector = (state: CallClientState, props: CallingB
// @public
export interface NotificationStackStrings {
assignedBreakoutRoomChanged?: NotificationStrings;
assignedBreakoutRoomChangedPromptJoin?: NotificationStrings;
assignedBreakoutRoomClosed?: NotificationStrings;
assignedBreakoutRoomOpened?: NotificationStrings;
assignedBreakoutRoomOpenedPromptJoin?: NotificationStrings;
Expand Down Expand Up @@ -3912,7 +3913,7 @@ export interface NotificationStyles {
}

// @public (undocumented)
export type NotificationTarget = 'assignedBreakoutRoomOpened' | 'assignedBreakoutRoomOpenedPromptJoin' | 'assignedBreakoutRoomChanged' | 'assignedBreakoutRoomClosed' | 'breakoutRoomJoined' | 'breakoutRoomClosingSoon' | 'capabilityTurnVideoOnPresent' | 'capabilityTurnVideoOnAbsent' | 'capabilityUnmuteMicPresent' | 'capabilityUnmuteMicAbsent' | 'togetherModeStarted' | 'togetherModeEnded';
export type NotificationTarget = 'assignedBreakoutRoomOpened' | 'assignedBreakoutRoomOpenedPromptJoin' | 'assignedBreakoutRoomChanged' | 'assignedBreakoutRoomChangedPromptJoin' | 'assignedBreakoutRoomClosed' | 'breakoutRoomJoined' | 'breakoutRoomClosingSoon' | 'capabilityTurnVideoOnPresent' | 'capabilityTurnVideoOnAbsent' | 'capabilityUnmuteMicPresent' | 'capabilityUnmuteMicAbsent' | 'togetherModeStarted' | 'togetherModeEnded';

// @public
export type NotificationType = keyof NotificationStackStrings;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,10 @@ export interface NotificationStackStrings {
* Message shown in notification when the user's assigned breakout room is changed
*/
assignedBreakoutRoomChanged?: NotificationStrings;
/**
* Message shown in notification when the user is prompted to join their new assigned breakout room
*/
assignedBreakoutRoomChangedPromptJoin?: NotificationStrings;
/**
* Message shown in notification when the user's assigned breakout room is closed
*/
Expand Down
1 change: 1 addition & 0 deletions packages/react-components/src/components/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ export const customNotificationIconName: Partial<{ [key in NotificationType]: st
assignedBreakoutRoomOpened: 'NotificationBarBreakoutRoomOpened',
assignedBreakoutRoomOpenedPromptJoin: 'NotificationBarBreakoutRoomPromptJoin',
assignedBreakoutRoomChanged: 'NotificationBarBreakoutRoomChanged',
assignedBreakoutRoomChangedPromptJoin: 'NotificationBarBreakoutRoomChanged',
assignedBreakoutRoomClosed: 'NotificationBarBreakoutRoomClosed',
breakoutRoomJoined: 'NotificationBarBreakoutRoomJoined',
breakoutRoomClosingSoon: 'NotificationBarBreakoutRoomClosingSoon',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,12 @@
"message": "We'll move you to your assigned room in 5 seconds.",
"dismissButtonAriaLabel": "Close"
},
"assignedBreakoutRoomChangedPromptJoin": {
"title": "Your breakout room has changed",
"message": "You've been assigned to a different breakout room.",
"dismissButtonAriaLabel": "Close",
"primaryButtonLabel": "Join room"
},
"assignedBreakoutRoomClosed": {
"title": "Your breakout room has closed",
"message": "We'll move you back to your meeting in 5 seconds.",
Expand Down
Loading