Merge branch 'cBioPortal:master' into master

cBioPortal · Jul 30, 2024 · 1076bf8 · 1076bf8
2 parents f409bfd + 895d50f
commit 1076bf8
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 7 deletions.
diff --git a/src/shared/components/query/QueryStore.ts b/src/shared/components/query/QueryStore.ts
@@ -1170,6 +1170,10 @@ export class QueryStore {
  return _.sumBy(this.selectableSelectedStudies, s => s.allSampleCount);
  }
 
+ @computed get sampleCountForAllStudies() {
+ return _.sumBy(this.selectableStudies, s => s.allSampleCount);
+ }
+
  readonly sampleLists = remoteData<SampleList[]>({
  invoke: async () => {
  if (!this.isSingleNonVirtualStudySelected) {
@@ -1578,6 +1582,10 @@ export class QueryStore {
  .filter(_.identity);
  }
 
+ @computed get selectableStudies() {
+ return Array.from(this.treeData.map_studyId_cancerStudy.values());
+ }
+
  public isVirtualStudy(studyId: string): boolean {
  // if the study id doesn't correspond to one in this.cancerStudies, then its a virtual Study
  return !this.cancerStudyIdsSet.result[studyId];

diff --git a/src/shared/components/query/StudySelectorStats.tsx b/src/shared/components/query/StudySelectorStats.tsx
@@ -18,6 +18,10 @@ export const StudySelectorStats: React.FunctionComponent<{
  let numSelectedStudies = expr(
  () => props.store.selectableSelectedStudyIds.length
  );
+ let numAllStudies = expr(
+ () => props.store.selectableStudies.length
+ );
+
  return (
  <>
  <a
@@ -27,13 +31,38 @@ export const StudySelectorStats: React.FunctionComponent<{
  .store.showSelectedStudiesOnly;
  }}
  >
- <b>{numSelectedStudies}</b>{' '}
- {numSelectedStudies === 1 ? 'study' : 'studies'}{' '}
- selected (
- <b>
- {props.store.sampleCountForSelectedStudies}
- </b>{' '}
- samples)
+ {props.store.selectableSelectedStudies.length ==
+ 0 && (
+ <div>
+ <b>{numAllStudies}</b> studies available
+ (
+ <b>
+ {
+ props.store
+ .sampleCountForAllStudies
+ }
+ </b>{' '}
+ samples)
+ </div>
+ )}
+
+ {props.store.selectableSelectedStudies.length >
+ 0 && (
+ <div>
+ <b>{numSelectedStudies}</b>{' '}
+ {numSelectedStudies === 1
+ ? 'study'
+ : 'studies'}{' '}
+ selected (
+ <b>
+ {
+ props.store
+ .sampleCountForSelectedStudies
+ }
+ </b>{' '}
+ samples)
+ </div>
+ )}
  </a>
  {props.store.selectableSelectedStudies.length >
  0 && (