diff --git a/client/src/components/Pages/Assay/Assay.tsx b/client/src/components/Pages/Assay/Assay.tsx index 86c71da0..ac7a3375 100644 --- a/client/src/components/Pages/Assay/Assay.tsx +++ b/client/src/components/Pages/Assay/Assay.tsx @@ -1,6 +1,6 @@ // TODO: enforce CURIE requirements in fields -import { FusionContext } from "../../../global/contexts/FusionContext"; -import { useColorTheme } from "../../../global/contexts/Theme/ColorThemeContext"; +import { FusionContext } from "global/contexts/FusionContext"; +import { useColorTheme } from "global/contexts/Theme/ColorThemeContext"; import { FormEvent, useContext, useEffect, useState } from "react"; import { Box, @@ -12,9 +12,9 @@ import { Typography, } from "@material-ui/core"; import { makeStyles } from "@material-ui/core/styles"; -import { Assay as FusionAssay } from "../../../services/ResponseModels"; +import { Assay as FusionAssay } from "services/ResponseModels"; import React from "react"; -import HelpTooltip from "../../main/shared/HelpTooltip/HelpTooltip"; +import HelpTooltip from "components/main/shared/HelpTooltip/HelpTooltip"; interface Props { index: number; diff --git a/client/src/components/Pages/CausativeEvent/CausativeEvent.tsx b/client/src/components/Pages/CausativeEvent/CausativeEvent.tsx index 1e5c3aa1..9986083f 100644 --- a/client/src/components/Pages/CausativeEvent/CausativeEvent.tsx +++ b/client/src/components/Pages/CausativeEvent/CausativeEvent.tsx @@ -1,5 +1,5 @@ import "./CausativeEvent.scss"; -import { FusionContext } from "../../../global/contexts/FusionContext"; +import { FusionContext } from "global/contexts/FusionContext"; import React, { useContext, useState } from "react"; import { Box, @@ -11,8 +11,8 @@ import { TextField, Typography, } from "@material-ui/core"; -import { HelpPopover } from "../../main/shared/HelpPopover/HelpPopover"; -import HelpTooltip from "../../main/shared/HelpTooltip/HelpTooltip"; +import { HelpPopover } from "components/main/shared/HelpPopover/HelpPopover"; +import HelpTooltip from "components/main/shared/HelpTooltip/HelpTooltip"; interface Props { index: number; diff --git a/client/src/components/Pages/Domains/DomainForm/DomainForm.tsx b/client/src/components/Pages/Domains/DomainForm/DomainForm.tsx index 8665cc8a..a48cd3c3 100644 --- a/client/src/components/Pages/Domains/DomainForm/DomainForm.tsx +++ b/client/src/components/Pages/Domains/DomainForm/DomainForm.tsx @@ -8,9 +8,9 @@ import { Typography, } from "@material-ui/core/"; import { makeStyles } from "@material-ui/core/styles"; -import { FusionContext } from "../../../../global/contexts/FusionContext"; -import { DomainOptionsContext } from "../../../../global/contexts/DomainOptionsContext"; -import { GeneContext } from "../../../../global/contexts/GeneContext"; +import { FusionContext } from "global/contexts/FusionContext"; +import { DomainOptionsContext } from "global/contexts/DomainOptionsContext"; +import { GeneContext } from "global/contexts/GeneContext"; import { v4 as uuid } from "uuid"; import "./DomainForm.scss"; import { @@ -18,9 +18,9 @@ import { DomainParams, DomainStatus, } from "../../../../services/ResponseModels"; -import { getFunctionalDomain } from "../../../../services/main"; +import { getFunctionalDomain } from "services/main"; import AddIcon from "@material-ui/icons/Add"; -import HelpTooltip from "../../../main/shared/HelpTooltip/HelpTooltip"; +import HelpTooltip from "main/shared/HelpTooltip/HelpTooltip"; const useStyles = makeStyles((theme) => ({ formControl: { diff --git a/client/src/components/Pages/Domains/Main/Domains.tsx b/client/src/components/Pages/Domains/Main/Domains.tsx index f51d63b1..1c7c922e 100644 --- a/client/src/components/Pages/Domains/Main/Domains.tsx +++ b/client/src/components/Pages/Domains/Main/Domains.tsx @@ -1,9 +1,9 @@ import React, { useContext } from "react"; -import { FusionContext } from "../../../../global/contexts/FusionContext"; -import { useColorTheme } from "../../../../global/contexts/Theme/ColorThemeContext"; -import DomainForm from "../DomainForm/DomainForm"; -import { ClientFunctionalDomain } from "../../../../services/ResponseModels"; -import { GeneContext } from "../../../../global/contexts/GeneContext"; +import { FusionContext } from "global/contexts/FusionContext"; +import { useColorTheme } from "global/contexts/Theme/ColorThemeContext"; +import DomainForm from "DomainForm/DomainForm"; +import { ClientFunctionalDomain } from "services/ResponseModels"; +import { GeneContext } from "global/contexts/GeneContext"; import { Avatar, Box, @@ -12,7 +12,7 @@ import { makeStyles, Typography, } from "@material-ui/core"; -import { HelpPopover } from "../../../main/shared/HelpPopover/HelpPopover"; +import { HelpPopover } from "main/shared/HelpPopover/HelpPopover"; interface Props { index: number; diff --git a/client/src/components/Pages/FusionType/FusionType.tsx b/client/src/components/Pages/FusionType/FusionType.tsx index 441c4a16..93543e79 100644 --- a/client/src/components/Pages/FusionType/FusionType.tsx +++ b/client/src/components/Pages/FusionType/FusionType.tsx @@ -15,7 +15,7 @@ import { RadioGroup, } from "@material-ui/core"; import { useContext, useEffect, useState } from "react"; -import { FusionContext } from "../../../global/contexts/FusionContext"; +import { FusionContext } from "global/contexts/FusionContext"; import "./FusionType.scss"; interface Props { diff --git a/client/src/components/Pages/Gene/Main/Gene.tsx b/client/src/components/Pages/Gene/Main/Gene.tsx index 4f8e3780..dde961aa 100644 --- a/client/src/components/Pages/Gene/Main/Gene.tsx +++ b/client/src/components/Pages/Gene/Main/Gene.tsx @@ -1,5 +1,5 @@ -import { GeneSearch } from "../Search/GeneSearch"; -import { GeneResults } from "../Results/GeneResults"; +import { GeneSearch } from "Search/GeneSearch"; +import { GeneResults } from "Results/GeneResults"; import "./Gene.scss"; diff --git a/client/src/components/Pages/Gene/Results/GeneResults.tsx b/client/src/components/Pages/Gene/Results/GeneResults.tsx index abc76e71..1a0df91c 100644 --- a/client/src/components/Pages/Gene/Results/GeneResults.tsx +++ b/client/src/components/Pages/Gene/Results/GeneResults.tsx @@ -1,7 +1,7 @@ import { useContext } from "react"; -import { SuggestionContext } from "../../../../global/contexts/SuggestionContext"; -import { StructureDiagram } from "../StructureDiagram/StructureDiagram"; -import { ColorKey } from "../ColorKey/ColorKey"; +import { SuggestionContext } from "global/contexts/SuggestionContext"; +import { StructureDiagram } from "StructureDiagram/StructureDiagram"; +import { ColorKey } from "ColorKey/ColorKey"; import "./GeneResults.scss"; export const GeneResults: React.FC = () => { diff --git a/client/src/components/Pages/Gene/Search/GeneSearch.tsx b/client/src/components/Pages/Gene/Search/GeneSearch.tsx index ac4e0b15..dd56c0c9 100644 --- a/client/src/components/Pages/Gene/Search/GeneSearch.tsx +++ b/client/src/components/Pages/Gene/Search/GeneSearch.tsx @@ -1,5 +1,5 @@ import React, { useState, useContext, useEffect } from "react"; -import { SuggestionContext } from "../../../../global/contexts/SuggestionContext"; +import { SuggestionContext } from "global/contexts/SuggestionContext"; // MUI import { makeStyles } from "@material-ui/core/styles"; diff --git a/client/src/components/Pages/Gene/StructureDiagram/StructureDiagram.tsx b/client/src/components/Pages/Gene/StructureDiagram/StructureDiagram.tsx index 31caa2d9..8857f9cf 100644 --- a/client/src/components/Pages/Gene/StructureDiagram/StructureDiagram.tsx +++ b/client/src/components/Pages/Gene/StructureDiagram/StructureDiagram.tsx @@ -1,6 +1,6 @@ import React, { useContext, useState } from "react"; -import { SuggestionContext } from "../../../../global/contexts/SuggestionContext"; -import { FusionContext } from "../../../../global/contexts/FusionContext"; +import { SuggestionContext } from "global/contexts/SuggestionContext"; +import { FusionContext } from "global/contexts/FusionContext"; import Grid from "@material-ui/core/Grid"; import "./StructureDiagram.scss"; diff --git a/client/src/components/Pages/ReadingFrame/ReadingFrame.tsx b/client/src/components/Pages/ReadingFrame/ReadingFrame.tsx index 057fe0bc..863c3645 100644 --- a/client/src/components/Pages/ReadingFrame/ReadingFrame.tsx +++ b/client/src/components/Pages/ReadingFrame/ReadingFrame.tsx @@ -1,5 +1,5 @@ import "./ReadingFrame.scss"; -import { FusionContext } from "../../../global/contexts/FusionContext"; +import { FusionContext } from "global/contexts/FusionContext"; import React, { FormEvent, useContext, useEffect, useState } from "react"; import { Box, @@ -11,7 +11,7 @@ import { Typography, } from "@material-ui/core"; import { makeStyles } from "@material-ui/core/styles"; -import { HelpPopover } from "../../main/shared/HelpPopover/HelpPopover"; +import { HelpPopover } from "components/main/shared/HelpPopover/HelpPopover"; interface Props { index: number; diff --git a/client/src/components/Pages/Structure/Builder/Builder.tsx b/client/src/components/Pages/Structure/Builder/Builder.tsx index cd7e73ed..c0b5bdc0 100644 --- a/client/src/components/Pages/Structure/Builder/Builder.tsx +++ b/client/src/components/Pages/Structure/Builder/Builder.tsx @@ -8,18 +8,14 @@ import { } from "react-beautiful-dnd"; import { v4 as uuid } from "uuid"; // global fusion -import { FusionContext } from "../../../../global/contexts/FusionContext"; +import { FusionContext } from "global/contexts/FusionContext"; // elements -import { ClientElementUnion, ElementType } from "../../../../services/main"; +import { ClientElementUnion, ElementType } from "services/main"; import { ClientMultiplePossibleGenesElement, ClientUnknownGeneElement, -} from "../../../../services/ResponseModels"; -import GeneElementInput from "../Input/GeneElementInput/GeneElementInput"; -import LinkerElementInput from "../Input/LinkerElementInput/LinkerElementInput"; -import StaticElement from "../Input/StaticElement/StaticElement"; -import TemplatedSequenceElementInput from "../Input/TemplatedSequenceElementInput/TemplatedSequenceElementInput"; -import TxSegmentElementInput from "../Input/TxSegmentElementInput/TxSegmentElementInput"; +} from "services/ResponseModels"; + // style import "./Builder.scss"; import BlurCircularOutlinedIcon from "@mui/icons-material/BlurCircularOutlined"; @@ -29,10 +25,15 @@ import HelpIcon from "@mui/icons-material/Help"; import WorkspacesIcon from "@mui/icons-material/Workspaces"; import LinkIcon from "@mui/icons-material/Link"; import AutorenewIcon from "@mui/icons-material/Autorenew"; -import RegulatoryElementInput from "../Input/RegulatoryElementInput/RegulatoryElementInput"; import { Box, Divider, Typography } from "@material-ui/core"; -import { MARGIN_OFFSETS } from "../../../../global/styles/theme"; -import HelpTooltip from "../../../main/shared/HelpTooltip/HelpTooltip"; +import { MARGIN_OFFSETS } from "global/styles/theme"; +import HelpTooltip from "components/main/shared/HelpTooltip/HelpTooltip"; +import GeneElementInput from "../Input/GeneElementInput/GeneElementInput"; +import LinkerElementInput from "../Input/LinkerElementInput/LinkerElementInput"; +import RegulatoryElementInput from "../Input/RegulatoryElementInput/RegulatoryElementInput"; +import StaticElement from "../Input/StaticElement/StaticElement"; +import TemplatedSequenceElementInput from "../Input/TemplatedSequenceElementInput/TemplatedSequenceElementInput"; +import TxSegmentElementInput from "../Input/TxSegmentElementInput/TxSegmentElementInput"; const EDITABLE_ELEMENT_TYPES = [ ElementType.geneElement, diff --git a/client/src/components/Pages/Structure/Input/GeneElementInput/GeneElementInput.tsx b/client/src/components/Pages/Structure/Input/GeneElementInput/GeneElementInput.tsx index 7b34f4d7..a823c913 100644 --- a/client/src/components/Pages/Structure/Input/GeneElementInput/GeneElementInput.tsx +++ b/client/src/components/Pages/Structure/Input/GeneElementInput/GeneElementInput.tsx @@ -3,13 +3,13 @@ import { ClientGeneElement, NomenclatureResponse, } from "../../../../../services/ResponseModels"; -import { StructuralElementInputProps } from "../StructuralElementInputProps"; -import { GeneAutocomplete } from "../../../../main/shared/GeneAutocomplete/GeneAutocomplete"; +import { StructuralElementInputProps } from "StructuralElementInputProps"; +import { GeneAutocomplete } from "main/shared/GeneAutocomplete/GeneAutocomplete"; import { getGeneElement, getGeneNomenclature, } from "../../../../../services/main"; -import StructuralElementInputAccordion from "../StructuralElementInputAccordion"; +import StructuralElementInputAccordion from "StructuralElementInputAccordion"; interface GeneElementInputProps extends StructuralElementInputProps { element: ClientGeneElement; @@ -35,7 +35,7 @@ const GeneElementInput: React.FC = ({ }, [gene, geneText]); const buildGeneElement = () => { - setPendingResponse(true) + setPendingResponse(true); getGeneElement(gene).then((geneElementResponse) => { if ( geneElementResponse.warnings && @@ -58,7 +58,7 @@ const GeneElementInput: React.FC = ({ nomenclature: nomenclatureResponse.nomenclature, }; handleSave(index, clientGeneElement); - setPendingResponse(false) + setPendingResponse(false); } } ); @@ -85,7 +85,7 @@ const GeneElementInput: React.FC = ({ inputElements, validated, icon, - pendingResponse + pendingResponse, }); }; diff --git a/client/src/components/Pages/Structure/Input/LinkerElementInput/LinkerElementInput.tsx b/client/src/components/Pages/Structure/Input/LinkerElementInput/LinkerElementInput.tsx index 90b64319..57c3accd 100644 --- a/client/src/components/Pages/Structure/Input/LinkerElementInput/LinkerElementInput.tsx +++ b/client/src/components/Pages/Structure/Input/LinkerElementInput/LinkerElementInput.tsx @@ -1,9 +1,9 @@ import { TextField, Typography } from "@material-ui/core"; import React, { useEffect, useState } from "react"; -import { ClientLinkerElement } from "../../../../../services/ResponseModels"; -import { StructuralElementInputProps } from "../StructuralElementInputProps"; -import StructuralElementInputAccordion from "../StructuralElementInputAccordion"; -import HelpTooltip from "../../../../main/shared/HelpTooltip/HelpTooltip"; +import { ClientLinkerElement } from "services/ResponseModels"; +import { StructuralElementInputProps } from "StructuralElementInputProps"; +import StructuralElementInputAccordion from "StructuralElementInputAccordion"; +import HelpTooltip from "main/shared/HelpTooltip/HelpTooltip"; interface LinkerElementInputProps extends StructuralElementInputProps { element: ClientLinkerElement; diff --git a/client/src/components/Pages/Structure/Input/RegulatoryElementInput/RegulatoryElementInput.tsx b/client/src/components/Pages/Structure/Input/RegulatoryElementInput/RegulatoryElementInput.tsx index 3bc08c4a..81e7a53d 100644 --- a/client/src/components/Pages/Structure/Input/RegulatoryElementInput/RegulatoryElementInput.tsx +++ b/client/src/components/Pages/Structure/Input/RegulatoryElementInput/RegulatoryElementInput.tsx @@ -1,16 +1,16 @@ import React, { useState, useEffect, useContext } from "react"; -import { StructuralElementInputProps } from "../StructuralElementInputProps"; +import { StructuralElementInputProps } from "StructuralElementInputProps"; import { ClientRegulatoryElement, RegulatoryClass, } from "../../../../../services/ResponseModels"; -import StructuralElementInputAccordion from "../StructuralElementInputAccordion"; +import StructuralElementInputAccordion from "StructuralElementInputAccordion"; import { getRegElementNomenclature, getRegulatoryElement, } from "../../../../../services/main"; -import { FusionContext } from "../../../../../global/contexts/FusionContext"; -import RegElementForm from "../../RegElement/RegElementForm/RegElementForm"; +import { FusionContext } from "global/contexts/FusionContext"; +import RegElementForm from "RegElement/RegElementForm/RegElementForm"; /** * Lookup table used to map raw regulatory class enum values to options for the class diff --git a/client/src/components/Pages/Structure/Input/StaticElement/StaticElement.tsx b/client/src/components/Pages/Structure/Input/StaticElement/StaticElement.tsx index c97b963f..7ac30e47 100644 --- a/client/src/components/Pages/Structure/Input/StaticElement/StaticElement.tsx +++ b/client/src/components/Pages/Structure/Input/StaticElement/StaticElement.tsx @@ -1,5 +1,5 @@ -import { BaseStructuralElementProps } from "../StructuralElementInputProps"; -import StructuralElementInputAccordion from "../StructuralElementInputAccordion"; +import { BaseStructuralElementProps } from "StructuralElementInputProps"; +import StructuralElementInputAccordion from "StructuralElementInputAccordion"; const StaticElement: React.FC = ({ element, @@ -12,7 +12,7 @@ const StaticElement: React.FC = ({ handleDelete, validated: true, icon, - pendingResponse: false + pendingResponse: false, }); export default StaticElement; diff --git a/client/src/components/Pages/Structure/Input/StructuralElementInputProps.tsx b/client/src/components/Pages/Structure/Input/StructuralElementInputProps.tsx index ef4aa869..f150ae34 100644 --- a/client/src/components/Pages/Structure/Input/StructuralElementInputProps.tsx +++ b/client/src/components/Pages/Structure/Input/StructuralElementInputProps.tsx @@ -1,10 +1,10 @@ -import { ClientElementUnion } from "../../../../services/main"; +import { ClientElementUnion } from "services/main"; export interface BaseStructuralElementProps { element: ClientElementUnion; handleDelete?: (id?: string) => void; icon: JSX.Element; - pendingResponse?: boolean + pendingResponse?: boolean; } export interface StructuralElementInputProps diff --git a/client/src/components/Pages/Structure/Input/TemplatedSequenceElementInput/TemplatedSequenceElementInput.tsx b/client/src/components/Pages/Structure/Input/TemplatedSequenceElementInput/TemplatedSequenceElementInput.tsx index f7c60221..05fcaf97 100644 --- a/client/src/components/Pages/Structure/Input/TemplatedSequenceElementInput/TemplatedSequenceElementInput.tsx +++ b/client/src/components/Pages/Structure/Input/TemplatedSequenceElementInput/TemplatedSequenceElementInput.tsx @@ -1,14 +1,14 @@ import React, { useState, useEffect, KeyboardEvent } from "react"; import { TextField, Box, Typography } from "@material-ui/core"; -import { StructuralElementInputProps } from "../StructuralElementInputProps"; +import { StructuralElementInputProps } from "StructuralElementInputProps"; import { getTemplatedSequenceElement, getTemplatedSequenceNomenclature, } from "../../../../../services/main"; -import { ClientTemplatedSequenceElement } from "../../../../../services/ResponseModels"; -import StructuralElementInputAccordion from "../StructuralElementInputAccordion"; -import StrandSwitch from "../../../../main/shared/StrandSwitch/StrandSwitch"; -import HelpTooltip from "../../../../main/shared/HelpTooltip/HelpTooltip"; +import { ClientTemplatedSequenceElement } from "services/ResponseModels"; +import StructuralElementInputAccordion from "StructuralElementInputAccordion"; +import StrandSwitch from "main/shared/StrandSwitch/StrandSwitch"; +import HelpTooltip from "main/shared/HelpTooltip/HelpTooltip"; interface TemplatedSequenceElementInputProps extends StructuralElementInputProps { @@ -18,7 +18,6 @@ interface TemplatedSequenceElementInputProps const TemplatedSequenceElementInput: React.FC< TemplatedSequenceElementInputProps > = ({ element, index, handleSave, handleDelete, icon }) => { - const [chromosome, setChromosome] = useState( element.input_chromosome || "" ); @@ -67,7 +66,7 @@ const TemplatedSequenceElementInput: React.FC< ) { // TODO visible error handling setInputError("element validation unsuccessful"); - setPendingResponse(false) + setPendingResponse(false); return; } else if (templatedSequenceResponse.element) { setInputError(""); @@ -87,7 +86,7 @@ const TemplatedSequenceElementInput: React.FC< } }); } - setPendingResponse(false) + setPendingResponse(false); }); }; @@ -167,7 +166,7 @@ const TemplatedSequenceElementInput: React.FC< inputElements, validated, icon, - pendingResponse + pendingResponse, }); }; diff --git a/client/src/components/Pages/Structure/Input/TxSegmentElementInput/TxSegmentElementInput.tsx b/client/src/components/Pages/Structure/Input/TxSegmentElementInput/TxSegmentElementInput.tsx index 077808d0..751b0ff7 100644 --- a/client/src/components/Pages/Structure/Input/TxSegmentElementInput/TxSegmentElementInput.tsx +++ b/client/src/components/Pages/Structure/Input/TxSegmentElementInput/TxSegmentElementInput.tsx @@ -9,22 +9,22 @@ import { ClientTranscriptSegmentElement, TranscriptSegmentElement, TxSegmentElementResponse, -} from "../../../../../services/ResponseModels"; +} from "services/ResponseModels"; import React, { useEffect, useState, KeyboardEvent, useContext } from "react"; import { getTxSegmentElementECT, getTxSegmentElementGCG, getTxSegmentElementGCT, getTxSegmentNomenclature, -} from "../../../../../services/main"; -import { GeneAutocomplete } from "../../../../main/shared/GeneAutocomplete/GeneAutocomplete"; -import { StructuralElementInputProps } from "../StructuralElementInputProps"; +} from "services/main"; +import { FusionContext } from "global/contexts/FusionContext"; +import ChromosomeField from "components/main/shared/ChromosomeField/ChromosomeField"; +import { GeneAutocomplete } from "components/main/shared/GeneAutocomplete/GeneAutocomplete"; +import HelpTooltip from "components/main/shared/HelpTooltip/HelpTooltip"; +import StrandSwitch from "components/main/shared/StrandSwitch/StrandSwitch"; +import TranscriptField from "components/main/shared/TranscriptField/TranscriptField"; import StructuralElementInputAccordion from "../StructuralElementInputAccordion"; -import { FusionContext } from "../../../../../global/contexts/FusionContext"; -import StrandSwitch from "../../../../main/shared/StrandSwitch/StrandSwitch"; -import HelpTooltip from "../../../../main/shared/HelpTooltip/HelpTooltip"; -import ChromosomeField from "../../../../main/shared/ChromosomeField/ChromosomeField"; -import TranscriptField from "../../../../main/shared/TranscriptField/TranscriptField"; +import { StructuralElementInputProps } from "../StructuralElementInputProps"; interface TxSegmentElementInputProps extends StructuralElementInputProps { element: ClientTranscriptSegmentElement; @@ -437,10 +437,7 @@ const TxSegmentCompInput: React.FC = ({ const genomicCoordinateInfo = ( <> - + diff --git a/client/src/components/Pages/Structure/Main/Structure.tsx b/client/src/components/Pages/Structure/Main/Structure.tsx index 0f486842..9ad6f78c 100644 --- a/client/src/components/Pages/Structure/Main/Structure.tsx +++ b/client/src/components/Pages/Structure/Main/Structure.tsx @@ -1,9 +1,9 @@ import React, { useContext } from "react"; -import { FusionContext } from "../../../../global/contexts/FusionContext"; -import { useColorTheme } from "../../../../global/contexts/Theme/ColorThemeContext"; -import { HelpPopover } from "../../../main/shared/HelpPopover/HelpPopover"; -import Builder from "../Builder/Builder"; +import { FusionContext } from "global/contexts/FusionContext"; +import { useColorTheme } from "global/contexts/Theme/ColorThemeContext"; import { Typography, makeStyles, Link, Box } from "@material-ui/core"; +import { HelpPopover } from "components/main/shared/HelpPopover/HelpPopover"; +import Builder from "../Builder/Builder"; interface Props { index: number; diff --git a/client/src/components/Pages/Structure/RegElement/RegElementForm/RegElementForm.tsx b/client/src/components/Pages/Structure/RegElement/RegElementForm/RegElementForm.tsx index 8680cde6..1f111f9a 100644 --- a/client/src/components/Pages/Structure/RegElement/RegElementForm/RegElementForm.tsx +++ b/client/src/components/Pages/Structure/RegElement/RegElementForm/RegElementForm.tsx @@ -8,9 +8,9 @@ import { import { makeStyles } from "@material-ui/core/styles"; import "./RegElementForm.scss"; import React from "react"; -import { RegulatoryClass } from "../../../../../services/ResponseModels"; -import HelpTooltip from "../../../../main/shared/HelpTooltip/HelpTooltip"; -import { GeneAutocomplete } from "../../../../main/shared/GeneAutocomplete/GeneAutocomplete"; +import { RegulatoryClass } from "services/ResponseModels"; +import HelpTooltip from "main/shared/HelpTooltip/HelpTooltip"; +import { GeneAutocomplete } from "main/shared/GeneAutocomplete/GeneAutocomplete"; const useStyles = makeStyles((theme) => ({ formControl: { diff --git a/client/src/components/Pages/Summary/Invalid/Invalid.tsx b/client/src/components/Pages/Summary/Invalid/Invalid.tsx index 8672978c..f16826cc 100644 --- a/client/src/components/Pages/Summary/Invalid/Invalid.tsx +++ b/client/src/components/Pages/Summary/Invalid/Invalid.tsx @@ -10,9 +10,9 @@ import { } from "@material-ui/core"; import List from "@mui/material/List"; import React, { useContext } from "react"; -import { useColorTheme } from "../../../../global/contexts/Theme/ColorThemeContext"; -import { FusionContext } from "../../../../global/contexts/FusionContext"; -import { ClientElementUnion } from "../../../../services/main"; +import { useColorTheme } from "global/contexts/Theme/ColorThemeContext"; +import { FusionContext } from "global/contexts/FusionContext"; +import { ClientElementUnion } from "services/main"; interface Props { validationErrors: string[]; @@ -52,7 +52,8 @@ export const Invalid: React.FC = ({ const duplicateGeneError = (duplicateGenes: string[]) => { return ( - Duplicate gene element(s) detected: {duplicateGenes.join(", ")}. Per the{" "} + Duplicate gene element(s) detected: {duplicateGenes.join(", ")}. + Per the{" "} = ({ > Gene Fusion Specification - , Internal Tandem Duplications are not considered gene fusions, as they do not involve an interaction - between two or more genes.{" "} + , Internal Tandem Duplications are not considered gene fusions, as they + do not involve an interaction between two or more genes.{" "} setVisibleTab(0)}> Edit elements to resolve. - ) + ); }; const elementNumberError = ( @@ -107,9 +108,14 @@ export const Invalid: React.FC = ({ ); - const geneElements = fusion.structural_elements.filter(el => el.type === "GeneElement").map(el => { return el.nomenclature }) - const findDuplicates = arr => arr.filter((item, index) => arr.indexOf(item) !== index) - const duplicateGenes = findDuplicates(geneElements) + const geneElements = fusion.structural_elements + .filter((el) => el.type === "GeneElement") + .map((el) => { + return el.nomenclature; + }); + const findDuplicates = (arr) => + arr.filter((item, index) => arr.indexOf(item) !== index); + const duplicateGenes = findDuplicates(geneElements); const checkErrors = () => { const errorElements: React.ReactFragment[] = []; @@ -132,7 +138,7 @@ export const Invalid: React.FC = ({ } } if (duplicateGenes.length > 0) { - errorElements.push(duplicateGeneError(duplicateGenes)) + errorElements.push(duplicateGeneError(duplicateGenes)); } if (errorElements.length == 0) { errorElements.push( diff --git a/client/src/components/Pages/Summary/JSON/SummaryJSON.tsx b/client/src/components/Pages/Summary/JSON/SummaryJSON.tsx index 90045b22..bec07198 100644 --- a/client/src/components/Pages/Summary/JSON/SummaryJSON.tsx +++ b/client/src/components/Pages/Summary/JSON/SummaryJSON.tsx @@ -16,7 +16,7 @@ import { TranscriptSegmentElement, UnknownGeneElement, } from "../../../../services/ResponseModels"; -import { FusionType } from "../Main/Summary"; +import { FusionType } from "Main/Summary"; import "./SummaryJSON.scss"; interface Props { diff --git a/client/src/components/Pages/Summary/Main/Summary.tsx b/client/src/components/Pages/Summary/Main/Summary.tsx index 6854acd1..1af7dee6 100644 --- a/client/src/components/Pages/Summary/Main/Summary.tsx +++ b/client/src/components/Pages/Summary/Main/Summary.tsx @@ -1,5 +1,5 @@ import "./Summary.scss"; -import { FusionContext } from "../../../../global/contexts/FusionContext"; +import { FusionContext } from "global/contexts/FusionContext"; import React, { useContext, useEffect, useState } from "react"; import { @@ -19,8 +19,8 @@ import { TranscriptSegmentElement, UnknownGeneElement, } from "../../../../services/ResponseModels"; -import { Success } from "../Success/Success"; -import { Invalid } from "../Invalid/Invalid"; +import { Success } from "Success/Success"; +import { Invalid } from "Invalid/Invalid"; export type FusionType = AssayedFusion | CategoricalFusion; diff --git a/client/src/components/Pages/Summary/Readable/Readable.tsx b/client/src/components/Pages/Summary/Readable/Readable.tsx index 291464f2..9630feaf 100644 --- a/client/src/components/Pages/Summary/Readable/Readable.tsx +++ b/client/src/components/Pages/Summary/Readable/Readable.tsx @@ -1,8 +1,8 @@ import "./Readable.scss"; -import { ClientStructuralElement } from "../../../../services/ResponseModels"; +import { ClientStructuralElement } from "services/ResponseModels"; import React, { useContext, useEffect, useState } from "react"; import Chip from "@material-ui/core/Chip"; -import { FusionContext } from "../../../../global/contexts/FusionContext"; +import { FusionContext } from "global/contexts/FusionContext"; import { Table, TableCell, @@ -11,9 +11,9 @@ import { TableRow, Typography, } from "@material-ui/core"; -import { eventDisplayMap } from "../../CausativeEvent/CausativeEvent"; -import { FusionType } from "../Main/Summary"; -import { getFusionNomenclature } from "../../../../services/main"; +import { eventDisplayMap } from "CausativeEvent/CausativeEvent"; +import { FusionType } from "Main/Summary"; +import { getFusionNomenclature } from "services/main"; type Props = { validatedFusion: FusionType; @@ -31,8 +31,8 @@ export const Readable: React.FC = ({ validatedFusion }) => { ); }, [validatedFusion]); - const assayName = fusion.assay?.assay_name ? fusion.assay.assay_name : "" - const assayId = fusion.assay?.assay_id ? `(${fusion.assay.assay_id})` : "" + const assayName = fusion.assay?.assay_name ? fusion.assay.assay_name : ""; + const assayId = fusion.assay?.assay_id ? `(${fusion.assay.assay_id})` : ""; /** * Render rows specific to assayed fusion fields @@ -55,7 +55,9 @@ export const Readable: React.FC = ({ validatedFusion }) => { Assay - {fusion.assay ? `${assayName} ${assayId}` : ""} + + {fusion.assay ? `${assayName} ${assayId}` : ""} + diff --git a/client/src/components/Pages/Summary/Success/Success.tsx b/client/src/components/Pages/Summary/Success/Success.tsx index 28eaa0a0..49983468 100644 --- a/client/src/components/Pages/Summary/Success/Success.tsx +++ b/client/src/components/Pages/Summary/Success/Success.tsx @@ -1,9 +1,9 @@ import React, { useState } from "react"; -import { useColorTheme } from "../../../../global/contexts/Theme/ColorThemeContext"; -import { Readable } from "../Readable/Readable"; +import { useColorTheme } from "global/contexts/Theme/ColorThemeContext"; +import { Readable } from "Readable/Readable"; import { Tabs, Tab } from "@material-ui/core/"; -import { SummaryJSON } from "../JSON/SummaryJSON"; -import { FusionType } from "../Main/Summary"; +import { SummaryJSON } from "JSON/SummaryJSON"; +import { FusionType } from "Main/Summary"; const TabPanel = (props) => { const { children, value, index, ...other } = props; diff --git a/client/src/components/Utilities/GetCoordinates/GetCoordinates.tsx b/client/src/components/Utilities/GetCoordinates/GetCoordinates.tsx index 7e8f7431..9fc9b038 100644 --- a/client/src/components/Utilities/GetCoordinates/GetCoordinates.tsx +++ b/client/src/components/Utilities/GetCoordinates/GetCoordinates.tsx @@ -11,18 +11,18 @@ import { Link, } from "@material-ui/core"; import React, { useEffect, useState } from "react"; -import { GeneAutocomplete } from "../../main/shared/GeneAutocomplete/GeneAutocomplete"; -import { getGenomicCoords, getExonCoords } from "../../../services/main"; +import { getGenomicCoords, getExonCoords } from "services/main"; import { CoordsUtilsResponse, GenomicData, } from "../../../services/ResponseModels"; -import StrandSwitch from "../../main/shared/StrandSwitch/StrandSwitch"; -import TabHeader from "../../main/shared/TabHeader/TabHeader"; -import TabPaper from "../../main/shared/TabPaper/TabPaper"; -import { HelpPopover } from "../../main/shared/HelpPopover/HelpPopover"; -import ChromosomeField from "../../main/shared/ChromosomeField/ChromosomeField"; -import TranscriptField from "../../main/shared/TranscriptField/TranscriptField"; +import ChromosomeField from "components/main/shared/ChromosomeField/ChromosomeField"; +import { GeneAutocomplete } from "components/main/shared/GeneAutocomplete/GeneAutocomplete"; +import { HelpPopover } from "components/main/shared/HelpPopover/HelpPopover"; +import StrandSwitch from "components/main/shared/StrandSwitch/StrandSwitch"; +import TabHeader from "components/main/shared/TabHeader/TabHeader"; +import TabPaper from "components/main/shared/TabPaper/TabPaper"; +import TranscriptField from "components/main/shared/TranscriptField/TranscriptField"; const GetCoordinates: React.FC = () => { const useStyles = makeStyles(() => ({ @@ -250,10 +250,7 @@ const GetCoordinates: React.FC = () => { const genomicCoordinateInfo = ( <> - + { const [inputSequence, setInputSequence] = useState(""); diff --git a/client/src/components/Utilities/GetTranscripts/GetTranscripts.tsx b/client/src/components/Utilities/GetTranscripts/GetTranscripts.tsx index 8787864e..e85b4b5b 100644 --- a/client/src/components/Utilities/GetTranscripts/GetTranscripts.tsx +++ b/client/src/components/Utilities/GetTranscripts/GetTranscripts.tsx @@ -5,7 +5,6 @@ import { Box, Container, makeStyles, - Paper, Table, TableContainer, Typography, @@ -16,17 +15,17 @@ import { } from "@material-ui/core"; import ExpandMoreIcon from "@material-ui/icons/ExpandMore"; import React, { useEffect, useState } from "react"; -import { useColorTheme } from "../../../global/contexts/Theme/ColorThemeContext"; -import { getTranscripts } from "../../../services/main"; +import { useColorTheme } from "global/contexts/Theme/ColorThemeContext"; +import { getTranscripts } from "services/main"; import { GetTranscriptsResponse, ManeGeneTranscript, } from "../../../services/ResponseModels"; -import { GeneAutocomplete } from "../../main/shared/GeneAutocomplete/GeneAutocomplete"; -import { HelpPopover } from "../../main/shared/HelpPopover/HelpPopover"; -import HelpTooltip from "../../main/shared/HelpTooltip/HelpTooltip"; -import TabHeader from "../../main/shared/TabHeader/TabHeader"; -import TabPaper from "../../main/shared/TabPaper/TabPaper"; +import { GeneAutocomplete } from "components/main/shared/GeneAutocomplete/GeneAutocomplete"; +import { HelpPopover } from "components/main/shared/HelpPopover/HelpPopover"; +import HelpTooltip from "components/main/shared/HelpTooltip/HelpTooltip"; +import TabHeader from "components/main/shared/TabHeader/TabHeader"; +import TabPaper from "components/main/shared/TabPaper/TabPaper"; export const GetTranscripts: React.FC = () => { const [gene, setGene] = useState(""); diff --git a/client/src/components/Utilities/UtilitiesNavTabs/UtilitiesNavTabs.tsx b/client/src/components/Utilities/UtilitiesNavTabs/UtilitiesNavTabs.tsx index 82c51c95..e68cd54e 100644 --- a/client/src/components/Utilities/UtilitiesNavTabs/UtilitiesNavTabs.tsx +++ b/client/src/components/Utilities/UtilitiesNavTabs/UtilitiesNavTabs.tsx @@ -1,10 +1,10 @@ import React from "react"; -import { GetTranscripts } from "../GetTranscripts/GetTranscripts"; import { makeStyles, Theme } from "@material-ui/core/styles"; import { AppBar, Tabs, Tab, Box, Paper } from "@material-ui/core"; -import { useColorTheme } from "../../../global/contexts/Theme/ColorThemeContext"; +import { useColorTheme } from "global/contexts/Theme/ColorThemeContext"; import GetCoordinates from "../GetCoordinates/GetCoordinates"; import GetSequence from "../GetSequence/GetSequence"; +import { GetTranscripts } from "../GetTranscripts/GetTranscripts"; interface TabPanelProps { children?: React.ReactNode; diff --git a/client/src/components/main/About/About.tsx b/client/src/components/main/About/About.tsx index 272d5f55..b49f9e9a 100644 --- a/client/src/components/main/About/About.tsx +++ b/client/src/components/main/About/About.tsx @@ -7,8 +7,8 @@ import { ListItemText, } from "@material-ui/core"; import React, { useEffect, useState } from "react"; -import { getInfo } from "../../../services/main"; -import { ServiceInfoResponse } from "../../../services/ResponseModels"; +import { getInfo } from "services/main"; +import { ServiceInfoResponse } from "services/ResponseModels"; import ArrowForwardIosIcon from "@material-ui/icons/ArrowForwardIos"; import "./About.scss"; diff --git a/client/src/components/main/App/App.tsx b/client/src/components/main/App/App.tsx index 483ec9e4..cd3bd136 100644 --- a/client/src/components/main/App/App.tsx +++ b/client/src/components/main/App/App.tsx @@ -15,19 +15,17 @@ import { Typography, } from "@material-ui/core"; // global contexts -import { DomainOptionsContext } from "../../../global/contexts/DomainOptionsContext"; -import { FusionContext } from "../../../global/contexts/FusionContext"; -import { GeneContext } from "../../../global/contexts/GeneContext"; -import { SuggestionContext } from "../../../global/contexts/SuggestionContext"; +import { DomainOptionsContext } from "global/contexts/DomainOptionsContext"; +import { FusionContext } from "global/contexts/FusionContext"; +import { GeneContext } from "global/contexts/GeneContext"; +import { SuggestionContext } from "global/contexts/SuggestionContext"; // style things -import { useColorTheme } from "../../../global/contexts/Theme/ColorThemeContext"; +import { useColorTheme } from "global/contexts/Theme/ColorThemeContext"; import "../../../global/styles/global.scss"; -import theme, { MARGIN_OFFSETS } from "../../../global/styles/theme"; +import theme, { MARGIN_OFFSETS } from "global/styles/theme"; import "./App.scss"; // other components -import UtilitiesNavTabs from "../../../components/Utilities/UtilitiesNavTabs/UtilitiesNavTabs"; -import NavTabs from "../Nav/NavTabs"; -import About from "../About/About"; +import UtilitiesNavTabs from "components/Utilities/UtilitiesNavTabs/UtilitiesNavTabs"; // services things import { ClientElementUnion, @@ -39,15 +37,17 @@ import { DomainParams, GeneDescriptor, } from "../../../services/ResponseModels"; -import LandingPage from "../Landing/LandingPage"; import AppMenu from "./AppMenu"; import DemoDropdown from "./DemoDropdown"; -import { HelpPopover } from "../shared/HelpPopover/HelpPopover"; import { initialSettings, SettingsContext, SettingsType, -} from "../../../global/contexts/SettingsContext"; +} from "global/contexts/SettingsContext"; +import About from "../About/About"; +import LandingPage from "../Landing/LandingPage"; +import NavTabs from "../Nav/NavTabs"; +import { HelpPopover } from "../shared/HelpPopover/HelpPopover"; type ClientFusion = ClientCategoricalFusion | ClientAssayedFusion; diff --git a/client/src/components/main/App/AppMenu.tsx b/client/src/components/main/App/AppMenu.tsx index b1a5a74a..ace11bfa 100644 --- a/client/src/components/main/App/AppMenu.tsx +++ b/client/src/components/main/App/AppMenu.tsx @@ -8,8 +8,8 @@ import { Drawer, Switch, } from "@material-ui/core"; -import { ServiceInfoResponse } from "../../../services/ResponseModels"; -import { getInfo } from "../../../services/main"; +import { ServiceInfoResponse } from "services/ResponseModels"; +import { getInfo } from "services/main"; const useStyles = makeStyles(() => ({ menuLink: { diff --git a/client/src/components/main/Landing/LandingPage.tsx b/client/src/components/main/Landing/LandingPage.tsx index 048917f7..649a55ab 100644 --- a/client/src/components/main/Landing/LandingPage.tsx +++ b/client/src/components/main/Landing/LandingPage.tsx @@ -1,7 +1,7 @@ import React from "react"; import { Box, Typography, makeStyles, Link, Paper } from "@material-ui/core"; import Carousel from "react-material-ui-carousel"; -import theme from "../../../global/styles/theme"; +import theme from "global/styles/theme"; import { red } from "@material-ui/core/colors"; const useStyles = makeStyles((theme) => ({ diff --git a/client/src/components/main/Nav/NavTabs.tsx b/client/src/components/main/Nav/NavTabs.tsx index a0e0f6f0..1c3bf9af 100644 --- a/client/src/components/main/Nav/NavTabs.tsx +++ b/client/src/components/main/Nav/NavTabs.tsx @@ -1,15 +1,7 @@ import React, { useContext } from "react"; // Global fusion -import { FusionContext } from "../../../global/contexts/FusionContext"; - -// Pages -import { Structure } from "../../Pages/Structure/Main/Structure"; -import { Summary } from "../../Pages/Summary/Main/Summary"; -import { Domain } from "../../Pages/Domains/Main/Domains"; -import { ReadingFrame } from "../../Pages/ReadingFrame/ReadingFrame"; -import { CausativeEvent } from "../../Pages/CausativeEvent/CausativeEvent"; -import { Assay } from "../../Pages/Assay/Assay"; +import { FusionContext } from "global/contexts/FusionContext"; // MUI Stuff import { makeStyles, Theme } from "@material-ui/core/styles"; @@ -17,7 +9,13 @@ import { Tabs, Tab, Button } from "@material-ui/core"; // Styles import "./NavTabs.scss"; -import { useColorTheme } from "../../../global/contexts/Theme/ColorThemeContext"; +import { useColorTheme } from "global/contexts/Theme/ColorThemeContext"; +import { Domain } from "@material-ui/icons"; +import { Assay } from "components/Pages/Assay/Assay"; +import { CausativeEvent } from "components/Pages/CausativeEvent/CausativeEvent"; +import { ReadingFrame } from "components/Pages/ReadingFrame/ReadingFrame"; +import { Structure } from "components/Pages/Structure/Main/Structure"; +import { Summary } from "components/Pages/Summary/Main/Summary"; interface TabPanelProps { children?: React.ReactNode; diff --git a/client/src/components/main/shared/ChromosomeField/ChromosomeField.tsx b/client/src/components/main/shared/ChromosomeField/ChromosomeField.tsx index 26d02456..f925c231 100644 --- a/client/src/components/main/shared/ChromosomeField/ChromosomeField.tsx +++ b/client/src/components/main/shared/ChromosomeField/ChromosomeField.tsx @@ -1,6 +1,6 @@ import { makeStyles, TextField, Typography } from "@material-ui/core"; import React, { KeyboardEventHandler } from "react"; -import HelpTooltip from "../HelpTooltip/HelpTooltip"; +import HelpTooltip from "HelpTooltip/HelpTooltip"; interface Props { fieldValue: string; @@ -8,11 +8,7 @@ interface Props { width?: number | undefined; } -const ChromosomeField: React.FC = ({ - fieldValue, - errorText, - width, -}) => { +const ChromosomeField: React.FC = ({ fieldValue, errorText, width }) => { const useStyles = makeStyles(() => ({ textField: { height: 38, diff --git a/client/src/components/main/shared/GeneAutocomplete/GeneAutocomplete.tsx b/client/src/components/main/shared/GeneAutocomplete/GeneAutocomplete.tsx index fbeb24b4..61eeff61 100644 --- a/client/src/components/main/shared/GeneAutocomplete/GeneAutocomplete.tsx +++ b/client/src/components/main/shared/GeneAutocomplete/GeneAutocomplete.tsx @@ -3,10 +3,10 @@ import { TextField, Typography, makeStyles } from "@material-ui/core"; import Autocomplete, { AutocompleteRenderGroupParams, } from "@material-ui/lab/Autocomplete"; -import { getGeneSuggestions } from "../../../../services/main"; -import { SuggestGeneResponse } from "../../../../services/ResponseModels"; -import HelpTooltip from "../HelpTooltip/HelpTooltip"; -import { useColorTheme } from "../../../../global/contexts/Theme/ColorThemeContext"; +import { getGeneSuggestions } from "services/main"; +import { SuggestGeneResponse } from "services/ResponseModels"; +import HelpTooltip from "HelpTooltip/HelpTooltip"; +import { useColorTheme } from "global/contexts/Theme/ColorThemeContext"; export enum GeneSuggestionType { conceptId = "Concept ID", @@ -90,7 +90,9 @@ export const GeneAutocomplete: React.FC = ({ setGeneValue(selection); if (setChromosome) { // substring is to remove identifier from beginning of chromosome (ex: result in NC_000007.14 instead of NCBI:NC_000007.14) - setChromosome(selection.chromosome?.substring(selection.chromosome.indexOf(":") + 1)); + setChromosome( + selection.chromosome?.substring(selection.chromosome.indexOf(":") + 1) + ); } if (setStrand) { setStrand(selection.strand); diff --git a/client/src/components/main/shared/HelpPopover/HelpPopover.tsx b/client/src/components/main/shared/HelpPopover/HelpPopover.tsx index 9cc740e2..0d506d07 100644 --- a/client/src/components/main/shared/HelpPopover/HelpPopover.tsx +++ b/client/src/components/main/shared/HelpPopover/HelpPopover.tsx @@ -1,7 +1,7 @@ import { Box, Popover, makeStyles } from "@material-ui/core"; import React from "react"; import HelpOutlineIcon from "@material-ui/icons/HelpOutline"; -import { useColorTheme } from "../../../../global/contexts/Theme/ColorThemeContext"; +import { useColorTheme } from "global/contexts/Theme/ColorThemeContext"; interface HelpPopoverProps { children: React.ReactFragment; diff --git a/client/src/components/main/shared/HelpTooltip/HelpTooltip.tsx b/client/src/components/main/shared/HelpTooltip/HelpTooltip.tsx index 32440638..0817536e 100644 --- a/client/src/components/main/shared/HelpTooltip/HelpTooltip.tsx +++ b/client/src/components/main/shared/HelpTooltip/HelpTooltip.tsx @@ -1,6 +1,6 @@ import { makeStyles, Tooltip } from "@material-ui/core"; import React, { useContext } from "react"; -import { SettingsContext } from "../../../../global/contexts/SettingsContext"; +import { SettingsContext } from "global/contexts/SettingsContext"; const useStylesBootstrap = makeStyles(() => ({ tooltip: { diff --git a/client/src/components/main/shared/TabPaper/TabPaper.tsx b/client/src/components/main/shared/TabPaper/TabPaper.tsx index 02ae607c..f9660d70 100644 --- a/client/src/components/main/shared/TabPaper/TabPaper.tsx +++ b/client/src/components/main/shared/TabPaper/TabPaper.tsx @@ -1,6 +1,6 @@ import { Box, Divider, makeStyles, Paper } from "@material-ui/core"; import React from "react"; -import { useColorTheme } from "../../../../global/contexts/Theme/ColorThemeContext"; +import { useColorTheme } from "global/contexts/Theme/ColorThemeContext"; interface Props { leftColumn: React.ReactFragment; diff --git a/client/src/components/main/shared/TranscriptField/TranscriptField.tsx b/client/src/components/main/shared/TranscriptField/TranscriptField.tsx index 1c44a9a1..233923dc 100644 --- a/client/src/components/main/shared/TranscriptField/TranscriptField.tsx +++ b/client/src/components/main/shared/TranscriptField/TranscriptField.tsx @@ -1,6 +1,6 @@ import { makeStyles, TextField, Typography } from "@material-ui/core"; import React, { KeyboardEventHandler } from "react"; -import HelpTooltip from "../HelpTooltip/HelpTooltip"; +import HelpTooltip from "HelpTooltip/HelpTooltip"; interface Props { fieldValue: string; diff --git a/client/src/global/styles/theme.ts b/client/src/global/styles/theme.ts index 4561b371..765ce15d 100644 --- a/client/src/global/styles/theme.ts +++ b/client/src/global/styles/theme.ts @@ -1,6 +1,5 @@ import { createTheme } from "@material-ui/core/styles"; - -import { COLORTHEMES } from "../contexts/Theme/Theme.model"; +import { COLORTHEMES } from "global/contexts/Theme/Theme.model"; declare module "@material-ui/core/styles/createTheme" { interface Theme { diff --git a/client/tsconfig.json b/client/tsconfig.json index 14ebba7d..670df9ce 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -1,6 +1,7 @@ { "compilerOptions": { "target": "es6", + "baseUrl": "src", "lib": ["dom", "dom.iterable", "esnext"], "allowJs": true, "skipLibCheck": true, @@ -17,9 +18,5 @@ "jsx": "react-jsx", "checkJs": true }, - "include": [ - "./src/**/*.ts", - "global/ResponseModels.ts", - "src/services/main.tsx" - ] + "include": ["src"] }