Update Mutational Signature plot render based on condition count Data

Show table when only contribution data is present Merged with the hackathon improvements fix merge error update url and description
cBioPortal · Jun 28, 2024 · 9003235 · 9003235
1 parent fa4a480
commit 9003235
Show file tree

Hide file tree

Showing 9 changed files with 153 additions and 163 deletions.
diff --git a/src/pages/patientView/PatientViewPageTabs.tsx b/src/pages/patientView/PatientViewPageTabs.tsx
@@ -645,58 +645,61 @@ export function tabs(
             </MSKTab>
         );
 
-    tabs.push(
-        <MSKTab
-            key={8}
-            id="mutationalSignatures"
-            linkText="Mutational Signatures"
-            hide={
-                pageComponent.patientViewPageStore
-                    .mutationalSignatureMolecularProfiles.isPending ||
-                pageComponent.patientViewPageStore
-                    .initialMutationalSignatureVersion.isPending ||
-                _.isEmpty(
-                    pageComponent.patientViewPageStore
-                        .mutationalSignatureDataGroupByVersion.result
-                )
-            }
-        >
-            <MutationalSignaturesContainer
-                data={
-                    pageComponent.patientViewPageStore
-                        .mutationalSignatureDataGroupByVersion.result
-                }
-                profiles={
-                    pageComponent.patientViewPageStore
-                        .mutationalSignatureMolecularProfiles.result
-                }
-                onVersionChange={
-                    pageComponent.onMutationalSignatureVersionChange
-                }
-                version={
-                    pageComponent.patientViewPageStore
-                        .selectedMutationalSignatureVersion
-                }
-                dataCount={
-                    pageComponent.patientViewPageStore
-                        .mutationalSignatureCountDataGroupedByVersion.result
-                }
-                sample={
-                    pageComponent.patientViewPageStore
-                        .selectedSampleMutationalSignatureData
-                }
-                samples={
+    pageComponent.patientViewPageStore.hasMutationalSignatureData.result &&
+        pageComponent.patientViewPageStore.initialMutationalSignatureVersion
+            .isComplete &&
+        tabs.push(
+            <MSKTab
+                key={8}
+                id="mutationalSignatures"
+                linkText="Mutational Signatures"
+                hide={
                     pageComponent.patientViewPageStore
-                        .samplesWithCountDataAvailable
-                }
-                samplesNotProfiled={
+                        .mutationalSignatureMolecularProfiles.isPending ||
                     pageComponent.patientViewPageStore
-                        .samplesNotProfiledForMutationalSignatures
+                        .initialMutationalSignatureVersion.isPending ||
+                    _.isEmpty(
+                        pageComponent.patientViewPageStore
+                            .mutationalSignatureDataGroupByVersion.result
+                    )
                 }
-                onSampleChange={pageComponent.onSampleIdChange}
-            />
-        </MSKTab>
-    );
+            >
+                <MutationalSignaturesContainer
+                    data={
+                        pageComponent.patientViewPageStore
+                            .mutationalSignatureDataGroupByVersion.result
+                    }
+                    profiles={
+                        pageComponent.patientViewPageStore
+                            .mutationalSignatureMolecularProfiles.result
+                    }
+                    onVersionChange={
+                        pageComponent.onMutationalSignatureVersionChange
+                    }
+                    version={
+                        pageComponent.patientViewPageStore
+                            .selectedMutationalSignatureVersion
+                    }
+                    dataCount={
+                        pageComponent.patientViewPageStore
+                            .mutationalSignatureCountDataGroupedByVersion.result
+                    }
+                    sample={
+                        pageComponent.patientViewPageStore
+                            .selectedSampleMutationalSignatureData
+                    }
+                    samples={
+                        pageComponent.patientViewPageStore
+                            .samplesWithDataAvailable
+                    }
+                    samplesNotProfiled={
+                        pageComponent.patientViewPageStore
+                            .samplesNotProfiledForMutationalSignatures
+                    }
+                    onSampleChange={pageComponent.onSampleIdChange}
+                />
+            </MSKTab>
+        );
 
     pageComponent.resourceTabs.component &&
         /* @ts-ignore */

diff --git a/src/pages/patientView/PatientViewPageUtils.tsx b/src/pages/patientView/PatientViewPageUtils.tsx
@@ -10,10 +10,7 @@ import {
     IMutationalSignatureMeta,
     IMutationalCounts,
 } from 'shared/model/MutationalSignature';
-import {
-    getGenericAssayMetaPropertyOrDefault,
-    getGenericAssayCategoryFromName,
-} from 'shared/lib/GenericAssayUtils/GenericAssayCommonUtils';
+import { getGenericAssayMetaPropertyOrDefault } from 'shared/lib/GenericAssayUtils/GenericAssayCommonUtils';
 import {
     MutationalSignatureLabelMap,
     MutationalSignatureCount,

diff --git a/...ages/patientView/clinicalInformation/ClinicalInformationMutationalSignatureTable.spec.tsx b/...ages/patientView/clinicalInformation/ClinicalInformationMutationalSignatureTable.spec.tsx
@@ -99,6 +99,7 @@ describe('ClinicalInformationMutationalSignatureTable', () => {
                         confidence: 0.8,
                     },
                 },
+                description: 'test signature 1',
                 url: 'COSMIC/FakeMutationalSignature1',
             },
             {
@@ -113,6 +114,7 @@ describe('ClinicalInformationMutationalSignatureTable', () => {
                         confidence: 0.01,
                     },
                 },
+                description: 'test signature 2',
                 url: 'COSMIC/FakeMutationalSignature2',
             },
         ]);

diff --git a/src/pages/patientView/clinicalInformation/ClinicalInformationMutationalSignatureTable.tsx b/src/pages/patientView/clinicalInformation/ClinicalInformationMutationalSignatureTable.tsx
@@ -34,6 +34,7 @@ export interface IMutationalSignatureRow {
             confidence: number;
         };
     };
+    description: string;
     url: string;
 }
 
@@ -74,15 +75,29 @@ export default class ClinicalInformationMutationalSignatureTable extends React.C
                         <b>Signature: </b>
                         {this.props.signature}
                     </h5>
-                    <p style={{ fontSize: '12px' }}>
-                        <b>Description: </b>
-                        {this.props.description}
-                    </p>
-                    <p style={{ fontSize: '12px' }}>
-                        <a href={this.props.url} target="_blank">
-                            External link to signature (opens new tab)
-                        </a>
-                    </p>
+                    {this.props.description != '' && (
+                        <p style={{ fontSize: '12px' }}>
+                            <b>Description: </b>
+                            {this.props.description}
+                        </p>
+                    )}
+                    {this.props.description == '' && (
+                        <p style={{ fontSize: '12px' }}>
+                            No description annnotated in data
+                        </p>
+                    )}
+                    {this.props.url != '' && (
+                        <p style={{ fontSize: '12px' }}>
+                            <a href={this.props.url} target="_blank">
+                                External link to signature (opens new tab)
+                            </a>
+                        </p>
+                    )}
+                    {this.props.url == '' && (
+                        <p style={{ fontSize: '12px' }}>
+                            No url annnotated in data
+                        </p>
+                    )}
                 </div>
             </div>
         );

diff --git a/src/pages/patientView/clinicalInformation/PatientViewPageStore.ts b/src/pages/patientView/clinicalInformation/PatientViewPageStore.ts
@@ -902,12 +902,17 @@ export class PatientViewPageStore {
             .filter(item => item.sampleId === sampleToFilter)
             .map(item => item.uniqueSampleKey);
     }
-    @computed get samplesWithCountDataAvailable(): string[] {
+
+    @computed get samplesWithDataAvailable(): string[] {
         return this.fetchAllMutationalSignatureData.result
-            .filter(data =>
-                data.molecularProfileId.includes(
-                    MutationalSignatureStableIdKeyWord.MutationalSignatureCountKeyWord
-                )
+            .filter(
+                data =>
+                    data.molecularProfileId.includes(
+                        MutationalSignatureStableIdKeyWord.MutationalSignatureCountKeyWord
+                    ) ||
+                    data.molecularProfileId.includes(
+                        MutationalSignatureStableIdKeyWord.MutationalSignatureContributionKeyWord
+                    )
             )
             .map(sample => sample.sampleId)
             .filter((value, index, self) => self.indexOf(value) === index);
@@ -918,7 +923,7 @@ export class PatientViewPageStore {
             sample => sample.sampleId
         );
         return allSamples.filter(
-            element => !this.samplesWithCountDataAvailable.includes(element)
+            element => !this.samplesWithDataAvailable.includes(element)
         );
     }
 

diff --git a/src/pages/patientView/mutationalSignatures/MutationalSignatureBarChartUtils.ts b/src/pages/patientView/mutationalSignatures/MutationalSignatureBarChartUtils.ts
@@ -547,17 +547,21 @@ export function prepareMutationalSignatureDataForTable(
         .map((mutationalSignatureSampleData, name) => ({
             name,
             samples: mutationalSignatureSampleData,
+            description: mutationalSignatureSampleData[0].meta.description,
             url: mutationalSignatureSampleData[0].meta.url,
         }))
         .value();
     for (const mutationalSignature of sampleInvertedDataByMutationalSignature) {
         let mutationalSignatureRowForTable: IMutationalSignatureRow = {
             name: '',
             sampleValues: {},
+            description: '',
             url: '',
         };
 
         mutationalSignatureRowForTable.name = mutationalSignature.name;
+        mutationalSignatureRowForTable.description =
+            mutationalSignature.description;
         mutationalSignatureRowForTable.url = mutationalSignature.url;
         if (
             Object.keys(mutationalSignature.samples).length ===