reorganised components

src/ui/components/function/FunctionalDetail.tsx

@@ -1,7 +1,7 @@
 import { useState, useEffect } from 'react';
 import NoFunctionalDataRow from './NoFunctionalDataRow';
 import FunctionalDataRow from './FunctionalDataRow';
-import LoaderRow from '../result/LoaderRow';
+import LoaderRow from '../../pages/result/LoaderRow';
 import {getFunctionalData} from "../../../services/ProtVarService";
 import {FunctionalResponse} from "../../../types/FunctionalResponse";
 import {AMScore, ConservScore, ESMScore, EVEScore, TranslatedSequence} from "../../../types/MappingResponse";

src/ui/components/population/PopulationDetail.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import PopulationDataRow from './PopulationDataRow';
 import NoPopulationDataRow from './NoPopulationDataRow';
-import LoaderRow from '../result/LoaderRow';
+import LoaderRow from '../../pages/result/LoaderRow';
 import {getPopulationData} from "../../../services/ProtVarService";
 import {PopulationObservationResponse} from "../../../types/PopulationObservationResponse";
 

src/ui/components/structure/StructuralDetail.tsx

@@ -3,7 +3,7 @@ import PdbInfoTable from './PdbInfoTable';
 import AlphafoldInfoTable from './AlphafoldInfoTable';
 import PdbeMolstar from "./PdbeMolstar";
 import InteractionInfoTable from "./InteractionInfoTable";
-import LoaderRow from "../result/LoaderRow";
+import LoaderRow from "../../pages/result/LoaderRow";
 import PdbeRef from "./PdbeRef";
 import {getPredictedStructure} from "../../../services/AlphafoldService";
 import {getFunctionalData, getStructureData} from "../../../services/ProtVarService";

src/ui/layout/DefaultPageContent.tsx

@@ -1,7 +1,7 @@
 import { NavLink } from 'react-router-dom'
 import {DOWNLOAD, HOME, RESULT} from '../../constants/BrowserPaths'
 import {useEffect, useState} from "react";
-import ResultHistory from "../components/result/ResultHistory";
+import ResultHistory from "../pages/result/ResultHistory";
 import {LOCAL_DOWNLOADS, LOCAL_RESULTS} from "../../constants/const";
 import useLocalStorage from "../../hooks/useLocalStorage";
 import {SET_ITEM} from "../../context/LocalStorageContext";

src/ui/layout/DefaultPageLayout.tsx

@@ -8,7 +8,7 @@ import DefaultPageContent from './DefaultPageContent'
 import EMBLEBILogo from '../../images/embl-ebi-logo.svg'
 import openTargetsLogo from '../../images/open-targets-logo.png'
 import SignUp from "./SignUp";
-import {WARN_ICON} from "../components/result/MsgRow";
+import {WARN_ICON} from "../pages/result/MsgRow";
 import {CookieConsent} from "react-cookie-consent";
 interface DefaultPageLayoutProps {
   content: JSX.Element

src/ui/pages/query/QueryPage.tsx

@@ -1,6 +1,6 @@
 import {useEffect, useState} from 'react'
 import {useLocation, useSearchParams} from 'react-router-dom'
-import ResultTable from '../../components/result/ResultTable'
+import ResultTable from '../result/ResultTable'
 import DefaultPageLayout from '../../layout/DefaultPageLayout'
 import DownloadModal from '../../modal/DownloadModal'
 import LegendModal from '../../modal/LegendModal'

src/ui/components/result/AlternateIsoFormRow.tsx → src/ui/pages/result/AlternateIsoFormRow.tsx

@@ -5,7 +5,7 @@ import Tool from "../../elements/Tool";
 import Spaces from "../../elements/Spaces";
 import { EmptyElement } from "../../../constants/ConstElement";
 import {Gene, GenomicInput, IsoFormMapping} from "../../../types/MappingResponse";
-import {aaChangeStr} from "../search/PrimaryRow";
+import {aaChangeStr} from "./PrimaryRow";
 import {rowBg} from "./ResultTable";
 
 export function aaChangeTip(change: string | undefined) {

src/ui/components/search/PrimaryRow.tsx → src/ui/pages/result/PrimaryRow.tsx

@@ -13,16 +13,16 @@ import {
 import { ALLELE, CONSEQUENCES } from "../../../constants/SearchResultTable";
 import Spaces from "../../elements/Spaces";
 import Tool from "../../elements/Tool";
-import {caddScoreAttr, formatCaddScore} from "../function/prediction/CaddScorePred";
-import {amScoreAttr, formatAMScore} from "../function/prediction/AlphaMissensePred";
+import {caddScoreAttr, formatCaddScore} from "../../components/function/prediction/CaddScorePred";
+import {amScoreAttr, formatAMScore} from "../../components/function/prediction/AlphaMissensePred";
 import ProteinIcon from '../../../images/proteins.svg';
 import StructureIcon from '../../../images/structures-3d.svg';
 import PopulationIcon from '../../../images/human.svg';
-import LoaderRow from "../result/LoaderRow";
+import LoaderRow from "./LoaderRow";
 import { ReactComponent as ChevronDownIcon } from "../../../images/chevron-down.svg"
 import { ReactComponent as ChevronUpIcon } from "../../../images/chevron-up.svg"
 import { EmptyElement } from "../../../constants/ConstElement";
-import {aaChangeTip, CanonicalIcon, getProteinName} from "../result/AlternateIsoFormRow";
+import {aaChangeTip, CanonicalIcon, getProteinName} from "./AlternateIsoFormRow";
 import {
   INPUT_GEN,
   INPUT_PRO,
@@ -33,11 +33,11 @@ import {
   IsoFormMapping,
   CustomInput, TranslatedSequence
 } from "../../../types/MappingResponse";
-import {rowBg} from "../result/ResultTable";
+import {rowBg} from "./ResultTable";
 
-const StructuralDetail = lazy(() => import(/* webpackChunkName: "StructuralDetail" */ "../structure/StructuralDetail"));
-const PopulationDetail = lazy(() => import(/* webpackChunkName: "PopulationDetail" */ "../population/PopulationDetail"));
-const FunctionalDetail = lazy(() => import(/* webpackChunkName: "FunctionalDetail" */ "../function/FunctionalDetail"));
+const StructuralDetail = lazy(() => import(/* webpackChunkName: "StructuralDetail" */ "../../components/structure/StructuralDetail"));
+const PopulationDetail = lazy(() => import(/* webpackChunkName: "PopulationDetail" */ "../../components/population/PopulationDetail"));
+const FunctionalDetail = lazy(() => import(/* webpackChunkName: "FunctionalDetail" */ "../../components/function/FunctionalDetail"));
 
 export const getIdUrl = (id:string) => {
   if (id) {

src/ui/pages/result/ResultPage.tsx

@@ -1,7 +1,7 @@
 import DefaultPageLayout from "../../layout/DefaultPageLayout";
 import LegendModal from "../../modal/LegendModal";
 import {useLocation, useParams, useSearchParams} from "react-router-dom";
-import ResultTable from "../../components/result/ResultTable";
+import ResultTable from "./ResultTable";
 import React, {useCallback, useEffect, useState} from "react";
 import PaginationRow from "./PaginationRow";
 import {DEFAULT_PAGE, DEFAULT_PAGE_SIZE, LOCAL_RESULTS, PERMITTED_PAGE_SIZES, TITLE} from "../../../constants/const";

src/ui/components/result/ResultTable.tsx → src/ui/pages/result/ResultTable.tsx

@@ -11,7 +11,7 @@ import {
 } from "../../../types/MappingResponse";
 import {StringVoidFun} from "../../../constants/CommonTypes";
 import {getAlternateIsoFormRow} from "./AlternateIsoFormRow";
-import {getNewPrimaryRow} from "../search/PrimaryRow";
+import {getNewPrimaryRow} from "./PrimaryRow";
 import {AppContext} from "../../App";
 import Loader from "../../elements/Loader";
 import MsgRow from "./MsgRow";