Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/real-fishes-fail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Disables sorting on non-indexed columns in the "Chats" tab of Omnichannel Contact Center
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ const ChatsTable = () => {
const chatsQuery = useChatsQuery();

const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
const { sortBy, sortDirection, setSort } = useSort<
'fname' | 'priorityWeight' | 'source.type' | 'verified' | 'department.name' | 'servedBy' | 'ts' | 'lm' | 'status'
>('lm', 'desc');
const { sortBy, sortDirection, setSort } = useSort<'fname' | 'ts'>('ts', 'desc');

const query = useMemo(
() => chatsQuery(filters, [sortBy, sortDirection], current, itemsPerPage),
Expand All @@ -51,50 +49,19 @@ const ChatsTable = () => {
{t('Name')}
</GenericTableHeaderCell>
{isPriorityEnabled && (
<GenericTableHeaderCell
key='priorityWeight'
direction={sortDirection}
active={sortBy === 'priorityWeight'}
onClick={setSort}
sort='priorityWeight'
alignItems='center'
>
<GenericTableHeaderCell key='priorityWeight' alignItems='center'>
{t('Priority')}
</GenericTableHeaderCell>
)}
<GenericTableHeaderCell
key='source.type'
direction={sortDirection}
active={sortBy === 'source.type'}
onClick={setSort}
sort='source.type'
>
{t('Channel')}
</GenericTableHeaderCell>
<GenericTableHeaderCell key='servedBy' direction={sortDirection} active={sortBy === 'servedBy'} onClick={setSort} sort='servedBy'>
{t('Agent')}
</GenericTableHeaderCell>
<GenericTableHeaderCell w='x100' direction={sortDirection} active={sortBy === 'verified'} onClick={setSort} sort='verified'>
{t('Verification')}
</GenericTableHeaderCell>
<GenericTableHeaderCell
key='department.name'
direction={sortDirection}
active={sortBy === 'department.name'}
onClick={setSort}
sort='department.name'
>
{t('Department')}
</GenericTableHeaderCell>
<GenericTableHeaderCell key='source.type'>{t('Channel')}</GenericTableHeaderCell>
<GenericTableHeaderCell key='servedBy'>{t('Agent')}</GenericTableHeaderCell>
<GenericTableHeaderCell w='x100'>{t('Verification')}</GenericTableHeaderCell>
<GenericTableHeaderCell key='department.name'>{t('Department')}</GenericTableHeaderCell>
<GenericTableHeaderCell key='ts' direction={sortDirection} active={sortBy === 'ts'} onClick={setSort} sort='ts'>
{t('Started_At')}
</GenericTableHeaderCell>
<GenericTableHeaderCell key='lm' direction={sortDirection} active={sortBy === 'lm'} onClick={setSort} sort='lm'>
{t('Last_Message')}
</GenericTableHeaderCell>
<GenericTableHeaderCell key='status' direction={sortDirection} active={sortBy === 'status'} onClick={setSort} sort='status'>
{t('Status')}
</GenericTableHeaderCell>
<GenericTableHeaderCell key='lm'>{t('Last_Message')}</GenericTableHeaderCell>
<GenericTableHeaderCell key='status'>{t('Status')}</GenericTableHeaderCell>
{canRemoveClosedChats && <GenericTableHeaderCell key='remove' w='x60' data-qa='current-chats-header-remove' />}
</>
);
Expand Down
Loading