From e57a8f466cdbaec06d35639cc54241600a6b54e7 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Mon, 12 Oct 2020 19:12:52 -0300 Subject: [PATCH] 16718: Removes redundant column on search results. Also condenses the table contents by making padding between columns a bit smaller. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- src/components/data-table/data-table.tsx | 7 ++++--- .../search-results-panel/search-results-panel-view.tsx | 8 -------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/components/data-table/data-table.tsx b/src/components/data-table/data-table.tsx index 4e2b430a..87386d50 100644 --- a/src/components/data-table/data-table.tsx +++ b/src/components/data-table/data-table.tsx @@ -55,7 +55,8 @@ const styles: StyleRulesCallback = (theme: Theme) => ({ padding: theme.spacing.unit }, tableCell: { - wordWrap: 'break-word' + wordWrap: 'break-word', + paddingRight: '24px' }, tableCellWorkflows: { '&:nth-last-child(2)': { @@ -107,8 +108,8 @@ export const DataTable = withStyles(styles)( renderHeadCell = (column: DataColumn, index: number) => { const { name, key, renderHeader, filters, sortDirection } = column; - const { onSortToggle, onFiltersChange } = this.props; - return + const { onSortToggle, onFiltersChange, classes } = this.props; + return {renderHeader ? renderHeader() : countNodes(filters) > 0 diff --git a/src/views/search-results-panel/search-results-panel-view.tsx b/src/views/search-results-panel/search-results-panel-view.tsx index ebe5a826..109fb305 100644 --- a/src/views/search-results-panel/search-results-panel-view.tsx +++ b/src/views/search-results-panel/search-results-panel-view.tsx @@ -30,7 +30,6 @@ import { ArvadosTheme } from '~/common/custom-theme'; export enum SearchResultsPanelColumnNames { CLUSTER = "Cluster", NAME = "Name", - PROJECT = "Project", STATUS = "Status", TYPE = 'Type', OWNER = "Owner", @@ -67,13 +66,6 @@ export const searchResultsPanelColumns: DataColumns = [ filters: createTree(), render: (uuid: string) => }, - { - name: SearchResultsPanelColumnNames.PROJECT, - selected: true, - configurable: true, - filters: createTree(), - render: uuid => - }, { name: SearchResultsPanelColumnNames.STATUS, selected: true, -- 2.30.2