Skip to content
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

fix(ObjectSummary): do not display CreateTime if CreateStep is 0 #2018

Merged
merged 2 commits into from
Mar 19, 2025
Merged

fix(ObjectSummary): do not display CreateTime if CreateStep is 0 #2018

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
549e848
fix(ObjectSummary): do not display CreateTime if CreateStep is 0
artemmufazalov Mar 17, 2025
b14219c
fix: prevent 1970 in formatDateTime
artemmufazalov Mar 19, 2025
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
3 changes: 2 additions & 1 deletion src/components/InfoViewer/formatters/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import type {TDirEntry} from '../../../types/api/schema';
import {EMPTY_DATA_PLACEHOLDER} from '../../../utils/constants';
import {formatDateTime} from '../../../utils/dataFormatters/dataFormatters';
import i18n from '../i18n';
import {createInfoFormatter} from '../utils';

export const formatCommonItem = createInfoFormatter<TDirEntry>({
values: {
PathType: (value) => value?.substring('EPathType'.length),
CreateStep: formatDateTime,
CreateStep: (value) => (Number(value) ? formatDateTime(value) : EMPTY_DATA_PLACEHOLDER),
Copy link
Collaborator

Choose a reason for hiding this comment

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

maybe it would be better to handle zero values in formatDateTime and to pass EMPTY_DATA_PLACEHOLDER as defaultValue ?

Can't imagine anyone would need 1970-01-01 03:00 value (that is returned for formatDateTime(0)) anywhere accross the project

},
labels: {
PathType: i18n('common.type'),
Expand Down
14 changes: 9 additions & 5 deletions src/containers/Tenant/Diagnostics/Overview/ChangefeedInfo/ChangefeedInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,21 @@ const prepareChangefeedInfo = (

const {Mode, Format} = streamDescription || {};

const created = formatCommonItem(
'CreateStep',
changefeedData?.PathDescription?.Self?.CreateStep,
);
const changefeedInfo = formatObject(formatCdcStreamItem, {
Mode,
Format,
});
const topicInfo = prepareTopicSchemaInfo(topicData);

return [created, ...changefeedInfo, ...topicInfo];
const info = [...changefeedInfo, ...topicInfo];

const createStep = changefeedData?.PathDescription?.Self?.CreateStep;

if (Number(createStep)) {
info.unshift(formatCommonItem('CreateStep', createStep));
}

return info;
};

interface ChangefeedProps {
Expand Down
13 changes: 10 additions & 3 deletions src/containers/Tenant/Info/ExternalDataSource/ExternalDataSource.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,21 @@ import './ExternalDataSource.scss';

const b = cn('ydb-external-data-source-info');

const prepareExternalDataSourceSummary = (data: TEvDescribeSchemeResult): InfoViewerItem[] => {
return [
const prepareExternalDataSourceSummary = (data: TEvDescribeSchemeResult) => {
const info: InfoViewerItem[] = [
{
label: i18n('external-objects.source-type'),
value: data.PathDescription?.ExternalDataSourceDescription?.SourceType,
},
formatCommonItem('CreateStep', data.PathDescription?.Self?.CreateStep),
];

const createStep = data.PathDescription?.Self?.CreateStep;

if (Number(createStep)) {
info.push(formatCommonItem('CreateStep', data.PathDescription?.Self?.CreateStep));
}

return info;
};

const prepareExternalDataSourceInfo = (data: TEvDescribeSchemeResult): InfoViewerItem[] => {
Expand Down
31 changes: 17 additions & 14 deletions src/containers/Tenant/Info/ExternalTable/ExternalTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,30 @@ import './ExternalTable.scss';

const b = cn('ydb-external-table-info');

const prepareExternalTableSummary = (
data: TEvDescribeSchemeResult,
pathToDataSource: string,
): InfoViewerItem[] => {
const prepareExternalTableSummary = (data: TEvDescribeSchemeResult, pathToDataSource: string) => {
const {CreateStep} = data.PathDescription?.Self || {};
const {SourceType, DataSourcePath} = data.PathDescription?.ExternalTableDescription || {};

const dataSourceName = DataSourcePath?.split('/').pop();

return [
const info: InfoViewerItem[] = [
{label: i18n('external-objects.source-type'), value: SourceType},
formatCommonItem('CreateStep', CreateStep),
{
label: i18n('external-objects.data-source'),
value: DataSourcePath && (
<span title={DataSourcePath}>
<LinkWithIcon title={dataSourceName || ''} url={pathToDataSource} />
</span>
),
},
];

if (Number(CreateStep)) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Mb it would be more consistent to display EMPTY_DATA_PLACEHOLDER (via date formatter and defaultValue) everywhere?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think so. Normally, we have 0 CreateStep for certain list of entities - Domain, databases, system tables. So in your case there will be always placeholder there. I added placeholder in formatCommonItem just as fallback, but you are right - it's better to check correctness inside formatDateTime

info.push(formatCommonItem('CreateStep', CreateStep));
}

info.push({
label: i18n('external-objects.data-source'),
value: DataSourcePath && (
<span title={DataSourcePath}>
<LinkWithIcon title={dataSourceName || ''} url={pathToDataSource} />
</span>
),
});

return info;
};

const prepareExternalTableInfo = (
Expand Down
10 changes: 6 additions & 4 deletions src/containers/Tenant/ObjectSummary/ObjectSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,12 @@ export function ObjectSummary({

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

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

const {PathDescription} = currentObjectData;

Expand Down
Loading