diff --git a/screen2.0/src/app/_mainsearch/bedupload.tsx b/screen2.0/src/app/_mainsearch/bedupload.tsx index 2d9ea1fb..e1345d86 100644 --- a/screen2.0/src/app/_mainsearch/bedupload.tsx +++ b/screen2.0/src/app/_mainsearch/bedupload.tsx @@ -3,7 +3,6 @@ import React, { useCallback, useState } from "react" import { Button, Typography, Stack, Container, IconButton } from "@mui/material" import { useDropzone } from "react-dropzone" -import { useRouter } from 'next/navigation' import UploadFileIcon from '@mui/icons-material/UploadFile'; import { Cancel, Search } from "@mui/icons-material" import { LoadingButton } from "@mui/lab" @@ -12,7 +11,6 @@ import { useLazyQuery } from "@apollo/client" import { BED_INTERSECT_QUERY } from "./queries" const BedUpload = (props: { assembly: "mm10" | "GRCh38", header?: boolean }) => { - const router = useRouter() const [files, setFiles] = useState([]) const [loading, setLoading] = useState(false) @@ -84,7 +82,7 @@ const BedUpload = (props: { assembly: "mm10" | "GRCh38", header?: boolean }) => } else { sessionStorage.setItem("warning", "false") } - router.push(`/search?intersect=t&assembly=${props.assembly}`) + window.open(`/search?intersect=t&assembly=${props.assembly}`, '_self') }, //Error diff --git a/screen2.0/src/app/_mainsearch/ccreautocomplete.tsx b/screen2.0/src/app/_mainsearch/ccreautocomplete.tsx index 2c7c4fa2..e4e843fc 100644 --- a/screen2.0/src/app/_mainsearch/ccreautocomplete.tsx +++ b/screen2.0/src/app/_mainsearch/ccreautocomplete.tsx @@ -9,14 +9,12 @@ import { IconButton, Stack } from "@mui/material" import { Search } from "@mui/icons-material" import { useQuery } from "@apollo/client" import { client } from "../search/_ccredetails/client" -import { useRouter } from "next/navigation" export const CcreAutoComplete: React.FC<{ assembly: string, header?: boolean }> = (props) => { const [value, setValue] = useState(null) const [inputValue, setInputValue] = useState("") const [options, setOptions] = useState([]) const [ccreAccessions, setCcreAccessions] = useState([]) - const router = useRouter(); const {loading: loadingOptions} = useQuery(CCRE_AUTOCOMPLETE_QUERY, { @@ -73,7 +71,7 @@ export const CcreAutoComplete: React.FC<{ assembly: string, header?: boolean }> onKeyDown={(event) => { if (event.key === "Enter") { event.defaultPrevented = true - router.push(handleSubmit()) + window.open(handleSubmit(), '_self') } }} value={value} @@ -133,7 +131,7 @@ export const CcreAutoComplete: React.FC<{ assembly: string, header?: boolean }> ) }} /> - router.push(handleSubmit())} sx={{ color: `${props.header ? "white" : "black"}`, maxHeight: "100%" }}> + window.open(handleSubmit(), '_self')} sx={{ color: `${props.header ? "white" : "black"}`, maxHeight: "100%" }}> diff --git a/screen2.0/src/app/_mainsearch/celltypeautocomplete.tsx b/screen2.0/src/app/_mainsearch/celltypeautocomplete.tsx index f003e838..f9660e01 100644 --- a/screen2.0/src/app/_mainsearch/celltypeautocomplete.tsx +++ b/screen2.0/src/app/_mainsearch/celltypeautocomplete.tsx @@ -9,14 +9,12 @@ import { Search } from "@mui/icons-material" import { parseGenomicRegion } from "./parsegenomicregion" import { biosampleQuery } from "../../common/lib/queries" import { RegistryBiosample } from "../search/types" -import { useRouter } from "next/navigation" export const CelltypeAutocomplete: React.FC<{ assembly: string, header?: boolean }> = (props) => { const [valueCellType, setValueCellType] = useState(null) const [valueRegion, setValueRegion] = useState("") const [inputValue, setInputValue] = useState("") const [options, setOptions] = useState([]) - const router = useRouter(); /** * @todo move this fetch to client side. Invoking server action to fetch data has no clear benefit @@ -66,7 +64,7 @@ export const CelltypeAutocomplete: React.FC<{ assembly: string, header?: boolean onKeyDown={(event) => { if (event.key === "Enter" && valueCellType) { event.defaultPrevented = true - router.push(handleSubmit()) + window.open(handleSubmit(), '_self') } }} value={valueCellType} @@ -143,7 +141,7 @@ export const CelltypeAutocomplete: React.FC<{ assembly: string, header?: boolean }} onKeyDown={(event) => { if (event.key === "Enter" && valueCellType) { - router.push(handleSubmit()) + window.open(handleSubmit(), '_self') } if (event.key === "Tab" && !valueRegion) { const defaultGenomicRegion = `chr12:${(53380176).toLocaleString()}-${(53416446).toLocaleString()}` @@ -162,7 +160,7 @@ export const CelltypeAutocomplete: React.FC<{ assembly: string, header?: boolean }} size={props.header ? "small" : "medium"} /> - router.push(handleSubmit())} sx={{ color: `${props.header ? "white" : "black"}`, maxHeight: "100%" }}> + window.open(handleSubmit(), '_self')} sx={{ color: `${props.header ? "white" : "black"}`, maxHeight: "100%" }}> diff --git a/screen2.0/src/app/_mainsearch/genomicregion.tsx b/screen2.0/src/app/_mainsearch/genomicregion.tsx index 371cd4fb..fda17c97 100644 --- a/screen2.0/src/app/_mainsearch/genomicregion.tsx +++ b/screen2.0/src/app/_mainsearch/genomicregion.tsx @@ -16,7 +16,6 @@ import { useState, SetStateAction, useEffect, useMemo } from "react" import { Search } from "@mui/icons-material" import Grid from "@mui/material/Grid2" import { parseGenomicRegion } from "./parsegenomicregion" -import { useRouter } from "next/navigation" //https://mui.com/material-ui/react-text-field/#integration-with-3rd-party-input-libraries //For formatting the start/end as it's being entered. @@ -53,7 +52,6 @@ const GenomicRegion = (props: { assembly: "mm10" | "GRCh38"; header?: boolean }) const [error, setError] = useState(false) const [sepErrStart, setSepErrStart] = useState(false) const [sepErrEnd, setSepErrEnd] = useState(false) - const router = useRouter(); const handleChange = (event: { target: { value: SetStateAction } }) => { setValue(event.target.value) @@ -267,7 +265,7 @@ const GenomicRegion = (props: { assembly: "mm10" | "GRCh38"; header?: boolean }) }} onKeyDown={(event) => { if (event.key === "Enter") { - router.push(url); + window.open(url, '_self') } if (event.key === "Tab" && !start) { setStart("53380176") @@ -304,7 +302,7 @@ const GenomicRegion = (props: { assembly: "mm10" | "GRCh38"; header?: boolean }) }} onKeyDown={(event) => { if (event.key === "Enter") { - router.push(url); + window.open(url, '_self') } if (event.key === "Tab" && !end) { setEnd("53416446") @@ -349,7 +347,7 @@ const GenomicRegion = (props: { assembly: "mm10" | "GRCh38"; header?: boolean }) onKeyDown={(event) => { if (event.key === "Enter") { if (!error) { - router.push(url); + window.open(url, '_self') } } if (event.key === "Tab" && !value) { @@ -381,7 +379,7 @@ const GenomicRegion = (props: { assembly: "mm10" | "GRCh38"; header?: boolean }) sx={{ color: `${props.header ? "white" : "black"}`, maxHeight: "100%" }} onClick={() => { if ((inputType !== "Separated" && !error) || (inputType === "Separated" && !sepErrStart && !sepErrEnd)) { - router.push(url); + window.open(url, '_self') } }} > diff --git a/screen2.0/src/app/_mainsearch/mainsearch.tsx b/screen2.0/src/app/_mainsearch/mainsearch.tsx index a6425ab1..a5b8f6a6 100644 --- a/screen2.0/src/app/_mainsearch/mainsearch.tsx +++ b/screen2.0/src/app/_mainsearch/mainsearch.tsx @@ -11,7 +11,6 @@ import BedUpload from "./bedupload" import GenomicRegion from "./genomicregion" import { GeneAutocomplete } from "../search/_geneAutocomplete/GeneAutocomplete" import { GeneInfo } from "../search/_geneAutocomplete/types" -import { useRouter } from "next/navigation" export type MainSearchProps = InputBaseProps & { //false for human, true for mouse @@ -22,7 +21,6 @@ export type MainSearchProps = InputBaseProps & { export const MainSearch: React.FC = (props: MainSearchProps) => { const [assembly, setAssembly] = useState<"GRCh38" | "mm10">("GRCh38") const [selectedSearch, setSelectedSearch] = useState("Genomic Region") - const router = useRouter(); const handleSearchChange = (event: SelectChangeEvent) => { setSelectedSearch(event.target.value) @@ -40,7 +38,7 @@ export const MainSearch: React.FC = (props: MainSearchProps) => const start = gene.coordinates.start const end = gene.coordinates.end const name = gene.name - router.push(`/search?assembly=${assembly}&chromosome=${chrom}&start=${start}&end=${end}&gene=${name}&tssDistance=0`) + window.open(`/search?assembly=${assembly}&chromosome=${chrom}&start=${start}&end=${end}&gene=${name}&tssDistance=0`, '_self') } } diff --git a/screen2.0/src/app/_mainsearch/snpautocomplete.tsx b/screen2.0/src/app/_mainsearch/snpautocomplete.tsx index 641f6519..37b48857 100644 --- a/screen2.0/src/app/_mainsearch/snpautocomplete.tsx +++ b/screen2.0/src/app/_mainsearch/snpautocomplete.tsx @@ -9,14 +9,12 @@ import Config from "../../config.json" import Grid from "@mui/material/Grid2" import { IconButton, Stack } from "@mui/material" import { Search } from "@mui/icons-material" -import { useRouter } from "next/navigation" export const SnpAutoComplete: React.FC<{ assembly: string, header?: boolean }> = (props) => { const [value, setValue] = useState(null) const [inputValue, setInputValue] = useState("") const [options, setOptions] = useState([]) const [snpids, setSnpIds] = useState([]) - const router = useRouter(); const onSearchChange = async (value: string, assembly: string) => { setOptions([]) @@ -79,7 +77,7 @@ export const SnpAutoComplete: React.FC<{ assembly: string, header?: boolean }> = onKeyDown={(event) => { if (event.key === "Enter" && value) { event.defaultPrevented = true - router.push(handleSubmit()) + window.open(handleSubmit(), '_self') } }} value={value} @@ -141,7 +139,7 @@ export const SnpAutoComplete: React.FC<{ assembly: string, header?: boolean }> = ) }} /> - router.push(handleSubmit())} sx={{ color: `${props.header ? "white" : "black"}`, maxHeight: "100%" }}> + window.open(handleSubmit(), '_self')} sx={{ color: `${props.header ? "white" : "black"}`, maxHeight: "100%" }}>