Skip to content
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

[FIX] Filters are not being applied correctly in Omnichannel Current Chats list #20320

Merged
merged 16 commits into from
Feb 2, 2021
Merged

[FIX] Filters are not being applied correctly in Omnichannel Current Chats list #20320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4b43102
fix capitalized "All" to "all" value.
rafaelblink Jan 22, 2021
8f7350d
Merge branch 'develop' into omnichannel/departments-auto-complete-fix
rafaelblink Jan 22, 2021
b8e3c24
Merge branch 'develop' into omnichannel/departments-auto-complete-fix
renatobecker Jan 26, 2021
f85e5c4
fix date filtering issue.
rafaelblink Jan 29, 2021
021de62
Merge branch 'develop' into omnichannel/departments-auto-complete-fix
rafaelblink Jan 29, 2021
7c8edbd
Merge branch 'develop' into omnichannel/departments-auto-complete-fix
rafaelblink Feb 1, 2021
77080ec
refactor client and server to accept only 'from' and 'to' dates to li…
rafaelblink Feb 1, 2021
a1883d0
set previous date limit to selected date on 'to' field.
rafaelblink Feb 2, 2021
a48f0ab
permitting users to filter date and hour selecting only 'start' date/…
rafaelblink Feb 2, 2021
ab4e3e2
Revert "permitting users to filter date and hour selecting only 'star…
rafaelblink Feb 2, 2021
26936a3
Merge branch 'develop' into omnichannel/departments-auto-complete-fix
rafaelblink Feb 2, 2021
a27f055
set a specific date format to server side read properly.
rafaelblink Feb 2, 2021
5a10476
check on the server side if dates are valid.
rafaelblink Feb 2, 2021
4cf885d
Revert "check on the server side if dates are valid."
rafaelblink Feb 2, 2021
aa2ce18
Code style improvements.
renatobecker Feb 2, 2021
33ed23b
Revert unnecessary changes.
renatobecker Feb 2, 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 client/components/AutoCompleteDepartment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const AutoCompleteDepartment = React.memo((props) => {

const { label } = props;

const options = useMemo(() => (data && [{ value: 'All', label: label && t('All') }, ...data.departments.map((department) => ({ value: department._id, label: department.name }))]) || [{ value: 'All', label: label || t('All') }], [data, label, t]);
const options = useMemo(() => (data && [{ value: 'all', label: label && t('All') }, ...data.departments.map((department) => ({ value: department._id, label: department.name }))]) || [{ value: 'all', label: label || t('All') }], [data, label, t]);

return <AutoComplete
{...props}
Expand Down
7 changes: 5 additions & 2 deletions client/views/omnichannel/currentChats/CurrentChatsRoute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,11 @@ const useQuery = ({ guest, servedBy, department, status, from, to, tags, customF
...current && { offset: current },
};

if (from && to) {
query.createdAt = JSON.stringify({ start: from, end: to });
if (from || to) {
query.createdAt = JSON.stringify({
rafaelblink marked this conversation as resolved.
Show resolved Hide resolved
...from && { start: moment(new Date(from)).set({ hour: '00', minutes: '00', seconds: '00' }).format('YYYY-MM-DDTHH:mm:ss') },
...to && { end: moment(new Date(to)).set({ hour: '23', minutes: '59', seconds: '59' }).format('YYYY-MM-DDTHH:mm:ss') },
});
}
if (status !== 'all') {
query.open = status === 'opened';
Expand Down