Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/containers/Tenant/Schema/SchemaViewer/SchemaViewer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,19 @@
&__more-badge {
margin-left: var(--g-spacing-1);
}
&__key-icon {
position: absolute;
top: 3.5px;

margin-left: var(--g-spacing-half);

vertical-align: baseline;
}
&__id-wrapper {
position: relative;

display: inline-block;

padding-right: var(--g-spacing-1);
}
}
15 changes: 14 additions & 1 deletion src/containers/Tenant/Schema/SchemaViewer/columns.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import DataTable from '@gravity-ui/react-data-table';
import {Icon} from '@gravity-ui/uikit';

import {getColumnWidth} from '../../../../utils/getColumnWidth';

import i18n from './i18n';
import {b} from './shared';
import type {SchemaColumn, SchemaData} from './types';

import KeyIcon from '@gravity-ui/icons/svgs/key.svg';

export const SCHEMA_COLUMNS_WIDTH_LS_KEY = 'schemaTableColumnsWidth';

const SCHEMA_TABLE_COLUMS_IDS = {
Expand All @@ -26,7 +30,16 @@ const idColumn: SchemaColumn = {
return i18n('column-title.id');
},
width: 60,
render: ({row}) => row.id,
align: DataTable.RIGHT,
render: ({row}) => {
const keyIcon = <Icon className={b('key-icon')} size={12} data={KeyIcon} />;
return (
<span className={b('id-wrapper')}>
{row.id}
{row.keyColumnIndex === undefined || row.keyColumnIndex === -1 ? null : keyIcon}
</span>
);
},
};
const nameColumn: SchemaColumn = {
name: SCHEMA_TABLE_COLUMS_IDS.name,
Expand Down
4 changes: 1 addition & 3 deletions src/containers/Tenant/Schema/SchemaViewer/prepareData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,8 @@ function prepareRowTableSchema(data: TTableDescription = {}): SchemaData[] {
columnCodec,
};
});
const keyColumns = preparedColumns?.filter((column) => column.keyColumnIndex !== -1) || [];
const otherColumns = preparedColumns?.filter((column) => column.keyColumnIndex === -1) || [];

return [...keyColumns, ...otherColumns];
return preparedColumns ?? [];
}

function prepareExternalTableSchema(data: TExternalTableDescription = {}): SchemaData[] {
Expand Down
Loading