Merge pull request cBioPortal#123 from onursumer/component-reorg

Moved all components under component directory

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';

src/DataTable.tsx → 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<T> = Column<T> & {
     name?: string;

src/component/toolbar/DataTableToolbar.tsx → 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 = {

src/DefaultLollipopPlotLegend.tsx → 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;

src/LollipopMutationPlot.tsx → 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";
 

src/LollipopMutationPlotControls.tsx → 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";

src/Domain.tsx → 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;

src/Lollipop.tsx → 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;

src/LollipopPlot.tsx → 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 = {

src/LollipopPlotNoTooltip.tsx → 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";

src/Sequence.tsx → 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;

src/DefaultMutationRateSummary.tsx → 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"
 

src/GeneSummary.tsx → 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";
 

src/MutationMapper.tsx → 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;

src/TranscriptDropdown.tsx → 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 = {

src/DefaultMutationTable.tsx → 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';

src/MutationColumnHelper.tsx → 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",

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 = {

src/OncoKbSummaryTable.tsx → 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[];

src/PtmAnnotationTable.tsx → 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 = {

src/PtmReferenceList.tsx → 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[];

src/HotspotTrack.tsx → 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;

src/OncoKbTrack.tsx → 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;