Skip to content

Commit 5b6cdde

Browse files
committed
Refactor & final cleanup
1 parent f295b56 commit 5b6cdde

File tree

7 files changed

+440
-752
lines changed

7 files changed

+440
-752
lines changed

src/pages/resultsView/ResultsViewPageStoreUtils.ts

-47
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ import {
6060
AnnotatedMutation,
6161
AnnotatedStructuralVariant,
6262
} from 'shared/model/AnnotatedMutation';
63-
import { StructuralVariantFilterExt } from 'shared/model/Fusion';
64-
import { StructuralVariantFilter } from 'cbioportal-ts-api-client/src';
6563

6664
type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
6765

@@ -960,48 +958,3 @@ export function getGeneAndProfileChunksForRequest(
960958
profileChunks: _.chunk(profileIds, profilesPerChunk),
961959
};
962960
}
963-
964-
export function getStructuralVariantProfile(studyId: string) {
965-
return studyId + '_structural_variants';
966-
}
967-
968-
export function getParamsForStructuralVariants(
969-
genes: Gene[],
970-
selectedMolecularProfiles: MolecularProfile[] | undefined,
971-
samples: Sample[] | undefined
972-
) {
973-
const params: StructuralVariantFilterExt = { entrezGeneIds: [] };
974-
if (genes) {
975-
params.entrezGeneIds = _.chain(genes)
976-
.map(gene => gene.entrezGeneId)
977-
.compact()
978-
.value();
979-
}
980-
// compose request parameters
981-
if (samples) {
982-
// get sample molecular identifiers
983-
const sampleMolecularIds = samples.map(sample => {
984-
return {
985-
molecularProfileId: getStructuralVariantProfile(sample.studyId),
986-
sampleId: sample.sampleId,
987-
};
988-
});
989-
params.sampleMolecularIdentifiers = sampleMolecularIds;
990-
} else {
991-
// get molecular profile ids
992-
if (selectedMolecularProfiles) {
993-
const molecularProfiles = selectedMolecularProfiles
994-
.filter(profile => {
995-
return (
996-
profile.molecularAlterationType ===
997-
AlterationTypeConstants.STRUCTURAL_VARIANT
998-
);
999-
})
1000-
.map(profile => {
1001-
return profile.molecularProfileId;
1002-
});
1003-
params.molecularProfileIds = molecularProfiles;
1004-
}
1005-
}
1006-
return params as StructuralVariantFilter;
1007-
}

src/pages/resultsView/fusion/ResultsViewFusionMapper.tsx

-9
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import {
2828
getOncoKbIconStyle,
2929
updateOncoKbIconStyle,
3030
} from 'shared/lib/AnnotationColumnUtils';
31-
import { StructuralVariant } from 'cbioportal-ts-api-client';
3231

3332
export interface IFusionMapperProps {
3433
store: ResultsViewFusionMapperStore;
@@ -78,14 +77,6 @@ export default class ResultsViewFusionMapper extends React.Component<
7877

7978
return (
8079
<>
81-
{/*This is reserved for fusion bar charts*/}
82-
{/*<div style={{ display: 'flex', flexWrap: 'wrap' }}>*/}
83-
{/* <FusionPieChart*/}
84-
{/* store={this.props.store.dataStore}*/}
85-
{/* fusionCounts={this.props.store.fusionCounts}*/}
86-
{/* />*/}
87-
{/*</div>*/}
88-
{/*<hr style={{ marginTop: 20 }} />*/}
8980
<ResultsViewFusionTable
9081
dataStore={this.props.store.dataStore}
9182
itemsLabelPlural={this.itemsLabelPlural}

src/pages/resultsView/fusion/ResultsViewFusionTable.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export default class ResultsViewFusionTable extends FusionTable<
6565
FusionTableColumnType.TUMOR_PAIRED_END_READ_COUNT,
6666
FusionTableColumnType.NORMAL_SPLIT_READ_COUNT,
6767
FusionTableColumnType.TUMOR_SPLIT_READ_COUNT,
68-
FusionTableColumnType.FUSION_DESCRIPTION,
68+
FusionTableColumnType.SV_DESCRIPTION,
6969
FusionTableColumnType.BREAKPOINT_TYPE,
7070
FusionTableColumnType.CENTER,
7171
FusionTableColumnType.CONNECTION_TYPE,

src/shared/components/fusionCharts/FusionPieChart.tsx

-126
This file was deleted.

0 commit comments

Comments
 (0)