[PRTL-2281] Hide Survival selectable columns from arrange column butt…

…on (#2446) Hide Survival selectable columns from arrangecolumn button in case entity page and gene entity page
NCI-GDC · Jan 17, 2019 · d37955f · d37955f
1 parent 392a6cd
commit d37955f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/src/packages/@ncigdc/components/ArrangeColumns.tsx b/src/packages/@ncigdc/components/ArrangeColumns.tsx
@@ -41,6 +41,7 @@ interface IArrangeColumnsProps {
   state: IState;
   searchTerm: string;
   entityType: string;
+  hideColumns?: string[];
 }
 const ArrangeColumns = compose<IArrangeColumnsProps, JSX.Element>(
   connect(
@@ -52,11 +53,19 @@ const ArrangeColumns = compose<IArrangeColumnsProps, JSX.Element>(
         };
         [x: string]: any;
       },
-      props: { entityType: string; searchTerm: string; [x: string]: any }
+      props: {
+        entityType: string;
+        searchTerm: string;
+        [x: string]: any;
+        hideColumns: string[];
+      }
     ) => ({
-      localTableColumns: state.tableColumns[props.entityType],
+      localTableColumns: state.tableColumns[props.entityType].filter(
+        (t: IColumnProps<boolean>) => !(props.hideColumns || []).includes(t.id)
+      ),
       filteredTableColumns: state.tableColumns[props.entityType].filter(
-        (t: IColumnProps<boolean>) => !t.subHeading
+        (t: IColumnProps<boolean>) =>
+          !(props.hideColumns || []).includes(t.id) && !t.subHeading
       ),
     })
   ),
@@ -84,10 +93,12 @@ const ArrangeColumns = compose<IArrangeColumnsProps, JSX.Element>(
     state,
     searchTerm,
     entityType,
+    hideColumns,
   }) => {
     const subHeadings =
       localTableColumns.filter((t: IColumnProps<boolean>) => t.subHeading) ||
       [];
+
     return (
       <div className="test-arrange-columns">
         {filteredTableColumns.map(

diff --git a/src/packages/@ncigdc/components/ArrangeColumnsButton.js b/src/packages/@ncigdc/components/ArrangeColumnsButton.js
@@ -32,7 +32,7 @@ const RestoreDefaults = styled(Row, {
 
 const ArrangeColumnsButton = compose(
   connect(),
-  withState('searchTerm', 'setSearchTerm', ''),
+  withState('searchTerm', 'setSearchTerm', '')
 )(
   class extends React.Component {
     searchInput;
@@ -43,6 +43,7 @@ const ArrangeColumnsButton = compose(
         dispatch,
         entityType,
         style = {},
+        hideColumns,
       } = this.props;
       return (
         <Dropdown
@@ -86,12 +87,16 @@ const ArrangeColumnsButton = compose(
             >
               Restore Defaults
             </RestoreDefaults>
-            <ArrangeColumns entityType={entityType} searchTerm={searchTerm} />
+            <ArrangeColumns
+              entityType={entityType}
+              searchTerm={searchTerm}
+              hideColumns={hideColumns}
+            />
           </Column>
         </Dropdown>
       );
     }
-  },
+  }
 );
 
 export default ArrangeColumnsButton;
diff --git a/src/packages/@ncigdc/components/TableActions.tsx b/src/packages/@ncigdc/components/TableActions.tsx
@@ -80,6 +80,7 @@ interface IProps {
   AppendSetButton?: React.ComponentClass;
   downloadClinical?: boolean;
   downloadBiospecimen?: boolean;
+  hideColumns?: string[];
 }
 
 const TableActions: React.SFC<IProps> = ({
@@ -110,6 +111,7 @@ const TableActions: React.SFC<IProps> = ({
   downloadBiospecimen,
   theme,
   totalCases,
+  hideColumns,
 }: IProps) => {
   const fieldContains = ({
     filters,
@@ -128,6 +130,7 @@ const TableActions: React.SFC<IProps> = ({
         <ArrangeColumnsButton
           entityType={arrangeColumnKey}
           style={visualizingButton}
+          hideColumns={hideColumns}
         />
       )}
       {sortOptions && (

diff --git a/src/packages/@ncigdc/modern_components/SsmsTable/SsmsTable.js b/src/packages/@ncigdc/modern_components/SsmsTable/SsmsTable.js
@@ -152,6 +152,7 @@ export default compose(
               RemoveFromSetButton={RemoveFromExploreSsmSetButton}
               idField="ssms.ssm_id"
               selectedIds={selectedIds}
+              hideColumns={hideSurvival ? ['survival_plot'] : []}
             />
           </Row>
         </Row>