Merge branch 'main' into astandrik.1984

Author: astandrik

src/components/InfoViewer/formatters/common.ts

@@ -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) => formatDateTime(value, {defaultValue: EMPTY_DATA_PLACEHOLDER}),
     },
     labels: {
         PathType: i18n('common.type'),

src/containers/Tenant/Diagnostics/Overview/ChangefeedInfo/ChangefeedInfo.tsx

@@ -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 {

src/containers/Tenant/Info/ExternalDataSource/ExternalDataSource.tsx

@@ -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[] => {

src/containers/Tenant/Info/ExternalTable/ExternalTable.tsx

@@ -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)) {
+        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 = (

src/containers/Tenant/ObjectSummary/ObjectSummary.tsx

@@ -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;
 

src/containers/Tenant/Schema/SchemaViewer/SchemaViewer.tsx

@@ -1,7 +1,5 @@
 import React from 'react';
 
-import {skipToken} from '@reduxjs/toolkit/query';
-
 import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/ResizeableDataTable';
 import {TableSkeleton} from '../../../../components/TableSkeleton/TableSkeleton';
 import {overviewApi} from '../../../../store/reducers/overview/overview';
@@ -42,23 +40,28 @@ export const SchemaViewer = ({type, path, tenantName, extended = false}: SchemaV
     // Refresh table only in Diagnostics
     const pollingInterval = extended ? autoRefreshInterval : undefined;
 
-    const {currentData: schemaData, isLoading: loading} = overviewApi.useGetOverviewQuery(
-        {path, database: tenantName},
-        {pollingInterval},
-    );
-
-    const viewSchemaRequestParams = isViewType(type) ? {path, database: tenantName} : skipToken;
-
-    const {data: viewColumnsData, isLoading: isViewSchemaLoading} =
-        viewSchemaApi.useGetViewSchemaQuery(viewSchemaRequestParams, {pollingInterval});
+    const {currentData: tableSchemaData, isFetching: isTableSchemaFetching} =
+        overviewApi.useGetOverviewQuery(
+            {path, database: tenantName},
+            {pollingInterval, skip: isViewType(type)},
+        );
+    const {currentData: viewColumnsData, isFetching: isViewSchemaFetching} =
+        viewSchemaApi.useGetViewSchemaQuery(
+            {path, database: tenantName},
+            {pollingInterval, skip: !isViewType(type)},
+        );
+
+    const loading =
+        (isViewSchemaFetching && viewColumnsData === undefined) ||
+        (isTableSchemaFetching && tableSchemaData === undefined);
 
     const tableData = React.useMemo(() => {
         if (isViewType(type)) {
             return prepareViewSchema(viewColumnsData);
         }
 
-        return prepareSchemaData(type, schemaData);
-    }, [schemaData, type, viewColumnsData]);
+        return prepareSchemaData(type, tableSchemaData);
+    }, [tableSchemaData, type, viewColumnsData]);
 
     const hasAutoIncrement = React.useMemo(() => {
         return tableData.some((i) => i.autoIncrement);
@@ -85,7 +88,7 @@ export const SchemaViewer = ({type, path, tenantName, extended = false}: SchemaV
         return [];
     }, [type, extended, hasAutoIncrement, hasDefaultValue, tableData]);
 
-    if (loading || isViewSchemaLoading) {
+    if (loading) {
         return <TableSkeleton />;
     }
 

src/utils/dataFormatters/dataFormatters.ts

@@ -215,6 +215,11 @@ export const formatDateTime = (
     value?: number | string,
     {withTimeZone, defaultValue = ''}: {withTimeZone?: boolean; defaultValue?: string} = {},
 ) => {
+    // prevent 1970-01-01 03:00
+    if (!Number(value)) {
+        return defaultValue;
+    }
+
     const tz = withTimeZone ? ' z' : '';
     const formattedData = dateTimeParse(Number(value))?.format(`YYYY-MM-DD HH:mm${tz}`);