Skip to content

[FIX] Pagination not working on current chats #27432

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
kodiakhq merged 4 commits into from
Dec 8, 2022
Merged

[FIX] Pagination not working on current chats #27432

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf1dc90
[FIX] Pagination not working on current chats
MartinSchoeler Dec 2, 2022
c4c55ec
[FIX]: Adjusted query to consider current page
aleksandernsilva Dec 5, 2022
3f71522
[FIX] Ajusted to return to first page after filtering
aleksandernsilva Dec 6, 2022
4d2dac9
Merge branch 'develop' into fix-current-chat-pagination
kodiakhq[bot] Dec 8, 2022
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
44 changes: 24 additions & 20 deletions apps/meteor/client/views/omnichannel/currentChats/CurrentChatsRoute.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,21 @@ type useQueryType = (
from: string;
to: string;
tags: any[];
itemsPerPage: 25 | 50 | 100;
current: number;
},
customFields: { [key: string]: string } | undefined,
[column, direction]: [string, 'asc' | 'desc'],
current: number,
itemsPerPage: 25 | 50 | 100,
) => GETLivechatRoomsParams;

const sortDir = (sortDir: 'asc' | 'desc'): 1 | -1 => (sortDir === 'asc' ? 1 : -1);

const currentChatQuery: useQueryType = (
{ guest, servedBy, department, status, from, to, tags, itemsPerPage, current },
{ guest, servedBy, department, status, from, to, tags },
customFields,
[column, direction],
current,
itemsPerPage,
) => {
const query: {
agents?: string[];
Expand Down Expand Up @@ -111,6 +113,18 @@ const currentChatQuery: useQueryType = (
const CurrentChatsRoute = (): ReactElement => {
const { sortBy, sortDirection, setSort } = useSort<'fname' | 'departmentId' | 'servedBy' | 'ts' | 'lm' | 'open'>('ts', 'desc');
const [customFields, setCustomFields] = useState<{ [key: string]: string }>();

const t = useTranslation();
const id = useRouteParameter('id');

const canViewCurrentChats = usePermission('view-livechat-current-chats');
const canRemoveClosedChats = usePermission('remove-closed-livechat-room');
const directoryRoute = useRoute('omnichannel-current-chats');

const { data: allCustomFields } = useAllCustomFields();

const { current, itemsPerPage, setItemsPerPage, setCurrent, ...paginationProps } = usePagination();

const [params, setParams] = useState({
guest: '',
fname: '',
Expand All @@ -120,31 +134,21 @@ const CurrentChatsRoute = (): ReactElement => {
from: '',
to: '',
current: 0,
itemsPerPage: 25 as 25 | 50 | 100,
tags: [] as string[],
});
const t = useTranslation();
const id = useRouteParameter('id');

const query = useMemo(
() => currentChatQuery(params, customFields, [sortBy, sortDirection]),
[customFields, params, sortBy, sortDirection],
);
const canViewCurrentChats = usePermission('view-livechat-current-chats');
const canRemoveClosedChats = usePermission('remove-closed-livechat-room');
const directoryRoute = useRoute('omnichannel-current-chats');

const result = useCurrentChats(query);

const { data: allCustomFields } = useAllCustomFields();

const { current, itemsPerPage, setItemsPerPage, setCurrent, ...paginationProps } = usePagination();

const hasCustomFields = useMemo(
() => !!allCustomFields?.customFields?.find((customField) => customField.scope === 'room'),
[allCustomFields],
);

const query = useMemo(
() => currentChatQuery(params, customFields, [sortBy, sortDirection], current, itemsPerPage),
[customFields, itemsPerPage, params, sortBy, sortDirection, current],
);

const result = useCurrentChats(query);

const onRowClick = useMutableCallback((_id) => {
directoryRoute.push({ id: _id });
});
Expand Down