From d4d173d042ad06d8382657797b6aae2d61cdd3d7 Mon Sep 17 00:00:00 2001 From: Lisa Knox Date: Wed, 23 Nov 2022 22:37:28 -0500 Subject: [PATCH] 19690: tidy up Arvados-DCO-1.1-Signed-off-by: Lisa Knox --- src/components/column-selector/column-selector.tsx | 14 ++------------ src/components/data-explorer/data-explorer.tsx | 5 ----- src/components/data-table/data-table.tsx | 8 ++------ .../data-explorer-middleware-service.ts | 2 -- .../data-explorer/data-explorer-middleware.ts | 2 -- src/store/data-explorer/data-explorer-reducer.ts | 3 --- .../data-explorer/data-explorer.tsx | 4 ---- src/views/groups-panel/groups-panel.tsx | 1 - 8 files changed, 4 insertions(+), 35 deletions(-) diff --git a/src/components/column-selector/column-selector.tsx b/src/components/column-selector/column-selector.tsx index 3ab38d4d..5fbef6b6 100644 --- 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 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)=> -// } -// ] -// //lisa -// // console.log('COLUMN_SELECTOR',columns) - return + {columns @@ -62,7 +52,7 @@ export const ColumnSelector = withStyles(styles)( )} - } + ); export const ColumnSelectorTrigger = (props: IconButtonProps) => diff --git a/src/components/data-explorer/data-explorer.tsx b/src/components/data-explorer/data-explorer.tsx index 67f9bfba..e4eef593 100644 --- 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
diff --git a/src/components/data-table/data-table.tsx b/src/components/data-table/data-table.tsx index 9b675843..e0803908 100644 --- a/src/components/data-table/data-table.tsx +++ b/src/components/data-table/data-table.tsx @@ -87,7 +87,6 @@ type DataTableProps = DataTableDataProps & WithStyles; export const DataTable = withStyles(styles)( class Component extends React.Component> { render() { - // console.log('DATA_TABLE, RENDER:' , this) const { items, classes, working } = this.props; return
@@ -98,7 +97,6 @@ export const DataTable = withStyles(styles)( - {/* {console.log('TABLEBODY>ITEMS',items, "THIS ?", this)} */} { !working && items.map(this.renderBodyRow) } @@ -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 + {this.mapVisibleColumns((column, index) => {column.render(item)} - })} + )} ; } diff --git a/src/store/data-explorer/data-explorer-middleware-service.ts b/src/store/data-explorer/data-explorer-middleware-service.ts index c747d533..0b8d6deb 100644 --- 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 = ( 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 b99af64a..7d0655e4 100644 --- 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 e1f4ef2a..997b6011 100644 --- 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 79f530a0..46aca455 100644 --- 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 f6f5048d..3251c729 100644 --- 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> { render() { - console.log('GROUPSPANEL', this) return (