forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-03-18 21:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enrues proper ordering is sent to shlink when ordering by visits

Browse Source
This commit is contained in:
Alejandro Celaya
2022-12-22 18:07:44 +01:00
parent 901df2b90d
commit b9285fd600
4 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/short-urls/ShortUrlsList.tsx
View File

@@ -7,14 +7,15 @@ import { getServerId, SelectedServer } from '../servers/data';
import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
import { Topics } from '../mercure/helpers/Topics';
import { TableOrderIcon } from '../utils/table/TableOrderIcon';
import { ShlinkShortUrlsListParams } from '../api/types';
import { ShlinkShortUrlsListParams, ShlinkShortUrlsOrder } from '../api/types';
import { DEFAULT_SHORT_URLS_ORDERING, Settings } from '../settings/reducers/settings';
import { ShortUrlsList as ShortUrlsListState } from './reducers/shortUrlsList';
import { ShortUrlsTableType } from './ShortUrlsTable';
import { Paginator } from './Paginator';
import { useShortUrlsQuery } from './helpers/hooks';
import { ShortUrlsOrderableFields } from './data';
import { ShortUrlsOrder, ShortUrlsOrderableFields } from './data';
import { ShortUrlsFilteringBarType } from './ShortUrlsFilteringBar';
import { supportsExcludeBotsOnShortUrls } from '../utils/helpers/features';
interface ShortUrlsListProps {
selectedServer: SelectedServer;
@@ -48,6 +49,13 @@ export const ShortUrlsList = (
(newTag: string) => [...new Set([...tags, newTag])],
(updatedTags) => toFirstPage({ tags: updatedTags }),
);
const parseOrderByForShlink = ({ field, dir }: ShortUrlsOrder): ShlinkShortUrlsOrder => {
if (supportsExcludeBotsOnShortUrls(selectedServer) && settings.visits?.excludeBots && field === 'visits') {
return { field: 'nonBotVisits', dir };
}
return { field, dir };
};
useEffect(() => {
listShortUrls({
@@ -56,10 +64,10 @@ export const ShortUrlsList = (
tags,
startDate,
endDate,
orderBy: actualOrderBy,
orderBy: parseOrderByForShlink(actualOrderBy),
tagsMode,
});
}, [page, search, tags, startDate, endDate, actualOrderBy, tagsMode]);
}, [page, search, tags, startDate, endDate, actualOrderBy.field, actualOrderBy.dir, tagsMode]);
return (
<>