diff options
author | Quentin Gliech <quentingliech@gmail.com> | 2022-02-22 20:38:32 +0100 |
---|---|---|
committer | Quentin Gliech <quentingliech@gmail.com> | 2022-02-22 20:38:32 +0100 |
commit | b0eb041e571dd616a9926d969bb42b3e7d6512e9 (patch) | |
tree | 5e6965b98386adb0fcd3548dc69e46daf788ccbb /webui/src/pages/list | |
parent | bce4d095e16fb33d181b29aa1d3476037c0c873a (diff) | |
download | git-bug-b0eb041e571dd616a9926d969bb42b3e7d6512e9.tar.gz |
webui: upgrade react-router
Diffstat (limited to 'webui/src/pages/list')
-rw-r--r-- | webui/src/pages/list/Filter.tsx | 7 | ||||
-rw-r--r-- | webui/src/pages/list/FilterToolbar.tsx | 4 | ||||
-rw-r--r-- | webui/src/pages/list/ListQuery.tsx | 6 |
3 files changed, 8 insertions, 9 deletions
diff --git a/webui/src/pages/list/Filter.tsx b/webui/src/pages/list/Filter.tsx index e85ae488..fd2d5a3a 100644 --- a/webui/src/pages/list/Filter.tsx +++ b/webui/src/pages/list/Filter.tsx @@ -1,8 +1,7 @@ import clsx from 'clsx'; -import { LocationDescriptor } from 'history'; import { useRef, useState, useEffect } from 'react'; import * as React from 'react'; -import { Link } from 'react-router-dom'; +import { Location, Link } from 'react-router-dom'; import Menu from '@material-ui/core/Menu'; import MenuItem from '@material-ui/core/MenuItem'; @@ -138,7 +137,7 @@ type FilterDropdownProps = { dropdown: DropdownTuple[]; itemActive: (key: string) => boolean; icon?: React.ComponentType<SvgIconProps>; - to: (key: string) => LocationDescriptor; + to: (key: string) => Location; hasFilter?: boolean; } & React.ButtonHTMLAttributes<HTMLButtonElement>; @@ -240,7 +239,7 @@ function FilterDropdown({ export type FilterProps = { active: boolean; - to: LocationDescriptor; // the target on click + to: Location; // the target on click icon?: React.ComponentType<SvgIconProps>; children: React.ReactNode; }; diff --git a/webui/src/pages/list/FilterToolbar.tsx b/webui/src/pages/list/FilterToolbar.tsx index 9620bd97..1a3476e2 100644 --- a/webui/src/pages/list/FilterToolbar.tsx +++ b/webui/src/pages/list/FilterToolbar.tsx @@ -1,6 +1,6 @@ import { pipe } from '@arrows/composition'; -import { LocationDescriptor } from 'history'; import * as React from 'react'; +import { Location } from 'react-router-dom'; import Toolbar from '@material-ui/core/Toolbar'; import { makeStyles } from '@material-ui/core/styles'; @@ -68,7 +68,7 @@ function quoteLabel(value: string) { type Props = { query: string; - queryLocation: (query: string) => LocationDescriptor; + queryLocation: (query: string) => Location; }; function FilterToolbar({ query, queryLocation }: Props) { diff --git a/webui/src/pages/list/ListQuery.tsx b/webui/src/pages/list/ListQuery.tsx index 8dd9668e..21818758 100644 --- a/webui/src/pages/list/ListQuery.tsx +++ b/webui/src/pages/list/ListQuery.tsx @@ -2,7 +2,7 @@ import { ApolloError } from '@apollo/client'; import { pipe } from '@arrows/composition'; import { useState, useEffect, useRef } from 'react'; import * as React from 'react'; -import { useLocation, useHistory, Link } from 'react-router-dom'; +import { useLocation, useNavigate, Link } from 'react-router-dom'; import { Button, FormControl, Menu, MenuItem } from '@material-ui/core'; import IconButton from '@material-ui/core/IconButton'; @@ -185,7 +185,7 @@ const Error: React.FC<ErrorProps> = ({ error }: ErrorProps) => { function ListQuery() { const location = useLocation(); - const history = useHistory(); + const navigate = useNavigate(); const params = new URLSearchParams(location.search); const query = params.has('q') ? params.get('q') || '' : 'status:open'; @@ -290,7 +290,7 @@ function ListQuery() { const formSubmit = (e: React.FormEvent) => { e.preventDefault(); - history.push(queryLocation(input)); + navigate(queryLocation(input)); }; const { |