IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 08:05:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Search: Adjust table structure (#48933)

Browse Source 
* Search: Adjust table structure

* Always include tags column
This commit is contained in:
kay delaney 2022-05-16 12:48:38 +01:00 committed by GitHub
parent 683c1c0f40
commit 8b5f899912
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
public/app/features/search/page/components/columns.tsx
View File

@ -12,10 +12,10 @@ import { SelectionChecker, SelectionToggle } from '../selection';
import { TableColumn } from './SearchResultsTable'; import { TableColumn } from './SearchResultsTable';
const TYPE_COLUMN_WIDTH = 130; const TYPE_COLUMN_WIDTH = 250;
const DATASOURCE_COLUMN_WIDTH = 200; const DATASOURCE_COLUMN_WIDTH = 200;
const LOCATION_COLUMN_WIDTH = 200; const LOCATION_COLUMN_WIDTH = 200;
const TAGS_COLUMN_WIDTH = 200; const TAGS_COLUMN_WIDTH = 300;
export const generateColumns = ( export const generateColumns = (
response: QueryResponse, response: QueryResponse,
@ -111,14 +111,7 @@ export const generateColumns = (
availableWidth -= width; availableWidth -= width;
} }
// Show tags if we have any width = Math.max(availableWidth - TAGS_COLUMN_WIDTH, LOCATION_COLUMN_WIDTH);
if (access.tags) {
width = TAGS_COLUMN_WIDTH;
columns.push(makeTagsColumn(access.tags, width, styles.tagList, onTagSelected));
availableWidth -= width;
}
width = Math.max(availableWidth, LOCATION_COLUMN_WIDTH);
const meta = response.view.dataFrame.meta?.custom as SearchResultMeta; const meta = response.view.dataFrame.meta?.custom as SearchResultMeta;
if (meta?.locationInfo) { if (meta?.locationInfo) {
columns.push({ columns.push({
@ -152,8 +145,11 @@ export const generateColumns = (
Header: 'Location', Header: 'Location',
width, width,
}); });
availableWidth -= width;
} }
columns.push(makeTagsColumn(access.tags, availableWidth, styles.tagList, onTagSelected));
return columns; return columns;
}; };
@ -282,14 +278,11 @@ function makeTagsColumn(
return { return {
Cell: (p) => { Cell: (p) => {
const tags = field.values.get(p.row.index); const tags = field.values.get(p.row.index);
if (tags) { return tags ? (
return ( <div {...p.cellProps} className={p.cellStyle}>
<div {...p.cellProps} className={p.cellStyle}> <TagList className={tagListClass} tags={tags} onClick={onTagSelected} />
<TagList className={tagListClass} tags={tags} onClick={onTagSelected} /> </div>
</div> ) : null;
);
}
return null;
}, },
id: `column-tags`, id: `column-tags`,
field: field, field: field,