Updated types of constants

cBioPortal · May 31, 2023 · e1f1d4b · e1f1d4b
1 parent e322ec6
commit e1f1d4b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 47 deletions.
diff --git a/src/pages/patientView/mutationalSignatures/MutationalSignatureBarChart.tsx b/src/pages/patientView/mutationalSignatures/MutationalSignatureBarChart.tsx
@@ -24,6 +24,7 @@ import {
     getxScalePoint,
     legendLabelsType,
     drawRectInfo,
+    labelInfo,
     getLengthLabelEntries,
     createLegendLabelObjects,
     formatLegendObjectsForRectangles,
@@ -79,21 +80,6 @@ export default class MutationalBarChart extends React.Component<
         super(props);
     }
 
-    /*    @action formatLegendColor(data: colorMapProps[]) {
-        const labels = getColorsForSignatures(this.props.data);
-        const labelsPresent = labels.map((item: IColorLegend) => item.group);
-        const dataLegend = data.filter((colorMapItem: colorMapProps) => {
-            if (labelsPresent.includes(colorMapItem.name)) {
-                return colorMapItem;
-            }
-        });
-
-        return dataLegend.map((obj: colorMapProps) => ({
-            name: obj.category,
-            symbol: { fill: obj.color }
-        }));
-    }*/
-
     @computed get xTickLabels(): string[] {
         return getColorsForSignatures(this.props.data).map(item => item.label);
     }
@@ -136,8 +122,9 @@ export default class MutationalBarChart extends React.Component<
         );
         const centerOfBoxes = this.formatColorBoxLegend;
         const xScale = getxScalePoint(labelObjects, 60, 1040);
-        const legendLabelsChart = legendOjbectsToAdd.map((item, i) => {
-            return (
+        const legendLabelsChart: JSX.Element[] = [];
+        legendOjbectsToAdd.forEach((item, i) => {
+            legendLabelsChart.push(
                 <VictoryLabel
                     x={
                         this.props.version != 'ID'
@@ -178,25 +165,22 @@ export default class MutationalBarChart extends React.Component<
             labels,
             this.props.version
         );
-        const legendLabelBoxes = legendInfoBoxes.map((item: drawRectInfo) => {
-            return (
+        const legendLabelBoxes: JSX.Element[] = [];
+        legendInfoBoxes.forEach((item: drawRectInfo) => {
+            legendLabelBoxes.push(
                 <rect
-                    x={xScale(item.start.toString())}
+                    x={xScale(item.start)}
                     y={15}
                     fill={item.color}
                     width={
-                        xScale(item.end.toString())! -
-                            xScale(item.start.toString())! >
-                        0
-                            ? xScale(item.end.toString())! -
-                              xScale(item.start.toString())!
+                        xScale(item.end)! - xScale(item.start)! > 0
+                            ? xScale(item.end)! - xScale(item.start)!
                             : 6
                     }
                     height="15px"
                 />
             );
         });
-
         return legendLabelBoxes;
     }
 
@@ -232,23 +216,22 @@ export default class MutationalBarChart extends React.Component<
             uniqueSubLabels.map(item => item.subcategory!),
             this.props.version
         );
-        const legendLabelsChart = subLabelsForBoxes.map(
-            (item: drawRectInfo, i: number) => {
-                return (
-                    <VictoryLabel
-                        x={
-                            centerOfBoxes[i].props.x +
-                            0.5 * centerOfBoxes[i].props.width
-                        }
-                        y={35}
-                        width={this.props.width}
-                        text={item.category}
-                        style={{ fontSize: '10px' }}
-                        textAnchor={'middle'}
-                    />
-                );
-            }
-        );
+        const legendLabelsChart: JSX.Element[] = [];
+        subLabelsForBoxes.forEach((item: labelInfo, i: number) => {
+            legendLabelsChart.push(
+                <VictoryLabel
+                    x={
+                        centerOfBoxes[i].props.x +
+                        0.5 * centerOfBoxes[i].props.width
+                    }
+                    y={35}
+                    width={this.props.width}
+                    text={item.category}
+                    style={{ fontSize: '10px' }}
+                    textAnchor={'middle'}
+                />
+            );
+        });
         return legendLabelsChart;
     }
     @action getLabelsForTooltip(data: IMutationalCounts[]): string[] {

diff --git a/src/pages/patientView/mutationalSignatures/MutationalSignatureBarChartUtils.ts b/src/pages/patientView/mutationalSignatures/MutationalSignatureBarChartUtils.ts
@@ -27,10 +27,15 @@ export interface legendLabelsType {
 }
 export interface drawRectInfo {
     color: string;
-    start: number;
-    end: number;
+    start: string;
+    end: string;
+}
+export interface labelInfo {
+    color: string;
+    start: string;
+    end: string;
+    category: string;
     group: string;
-    category?: string;
 }
 export interface legendEntriesType {
     group: string;

diff --git a/src/shared/lib/GenericAssayUtils/MutationalSignaturesUtils.tsx b/src/shared/lib/GenericAssayUtils/MutationalSignaturesUtils.tsx
@@ -16,7 +16,7 @@ export enum MutationalSignaturesVersion {
 export enum MutationalSignatureStableIdKeyWord {
     MutationalSignatureContributionKeyWord = 'contribution',
     MutationalSignatureConfidenceKeyWord = 'pvalue',
-    MutationalSignatureCountKeyWord = 'counts',
+    MutationalSignatureCountKeyWord = 'matrix',
 }
 
 export const MUTATIONAL_SIGNATURES_SIGNIFICANT_PVALUE_THRESHOLD = 0.05;