Skip to content

feat(ObjectSummary): improve object overview #1447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 14, 2024
Merged

feat(ObjectSummary): improve object overview #1447

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8921877
feat(ObjectSummary): improve object overview
Raubzeug Oct 11, 2024
aab9567
fix: review
Raubzeug Oct 14, 2024
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
9 changes: 9 additions & 0 deletions src/containers/Tenant/ObjectSummary/ObjectSummary.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,13 @@
background-color: transparent;
}
}
&__overview-title {
margin: 15px 0 10px;

font-weight: 600;
Copy link
Collaborator

@astandrik astandrik Oct 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose mixin @include info-viewer-title() does the same thing

}
&__overview-item-content {
text-align: end;
white-space: nowrap;
}
}
103 changes: 59 additions & 44 deletions src/containers/Tenant/ObjectSummary/ObjectSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';

import {HelpPopover} from '@gravity-ui/components';
import {DefinitionList, HelpPopover} from '@gravity-ui/components';
import type {DefinitionListSingleItem} from '@gravity-ui/components/build/esm/components/DefinitionList/types';
import {Flex, Tabs} from '@gravity-ui/uikit';
import qs from 'qs';
import {Link, useLocation} from 'react-router-dom';
Expand All @@ -9,8 +10,6 @@ import {StringParam, useQueryParam} from 'use-query-params';
import {AsyncReplicationState} from '../../../components/AsyncReplicationState';
import {ClipboardButton} from '../../../components/ClipboardButton';
import {toFormattedSize} from '../../../components/FormattedBytes/utils';
import {InfoViewer} from '../../../components/InfoViewer/InfoViewer';
import type {InfoViewerItem} from '../../../components/InfoViewer/InfoViewer';
import {LinkWithIcon} from '../../../components/LinkWithIcon/LinkWithIcon';
import SplitPane from '../../../components/SplitPane';
import routes, {createExternalUILink, createHref} from '../../../routes';
Expand Down Expand Up @@ -156,28 +155,28 @@ export function ObjectSummary({
}
const {CreateStep, PathType, PathSubType, PathId, PathVersion} = currentSchemaData;

const overview: InfoViewerItem[] = [];
const overview: DefinitionListSingleItem[] = [];

const normalizedType = isDomain(path, PathType)
? 'Domain'
: PathType?.replace(/^EPathType/, '');

overview.push({label: i18n('field_type'), value: normalizedType});
overview.push({name: i18n('field_type'), content: normalizedType});

if (PathSubType !== EPathSubType.EPathSubTypeEmpty) {
overview.push({
label: i18n('field_subtype'),
value: PathSubType?.replace(/^EPathSubType/, ''),
name: i18n('field_subtype'),
content: PathSubType?.replace(/^EPathSubType/, ''),
});
}

overview.push({label: i18n('field_id'), value: PathId});
overview.push({name: i18n('field_id'), content: PathId});

overview.push({label: i18n('field_version'), value: PathVersion});
overview.push({name: i18n('field_version'), content: PathVersion});

overview.push({
label: i18n('field_created'),
value: formatDateTime(CreateStep),
name: i18n('field_created'),
content: formatDateTime(CreateStep),
});

const {PathDescription} = currentObjectData;
Expand All @@ -187,18 +186,16 @@ export function ObjectSummary({

overview.push(
{
label: i18n('field_data-size'),
value: toFormattedSize(DataSize),
name: i18n('field_data-size'),
content: toFormattedSize(DataSize),
},
{
label: i18n('field_row-count'),
value: formatNumber(RowCount),
name: i18n('field_row-count'),
content: formatNumber(RowCount),
},
);
}

const title = <EntityTitle data={PathDescription} />;

const getDatabaseOverview = () => {
const {PathsInside, ShardsInside, PathsLimit, ShardsLimit} =
PathDescription?.DomainDescription ?? {};
Expand All @@ -215,51 +212,55 @@ export function ObjectSummary({

return [
{
label: i18n('field_paths'),
value: paths,
name: i18n('field_paths'),
content: paths,
},
{
label: i18n('field_shards'),
value: shards,
name: i18n('field_shards'),
content: shards,
},
];
};

const getPathTypeOverview: Record<EPathType, (() => InfoViewerItem[]) | undefined> = {
const getPathTypeOverview: Record<
EPathType,
(() => DefinitionListSingleItem[]) | undefined
> = {
[EPathType.EPathTypeInvalid]: undefined,
[EPathType.EPathTypeDir]: undefined,
[EPathType.EPathTypeTable]: () => [
{
label: i18n('field_partitions'),
value: PathDescription?.TablePartitions?.length,
name: i18n('field_partitions'),
content: PathDescription?.TablePartitions?.length,
},
],
[EPathType.EPathTypeSubDomain]: getDatabaseOverview,
[EPathType.EPathTypeTableIndex]: undefined,
[EPathType.EPathTypeExtSubDomain]: getDatabaseOverview,
[EPathType.EPathTypeColumnStore]: () => [
{
label: i18n('field_partitions'),
value: PathDescription?.ColumnStoreDescription?.ColumnShards?.length,
name: i18n('field_partitions'),
content: PathDescription?.ColumnStoreDescription?.ColumnShards?.length,
},
],
[EPathType.EPathTypeColumnTable]: () => [
{
label: i18n('field_partitions'),
value: PathDescription?.ColumnTableDescription?.Sharding?.ColumnShards?.length,
name: i18n('field_partitions'),
content:
PathDescription?.ColumnTableDescription?.Sharding?.ColumnShards?.length,
},
],
[EPathType.EPathTypeCdcStream]: () => {
const {Mode, Format} = PathDescription?.CdcStreamDescription || {};

return [
{
label: i18n('field_mode'),
value: Mode?.replace(/^ECdcStreamMode/, ''),
name: i18n('field_mode'),
content: Mode?.replace(/^ECdcStreamMode/, ''),
},
{
label: i18n('field_format'),
value: Format?.replace(/^ECdcStreamFormat/, ''),
name: i18n('field_format'),
content: Format?.replace(/^ECdcStreamFormat/, ''),
},
];
},
Expand All @@ -269,12 +270,12 @@ export function ObjectSummary({

return [
{
label: i18n('field_partitions'),
value: pqGroup?.Partitions?.length,
name: i18n('field_partitions'),
content: pqGroup?.Partitions?.length,
},
{
label: i18n('field_retention'),
value: value && formatSecondsToHours(value),
name: i18n('field_retention'),
content: value && formatSecondsToHours(value),
},
];
},
Expand All @@ -290,10 +291,10 @@ export function ObjectSummary({
const dataSourceName = DataSourcePath?.match(/([^/]*)\/*$/)?.[1] || '';

return [
{label: i18n('field_source-type'), value: SourceType},
{name: i18n('field_source-type'), content: SourceType},
{
label: i18n('field_data-source'),
value: DataSourcePath && (
name: i18n('field_data-source'),
content: DataSourcePath && (
<span title={DataSourcePath}>
<LinkWithIcon title={dataSourceName || ''} url={pathToDataSource} />
</span>
Expand All @@ -303,8 +304,8 @@ export function ObjectSummary({
},
[EPathType.EPathTypeExternalDataSource]: () => [
{
label: i18n('field_source-type'),
value: PathDescription?.ExternalDataSourceDescription?.SourceType,
name: i18n('field_source-type'),
content: PathDescription?.ExternalDataSourceDescription?.SourceType,
},
],
[EPathType.EPathTypeView]: undefined,
Expand All @@ -317,8 +318,8 @@ export function ObjectSummary({

return [
{
label: i18n('field_state'),
value: <AsyncReplicationState state={state} />,
name: i18n('field_state'),
content: <AsyncReplicationState state={state} />,
},
];
},
Expand All @@ -329,7 +330,21 @@ export function ObjectSummary({

// filter all empty values in according this requirement
// https://github.com/ydb-platform/ydb-embedded-ui/issues/906
return <InfoViewer title={title} info={overview.filter((i) => i.value)} />;
const listItems = overview
.filter((i) => i.content)
.map((el) => ({
...el,
content: <div className={b('overview-item-content')}>{el.content}</div>,
multilineName: true,
}));
return (
<React.Fragment>
<div className={b('overview-title')}>
<EntityTitle data={PathDescription} />
</div>
<DefinitionList items={listItems} responsive nameMaxWidth={150} />
</React.Fragment>
);
};

const renderTabContent = () => {
Expand Down
Loading