diff --git a/src/pages/groupComparison/CategoryPlot.tsx b/src/pages/groupComparison/CategoryPlot.tsx index ee231337a16..30cb2f3fd01 100644 --- a/src/pages/groupComparison/CategoryPlot.tsx +++ b/src/pages/groupComparison/CategoryPlot.tsx @@ -3,7 +3,7 @@ import { observer } from 'mobx-react'; import { computed, makeObservable } from 'mobx'; import MultipleCategoryBarPlot, { IMultipleCategoryBarPlotProps, -} from 'pages/groupComparison/MultipleCategoryBarPlot'; +} from 'shared/components/plots/MultipleCategoryBarPlot'; import MultipleCategoryHeatmap from 'shared/components/plots/MultipleCategoryHeatmap'; import autobind from 'autobind-decorator'; import { OncoprintJS } from 'oncoprintjs'; diff --git a/src/pages/resultsView/enrichments/EnrichmentsUtil.tsx b/src/pages/resultsView/enrichments/EnrichmentsUtil.tsx index 64aafcc005a..b2cfc5d2d23 100644 --- a/src/pages/resultsView/enrichments/EnrichmentsUtil.tsx +++ b/src/pages/resultsView/enrichments/EnrichmentsUtil.tsx @@ -25,7 +25,7 @@ import { } from './AlterationEnrichmentsTable'; import styles from './styles.module.scss'; import classNames from 'classnames'; -import { IMultipleCategoryBarPlotData } from 'pages/groupComparison/MultipleCategoryBarPlot'; +import { IMultipleCategoryBarPlotData } from 'shared/components/plots/MultipleCategoryBarPlot'; import { getTextColor } from '../../groupComparison/OverlapUtils'; import { DefaultTooltip, TruncatedText } from 'cbioportal-frontend-commons'; import { diff --git a/src/pages/resultsView/enrichments/GeneBarPlot.tsx b/src/pages/resultsView/enrichments/GeneBarPlot.tsx index 0f2834538bc..01ebc692a06 100644 --- a/src/pages/resultsView/enrichments/GeneBarPlot.tsx +++ b/src/pages/resultsView/enrichments/GeneBarPlot.tsx @@ -7,7 +7,7 @@ import { DownloadControlOption, } from 'cbioportal-frontend-commons'; import autobind from 'autobind-decorator'; -import MultipleCategoryBarPlot from 'pages/groupComparison/MultipleCategoryBarPlot'; +import MultipleCategoryBarPlot from 'shared/components/plots/MultipleCategoryBarPlot'; import ReactSelect from 'react-select'; import OQLTextArea, { GeneBoxType, diff --git a/src/pages/resultsView/enrichments/GenericAssayBarPlot.tsx b/src/pages/resultsView/enrichments/GenericAssayBarPlot.tsx index 675b9ee7683..3e85a835468 100644 --- a/src/pages/resultsView/enrichments/GenericAssayBarPlot.tsx +++ b/src/pages/resultsView/enrichments/GenericAssayBarPlot.tsx @@ -7,7 +7,7 @@ import { DownloadControlOption, } from 'cbioportal-frontend-commons'; import autobind from 'autobind-decorator'; -import MultipleCategoryBarPlot from 'pages/groupComparison/MultipleCategoryBarPlot'; +import MultipleCategoryBarPlot from 'shared/components/plots/MultipleCategoryBarPlot'; import ReactSelect from 'react-select'; import _ from 'lodash'; import { diff --git a/src/shared/components/plots/BoxScatterPlot.tsx b/src/shared/components/plots/BoxScatterPlot.tsx index b78cc6aa9a8..6a47a078d8e 100644 --- a/src/shared/components/plots/BoxScatterPlot.tsx +++ b/src/shared/components/plots/BoxScatterPlot.tsx @@ -43,7 +43,7 @@ import classnames from 'classnames'; import WindowStore from '../window/WindowStore'; import LegendDataComponent from './LegendDataComponent'; import LegendLabelComponent from './LegendLabelComponent'; -import { PQValueLabel } from 'pages/groupComparison/MultipleCategoryBarPlot'; +import { PQValueLabel } from 'shared/components/plots/MultipleCategoryBarPlot'; export interface IBaseBoxScatterPlotPoint { value: number; diff --git a/src/pages/groupComparison/MultipleCategoryBarPlot.tsx b/src/shared/components/plots/MultipleCategoryBarPlot.tsx similarity index 99% rename from src/pages/groupComparison/MultipleCategoryBarPlot.tsx rename to src/shared/components/plots/MultipleCategoryBarPlot.tsx index 808acd34c43..a7b8a663bac 100644 --- a/src/pages/groupComparison/MultipleCategoryBarPlot.tsx +++ b/src/shared/components/plots/MultipleCategoryBarPlot.tsx @@ -21,13 +21,13 @@ import { VictoryGroup, } from 'victory'; import { tickFormatNumeral } from 'cbioportal-frontend-commons'; -import { makeUniqueColorGetter } from '../../shared/components/plots/PlotUtils'; +import { makeUniqueColorGetter } from './PlotUtils'; import { makePlotData, makeBarSpecs, sortDataByCategory, getSortedMajorCategories, -} from '../../shared/components/plots/MultipleCategoryBarPlotUtils'; +} from './MultipleCategoryBarPlotUtils'; import * as ReactDOM from 'react-dom'; import { Popover } from 'react-bootstrap'; import classnames from 'classnames'; diff --git a/src/shared/components/plots/MultipleCategoryBarPlotUtils.ts b/src/shared/components/plots/MultipleCategoryBarPlotUtils.ts index 652171a0a43..ffa8e0b9cc4 100644 --- a/src/shared/components/plots/MultipleCategoryBarPlotUtils.ts +++ b/src/shared/components/plots/MultipleCategoryBarPlotUtils.ts @@ -1,7 +1,7 @@ import { IStringAxisData } from './PlotsTabUtils'; import { SortByOptions } from './PlotsTab'; import _ from 'lodash'; -import { IMultipleCategoryBarPlotData } from '../../../pages/groupComparison/MultipleCategoryBarPlot'; +import { IMultipleCategoryBarPlotData } from 'shared/components/plots/MultipleCategoryBarPlot'; interface CountItem { majorCategory: string; count: number; diff --git a/src/shared/components/plots/PlotsTab.tsx b/src/shared/components/plots/PlotsTab.tsx index ac38f48848a..3fabcf83a0e 100644 --- a/src/shared/components/plots/PlotsTab.tsx +++ b/src/shared/components/plots/PlotsTab.tsx @@ -108,7 +108,7 @@ import { scatterPlotSize, } from '../../../shared/components/plots/PlotUtils'; import { getTablePlotDownloadData } from '../../../shared/components/plots/TablePlotUtils'; -import MultipleCategoryBarPlot from 'pages/groupComparison/MultipleCategoryBarPlot'; +import MultipleCategoryBarPlot from 'shared/components/plots/MultipleCategoryBarPlot'; import { RESERVED_CLINICAL_VALUE_COLORS } from 'shared/lib/Colors'; import { DownloadControlOption,