Skip to content

Regression: fix outdated data on canned filters #22766

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 2 commits into from
Jul 26, 2021
Merged

Regression: fix outdated data on canned filters #22766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38c71d2
Regression: fix outdated data on canned filters
MartinSchoeler Jul 26, 2021
e51309b
Merge branch 'develop' into fix-filters
KevLehman Jul 26, 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
2 changes: 1 addition & 1 deletion ee/app/api-enterprise/server/lib/canned-responses.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export async function findAllCannedResponsesFilter({ userId, shortcut, text, dep
...shortcut ? [{ shortcut }] : [],
...text ? [{ $or: [{ shortcut: textFilter }, { text: textFilter }] }] : [],
...scope ? [{ scope }] : [],
...createdBy ? [{ 'createdBy.username': createdBy }] : [],
...createdBy ? [{ 'createdBy._id': createdBy }] : [],
...tags.length ? [{
tags: {
$in: tags,
Expand Down
4 changes: 2 additions & 2 deletions ee/client/omnichannel/cannedResponses/CannedResponseFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import AutoCompleteTagsMultiple from '../tags/AutoCompleteTagsMultiple';

type CannedResponsesFilterProps = {
sharingValue: string;
createdByValue: { value: string; label: string };
tagsValue: string;
createdByValue: string;
tagsValue: Array<{ value: string; label: string }>;
shortcutValue: string;
setSharing: (eventOrValue: unknown) => void;
setCreatedBy: (eventOrValue: unknown) => void;
Expand Down
10 changes: 5 additions & 5 deletions ee/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ const CannedResponsesRoute: FC = () => {

type CannedResponseFilterValues = {
sharing: string;
createdBy: { value: string; label: string };
tags: string;
createdBy: string;
tags: Array<{ value: string; label: string }>;
text: string;
firstMessage: string;
};

const { values, handlers } = useForm({
sharing: '',
createdBy: {},
createdBy: '',
tags: [],
text: '',
});
Expand All @@ -52,9 +52,9 @@ const CannedResponsesRoute: FC = () => {
() => ({
text: debouncedText,
sort: JSON.stringify({ [debouncedSort[0]]: debouncedSort[1] === 'asc' ? 1 : -1 }),
...(tags && tags.length > 0 && { tags }),
...(tags && tags.length > 0 && { tags: tags.map((tag) => tag.label) }),
...(sharing && { scope: sharing }),
...(createdBy?.label && { createdBy: createdBy.label }),
...(createdBy && createdBy !== 'all' && { createdBy }),
...(debouncedParams.itemsPerPage && { count: debouncedParams.itemsPerPage }),
...(debouncedParams.current && { offset: debouncedParams.current }),
}),
Expand Down