Custom data Enhancements for Plots Tab

src/pages/resultsView/ResultsViewPage.tsx

@@ -265,7 +265,10 @@ export default class ResultsViewPage extends React.Component<
                                 entrezGeneIdToGene={store.entrezGeneIdToGene}
                                 sampleKeyToSample={store.sampleKeyToSample}
                                 genes={store.genes}
-                                clinicalAttributes={store.clinicalAttributes}
+                                clinicalAttributes={
+                                    store.plotClinicalAttributes
+                                }
+                                customAttributes={store.customAttributes}
                                 genesets={store.genesets}
                                 genericAssayEntitiesGroupByMolecularProfileId={
                                     store.genericAssayEntitiesGroupByMolecularProfileId

src/pages/resultsView/ResultsViewPageStore.ts

@@ -1093,7 +1093,7 @@ export class ResultsViewPageStore extends AnalysisStore
             this.studyIds,
             this.clinicalAttributes_profiledIn,
             this.clinicalAttributes_comparisonGroupMembership,
-            this.clinicalAttributes_customCharts,
+            this.customAttributes,
             this.samples,
             this.patients,
         ],
@@ -1142,7 +1142,7 @@ export class ResultsViewPageStore extends AnalysisStore
                 ...specialAttributes,
                 ...this.clinicalAttributes_profiledIn.result!,
                 ...this.clinicalAttributes_comparisonGroupMembership.result!,
-                ...this.clinicalAttributes_customCharts.result!,
+                ...this.customAttributes.result!,
             ];
         },
     });
@@ -1187,7 +1187,7 @@ export class ResultsViewPageStore extends AnalysisStore
             this.studyToDataQueryFilter,
             this.clinicalAttributes_profiledIn,
             this.clinicalAttributes_comparisonGroupMembership,
-            this.clinicalAttributes_customCharts,
+            this.customAttributes,
         ],
         invoke: async () => {
             let clinicalAttributeCountFilter: ClinicalAttributeCountFilter;
@@ -1270,7 +1270,7 @@ export class ResultsViewPageStore extends AnalysisStore
                 );
             }
             // add counts for custom chart clinical attributes
-            for (const attr of this.clinicalAttributes_customCharts.result!) {
+            for (const attr of this.customAttributes.result!) {
                 ret[attr.clinicalAttributeId] = attr.data!.filter(
                     d => d.value !== 'NA'
                 ).length;
@@ -2723,7 +2723,17 @@ export class ResultsViewPageStore extends AnalysisStore
         default: [],
     });
 
-    readonly clinicalAttributes_customCharts = remoteData({
+    readonly plotClinicalAttributes = remoteData<ExtendedClinicalAttribute[]>({
+        await: () => [this.clinicalAttributes, this.customAttributes],
+        invoke: async () => {
+            return _.filter(
+                this.clinicalAttributes.result!,
+                attr => !this.customAttributes.result!.includes(attr)
+            );
+        },
+    });
+
+    readonly customAttributes = remoteData({
         await: () => [this.sampleMap],
         invoke: async () => {
             let ret: ExtendedClinicalAttribute[] = [];
@@ -5693,7 +5703,7 @@ export class ResultsViewPageStore extends AnalysisStore
         this.coverageInformation,
         this.filteredSampleKeyToSample,
         this.filteredPatientKeyToPatient,
-        this.clinicalAttributes_customCharts
+        this.customAttributes
     );
 
     public mutationCache = new MobxPromiseCache<

src/pages/resultsView/oncoprint/TracksMenu.tsx

@@ -151,7 +151,7 @@ export default class TracksMenu extends React.Component<IAddTrackProps, {}> {
         await: () => [
             this.props.store.clinicalAttributes,
             this.clinicalAttributeIdToAvailableFrequency,
-            this.props.store.clinicalAttributes_customCharts,
+            this.props.store.customAttributes,
         ],
         invoke: () => {
             const uniqueAttributes = _.uniqBy(
@@ -167,7 +167,7 @@ export default class TracksMenu extends React.Component<IAddTrackProps, {}> {
             };
 
             const customChartClinicalAttributeIds = _.keyBy(
-                this.props.store.clinicalAttributes_customCharts.result!,
+                this.props.store.customAttributes.result!,
                 a => a.clinicalAttributeId
             );
 

src/pages/studyView/StudyViewPage.tsx

@@ -772,6 +772,9 @@ export default class StudyViewPage extends React.Component<
                                             clinicalAttributes={
                                                 this.store.clinicalAttributes
                                             }
+                                            customAttributes={
+                                                this.store.customAttributes
+                                            }
                                             genesets={this.store.genesets}
                                             genericAssayEntitiesGroupByMolecularProfileId={
                                                 this.store

src/pages/studyView/StudyViewPageStore.ts

@@ -11439,7 +11439,7 @@ export class StudyViewPageStore
             ),
     });
 
-    readonly clinicalAttributes_customCharts = remoteData({
+    readonly customAttributes = remoteData({
         await: () => [this.sampleMap],
         invoke: async () => {
             let ret: ExtendedClinicalAttribute[] = [];
@@ -11485,7 +11485,7 @@ export class StudyViewPageStore
         this.coverageInformation,
         this.filteredSampleKeyToSample,
         this.filteredPatientKeyToPatient,
-        this.clinicalAttributes_customCharts
+        this.customAttributes
     );
 
     private _numericGeneMolecularDataCache = new MobxPromiseCache<