Skip to content

Commit 60b6113

Browse files
[Chat] Add more CCs for inline image beta-release build (#4187)
* Add more CCs for inline image * Change files * Duplicate change files for beta release
1 parent 7c459e2 commit 60b6113

5 files changed

Lines changed: 40 additions & 6 deletions

File tree

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "none",
3+
"area": "improvement",
4+
"workstream": "InlineImage",
5+
"comment": "Add more CCs for inline image",
6+
"packageName": "@azure/communication-react",
7+
"email": "107075081+Leah-Xia-Microsoft@users.noreply.github.com",
8+
"dependentChangeType": "none"
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "none",
3+
"area": "improvement",
4+
"workstream": "InlineImage",
5+
"comment": "Add more CCs for inline image",
6+
"packageName": "@azure/communication-react",
7+
"email": "107075081+Leah-Xia-Microsoft@users.noreply.github.com",
8+
"dependentChangeType": "none"
9+
}

packages/chat-component-bindings/src/messageThreadSelector.ts

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,19 @@ const extractAttachedFilesMetadata = (metadata: Record<string, string>): FileMet
7878
const extractTeamsAttachmentsMetadata = (
7979
attachments: ChatAttachment[],
8080
resourceCache?: Record<string, string>
81-
): { /* @conditional-compile-remove(file-sharing) */ files: FileMetadata[]; inlineImages: InlineImageMetadata[] } => {
81+
): {
82+
/* @conditional-compile-remove(file-sharing) */ files: FileMetadata[];
83+
/* @conditional-compile-remove(teams-inline-images-and-file-sharing) */ inlineImages: InlineImageMetadata[];
84+
} => {
8285
/* @conditional-compile-remove(file-sharing) */
8386
const files: FileMetadata[] = [];
87+
/* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
8488
const inlineImages: InlineImageMetadata[] = [];
8589
attachments.forEach((attachment) => {
8690
const attachmentType = mapAttachmentType(attachment.attachmentType);
8791
/* @conditional-compile-remove(file-sharing) */
8892
const contentType = extractAttachmentContentTypeFromName(attachment.name);
93+
/* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
8994
if (attachmentType === 'inlineImage') {
9095
inlineImages.push({
9196
attachmentType: attachmentType,
@@ -107,7 +112,10 @@ const extractTeamsAttachmentsMetadata = (
107112
});
108113
}
109114
});
110-
return { /* @conditional-compile-remove(file-sharing) */ files, inlineImages };
115+
return {
116+
/* @conditional-compile-remove(file-sharing) */ files,
117+
/* @conditional-compile-remove(teams-inline-images-and-file-sharing) */ inlineImages
118+
};
111119
};
112120

113121
/* @conditional-compile-remove(data-loss-prevention) */
@@ -217,9 +225,13 @@ const extractAttachmentContentTypeFromName = (name?: string): string => {
217225
/* @conditional-compile-remove(file-sharing) @conditional-compile-remove(teams-inline-images-and-file-sharing) */
218226
const extractAttachmentsMetadata = (
219227
message: ChatMessageWithStatus
220-
): { /* @conditional-compile-remove(file-sharing) */ files: FileMetadata[]; inlineImages: InlineImageMetadata[] } => {
228+
): {
229+
/* @conditional-compile-remove(file-sharing) */ files: FileMetadata[];
230+
/* @conditional-compile-remove(teams-inline-images-and-file-sharing) */ inlineImages: InlineImageMetadata[];
231+
} => {
221232
/* @conditional-compile-remove(file-sharing) */
222233
let files: FileMetadata[] = [];
234+
/* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
223235
let inlineImages: InlineImageMetadata[] = [];
224236

225237
/* @conditional-compile-remove(file-sharing) */
@@ -232,10 +244,14 @@ const extractAttachmentsMetadata = (
232244
const teamsAttachments = extractTeamsAttachmentsMetadata(message.content?.attachments, message.resourceCache);
233245
/* @conditional-compile-remove(file-sharing) */
234246
files = files.concat(teamsAttachments.files);
247+
/* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
235248
inlineImages = inlineImages.concat(teamsAttachments.inlineImages);
236249
}
237250

238-
return { /* @conditional-compile-remove(file-sharing) */ files, inlineImages };
251+
return {
252+
/* @conditional-compile-remove(file-sharing) */ files,
253+
/* @conditional-compile-remove(teams-inline-images-and-file-sharing) */ inlineImages
254+
};
239255
};
240256
const convertToUiChatMessage = (
241257
message: ChatMessageWithStatus,

packages/react-components/src/components/MessageThread.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { BlockedMessage } from '../types';
1212
import { createTestLocale, renderWithLocalization } from './utils/testUtils';
1313
/* @conditional-compile-remove(date-time-customization) @conditional-compile-remove(data-loss-prevention) */
1414
import { COMPONENT_LOCALE_EN_US } from '../localization/locales';
15-
/* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
15+
/* @conditional-compile-remove(teams-inline-images-and-file-sharing) @conditional-compile-remove(mention)*/
1616
import { waitFor } from '@testing-library/react';
1717
/* @conditional-compile-remove(data-loss-prevention) */ /* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
1818
import { registerIcons } from '@fluentui/react';

packages/react-composites/src/composites/ChatComposite/adapter/AzureCommunicationChatAdapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import {
3535
/* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
3636
import { ResourceDetails } from './ChatAdapter';
3737
import { AdapterError } from '../../common/adapters';
38-
/* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
38+
/* @conditional-compile-remove(file-sharing) */
3939
import { FileUploadAdapter, convertFileUploadsUiStateToMessageMetadata } from './AzureCommunicationFileUploadAdapter';
4040
/* @conditional-compile-remove(file-sharing) */
4141
import { AzureCommunicationFileUploadAdapter } from './AzureCommunicationFileUploadAdapter';

0 commit comments

Comments
 (0)