Skip to content

fix(apollo-react): align chat message defaults with the catalog so lingui extract runs #1452

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

Open
roxana-mocanu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(apollo-react): align chat message defaults with the catalog so lingui extract runs #1452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/apollo-react/src/chat/headless/hooks/use-attachment-intake.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export function useAttachmentIntake() {
_(
msg({
id: 'autopilot-chat.error.multiple-files',
message: `Only one file can be attached at a time`,
message: `Only one file can be attached per message`,
})
)
);
Expand All @@ -137,7 +137,7 @@ export function useAttachmentIntake() {
_(
msg({
id: 'autopilot-chat.error.too-many-files',
message: `Maximum ${maxCount} files allowed`,
message: `Too many files. ${maxCount} files are allowed per message`,
})
)
);
Expand Down
6 changes: 4 additions & 2 deletions packages/apollo-react/src/chat/headless/providers/attachments-provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,13 @@ export function AutopilotAttachmentsProvider({ children }: { children: React.Rea
const totalCount = filesToAdd.length;

if (allowedAttachments.maxCount && totalCount > allowedAttachments.maxCount) {
// Named `maxCount` to match the catalog's placeholder.
const maxCount = allowedAttachments.maxCount;
setError(
_(
msg({
id: 'autopilot-chat.error.too-many-files',
message: `Maximum ${allowedAttachments.maxCount} files allowed`,
message: `Too many files. ${maxCount} files are allowed per message`,
})
)
);
Expand All @@ -118,7 +120,7 @@ export function AutopilotAttachmentsProvider({ children }: { children: React.Rea
_(
msg({
id: 'autopilot-chat.error.multiple-files',
message: `Only one file is allowed`,
message: `Only one file can be attached per message`,
})
)
);
Expand Down
6 changes: 4 additions & 2 deletions packages/apollo-react/src/material/components/ap-chat/components/common/attachments.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ export const Attachment = React.memo(

return [IconComp, fileType];
}, [attachment]);
// Named `name` to match the catalog's placeholder.
const name = attachment.name;

return (
<StyledAttachment
Expand Down Expand Up @@ -201,12 +203,12 @@ export const Attachment = React.memo(
iconSize={token.Icon.IconS}
iconName="close"
tooltip={_(
msg({ id: 'autopilot-chat.common.attachments.remove-file', message: `Remove file` })
msg({ id: 'autopilot-chat.common.attachments.remove-file', message: `Remove` })
)}
ariaLabel={_(
msg({
id: 'autopilot-chat.common.attachments.remove-file-name',
message: `Remove ${attachment.name}`,
message: `Remove ${name}`,
})
)}
onClick={() => {
Expand Down
4 changes: 2 additions & 2 deletions ...react/src/material/components/ap-chat/components/input/tiptap/resource-chip-node-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@ const ResourceChipBaseInner: React.FC<ResourceChipBaseProps> = ({
iconName="close"
tooltip={_(
msg({
id: 'autopilot-chat.common.attachments.remove-file',
id: 'autopilot-chat.input.resource-chip.remove',
message: 'Remove',
})
)}
ariaLabel={_(
msg({
id: 'autopilot-chat.common.attachments.remove-file-name',
id: 'autopilot-chat.input.resource-chip.remove-name',
message: `Remove ${label}`,
})
)}
Expand Down
Loading