19690: tidy up

Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox@curii.com>

diff --git a/src/components/column-selector/column-selector.tsx b/src/components/column-selector/column-selector.tsx
index 3ab38d4d95feac18fd7d33e1b427c701c5a00670..5fbef6b62c1e37d2c882c5968f3983d3f5f2fcf6 100644 (file)
--- a/src/components/column-selector/column-selector.tsx
+++ b/src/components/column-selector/column-selector.tsx
@@ -30,17 +30,7 @@ export type ColumnSelectorProps = ColumnSelectorDataProps & WithStyles<CssRules>
 
 export const ColumnSelector = withStyles(styles)(
     ({ columns, onColumnToggle, classes }: ColumnSelectorProps) =>
-    {
-//         // console.log('COLUMN_SELECTOR',columns)
-//     columns = [...columns, {
-//         name:'bananas',
-//         selected: false,
-//         configurable: true, filters:{}, render: (uuid)=><ResourceName uuid='bananas'/>
-//     }
-// ]
-// //lisa
-//     // console.log('COLUMN_SELECTOR',columns)
-       return <Popover triggerComponent={ColumnSelectorTrigger}>
+        <Popover triggerComponent={ColumnSelectorTrigger}>
             <Paper>
                 <List dense>
                     {columns
@@ -62,7 +52,7 @@ export const ColumnSelector = withStyles(styles)(
                         )}
                 </List>
             </Paper>
-        </Popover>}
+        </Popover>
 );
 
 export const ColumnSelectorTrigger = (props: IconButtonProps) =>

diff --git a/src/components/data-explorer/data-explorer.tsx b/src/components/data-explorer/data-explorer.tsx
index 67f9bfba99e79af6dc980df16740b536752d3770..e4eef5935d9d68de8722caf832dc07a09eddc624 100644 (file)
--- a/src/components/data-explorer/data-explorer.tsx
+++ b/src/components/data-explorer/data-explorer.tsx
@@ -141,9 +141,6 @@ export const DataExplorer = withStyles(styles)(
 
         componentDidMount() {
             if (this.props.onSetColumns) {
-                //lisa
-                // console.log('DATA_EXPLORER_CDM:',this.props)
-                
                 this.props.onSetColumns(this.props.columns);
             }
             // Component just mounted, so we need to show the loading indicator.
@@ -163,8 +160,6 @@ export const DataExplorer = withStyles(styles)(
                 paperKey, fetchMode, currentItemUuid, title,
                 doHidePanel, doMaximizePanel, doUnMaximizePanel, panelName, panelMaximized, elementPath
             } = this.props;
-            //lisa
-// console.log('DATA_EXPLORER_TSX', this.props)
             return <Paper className={classes.root} {...paperProps} key={paperKey} data-cy={this.props["data-cy"]}>
                 <Grid container direction="column" wrap="nowrap" className={classes.container}>
                     <div>

diff --git a/src/components/data-table/data-table.tsx b/src/components/data-table/data-table.tsx
index 9b6758434640c078984e3f387df6ab73b91acfa4..e08039082fd1ba0df0d686264dd792678ddb3f3a 100644 (file)
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@ -87,7 +87,6 @@ type DataTableProps<T> = DataTableDataProps<T> & WithStyles<CssRules>;
 export const DataTable = withStyles(styles)(
     class Component<T> extends React.Component<DataTableProps<T>> {
         render() {
-            // console.log('DATA_TABLE, RENDER:' , this)
             const { items, classes, working } = this.props;
             return <div className={classes.root}>
                 <div className={classes.content}>
@@ -98,7 +97,6 @@ export const DataTable = withStyles(styles)(
                             </TableRow>
                         </TableHead>
                         <TableBody className={classes.tableBody}>
-                            {/* {console.log('TABLEBODY>ITEMS',items, "THIS ?", this)} */}
                             { !working && items.map(this.renderBodyRow) }
                         </TableBody>
                     </Table>
@@ -169,12 +167,10 @@ export const DataTable = withStyles(styles)(
                 onContextMenu={this.handleRowContextMenu(item)}
                 onDoubleClick={event => onRowDoubleClick && onRowDoubleClick(event, item)}
                 selected={item === currentItemUuid}>
-                {this.mapVisibleColumns((column, index) => {
-                    // console.log('RENDERBODYROW', column.render(item))
-                    return <TableCell key={column.key || index} className={currentRoute === '/workflows' ? classes.tableCellWorkflows : classes.tableCell}>
+                {this.mapVisibleColumns((column, index) => <TableCell key={column.key || index} className={currentRoute === '/workflows' ? classes.tableCellWorkflows : classes.tableCell}>
                         {column.render(item)}
                     </TableCell>
-        })}
+                )}
             </TableRow>;
         }
 

diff --git a/src/store/data-explorer/data-explorer-middleware-service.ts b/src/store/data-explorer/data-explorer-middleware-service.ts
index c747d53340d6be2265fe3ce6c5962478735861d0..0b8d6debe7ca44d9134905e94ea0e803d69b896a 100644 (file)
--- a/src/store/data-explorer/data-explorer-middleware-service.ts
+++ b/src/store/data-explorer/data-explorer-middleware-service.ts
@@ -39,8 +39,6 @@ export const getDataExplorerColumnFilters = <T>(
   columnName: string
 ): DataTableFilters => {
   const column = columns.find((c) => c.name === columnName);
-  //lisa
-  //   console.log('DATA_EXPLORER_MIDD, GETDEXCOLUMNFILTERS', column);
   return column ? column.filters : createTree();
 };
 

diff --git a/src/store/data-explorer/data-explorer-middleware.ts b/src/store/data-explorer/data-explorer-middleware.ts
index b99af64a328bcc8df4cd040b3a9cf342c96109a5..7d0655e4968ee36392f812eb6da354db77467a5d 100644 (file)
--- a/src/store/data-explorer/data-explorer-middleware.ts
+++ b/src/store/data-explorer/data-explorer-middleware.ts
@@ -82,8 +82,6 @@ export const dataExplorerMiddleware =
                       getState().dataExplorer,
                       service.getId()
                     );
-                    //lisa
-                    // console.log('DE_MIDDLEWARE', de);
                     const complete =
                       de.requestState === DataTableRequestState.PENDING;
                     dispatch(

diff --git a/src/store/data-explorer/data-explorer-reducer.ts b/src/store/data-explorer/data-explorer-reducer.ts
index e1f4ef2a7bb6068d1cc0462e0f7a2335408271c0..997b6011d5779e90b8900e190f26b3b1b249b431 100644 (file)
--- a/src/store/data-explorer/data-explorer-reducer.ts
+++ b/src/store/data-explorer/data-explorer-reducer.ts
@@ -50,7 +50,6 @@ export const dataExplorerReducer = (
   state: DataExplorerState = {},
   action: DataExplorerAction
 ) => {
-  //   console.log('DATA_EXPLORERE_REDUCER, satate:', state);
   return dataExplorerActions.match(action, {
     CLEAR: ({ id }) =>
       update(state, id, (explorer) => ({
@@ -112,8 +111,6 @@ export const dataExplorerReducer = (
 };
 export const getDataExplorer = (state: DataExplorerState, id: string) => {
   const returnValue = state[id] || initialDataExplorer;
-  //lisa
-  //   console.log('GETDATAEXPLORER RETURN:', state[id]);
   return returnValue;
 };
 

diff --git a/src/views-components/data-explorer/data-explorer.tsx b/src/views-components/data-explorer/data-explorer.tsx
index 79f530a062979ec64ee02c609afa5202a974cbaf..46aca4554ddfe506deda4caca5e08e869d40a2af 100644 (file)
--- a/src/views-components/data-explorer/data-explorer.tsx
+++ b/src/views-components/data-explorer/data-explorer.tsx
@@ -22,16 +22,12 @@ interface Props {
 }
 
 const mapStateToProps = (state: RootState, { id }: Props) => {
-    // console.log('DATA_EXPLORER, MSTP GLOBAL STATE:', state)
-    const test = 'foo'
     const progress = state.progressIndicator.find(p => p.id === id);
     const dataExplorerState = getDataExplorer(state.dataExplorer, id);
     const currentRoute = state.router.location ? state.router.location.pathname : '';
     const currentRefresh = localStorage.getItem(LAST_REFRESH_TIMESTAMP) || '';
     const currentItemUuid = currentRoute === '/workflows' ? state.properties.workflowPanelDetailsUuid : state.detailsPanel.resourceUuid;
-// console.log('DATA_EXPLORER, MSTP FILTERED:', {...dataExplorerState})
     return {
-        foo: test,
         ...dataExplorerState,
         working: !!progress?.working,
         currentRefresh: currentRefresh,

diff --git a/src/views/groups-panel/groups-panel.tsx b/src/views/groups-panel/groups-panel.tsx
index f6f5048dec7f944479c24402b4b444db37981ae7..3251c729eee32d6df8d75a4c298d38d9bb0e8c4b 100644 (file)
--- a/src/views/groups-panel/groups-panel.tsx
+++ b/src/views/groups-panel/groups-panel.tsx
@@ -85,7 +85,6 @@ export const GroupsPanel = withStyles(styles)(connect(
     class GroupsPanel extends React.Component<GroupsPanelProps & WithStyles<CssRules>> {
 
         render() {
-            console.log('GROUPSPANEL', this)
             return (
                 <div className={this.props.classes.root}><DataExplorer
                     id={GROUPS_PANEL_ID}