Working everything!

Author: alisman

src/pages/resultsView/fusion/ResultViewFusionMapper.tsx

@@ -78,6 +78,8 @@ export default class ResultViewFusionMapper extends React.Component<
         await: () => [
             this.props.store.studyIdToStudy,
             this.props.store.molecularProfileIdToMolecularProfile,
+            this.props.store.ensemblTranscripts,
+            this.props.store.pfamDomainData,
         ],
         render: () => {
             return this.renderComponents();

src/pages/resultsView/fusion/ResultViewFusionMapperStore.ts

@@ -125,6 +125,7 @@ export class ResultViewFusionMapperStore {
         []
     );
 
+    @computed
     get exonsChartStore(): ExonsChartStore {
         return new ExonsChartStore(
             this.gene,
@@ -156,7 +157,11 @@ export class ResultViewFusionMapperStore {
 
     @computed
     get fusionCounts(): { [fusionLabel: string]: number } {
-        return _.countBy(this.fusions, d => d.label);
+        return _.countBy(this.fusions, d => {
+            const dash = d.site1HugoSymbol && d.site2HugoSymbol ? '-' : '';
+            return `${d.site1HugoSymbol || ''}${dash}${d.site2HugoSymbol ||
+                ''}`;
+        });
     }
 
     @computed

src/shared/components/exonsCharts/ExonsBarPlotStore.ts

@@ -21,7 +21,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-import { computed } from 'mobx';
+import { computed, makeObservable } from 'mobx';
 import { EnsemblTranscriptExt } from '../../model/Fusion';
 import {
     ExonRangeExt,
@@ -38,6 +38,7 @@ export default class ExonsBarPlotStore {
         public referenceGeneWidth?: number
     ) {
         this.divider = 0.1;
+        makeObservable(this);
     }
 
     @computed

src/shared/components/exonsCharts/ExonsChartStore.ts

@@ -103,15 +103,19 @@ export class ExonsChartStore {
     }
 
     addExtraFusionProps(fusion: StructuralVariantExt): StructuralVariantExt {
+        const m = fusion.monkey;
+        // AARON: PROBLEM IS THAT third argument is undefined
+        // it is used internally as "breakpoint" in order to filter exons
+        // for addition to the fusions
         const site1Exons = this.getExonsBySite(
             1,
             fusion.site1EnsemblTranscriptId,
-            fusion.site1Exon
+            fusion.site1RegionNumber
         );
         const site2Exons = this.getExonsBySite(
             2,
             fusion.site2EnsemblTranscriptId,
-            fusion.site2Exon
+            fusion.site2RegionNumber
         );
         const exons = site1Exons.concat(site2Exons);
         const totalWidth = ExonsChartStore.getTotalWidth(
@@ -300,6 +304,9 @@ export class ExonsChartStore {
         await: () => [this.transcripts],
         invoke: () => {
             const { result } = this.transcripts;
+
+            // each of the fusions in response should have their own exon collection
+            // but they are all empty
             const transcripts = (result || [])
                 .map(ExonsChartStore.addExonProps)
                 .filter(t => t.isReferenceGene) // get only reference gene transcripts

src/shared/components/fusionCharts/FusionPieChart.tsx

@@ -85,11 +85,13 @@ export default class FusionPieChart extends React.Component<
     }
 
     getFusionCounts() {
-        return this.props.fusionCounts
+        const ret = this.props.fusionCounts
             ? Object.keys(this.props.fusionCounts).map((d: string) => {
                   return { x: d, y: this.props.fusionCounts[d] };
               })
             : [];
+
+        return ret;
     }
 
     public render() {

src/shared/model/Fusion.ts

@@ -24,6 +24,7 @@
 import {
     EnsemblTranscript,
     Exon,
+    PfamDomain,
     PfamDomainRange,
 } from 'genome-nexus-ts-api-client/src';
 import { StructuralVariant } from 'cbioportal-ts-api-client/src';
@@ -56,6 +57,7 @@ export type StructuralVariantExt = StructuralVariant & {
     deltaX?: number;
     exons?: ExonRangeExt[];
     label?: string;
+    //added AARON  (these are requested by code)
 };
 
 export type EnsemblTranscriptExt = EnsemblTranscript & {