Skip to content

Regression: fix non ee tag field on canned responses #22775

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
KevLehman merged 3 commits into from
Jul 27, 2021
Merged

Regression: fix non ee tag field on canned responses #22775

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4369b73
Regression: fix non ee tag field on canned responses
MartinSchoeler Jul 27, 2021
ab0eaec
Merge branch 'develop' into fix-non-EE-tags-canned
KevLehman Jul 27, 2021
52a5fcf
Merge branch 'develop' into fix-non-EE-tags-canned
KevLehman Jul 27, 2021
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 client/components/Omnichannel/Tags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const Tags = ({ tags = [], handler = () => {}, error = '', tagRequired = false }
<Field.Row>
<TextInput
error={error}
value={tagValue}
value={tagValue?.value ? tagValue.value : tagValue}
onChange={(event) => handleTagValue(event.target.value)}
flexGrow={1}
placeholder={t('Enter_a_tag')}
Expand All @@ -80,7 +80,7 @@ const Tags = ({ tags = [], handler = () => {}, error = '', tagRequired = false }
<Field.Row justifyContent='flex-start'>
{tags.map((tag, i) => (
<Chip key={i} onClick={() => removeTag(tag)} mie='x8'>
{tag}
{tag?.value ? tag.value : tag}
</Chip>
))}
</Field.Row>
Expand Down
5 changes: 4 additions & 1 deletion ee/client/omnichannel/cannedResponses/CannedResponseEdit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,15 @@ const CannedResponseEdit: FC<{
tags: any;
departmentId: { value: string; label: string };
};
const mappedTags = tags.map((tag: string | { value: string; label: string }) =>
typeof tag === 'object' ? tag?.value : tag,
);
await saveCannedResponse({
...(_id && { _id }),
shortcut,
text,
scope,
...(tags.length > 0 && { tags }),
...(mappedTags.length > 0 && { tags: mappedTags }),
...(departmentId && { departmentId: departmentId.value }),
});
dispatchToastMessage({
Expand Down
5 changes: 4 additions & 1 deletion ee/client/omnichannel/components/CannedResponse/modals/CreateCannedResponse/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,15 @@ const WrapCreateCannedResponseModal: FC<{ data?: any; reloadCannedList?: any }>
tags: any;
departmentId: { value: string; label: string };
};
const mappedTags = tags.map((tag: string | { value: string; label: string }) =>
typeof tag === 'object' ? tag?.value : tag,
);
await saveCannedResponse({
...(_id && { _id }),
shortcut,
text,
scope,
...(tags.length > 0 && { tags }),
...(tags.length > 0 && { tags: mappedTags }),
...(departmentId && { departmentId: departmentId.value }),
});
dispatchToastMessage({
Expand Down