X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/4fd42aef3c07c9e4c43bf873afe45e0043755ba0..62cb779efb0b098c05053e957c765a807467b28b:/src/components/column-selector/column-selector.tsx diff --git a/src/components/column-selector/column-selector.tsx b/src/components/column-selector/column-selector.tsx index 441d8ec8..2323987b 100644 --- a/src/components/column-selector/column-selector.tsx +++ b/src/components/column-selector/column-selector.tsx @@ -10,7 +10,6 @@ import { Popover } from "../popover/popover"; import { IconButtonProps } from '@material-ui/core/IconButton'; import { DataColumns } from '../data-table/data-table'; import { ArvadosTheme } from "common/custom-theme"; -import { ResourceName } from 'views-components/data-explorer/renderers'; interface ColumnSelectorDataProps { columns: DataColumns; @@ -18,12 +17,18 @@ interface ColumnSelectorDataProps { className?: string; } -type CssRules = "checkbox"; +type CssRules = "checkbox" | "listItem" | "listItemText"; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ checkbox: { width: 24, height: 24 + }, + listItem: { + padding: 0 + }, + listItemText: { + paddingTop: '0.2rem' } }); @@ -31,15 +36,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)=> - } -] - console.log('COLUMN_SELECTOR',columns) - return + {columns @@ -48,20 +45,22 @@ export const ColumnSelector = withStyles(styles)( onColumnToggle(column)}> - + {column.name} )} - } + ); export const ColumnSelectorTrigger = (props: IconButtonProps) => @@ -70,3 +69,5 @@ export const ColumnSelectorTrigger = (props: IconButtonProps) => ; + +