From 0fdd890511e5bd6ddfef125825166105fb66490b Mon Sep 17 00:00:00 2001 From: Onur Sumer Date: Thu, 14 Nov 2019 14:11:29 -0500 Subject: [PATCH] moved all components under component directory --- src/component/column/HotspotAnnotation.tsx | 2 +- .../{ => dataTable}/ColumnSelector.tsx | 0 src/{ => component/dataTable}/DataTable.tsx | 15 ++++---- .../DataTableToolbar.tsx | 2 +- .../{toolbar => dataTable}/SearchBox.tsx | 0 src/{ => component/hotspot}/HotspotInfo.tsx | 0 .../hotspot}/hotspotInfo.module.scss | 0 .../DefaultLollipopPlotLegend.tsx | 2 +- .../LollipopMutationPlot.tsx | 32 ++++++++--------- .../LollipopMutationPlotControls.tsx | 6 ++-- .../lollipopMutationPlot.module.scss | 0 .../lollipopMutationPlot.scss | 0 src/{ => component/lollipopPlot}/Domain.tsx | 2 +- src/{ => component/lollipopPlot}/Lollipop.tsx | 2 +- .../lollipopPlot}/LollipopPlot.tsx | 8 ++--- .../lollipopPlot}/LollipopPlotNoTooltip.tsx | 6 ++-- src/{ => component/lollipopPlot}/Sequence.tsx | 2 +- .../DefaultMutationRateSummary.tsx | 2 +- .../{ => mutationMapper}/FilterResetPanel.tsx | 0 .../mutationMapper}/GeneSummary.tsx | 6 ++-- .../mutationMapper}/MutationMapper.tsx | 34 +++++++++---------- .../mutationMapper}/TranscriptDropdown.tsx | 6 ++-- .../defaultMutationRateSummary.module.scss | 0 .../filterResetPanel.module.scss | 0 .../mutationMapper}/geneSummary.module.scss | 0 .../transcriptDropdown.module.scss | 0 .../mutationTable}/DefaultMutationTable.tsx | 28 +++++++-------- .../mutationTable}/MutationColumnHelper.tsx | 16 ++++----- .../mutationTable}/defaultMutationTable.scss | 0 src/component/oncokb/OncoKbCard.tsx | 2 +- .../oncokb}/OncoKbSummaryTable.tsx | 4 +-- .../ptm}/PtmAnnotationTable.tsx | 4 +-- src/{ => component/ptm}/PtmReferenceList.tsx | 4 +-- src/{ => component/track}/HotspotTrack.tsx | 16 ++++----- src/{ => component/track}/OncoKbTrack.tsx | 8 ++--- .../track}/OncoKbTrackTooltip.tsx | 6 ++-- src/{ => component/track}/PtmTrack.tsx | 10 +++--- src/{ => component/track}/Track.tsx | 6 ++-- src/{ => component/track}/TrackCircle.tsx | 0 src/{ => component/track}/TrackPanel.tsx | 4 +-- src/{ => component/track}/TrackSelector.tsx | 0 .../track}/defaultTrackTooltipTable.scss | 0 .../track}/ptmTrackStyles.module.scss | 0 .../track}/trackStyles.module.scss | 0 src/index.tsx | 28 +++++++-------- src/util/TrackUtils.ts | 2 +- 46 files changed, 133 insertions(+), 132 deletions(-) rename src/component/{ => dataTable}/ColumnSelector.tsx (100%) rename src/{ => component/dataTable}/DataTable.tsx (96%) rename src/component/{toolbar => dataTable}/DataTableToolbar.tsx (98%) rename src/component/{toolbar => dataTable}/SearchBox.tsx (100%) rename src/{ => component/hotspot}/HotspotInfo.tsx (100%) rename src/{ => component/hotspot}/hotspotInfo.module.scss (100%) rename src/{ => component/lollipopMutationPlot}/DefaultLollipopPlotLegend.tsx (98%) rename src/{ => component/lollipopMutationPlot}/LollipopMutationPlot.tsx (95%) rename src/{ => component/lollipopMutationPlot}/LollipopMutationPlotControls.tsx (97%) rename src/{ => component/lollipopMutationPlot}/lollipopMutationPlot.module.scss (100%) rename src/{ => component/lollipopMutationPlot}/lollipopMutationPlot.scss (100%) rename src/{ => component/lollipopPlot}/Domain.tsx (98%) rename src/{ => component/lollipopPlot}/Lollipop.tsx (97%) rename src/{ => component/lollipopPlot}/LollipopPlot.tsx (94%) rename src/{ => component/lollipopPlot}/LollipopPlotNoTooltip.tsx (99%) rename src/{ => component/lollipopPlot}/Sequence.tsx (96%) rename src/{ => component/mutationMapper}/DefaultMutationRateSummary.tsx (95%) rename src/component/{ => mutationMapper}/FilterResetPanel.tsx (100%) rename src/{ => component/mutationMapper}/GeneSummary.tsx (97%) rename src/{ => component/mutationMapper}/MutationMapper.tsx (92%) rename src/{ => component/mutationMapper}/TranscriptDropdown.tsx (97%) rename src/{ => component/mutationMapper}/defaultMutationRateSummary.module.scss (100%) rename src/component/{ => mutationMapper}/filterResetPanel.module.scss (100%) rename src/{ => component/mutationMapper}/geneSummary.module.scss (100%) rename src/{ => component/mutationMapper}/transcriptDropdown.module.scss (100%) rename src/{ => component/mutationTable}/DefaultMutationTable.tsx (89%) rename src/{ => component/mutationTable}/MutationColumnHelper.tsx (94%) rename src/{ => component/mutationTable}/defaultMutationTable.scss (100%) rename src/{ => component/oncokb}/OncoKbSummaryTable.tsx (98%) rename src/{ => component/ptm}/PtmAnnotationTable.tsx (95%) rename src/{ => component/ptm}/PtmReferenceList.tsx (93%) rename src/{ => component/track}/HotspotTrack.tsx (87%) rename src/{ => component/track}/OncoKbTrack.tsx (90%) rename src/{ => component/track}/OncoKbTrackTooltip.tsx (94%) rename src/{ => component/track}/PtmTrack.tsx (96%) rename src/{ => component/track}/Track.tsx (98%) rename src/{ => component/track}/TrackCircle.tsx (100%) rename src/{ => component/track}/TrackPanel.tsx (96%) rename src/{ => component/track}/TrackSelector.tsx (100%) rename src/{ => component/track}/defaultTrackTooltipTable.scss (100%) rename src/{ => component/track}/ptmTrackStyles.module.scss (100%) rename src/{ => component/track}/trackStyles.module.scss (100%) diff --git a/src/component/column/HotspotAnnotation.tsx b/src/component/column/HotspotAnnotation.tsx index bc264e36557..05614da24ef 100644 --- a/src/component/column/HotspotAnnotation.tsx +++ b/src/component/column/HotspotAnnotation.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import {loaderIcon} from "../StatusHelpers"; -import HotspotInfo from "../../HotspotInfo"; +import HotspotInfo from "../hotspot/HotspotInfo"; import {DefaultTooltip} from "cbioportal-frontend-commons"; import hotspotImg from '../../images/cancer-hotspots.svg'; diff --git a/src/component/ColumnSelector.tsx b/src/component/dataTable/ColumnSelector.tsx similarity index 100% rename from src/component/ColumnSelector.tsx rename to src/component/dataTable/ColumnSelector.tsx diff --git a/src/DataTable.tsx b/src/component/dataTable/DataTable.tsx similarity index 96% rename from src/DataTable.tsx rename to src/component/dataTable/DataTable.tsx index 1e61827a818..7c43f8c56c0 100644 --- a/src/DataTable.tsx +++ b/src/component/dataTable/DataTable.tsx @@ -10,13 +10,14 @@ import {observer} from "mobx-react"; import * as React from 'react'; import ReactTable, {Column, RowInfo, TableProps} from "react-table"; -import {ColumnSelectorProps, ColumnVisibilityDef} from "./component/ColumnSelector"; -import {DataTableToolbar} from "./component/toolbar/DataTableToolbar"; -import {DataFilter} from "./model/DataFilter"; -import {DataStore} from "./model/DataStore"; -import {RemoteData} from "./model/RemoteData"; -import {TEXT_INPUT_FILTER_ID} from "./util/FilterUtils"; -import {getRemoteDataGroupStatus} from "./util/RemoteDataUtils"; +import {DataFilter} from "../../model/DataFilter"; +import {DataStore} from "../../model/DataStore"; +import {RemoteData} from "../../model/RemoteData"; +import {TEXT_INPUT_FILTER_ID} from "../../util/FilterUtils"; +import {getRemoteDataGroupStatus} from "../../util/RemoteDataUtils"; +import {ColumnSelectorProps, ColumnVisibilityDef} from "./ColumnSelector"; +import {DataTableToolbar} from "./DataTableToolbar"; + export type DataTableColumn = Column & { name?: string; diff --git a/src/component/toolbar/DataTableToolbar.tsx b/src/component/dataTable/DataTableToolbar.tsx similarity index 98% rename from src/component/toolbar/DataTableToolbar.tsx rename to src/component/dataTable/DataTableToolbar.tsx index 8ea82f3ec89..c9202cd8e83 100644 --- a/src/component/toolbar/DataTableToolbar.tsx +++ b/src/component/dataTable/DataTableToolbar.tsx @@ -2,7 +2,7 @@ import _ from "lodash"; import {observer} from "mobx-react"; import * as React from "react"; -import {ColumnSelector, ColumnSelectorProps, ColumnVisibilityDef} from "../ColumnSelector"; +import {ColumnSelector, ColumnSelectorProps, ColumnVisibilityDef} from "./ColumnSelector"; import {SearchBox} from "./SearchBox"; type DataTableToolbarProps = { diff --git a/src/component/toolbar/SearchBox.tsx b/src/component/dataTable/SearchBox.tsx similarity index 100% rename from src/component/toolbar/SearchBox.tsx rename to src/component/dataTable/SearchBox.tsx diff --git a/src/HotspotInfo.tsx b/src/component/hotspot/HotspotInfo.tsx similarity index 100% rename from src/HotspotInfo.tsx rename to src/component/hotspot/HotspotInfo.tsx diff --git a/src/hotspotInfo.module.scss b/src/component/hotspot/hotspotInfo.module.scss similarity index 100% rename from src/hotspotInfo.module.scss rename to src/component/hotspot/hotspotInfo.module.scss diff --git a/src/DefaultLollipopPlotLegend.tsx b/src/component/lollipopMutationPlot/DefaultLollipopPlotLegend.tsx similarity index 98% rename from src/DefaultLollipopPlotLegend.tsx rename to src/component/lollipopMutationPlot/DefaultLollipopPlotLegend.tsx index 5c8acb0270c..fc0aec08d95 100644 --- a/src/DefaultLollipopPlotLegend.tsx +++ b/src/component/lollipopMutationPlot/DefaultLollipopPlotLegend.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import {MUT_COLOR_INFRAME, MUT_COLOR_MISSENSE, MUT_COLOR_OTHER, MUT_COLOR_TRUNC} from "./util/MutationUtils"; +import {MUT_COLOR_INFRAME, MUT_COLOR_MISSENSE, MUT_COLOR_OTHER, MUT_COLOR_TRUNC} from "../../util/MutationUtils"; type DefaultLollipopPlotLegendProps = { missenseColor?: string; diff --git a/src/LollipopMutationPlot.tsx b/src/component/lollipopMutationPlot/LollipopMutationPlot.tsx similarity index 95% rename from src/LollipopMutationPlot.tsx rename to src/component/lollipopMutationPlot/LollipopMutationPlot.tsx index 1854832ab0f..64ec6fa3d4d 100644 --- a/src/LollipopMutationPlot.tsx +++ b/src/component/lollipopMutationPlot/LollipopMutationPlot.tsx @@ -7,30 +7,30 @@ import {Collapse} from "react-collapse"; import $ from "jquery"; -import {DomainSpec} from "./model/DomainSpec"; -import {LollipopPlotControlsConfig} from "./model/LollipopPlotControlsConfig"; -import {LollipopPlacement, LollipopSpec} from "./model/LollipopSpec"; -import {MobxCache} from "./model/MobxCache"; -import {Mutation} from "./model/Mutation"; -import {MutationMapperStore} from "./model/MutationMapperStore"; -import {PfamDomain, PfamDomainRange} from "./model/Pfam"; -import {SequenceSpec} from "./model/SequenceSpec"; -import {DefaultLollipopPlotControlsConfig} from "./store/DefaultLollipopPlotControlsConfig"; +import {DomainSpec} from "../../model/DomainSpec"; +import {LollipopPlotControlsConfig} from "../../model/LollipopPlotControlsConfig"; +import {LollipopPlacement, LollipopSpec} from "../../model/LollipopSpec"; +import {MobxCache} from "../../model/MobxCache"; +import {Mutation} from "../../model/Mutation"; +import {MutationMapperStore} from "../../model/MutationMapperStore"; +import {PfamDomain, PfamDomainRange} from "../../model/Pfam"; +import {SequenceSpec} from "../../model/SequenceSpec"; +import {DefaultLollipopPlotControlsConfig} from "../../store/DefaultLollipopPlotControlsConfig"; import { calcCountRange, calcYMaxInput, getYAxisMaxInputValue, lollipopLabelText, lollipopLabelTextAnchor -} from "./util/LollipopPlotUtils"; -import {DEFAULT_PROTEIN_IMPACT_TYPE_COLORS, getColorForProteinImpactType} from "./util/MutationUtils"; -import {generatePfamDomainColorMap} from "./util/PfamUtils"; -import {initDefaultTrackVisibility} from "./util/TrackUtils"; +} from "../../util/LollipopPlotUtils"; +import {DEFAULT_PROTEIN_IMPACT_TYPE_COLORS, getColorForProteinImpactType} from "../../util/MutationUtils"; +import {generatePfamDomainColorMap} from "../../util/PfamUtils"; +import {initDefaultTrackVisibility} from "../../util/TrackUtils"; import DefaultLollipopPlotLegend from "./DefaultLollipopPlotLegend"; -import LollipopPlot from "./LollipopPlot"; +import LollipopPlot from "../lollipopPlot/LollipopPlot"; import LollipopMutationPlotControls from "./LollipopMutationPlotControls"; -import {TrackDataStatus, TrackName, TrackVisibility} from "./TrackSelector"; -import TrackPanel from "./TrackPanel"; +import {TrackDataStatus, TrackName, TrackVisibility} from "../track/TrackSelector"; +import TrackPanel from "../track/TrackPanel"; import "./lollipopMutationPlot.scss"; diff --git a/src/LollipopMutationPlotControls.tsx b/src/component/lollipopMutationPlot/LollipopMutationPlotControls.tsx similarity index 97% rename from src/LollipopMutationPlotControls.tsx rename to src/component/lollipopMutationPlot/LollipopMutationPlotControls.tsx index 6b0ff057970..6fbc87b3174 100644 --- a/src/LollipopMutationPlotControls.tsx +++ b/src/component/lollipopMutationPlot/LollipopMutationPlotControls.tsx @@ -6,9 +6,9 @@ import Slider from 'react-rangeslider' import {computed} from "mobx"; import {observer} from "mobx-react"; -import {numberOfLeadingDecimalZeros} from "./util/FormatUtils"; -import {calcYMaxInput} from "./util/LollipopPlotUtils"; -import TrackSelector, {TrackDataStatus, TrackName, TrackVisibility} from "./TrackSelector"; +import {numberOfLeadingDecimalZeros} from "../../util/FormatUtils"; +import {calcYMaxInput} from "../../util/LollipopPlotUtils"; +import TrackSelector, {TrackDataStatus, TrackName, TrackVisibility} from "../track/TrackSelector"; import "react-rangeslider/lib/index.css"; import styles from "./lollipopMutationPlot.module.scss"; diff --git a/src/lollipopMutationPlot.module.scss b/src/component/lollipopMutationPlot/lollipopMutationPlot.module.scss similarity index 100% rename from src/lollipopMutationPlot.module.scss rename to src/component/lollipopMutationPlot/lollipopMutationPlot.module.scss diff --git a/src/lollipopMutationPlot.scss b/src/component/lollipopMutationPlot/lollipopMutationPlot.scss similarity index 100% rename from src/lollipopMutationPlot.scss rename to src/component/lollipopMutationPlot/lollipopMutationPlot.scss diff --git a/src/Domain.tsx b/src/component/lollipopPlot/Domain.tsx similarity index 98% rename from src/Domain.tsx rename to src/component/lollipopPlot/Domain.tsx index 7fbb9ea88ee..efb231c3d32 100644 --- a/src/Domain.tsx +++ b/src/component/lollipopPlot/Domain.tsx @@ -4,7 +4,7 @@ import {computed, observable} from "mobx"; import $ from 'jquery'; -import {DomainSpec} from "./model/DomainSpec"; +import {DomainSpec} from "../../model/DomainSpec"; type DomainProps = { x:number; diff --git a/src/Lollipop.tsx b/src/component/lollipopPlot/Lollipop.tsx similarity index 97% rename from src/Lollipop.tsx rename to src/component/lollipopPlot/Lollipop.tsx index efc76b3bf21..32a10bac9cd 100644 --- a/src/Lollipop.tsx +++ b/src/component/lollipopPlot/Lollipop.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import {observer} from "mobx-react"; import {computed, observable} from "mobx"; -import {LollipopPlacement, LollipopSpec} from "./model/LollipopSpec"; +import {LollipopPlacement, LollipopSpec} from "../../model/LollipopSpec"; type LollipopProps = { x:number; diff --git a/src/LollipopPlot.tsx b/src/component/lollipopPlot/LollipopPlot.tsx similarity index 94% rename from src/LollipopPlot.tsx rename to src/component/lollipopPlot/LollipopPlot.tsx index cc08a70bf67..2965a864aea 100644 --- a/src/LollipopPlot.tsx +++ b/src/component/lollipopPlot/LollipopPlot.tsx @@ -3,10 +3,10 @@ import {observer} from "mobx-react"; import {observable, computed} from "mobx"; import {HitZoneConfig, defaultHitzoneConfig, initHitZoneFromConfig, DefaultTooltip} from "cbioportal-frontend-commons"; -import DataStore from "./model/DataStore"; -import {SequenceSpec} from "./model/SequenceSpec"; -import {LollipopSpec} from "./model/LollipopSpec"; -import {DomainSpec} from "./model/DomainSpec"; +import DataStore from "../../model/DataStore"; +import {SequenceSpec} from "../../model/SequenceSpec"; +import {LollipopSpec} from "../../model/LollipopSpec"; +import {DomainSpec} from "../../model/DomainSpec"; import LollipopPlotNoTooltip from "./LollipopPlotNoTooltip"; export type LollipopPlotProps = { diff --git a/src/LollipopPlotNoTooltip.tsx b/src/component/lollipopPlot/LollipopPlotNoTooltip.tsx similarity index 99% rename from src/LollipopPlotNoTooltip.tsx rename to src/component/lollipopPlot/LollipopPlotNoTooltip.tsx index 7ef86de37ae..bddb8d6dc31 100644 --- a/src/LollipopPlotNoTooltip.tsx +++ b/src/component/lollipopPlot/LollipopPlotNoTooltip.tsx @@ -8,9 +8,9 @@ import {action, computed} from "mobx"; import {getComponentIndex, SVGAxis, Tick, unhoverAllComponents} from 'cbioportal-frontend-commons'; -import {LollipopPlacement, LollipopSpec} from "./model/LollipopSpec"; -import {DomainSpec} from "./model/DomainSpec"; -import {updatePositionHighlightFilters, updatePositionSelectionFilters} from "./util/FilterUtils"; +import {LollipopPlacement, LollipopSpec} from "../../model/LollipopSpec"; +import {DomainSpec} from "../../model/DomainSpec"; +import {updatePositionHighlightFilters, updatePositionSelectionFilters} from "../../util/FilterUtils"; import Sequence from "./Sequence"; import Lollipop from "./Lollipop"; import Domain from "./Domain"; diff --git a/src/Sequence.tsx b/src/component/lollipopPlot/Sequence.tsx similarity index 96% rename from src/Sequence.tsx rename to src/component/lollipopPlot/Sequence.tsx index 49da2e03ad0..a07fc7d8f6b 100644 --- a/src/Sequence.tsx +++ b/src/component/lollipopPlot/Sequence.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import {observer} from "mobx-react"; import {observable} from "mobx"; -import {SequenceSpec} from "./model/SequenceSpec"; +import {SequenceSpec} from "../../model/SequenceSpec"; type SequenceProps = { x:number; diff --git a/src/DefaultMutationRateSummary.tsx b/src/component/mutationMapper/DefaultMutationRateSummary.tsx similarity index 95% rename from src/DefaultMutationRateSummary.tsx rename to src/component/mutationMapper/DefaultMutationRateSummary.tsx index ec8bc23a4b3..44746060638 100644 --- a/src/DefaultMutationRateSummary.tsx +++ b/src/component/mutationMapper/DefaultMutationRateSummary.tsx @@ -1,7 +1,7 @@ import {DefaultTooltip} from "cbioportal-frontend-commons"; import * as React from "react"; -import {formatPercentValue} from "./util/FormatUtils"; +import {formatPercentValue} from "../../util/FormatUtils"; import styles from "./defaultMutationRateSummary.module.scss" diff --git a/src/component/FilterResetPanel.tsx b/src/component/mutationMapper/FilterResetPanel.tsx similarity index 100% rename from src/component/FilterResetPanel.tsx rename to src/component/mutationMapper/FilterResetPanel.tsx diff --git a/src/GeneSummary.tsx b/src/component/mutationMapper/GeneSummary.tsx similarity index 97% rename from src/GeneSummary.tsx rename to src/component/mutationMapper/GeneSummary.tsx index d2743f05115..6934872d803 100644 --- a/src/GeneSummary.tsx +++ b/src/component/mutationMapper/GeneSummary.tsx @@ -2,9 +2,9 @@ import {observer} from "mobx-react"; import * as React from "react"; import {getNCBIlink, VariantAnnotation} from "cbioportal-frontend-commons"; -import {EnsemblTranscript} from "./model/EnsemblTranscript"; -import {Mutation} from "./model/Mutation"; -import {RemoteData} from "./model/RemoteData"; +import {EnsemblTranscript} from "../../model/EnsemblTranscript"; +import {Mutation} from "../../model/Mutation"; +import {RemoteData} from "../../model/RemoteData"; import TranscriptDropdown from "./TranscriptDropdown"; import styles from "./geneSummary.module.scss"; diff --git a/src/MutationMapper.tsx b/src/component/mutationMapper/MutationMapper.tsx similarity index 92% rename from src/MutationMapper.tsx rename to src/component/mutationMapper/MutationMapper.tsx index c78ea42ada7..dbd492ced58 100644 --- a/src/MutationMapper.tsx +++ b/src/component/mutationMapper/MutationMapper.tsx @@ -4,25 +4,25 @@ import * as React from "react"; import {ReactNode} from "react"; import {TableProps} from "react-table"; -import {DefaultPubMedCache} from "./cache/DefaultPubMedCache"; -import FilterResetPanel from "./component/FilterResetPanel"; -import {DataFilter} from "./model/DataFilter"; -import {ApplyFilterFn, FilterApplier} from "./model/FilterApplier"; -import {LollipopPlotControlsConfig} from "./model/LollipopPlotControlsConfig"; -import {MobxCache} from "./model/MobxCache"; -import {Mutation} from "./model/Mutation"; -import MutationMapperStore from "./model/MutationMapperStore"; -import {DefaultLollipopPlotControlsConfig} from "./store/DefaultLollipopPlotControlsConfig"; -import DefaultMutationMapperStore from "./store/DefaultMutationMapperStore"; -import {initDefaultTrackVisibility} from "./util/TrackUtils"; -import {getDefaultWindowInstance} from "./util/DefaultWindowInstance"; -import {ColumnSortDirection, DataTableColumn} from "./DataTable"; +import {DefaultPubMedCache} from "../../cache/DefaultPubMedCache"; +import FilterResetPanel from "./FilterResetPanel"; +import {DataFilter} from "../../model/DataFilter"; +import {ApplyFilterFn, FilterApplier} from "../../model/FilterApplier"; +import {LollipopPlotControlsConfig} from "../../model/LollipopPlotControlsConfig"; +import {MobxCache} from "../../model/MobxCache"; +import {Mutation} from "../../model/Mutation"; +import MutationMapperStore from "../../model/MutationMapperStore"; +import {DefaultLollipopPlotControlsConfig} from "../../store/DefaultLollipopPlotControlsConfig"; +import DefaultMutationMapperStore from "../../store/DefaultMutationMapperStore"; +import {initDefaultTrackVisibility} from "../../util/TrackUtils"; +import {getDefaultWindowInstance} from "../../util/DefaultWindowInstance"; +import {ColumnSortDirection, DataTableColumn} from "../dataTable/DataTable"; import DefaultMutationRateSummary, {MutationRate} from "./DefaultMutationRateSummary"; -import DefaultMutationTable from "./DefaultMutationTable"; +import DefaultMutationTable from "../mutationTable/DefaultMutationTable"; import GeneSummary from "./GeneSummary"; -import LollipopMutationPlot from "./LollipopMutationPlot"; -import {DEFAULT_MUTATION_COLUMNS} from "./MutationColumnHelper"; -import {TrackDataStatus, TrackName, TrackVisibility} from "./TrackSelector"; +import LollipopMutationPlot from "../lollipopMutationPlot/LollipopMutationPlot"; +import {DEFAULT_MUTATION_COLUMNS} from "../mutationTable/MutationColumnHelper"; +import {TrackDataStatus, TrackName, TrackVisibility} from "../track/TrackSelector"; export type MutationMapperProps = { hugoSymbol?: string; diff --git a/src/TranscriptDropdown.tsx b/src/component/mutationMapper/TranscriptDropdown.tsx similarity index 97% rename from src/TranscriptDropdown.tsx rename to src/component/mutationMapper/TranscriptDropdown.tsx index 12396119da3..9f98efb342a 100644 --- a/src/TranscriptDropdown.tsx +++ b/src/component/mutationMapper/TranscriptDropdown.tsx @@ -6,9 +6,9 @@ import Select from "react-select"; import {VariantAnnotation} from "cbioportal-frontend-commons"; -import {EnsemblTranscript} from "./model/EnsemblTranscript"; -import {RemoteData} from "./model/RemoteData"; -import {Mutation} from "./model/Mutation"; +import {EnsemblTranscript} from "../../model/EnsemblTranscript"; +import {RemoteData} from "../../model/RemoteData"; +import {Mutation} from "../../model/Mutation"; import styles from "./transcriptDropdown.module.scss"; export type TranscriptDropdownProps = { diff --git a/src/defaultMutationRateSummary.module.scss b/src/component/mutationMapper/defaultMutationRateSummary.module.scss similarity index 100% rename from src/defaultMutationRateSummary.module.scss rename to src/component/mutationMapper/defaultMutationRateSummary.module.scss diff --git a/src/component/filterResetPanel.module.scss b/src/component/mutationMapper/filterResetPanel.module.scss similarity index 100% rename from src/component/filterResetPanel.module.scss rename to src/component/mutationMapper/filterResetPanel.module.scss diff --git a/src/geneSummary.module.scss b/src/component/mutationMapper/geneSummary.module.scss similarity index 100% rename from src/geneSummary.module.scss rename to src/component/mutationMapper/geneSummary.module.scss diff --git a/src/transcriptDropdown.module.scss b/src/component/mutationMapper/transcriptDropdown.module.scss similarity index 100% rename from src/transcriptDropdown.module.scss rename to src/component/mutationMapper/transcriptDropdown.module.scss diff --git a/src/DefaultMutationTable.tsx b/src/component/mutationTable/DefaultMutationTable.tsx similarity index 89% rename from src/DefaultMutationTable.tsx rename to src/component/mutationTable/DefaultMutationTable.tsx index e17367d562c..740956c2482 100644 --- a/src/DefaultMutationTable.tsx +++ b/src/component/mutationTable/DefaultMutationTable.tsx @@ -5,20 +5,20 @@ import {observer} from "mobx-react"; import * as React from "react"; import {Column} from "react-table"; -import Annotation, {getAnnotationData} from "./component/column/Annotation"; -import ClinVar from "./component/column/ClinVar"; -import Gnomad, {getMyVariantInfoData} from "./component/column/Gnomad"; -import {MutationFilterValue} from "./filter/MutationFilter"; -import {IHotspotIndex} from "./model/CancerHotspot"; -import {DataFilterType} from "./model/DataFilter"; -import {MobxCache} from "./model/MobxCache"; -import {Mutation} from "./model/Mutation"; -import {CancerGene, IOncoKbData} from "./model/OncoKb"; -import {RemoteData} from "./model/RemoteData"; -import {SimpleCache} from "./model/SimpleCache"; -import {findNonTextInputFilters, TEXT_INPUT_FILTER_ID} from "./util/FilterUtils"; -import {getRemoteDataGroupStatus} from "./util/RemoteDataUtils"; -import DataTable, {DataTableColumn, DataTableProps} from "./DataTable"; +import Annotation, {getAnnotationData} from "../column/Annotation"; +import ClinVar from "../column/ClinVar"; +import Gnomad, {getMyVariantInfoData} from "../column/Gnomad"; +import {MutationFilterValue} from "../../filter/MutationFilter"; +import {IHotspotIndex} from "../../model/CancerHotspot"; +import {DataFilterType} from "../../model/DataFilter"; +import {MobxCache} from "../../model/MobxCache"; +import {Mutation} from "../../model/Mutation"; +import {CancerGene, IOncoKbData} from "../../model/OncoKb"; +import {RemoteData} from "../../model/RemoteData"; +import {SimpleCache} from "../../model/SimpleCache"; +import {findNonTextInputFilters, TEXT_INPUT_FILTER_ID} from "../../util/FilterUtils"; +import {getRemoteDataGroupStatus} from "../../util/RemoteDataUtils"; +import DataTable, {DataTableColumn, DataTableProps} from "../dataTable/DataTable"; import {MutationColumn} from "./MutationColumnHelper"; import './defaultMutationTable.scss'; diff --git a/src/MutationColumnHelper.tsx b/src/component/mutationTable/MutationColumnHelper.tsx similarity index 94% rename from src/MutationColumnHelper.tsx rename to src/component/mutationTable/MutationColumnHelper.tsx index 257b8d53363..d460198ff82 100644 --- a/src/MutationColumnHelper.tsx +++ b/src/component/mutationTable/MutationColumnHelper.tsx @@ -1,15 +1,15 @@ import _ from "lodash"; import * as React from "react"; -import ColumnHeader from "./component/column/ColumnHeader"; +import ColumnHeader from "../column/ColumnHeader"; import {Column} from "react-table"; -import {Mutation} from "./model/Mutation"; -import ProteinChange, {proteinChangeSortMethod} from "./component/column/ProteinChange"; -import {annotationSortMethod} from "./component/column/Annotation"; -import {gnomadSortMethod} from "./component/column/Gnomad"; -import {clinVarSortMethod} from "./component/column/ClinVar"; -import MutationType from "./component/column/MutationType"; -import MutationStatus from "./component/column/MutationStatus"; +import {Mutation} from "../../model/Mutation"; +import ProteinChange, {proteinChangeSortMethod} from "../column/ProteinChange"; +import {annotationSortMethod} from "../column/Annotation"; +import {gnomadSortMethod} from "../column/Gnomad"; +import {clinVarSortMethod} from "../column/ClinVar"; +import MutationType from "../column/MutationType"; +import MutationStatus from "../column/MutationStatus"; export enum MutationColumn { PROTEIN_CHANGE = "proteinChange", diff --git a/src/defaultMutationTable.scss b/src/component/mutationTable/defaultMutationTable.scss similarity index 100% rename from src/defaultMutationTable.scss rename to src/component/mutationTable/defaultMutationTable.scss diff --git a/src/component/oncokb/OncoKbCard.tsx b/src/component/oncokb/OncoKbCard.tsx index a4312be0ce6..4c50cf89078 100644 --- a/src/component/oncokb/OncoKbCard.tsx +++ b/src/component/oncokb/OncoKbCard.tsx @@ -7,6 +7,7 @@ import {Collapse} from 'react-collapse'; import {Citations, OncoKbTreatment} from "../../model/OncoKb"; import {ICache} from "../../model/SimpleCache"; +import {levelIconClassNames} from "../../util/OncoKbUtils"; import OncoKBSuggestAnnotationLinkout from "./OncoKBSuggestAnnotationLinkout"; import OncoKbTreatmentTable from "./OncoKbTreatmentTable"; import OncoKbHelper from "./OncoKbHelper"; @@ -18,7 +19,6 @@ import collapsibleStyles from './collapsible.module.scss'; import levelStyles from './level.module.scss'; import mainStyles from './main.module.scss'; import tabsStyles from './tabs.module.scss'; -import {levelIconClassNames} from "../../util/OncoKbUtils"; type OncoKbCardPropsBase = { diff --git a/src/OncoKbSummaryTable.tsx b/src/component/oncokb/OncoKbSummaryTable.tsx similarity index 98% rename from src/OncoKbSummaryTable.tsx rename to src/component/oncokb/OncoKbSummaryTable.tsx index a458eaee817..5b9b5774363 100644 --- a/src/OncoKbSummaryTable.tsx +++ b/src/component/oncokb/OncoKbSummaryTable.tsx @@ -9,8 +9,8 @@ import { EllipsisTextTooltip } from "cbioportal-frontend-commons"; -import {defaultSortMethod, defaultStringArraySortMethod} from "./util/ReactTableUtils"; -import {levelIconClassNames} from "./util/OncoKbUtils"; +import {defaultSortMethod, defaultStringArraySortMethod} from "../../util/ReactTableUtils"; +import {levelIconClassNames} from "../../util/OncoKbUtils"; export type OncoKbSummaryTableProps = { data: OncoKbSummary[]; diff --git a/src/PtmAnnotationTable.tsx b/src/component/ptm/PtmAnnotationTable.tsx similarity index 95% rename from src/PtmAnnotationTable.tsx rename to src/component/ptm/PtmAnnotationTable.tsx index b1cfd87c9f1..39ae73d2639 100644 --- a/src/PtmAnnotationTable.tsx +++ b/src/component/ptm/PtmAnnotationTable.tsx @@ -5,8 +5,8 @@ import ReactTable, {Column} from "react-table"; import {computed} from "mobx"; import {observer} from "mobx-react"; -import {Cache, MobxCache} from "./model/MobxCache"; -import {PostTranslationalModification} from "./model/PostTranslationalModification"; +import {Cache, MobxCache} from "../../model/MobxCache"; +import {PostTranslationalModification} from "../../model/PostTranslationalModification"; import PtmReferenceList from "./PtmReferenceList"; export type PtmSummaryTableProps = { diff --git a/src/PtmReferenceList.tsx b/src/component/ptm/PtmReferenceList.tsx similarity index 93% rename from src/PtmReferenceList.tsx rename to src/component/ptm/PtmReferenceList.tsx index 85d054249af..367455bb5b1 100644 --- a/src/PtmReferenceList.tsx +++ b/src/component/ptm/PtmReferenceList.tsx @@ -2,8 +2,8 @@ import {DefaultTooltip} from "cbioportal-frontend-commons"; import {observer} from "mobx-react"; import * as React from "react"; -import ReferenceList from "./component/oncokb/ReferenceList"; -import {Cache} from "./model/MobxCache"; +import ReferenceList from "../oncokb/ReferenceList"; +import {Cache} from "../../model/MobxCache"; type PtmReferenceListProps = { pubmedIds: string[]; diff --git a/src/HotspotTrack.tsx b/src/component/track/HotspotTrack.tsx similarity index 87% rename from src/HotspotTrack.tsx rename to src/component/track/HotspotTrack.tsx index 3e9bae15cea..bacc62e9327 100644 --- a/src/HotspotTrack.tsx +++ b/src/component/track/HotspotTrack.tsx @@ -3,22 +3,22 @@ import * as _ from "lodash"; import {observer} from "mobx-react"; import {computed} from "mobx"; -import {HotspotFilterValue} from "./filter/HotspotFilter"; -import {Hotspot, IHotspotIndex} from "./model/CancerHotspot"; -import {DataFilterType} from "./model/DataFilter"; -import {Mutation} from "./model/Mutation"; -import MutationMapperStore from "./model/MutationMapperStore"; -import HotspotInfo from "./HotspotInfo"; +import {HotspotFilterValue} from "../../filter/HotspotFilter"; +import {Hotspot, IHotspotIndex} from "../../model/CancerHotspot"; +import {DataFilterType} from "../../model/DataFilter"; +import {Mutation} from "../../model/Mutation"; +import MutationMapperStore from "../../model/MutationMapperStore"; +import HotspotInfo from "../hotspot/HotspotInfo"; import { defaultHotspotFilter, filter3dHotspotsByMutations, filterRecurrentHotspotsByMutations, isHotspot -} from "./util/CancerHotspotsUtils"; +} from "../../util/CancerHotspotsUtils"; import Track, {TrackProps} from "./Track"; import {TrackItemSpec} from "./TrackCircle"; -import hotspotImg from './images/cancer-hotspots.svg'; +import hotspotImg from '../../images/cancer-hotspots.svg'; type HotspotTrackProps = TrackProps & { store: MutationMapperStore; diff --git a/src/OncoKbTrack.tsx b/src/component/track/OncoKbTrack.tsx similarity index 90% rename from src/OncoKbTrack.tsx rename to src/component/track/OncoKbTrack.tsx index c9850625cb2..7e661649a46 100644 --- a/src/OncoKbTrack.tsx +++ b/src/component/track/OncoKbTrack.tsx @@ -3,14 +3,14 @@ import * as _ from "lodash"; import {observer} from "mobx-react"; import {computed} from "mobx"; -import {OncoKbFilterValue} from "./filter/OncoKbFilter"; -import {DataFilterType} from "./model/DataFilter"; -import MutationMapperStore from "./model/MutationMapperStore"; +import {OncoKbFilterValue} from "../../filter/OncoKbFilter"; +import {DataFilterType} from "../../model/DataFilter"; +import MutationMapperStore from "../../model/MutationMapperStore"; import OncoKbTrackTooltip from "./OncoKbTrackTooltip"; import {default as Track, TrackProps} from "./Track"; import {TrackItemSpec} from "./TrackCircle"; -import oncoKbImg from './images/oncogenic-only.svg'; +import oncoKbImg from '../../images/oncogenic-only.svg'; type OncoKbTrackProps = TrackProps & { store: MutationMapperStore; diff --git a/src/OncoKbTrackTooltip.tsx b/src/component/track/OncoKbTrackTooltip.tsx similarity index 94% rename from src/OncoKbTrackTooltip.tsx rename to src/component/track/OncoKbTrackTooltip.tsx index 145548a38f4..e81f2cd94ad 100644 --- a/src/OncoKbTrackTooltip.tsx +++ b/src/component/track/OncoKbTrackTooltip.tsx @@ -3,9 +3,9 @@ import * as _ from "lodash"; import {LEVELS} from "cbioportal-frontend-commons"; -import {Mutation} from "./model/Mutation"; -import {IndicatorQueryResp} from "./model/OncoKb"; -import OncoKbSummaryTable from "./OncoKbSummaryTable"; +import {Mutation} from "../../model/Mutation"; +import {IndicatorQueryResp} from "../../model/OncoKb"; +import OncoKbSummaryTable from "../oncokb/OncoKbSummaryTable"; type OncoKbTrackTooltipProps = { mutations: Mutation[]; diff --git a/src/PtmTrack.tsx b/src/component/track/PtmTrack.tsx similarity index 96% rename from src/PtmTrack.tsx rename to src/component/track/PtmTrack.tsx index aee9faca848..44df9136f07 100644 --- a/src/PtmTrack.tsx +++ b/src/component/track/PtmTrack.tsx @@ -6,11 +6,11 @@ import {Collapse} from 'react-collapse'; import autobind from "autobind-decorator"; import {DefaultTooltip, EllipsisTextTooltip} from "cbioportal-frontend-commons"; -import {MobxCache} from "./model/MobxCache"; -import MutationMapperStore from "./model/MutationMapperStore"; -import {compareByPtmTypePriority, ptmColor} from "./util/PtmUtils"; -import PtmAnnotationTable from "./PtmAnnotationTable"; -import {PostTranslationalModification} from "./model/PostTranslationalModification"; +import {MobxCache} from "../../model/MobxCache"; +import MutationMapperStore from "../../model/MutationMapperStore"; +import {compareByPtmTypePriority, ptmColor} from "../../util/PtmUtils"; +import PtmAnnotationTable from "../ptm/PtmAnnotationTable"; +import {PostTranslationalModification} from "../../model/PostTranslationalModification"; import {default as Track, TrackProps} from "./Track"; import {TrackItemSpec} from "./TrackCircle"; diff --git a/src/Track.tsx b/src/component/track/Track.tsx similarity index 98% rename from src/Track.tsx rename to src/component/track/Track.tsx index b45b2aa1fbf..02049b716cc 100644 --- a/src/Track.tsx +++ b/src/component/track/Track.tsx @@ -15,9 +15,9 @@ import { unhoverAllComponents } from "cbioportal-frontend-commons"; -import {DataFilter} from "./model/DataFilter"; -import DataStore from "./model/DataStore"; -import {updatePositionHighlightFilters, updatePositionSelectionFilters} from "./util/FilterUtils"; +import {DataFilter} from "../../model/DataFilter"; +import DataStore from "../../model/DataStore"; +import {updatePositionHighlightFilters, updatePositionSelectionFilters} from "../../util/FilterUtils"; import TrackCircle, {TrackItemSpec} from "./TrackCircle"; import styles from "./trackStyles.module.scss"; diff --git a/src/TrackCircle.tsx b/src/component/track/TrackCircle.tsx similarity index 100% rename from src/TrackCircle.tsx rename to src/component/track/TrackCircle.tsx diff --git a/src/TrackPanel.tsx b/src/component/track/TrackPanel.tsx similarity index 96% rename from src/TrackPanel.tsx rename to src/component/track/TrackPanel.tsx index 0119b226417..a467d84211d 100644 --- a/src/TrackPanel.tsx +++ b/src/component/track/TrackPanel.tsx @@ -2,8 +2,8 @@ import * as React from "react"; import {observer} from "mobx-react"; import {computed} from "mobx"; -import {MobxCache} from "./model/MobxCache"; -import MutationMapperStore from "./model/MutationMapperStore"; +import {MobxCache} from "../../model/MobxCache"; +import MutationMapperStore from "../../model/MutationMapperStore"; import {TrackName, TrackVisibility} from "./TrackSelector"; import HotspotTrack from "./HotspotTrack"; import OncoKbTrack from "./OncoKbTrack"; diff --git a/src/TrackSelector.tsx b/src/component/track/TrackSelector.tsx similarity index 100% rename from src/TrackSelector.tsx rename to src/component/track/TrackSelector.tsx diff --git a/src/defaultTrackTooltipTable.scss b/src/component/track/defaultTrackTooltipTable.scss similarity index 100% rename from src/defaultTrackTooltipTable.scss rename to src/component/track/defaultTrackTooltipTable.scss diff --git a/src/ptmTrackStyles.module.scss b/src/component/track/ptmTrackStyles.module.scss similarity index 100% rename from src/ptmTrackStyles.module.scss rename to src/component/track/ptmTrackStyles.module.scss diff --git a/src/trackStyles.module.scss b/src/component/track/trackStyles.module.scss similarity index 100% rename from src/trackStyles.module.scss rename to src/component/track/trackStyles.module.scss diff --git a/src/index.tsx b/src/index.tsx index 88a8849f65a..6f5c8449c26 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -69,31 +69,31 @@ export { } from "./component/gnomad/GnomadFrequency"; export {default as GnomadFrequencyTable} from "./component/gnomad/GnomadFrequencyTable"; -export * from "./component/ColumnSelector"; -export * from "./component/FilterResetPanel"; +export * from "./component/dataTable/ColumnSelector"; +export * from "./component/mutationMapper/FilterResetPanel"; export * from "./component/StatusHelpers"; -export {default as DataTable, ColumnSortDirection, DataTableColumn} from "./DataTable"; -export {default as DefaultMutationTable} from "./DefaultMutationTable"; -export * from "./MutationColumnHelper"; -export {default as Domain} from "./Domain"; -export {default as HotspotInfo} from "./HotspotInfo"; -export {default as Lollipop} from "./Lollipop"; -export {default as LollipopMutationPlot} from "./LollipopMutationPlot"; -export {default as LollipopPlot} from "./LollipopPlot"; -export {default as LollipopPlotNoTooltip} from "./LollipopPlotNoTooltip"; -export {default as Sequence} from "./LollipopPlot"; +export {default as DataTable, ColumnSortDirection, DataTableColumn} from "./component/dataTable/DataTable"; +export {default as DefaultMutationTable} from "./component/mutationTable/DefaultMutationTable"; +export * from "./component/mutationTable/MutationColumnHelper"; +export {default as Domain} from "./component/lollipopPlot/Domain"; +export {default as HotspotInfo} from "./component/hotspot/HotspotInfo"; +export {default as Lollipop} from "./component/lollipopPlot/Lollipop"; +export {default as LollipopMutationPlot} from "./component/lollipopMutationPlot/LollipopMutationPlot"; +export {default as LollipopPlot} from "./component/lollipopPlot/LollipopPlot"; +export {default as LollipopPlotNoTooltip} from "./component/lollipopPlot/LollipopPlotNoTooltip"; +export {default as Sequence} from "./component/lollipopPlot/LollipopPlot"; export { default as MutationMapper, initDefaultMutationMapperStore, MutationMapperProps -} from "./MutationMapper"; +} from "./component/mutationMapper/MutationMapper"; export { default as TrackSelector, TrackDataStatus, TrackName, TrackVisibility -} from "./TrackSelector"; +} from "./component/track/TrackSelector"; export {CancerTypeFilter} from "./filter/CancerTypeFilter"; export {HotspotFilter} from "./filter/HotspotFilter"; diff --git a/src/util/TrackUtils.ts b/src/util/TrackUtils.ts index 02b9ba01dbc..890cbc9ae03 100644 --- a/src/util/TrackUtils.ts +++ b/src/util/TrackUtils.ts @@ -1,4 +1,4 @@ -import {TrackName, TrackVisibility} from "../TrackSelector"; +import {TrackName, TrackVisibility} from "../component/track/TrackSelector"; export function initDefaultTrackVisibility(): TrackVisibility { return {