mirror of
https://github.com/shlinkio/shlink-web-client.git
synced 2024-12-23 01:20:24 +03:00
Fixed visits query being lost when switching between sub-sections
This commit is contained in:
parent
f911f78c95
commit
b2b6b3af18
2 changed files with 3 additions and 8 deletions
|
@ -55,7 +55,6 @@ export const ShortUrlVisits = ({ exportVisits }: ReportExporter) => boundToMercu
|
|||
getVisits={loadVisits}
|
||||
cancelGetVisits={cancelGetShortUrlVisits}
|
||||
visitsInfo={shortUrlVisits}
|
||||
domain={domain}
|
||||
settings={settings}
|
||||
exportCsv={exportCsv}
|
||||
selectedServer={selectedServer}
|
||||
|
|
|
@ -4,7 +4,7 @@ import { Button, Progress, Row } from 'reactstrap';
|
|||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
||||
import { faCalendarAlt, faMapMarkedAlt, faList, faChartPie } from '@fortawesome/free-solid-svg-icons';
|
||||
import { IconDefinition } from '@fortawesome/fontawesome-common-types';
|
||||
import { Route, Routes, Navigate } from 'react-router-dom';
|
||||
import { Route, Routes, Navigate, useLocation } from 'react-router-dom';
|
||||
import classNames from 'classnames';
|
||||
import { DateRangeSelector } from '../utils/dates/DateRangeSelector';
|
||||
import { Message } from '../utils/Message';
|
||||
|
@ -35,7 +35,6 @@ export type VisitsStatsProps = PropsWithChildren<{
|
|||
settings: Settings;
|
||||
selectedServer: SelectedServer;
|
||||
cancelGetVisits: () => void;
|
||||
domain?: string;
|
||||
exportCsv: (visits: NormalizedVisit[]) => void;
|
||||
isOrphanVisits?: boolean;
|
||||
}>;
|
||||
|
@ -62,7 +61,6 @@ export const VisitsStats: FC<VisitsStatsProps> = ({
|
|||
visitsInfo,
|
||||
getVisits,
|
||||
cancelGetVisits,
|
||||
domain,
|
||||
settings,
|
||||
exportCsv,
|
||||
selectedServer,
|
||||
|
@ -86,11 +84,9 @@ export const VisitsStats: FC<VisitsStatsProps> = ({
|
|||
const [highlightedLabel, setHighlightedLabel] = useState<string | undefined>();
|
||||
const botsSupported = supportsBotVisits(selectedServer);
|
||||
const isFirstLoad = useRef(true);
|
||||
const { search } = useLocation();
|
||||
|
||||
const buildSectionUrl = (subPath?: string) => {
|
||||
const query = domain ? `?domain=${domain}` : '';
|
||||
return !subPath ? `${query}` : `${subPath}${query}`;
|
||||
};
|
||||
const buildSectionUrl = (subPath?: string) => (!subPath ? search : `${subPath}${search}`);
|
||||
const normalizedVisits = useMemo(() => normalizeVisits(visits), [visits]);
|
||||
const { os, browsers, referrers, countries, cities, citiesForMap, visitedUrls } = useMemo(
|
||||
() => processStatsFromVisits(normalizedVisits),
|
||||
|
|
Loading…
Reference in a new issue