Skip to content

Add messageEdited and messagedDeleted events to ChatAdapter. Update the unread message badge when a message is deleted. #3971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JamesBurnside merged 10 commits into from
Jan 5, 2024
Merged

Add messageEdited and messagedDeleted events to ChatAdapter. Update the unread message badge when a message is deleted. #3971

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cc0e3f4
Change files
JamesBurnside Jan 5, 2024
f71da7d
Duplicate change files for beta release
JamesBurnside Jan 5, 2024
1424503
Change files
JamesBurnside Jan 5, 2024
4d807c5
Duplicate change files for beta release
JamesBurnside Jan 5, 2024
e1a77f5
Add messageEdited and messagedDeleted events to the ChatAdapter. Use …
JamesBurnside Jan 5, 2024
b02fcd9
Merge branch 'main' into jaburnsi/chat-deleted-unread-message-count
JamesBurnside Jan 5, 2024
ca84bd9
Add deletedOn property to converted chat message type
JamesBurnside Jan 5, 2024
bce2375
Remove the redundant DeletedChatMessage interface by using the existi…
JamesBurnside Jan 5, 2024
55e5c9a
remove missed editedOn
JamesBurnside Jan 5, 2024
a8535f9
Merge branch 'main' into jaburnsi/chat-deleted-unread-message-count
JamesBurnside Jan 5, 2024
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
9 changes: 9 additions & 0 deletions change-beta/@azure-communication-react-0bde713d-dea9-4c4f-818d-5bcde6286354.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
Comment thread
vhuseinova-msft marked this conversation as resolved.
"area": "fix",
"workstream": "",
"comment": "Update the unread messages count on the CallWithChatComposite when a message is deleted.",
"packageName": "@azure/communication-react",
"email": "2684369+JamesBurnside@users.noreply.github.com",
"dependentChangeType": "patch"
}
9 changes: 9 additions & 0 deletions change-beta/@azure-communication-react-9086d50f-1734-491f-b814-ea14a009446e.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "improvement",
"workstream": "",
"comment": "Add messageEdited and messageDeleted events to the ChatAdapter",
"packageName": "@azure/communication-react",
"email": "2684369+JamesBurnside@users.noreply.github.com",
"dependentChangeType": "patch"
}
9 changes: 9 additions & 0 deletions change/@azure-communication-react-0bde713d-dea9-4c4f-818d-5bcde6286354.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "",
"comment": "Update the unread messages count on the CallWithChatComposite when a message is deleted.",
"packageName": "@azure/communication-react",
"email": "2684369+JamesBurnside@users.noreply.github.com",
"dependentChangeType": "patch"
}
9 changes: 9 additions & 0 deletions change/@azure-communication-react-9086d50f-1734-491f-b814-ea14a009446e.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "improvement",
"workstream": "",
"comment": "Add messageEdited and messageDeleted events to the ChatAdapter",
"packageName": "@azure/communication-react",
"email": "2684369+JamesBurnside@users.noreply.github.com",
"dependentChangeType": "patch"
}
29 changes: 28 additions & 1 deletion packages/communication-react/review/beta/communication-react.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,6 +1071,10 @@ export interface CallWithChatAdapterSubscriptions {
// (undocumented)
off(event: 'messageReceived', listener: MessageReceivedListener): void;
// (undocumented)
off(event: 'messageEdited', listener: MessageEditedListener): void;
// (undocumented)
off(event: 'messageDeleted', listener: MessageDeletedListener): void;
// (undocumented)
off(event: 'messageSent', listener: MessageSentListener): void;
// (undocumented)
off(event: 'messageRead', listener: MessageReadListener): void;
Expand Down Expand Up @@ -1115,6 +1119,10 @@ export interface CallWithChatAdapterSubscriptions {
// (undocumented)
on(event: 'messageReceived', listener: MessageReceivedListener): void;
// (undocumented)
on(event: 'messageEdited', listener: MessageEditedListener): void;
// (undocumented)
on(event: 'messageDeleted', listener: MessageDeletedListener): void;
// (undocumented)
on(event: 'messageSent', listener: MessageSentListener): void;
// (undocumented)
on(event: 'messageRead', listener: MessageReadListener): void;
Expand Down Expand Up @@ -1323,7 +1331,7 @@ export interface CallWithChatControlOptions extends CommonCallControlOptions {
}

// @public
export type CallWithChatEvent = 'callError' | 'chatError' | 'callEnded' | 'isMutedChanged' | 'callIdChanged' | 'isLocalScreenSharingActiveChanged' | 'displayNameChanged' | 'isSpeakingChanged' | 'callParticipantsJoined' | 'callParticipantsLeft' | 'selectedMicrophoneChanged' | 'selectedSpeakerChanged' | /* @conditional-compile-remove(close-captions) */ 'isCaptionsActiveChanged' | /* @conditional-compile-remove(close-captions) */ 'captionsReceived' | /* @conditional-compile-remove(close-captions) */ 'isCaptionLanguageChanged' | /* @conditional-compile-remove(close-captions) */ 'isSpokenLanguageChanged' | /* @conditional-compile-remove(capabilities) */ 'capabilitiesChanged' | 'messageReceived' | 'messageSent' | 'messageRead' | 'chatParticipantsAdded' | 'chatParticipantsRemoved';
export type CallWithChatEvent = 'callError' | 'chatError' | 'callEnded' | 'isMutedChanged' | 'callIdChanged' | 'isLocalScreenSharingActiveChanged' | 'displayNameChanged' | 'isSpeakingChanged' | 'callParticipantsJoined' | 'callParticipantsLeft' | 'selectedMicrophoneChanged' | 'selectedSpeakerChanged' | /* @conditional-compile-remove(close-captions) */ 'isCaptionsActiveChanged' | /* @conditional-compile-remove(close-captions) */ 'captionsReceived' | /* @conditional-compile-remove(close-captions) */ 'isCaptionLanguageChanged' | /* @conditional-compile-remove(close-captions) */ 'isSpokenLanguageChanged' | /* @conditional-compile-remove(capabilities) */ 'capabilitiesChanged' | 'messageReceived' | 'messageEdited' | 'messageDeleted' | 'messageSent' | 'messageRead' | 'chatParticipantsAdded' | 'chatParticipantsRemoved';

// @beta
export const CameraAndMicrophoneSitePermissions: (props: CameraAndMicrophoneSitePermissionsProps) => JSX.Element;
Expand Down Expand Up @@ -1543,13 +1551,17 @@ export type ChatAdapterState = ChatAdapterUiState & ChatCompositeClientState;
// @public
export interface ChatAdapterSubscribers {
off(event: 'messageReceived', listener: MessageReceivedListener): void;
off(event: 'messageEdited', listener: MessageEditedListener): void;
off(event: 'messageDeleted', listener: MessageDeletedListener): void;
off(event: 'messageSent', listener: MessageSentListener): void;
off(event: 'messageRead', listener: MessageReadListener): void;
off(event: 'participantsAdded', listener: ParticipantsAddedListener): void;
off(event: 'participantsRemoved', listener: ParticipantsRemovedListener): void;
off(event: 'topicChanged', listener: TopicChangedListener): void;
off(event: 'error', listener: (e: AdapterError) => void): void;
on(event: 'messageReceived', listener: MessageReceivedListener): void;
on(event: 'messageEdited', listener: MessageEditedListener): void;
on(event: 'messageDeleted', listener: MessageDeletedListener): void;
on(event: 'messageSent', listener: MessageSentListener): void;
on(event: 'messageRead', listener: MessageReadListener): void;
on(event: 'participantsAdded', listener: ParticipantsAddedListener): void;
Expand Down Expand Up @@ -2542,6 +2554,9 @@ export const DEFAULT_COMPOSITE_ICONS: {
SurveyStarIconFilled: React_2.JSX.Element;
};

// @public (undocumented)
export type DeletedChatMessage = Omit<ChatMessage_2, 'message' | 'metadata'>;
Comment thread
JamesBurnside marked this conversation as resolved.
Outdated

// @beta
export interface DeviceCheckOptions {
camera: 'required' | 'optional' | 'doNotPrompt';
Expand Down Expand Up @@ -3123,6 +3138,18 @@ export interface MessageCommon {
// @public
export type MessageContentType = 'text' | 'html' | 'richtext/html' | 'unknown';

// @public
export type MessageDeletedListener = (event: {
message: DeletedChatMessage;
deletedOn: Date;
}) => void;

// @public
export type MessageEditedListener = (event: {
message: ChatMessage_2;
editedOn: Date;
}) => void;

// @public
export type MessageProps = {
message: Message;
Expand Down
29 changes: 28 additions & 1 deletion packages/communication-react/review/stable/communication-react.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,10 @@ export interface CallWithChatAdapterSubscriptions {
// (undocumented)
off(event: 'messageReceived', listener: MessageReceivedListener): void;
// (undocumented)
off(event: 'messageEdited', listener: MessageEditedListener): void;
// (undocumented)
off(event: 'messageDeleted', listener: MessageDeletedListener): void;
// (undocumented)
off(event: 'messageSent', listener: MessageSentListener): void;
// (undocumented)
off(event: 'messageRead', listener: MessageReadListener): void;
Expand Down Expand Up @@ -849,6 +853,10 @@ export interface CallWithChatAdapterSubscriptions {
// (undocumented)
on(event: 'messageReceived', listener: MessageReceivedListener): void;
// (undocumented)
on(event: 'messageEdited', listener: MessageEditedListener): void;
Comment thread
JamesBurnside marked this conversation as resolved.
// (undocumented)
on(event: 'messageDeleted', listener: MessageDeletedListener): void;
// (undocumented)
on(event: 'messageSent', listener: MessageSentListener): void;
// (undocumented)
on(event: 'messageRead', listener: MessageReadListener): void;
Expand Down Expand Up @@ -1012,7 +1020,7 @@ export interface CallWithChatControlOptions extends CommonCallControlOptions {
}

// @public
export type CallWithChatEvent = 'callError' | 'chatError' | 'callEnded' | 'isMutedChanged' | 'callIdChanged' | 'isLocalScreenSharingActiveChanged' | 'displayNameChanged' | 'isSpeakingChanged' | 'callParticipantsJoined' | 'callParticipantsLeft' | 'selectedMicrophoneChanged' | 'selectedSpeakerChanged' | /* @conditional-compile-remove(close-captions) */ 'isCaptionsActiveChanged' | /* @conditional-compile-remove(close-captions) */ 'captionsReceived' | /* @conditional-compile-remove(close-captions) */ 'isCaptionLanguageChanged' | /* @conditional-compile-remove(close-captions) */ 'isSpokenLanguageChanged' | /* @conditional-compile-remove(capabilities) */ 'capabilitiesChanged' | 'messageReceived' | 'messageSent' | 'messageRead' | 'chatParticipantsAdded' | 'chatParticipantsRemoved';
export type CallWithChatEvent = 'callError' | 'chatError' | 'callEnded' | 'isMutedChanged' | 'callIdChanged' | 'isLocalScreenSharingActiveChanged' | 'displayNameChanged' | 'isSpeakingChanged' | 'callParticipantsJoined' | 'callParticipantsLeft' | 'selectedMicrophoneChanged' | 'selectedSpeakerChanged' | /* @conditional-compile-remove(close-captions) */ 'isCaptionsActiveChanged' | /* @conditional-compile-remove(close-captions) */ 'captionsReceived' | /* @conditional-compile-remove(close-captions) */ 'isCaptionLanguageChanged' | /* @conditional-compile-remove(close-captions) */ 'isSpokenLanguageChanged' | /* @conditional-compile-remove(capabilities) */ 'capabilitiesChanged' | 'messageReceived' | 'messageEdited' | 'messageDeleted' | 'messageSent' | 'messageRead' | 'chatParticipantsAdded' | 'chatParticipantsRemoved';

// @public
export const CameraButton: (props: CameraButtonProps) => JSX.Element;
Expand Down Expand Up @@ -1206,13 +1214,17 @@ export type ChatAdapterState = ChatAdapterUiState & ChatCompositeClientState;
// @public
export interface ChatAdapterSubscribers {
off(event: 'messageReceived', listener: MessageReceivedListener): void;
off(event: 'messageEdited', listener: MessageEditedListener): void;
off(event: 'messageDeleted', listener: MessageDeletedListener): void;
off(event: 'messageSent', listener: MessageSentListener): void;
off(event: 'messageRead', listener: MessageReadListener): void;
off(event: 'participantsAdded', listener: ParticipantsAddedListener): void;
off(event: 'participantsRemoved', listener: ParticipantsRemovedListener): void;
off(event: 'topicChanged', listener: TopicChangedListener): void;
off(event: 'error', listener: (e: AdapterError) => void): void;
on(event: 'messageReceived', listener: MessageReceivedListener): void;
on(event: 'messageEdited', listener: MessageEditedListener): void;
on(event: 'messageDeleted', listener: MessageDeletedListener): void;
on(event: 'messageSent', listener: MessageSentListener): void;
on(event: 'messageRead', listener: MessageReadListener): void;
on(event: 'participantsAdded', listener: ParticipantsAddedListener): void;
Expand Down Expand Up @@ -2070,6 +2082,9 @@ export const DEFAULT_COMPOSITE_ICONS: {
ContextMenuSpeakerIcon: React_2.JSX.Element;
};

// @public (undocumented)
export type DeletedChatMessage = Omit<ChatMessage_2, 'message' | 'metadata'>;

// @public
export type DeviceManagerState = {
isSpeakerSelectionAvailable: boolean;
Expand Down Expand Up @@ -2460,6 +2475,18 @@ export interface MessageCommon {
// @public
export type MessageContentType = 'text' | 'html' | 'richtext/html' | 'unknown';

// @public
export type MessageDeletedListener = (event: {
message: DeletedChatMessage;
deletedOn: Date;
}) => void;

// @public
export type MessageEditedListener = (event: {
message: ChatMessage_2;
editedOn: Date;
}) => void;

// @public
export type MessageProps = {
message: Message;
Expand Down
29 changes: 28 additions & 1 deletion packages/react-composites/review/beta/react-composites.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,10 @@ export interface CallWithChatAdapterSubscriptions {
// (undocumented)
off(event: 'messageReceived', listener: MessageReceivedListener): void;
// (undocumented)
off(event: 'messageEdited', listener: MessageEditedListener): void;
// (undocumented)
off(event: 'messageDeleted', listener: MessageDeletedListener): void;
// (undocumented)
off(event: 'messageSent', listener: MessageSentListener): void;
// (undocumented)
off(event: 'messageRead', listener: MessageReadListener): void;
Expand Down Expand Up @@ -816,6 +820,10 @@ export interface CallWithChatAdapterSubscriptions {
// (undocumented)
on(event: 'messageReceived', listener: MessageReceivedListener): void;
// (undocumented)
on(event: 'messageEdited', listener: MessageEditedListener): void;
// (undocumented)
on(event: 'messageDeleted', listener: MessageDeletedListener): void;
// (undocumented)
on(event: 'messageSent', listener: MessageSentListener): void;
// (undocumented)
on(event: 'messageRead', listener: MessageReadListener): void;
Expand Down Expand Up @@ -1024,7 +1032,7 @@ export interface CallWithChatControlOptions extends CommonCallControlOptions {
}

// @public
export type CallWithChatEvent = 'callError' | 'chatError' | 'callEnded' | 'isMutedChanged' | 'callIdChanged' | 'isLocalScreenSharingActiveChanged' | 'displayNameChanged' | 'isSpeakingChanged' | 'callParticipantsJoined' | 'callParticipantsLeft' | 'selectedMicrophoneChanged' | 'selectedSpeakerChanged' | /* @conditional-compile-remove(close-captions) */ 'isCaptionsActiveChanged' | /* @conditional-compile-remove(close-captions) */ 'captionsReceived' | /* @conditional-compile-remove(close-captions) */ 'isCaptionLanguageChanged' | /* @conditional-compile-remove(close-captions) */ 'isSpokenLanguageChanged' | /* @conditional-compile-remove(capabilities) */ 'capabilitiesChanged' | 'messageReceived' | 'messageSent' | 'messageRead' | 'chatParticipantsAdded' | 'chatParticipantsRemoved';
export type CallWithChatEvent = 'callError' | 'chatError' | 'callEnded' | 'isMutedChanged' | 'callIdChanged' | 'isLocalScreenSharingActiveChanged' | 'displayNameChanged' | 'isSpeakingChanged' | 'callParticipantsJoined' | 'callParticipantsLeft' | 'selectedMicrophoneChanged' | 'selectedSpeakerChanged' | /* @conditional-compile-remove(close-captions) */ 'isCaptionsActiveChanged' | /* @conditional-compile-remove(close-captions) */ 'captionsReceived' | /* @conditional-compile-remove(close-captions) */ 'isCaptionLanguageChanged' | /* @conditional-compile-remove(close-captions) */ 'isSpokenLanguageChanged' | /* @conditional-compile-remove(capabilities) */ 'capabilitiesChanged' | 'messageReceived' | 'messageEdited' | 'messageDeleted' | 'messageSent' | 'messageRead' | 'chatParticipantsAdded' | 'chatParticipantsRemoved';

// @public
export type CapabilitiesChangedListener = (data: CapabilitiesChangeInfo) => void;
Expand Down Expand Up @@ -1059,13 +1067,17 @@ export type ChatAdapterState = ChatAdapterUiState & ChatCompositeClientState;
// @public
export interface ChatAdapterSubscribers {
off(event: 'messageReceived', listener: MessageReceivedListener): void;
off(event: 'messageEdited', listener: MessageEditedListener): void;
off(event: 'messageDeleted', listener: MessageDeletedListener): void;
off(event: 'messageSent', listener: MessageSentListener): void;
off(event: 'messageRead', listener: MessageReadListener): void;
off(event: 'participantsAdded', listener: ParticipantsAddedListener): void;
off(event: 'participantsRemoved', listener: ParticipantsRemovedListener): void;
off(event: 'topicChanged', listener: TopicChangedListener): void;
off(event: 'error', listener: (e: AdapterError) => void): void;
on(event: 'messageReceived', listener: MessageReceivedListener): void;
on(event: 'messageEdited', listener: MessageEditedListener): void;
on(event: 'messageDeleted', listener: MessageDeletedListener): void;
on(event: 'messageSent', listener: MessageSentListener): void;
on(event: 'messageRead', listener: MessageReadListener): void;
on(event: 'participantsAdded', listener: ParticipantsAddedListener): void;
Expand Down Expand Up @@ -1502,6 +1514,9 @@ export const DEFAULT_COMPOSITE_ICONS: {
SurveyStarIconFilled: React_2.JSX.Element;
};

// @public (undocumented)
export type DeletedChatMessage = Omit<ChatMessage, 'message' | 'metadata'>;

// @beta
export interface DeviceCheckOptions {
camera: 'required' | 'optional' | 'doNotPrompt';
Expand Down Expand Up @@ -1660,6 +1675,18 @@ export type MediaDiagnosticChangedEvent = MediaDiagnosticChangedEventArgs & {
type: 'media';
};

// @public
export type MessageDeletedListener = (event: {
message: DeletedChatMessage;
deletedOn: Date;
}) => void;

// @public
export type MessageEditedListener = (event: {
message: ChatMessage;
editedOn: Date;
}) => void;

// @public
export type MessageReadListener = (event: {
message: ChatMessage;
Expand Down
Loading
⚡