Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
12 changes: 9 additions & 3 deletions src/containers/Tenant/Diagnostics/Describe/Describe.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import {shallowEqual} from 'react-redux';

import {ResponseError} from '../../../../components/Errors/ResponseError';
import {Loader} from '../../../../components/Loader';
import {describeApi} from '../../../../store/reducers/describe';
import {
overviewApi,
selectPreparedPathOverview,
} from '../../../../store/reducers/overview/overview';
import {selectSchemaMergedChildrenPaths} from '../../../../store/reducers/schema/schema';
import type {EPathType} from '../../../../types/api/schema';
import {cn} from '../../../../utils/cn';
Expand Down Expand Up @@ -41,14 +44,17 @@ const Describe = ({path, database, type}: IDescribeProps) => {
} else if (mergedChildrenPaths) {
paths = [path, ...mergedChildrenPaths];
}
const {currentData, isFetching, error} = describeApi.useGetDescribeQuery(
const {currentData, isFetching, error} = overviewApi.useGetOverviewQuery(
paths.length ? {paths, database} : skipToken,
{
pollingInterval: autoRefreshInterval,
},
);
const loading = isFetching && currentData === undefined;
const currentDescribe = currentData;

const data = useTypedSelector((state) => selectPreparedPathOverview(state, paths, database));

const currentDescribe = data;

let preparedDescribeData: Object | undefined;
if (currentDescribe) {
Expand Down
18 changes: 13 additions & 5 deletions src/containers/Tenant/Diagnostics/HotKeys/HotKeys.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import {Button, Card, Icon} from '@gravity-ui/uikit';
import {ResponseError} from '../../../../components/Errors/ResponseError';
import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/ResizeableDataTable';
import {hotKeysApi} from '../../../../store/reducers/hotKeys/hotKeys';
import {useGetSchemaQuery} from '../../../../store/reducers/schema/schema';
import {overviewApi} from '../../../../store/reducers/overview/overview';
import type {HotKey} from '../../../../types/api/hotkeys';
import {cn} from '../../../../utils/cn';
import {DEFAULT_TABLE_SETTINGS, IS_HOTKEYS_HELP_HIDDEN_KEY} from '../../../../utils/constants';
import {useSetting} from '../../../../utils/hooks';
import {useAutoRefreshInterval, useSetting} from '../../../../utils/hooks';

import i18n from './i18n';

Expand Down Expand Up @@ -61,9 +61,17 @@ interface HotKeysProps {
export function HotKeys({path, database}: HotKeysProps) {
const {currentData: data, isFetching, error} = hotKeysApi.useGetHotKeysQuery({path, database});
const loading = isFetching && data === undefined;

const {data: schemaData, isLoading: schemaLoading} = useGetSchemaQuery({path, database});

const [autoRefreshInterval] = useAutoRefreshInterval();
const {currentData, isLoading: schemaLoading} = overviewApi.useGetOverviewQuery(
{
paths: [path],
database,
},
{
pollingInterval: autoRefreshInterval,
},
);
const {data: schemaData} = currentData ?? {};
const keyColumnsIds = schemaData?.PathDescription?.Table?.KeyColumnNames;

const tableColumns = React.useMemo(() => {
Expand Down
8 changes: 1 addition & 7 deletions src/containers/Tenant/Diagnostics/Overview/Overview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ import {ResponseError} from '../../../../components/Errors/ResponseError';
import {TableIndexInfo} from '../../../../components/InfoViewer/schemaInfo';
import {Loader} from '../../../../components/Loader';
import {overviewApi} from '../../../../store/reducers/overview/overview';
import {
selectSchemaMergedChildrenPaths,
useGetSchemaQuery,
} from '../../../../store/reducers/schema/schema';
import {selectSchemaMergedChildrenPaths} from '../../../../store/reducers/schema/schema';
import {EPathType} from '../../../../types/api/schema';
import {useAutoRefreshInterval, useTypedSelector} from '../../../../utils/hooks';
import {ExternalDataSourceInfo} from '../../Info/ExternalDataSource/ExternalDataSource';
Expand Down Expand Up @@ -57,8 +54,6 @@ function Overview({type, path, database}: OverviewProps) {
const overviewLoading = isFetching && currentData === undefined;
const {data: rawData, additionalData} = currentData || {};

const {error: schemaError} = useGetSchemaQuery({path, database});

const entityLoading = overviewLoading;
const entityNotReady = isEntityWithMergedImpl && !mergedChildrenPaths;

Expand Down Expand Up @@ -101,7 +96,6 @@ function Overview({type, path, database}: OverviewProps) {

return (
<React.Fragment>
{schemaError ? <ResponseError error={schemaError} /> : null}
{overviewError ? <ResponseError error={overviewError} /> : null}
{overviewError && !rawData ? null : renderContent()}
</React.Fragment>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Loader} from '@gravity-ui/uikit';

import {EntityStatus} from '../../../../components/EntityStatus/EntityStatus';
import {useGetSchemaQuery} from '../../../../store/reducers/schema/schema';
import {overviewApi} from '../../../../store/reducers/overview/overview';
import {TENANT_METRICS_TABS_IDS} from '../../../../store/reducers/tenant/constants';
import {tenantApi} from '../../../../store/reducers/tenant/tenant';
import {calculateTenantMetrics} from '../../../../store/reducers/tenants/utils';
Expand Down Expand Up @@ -44,9 +44,17 @@ export function TenantOverview({
const {Name, Type, Overall} = tenant || {};

const tenantType = mapDatabaseTypeToDBName(Type);

// FIXME: remove after correct data is added to tenantInfo
const {data: tenantSchemaData} = useGetSchemaQuery({path: tenantName, database: tenantName});
const {currentData} = overviewApi.useGetOverviewQuery(
{
paths: [tenantName],
database: tenantName,
},
{
pollingInterval: autoRefreshInterval,
},
);
const {data: tenantSchemaData} = currentData ?? {};
const {Tables, Topics} =
tenantSchemaData?.PathDescription?.DomainDescription?.DiskSpaceUsage || {};

Expand Down
16 changes: 13 additions & 3 deletions src/containers/Tenant/ObjectSummary/ObjectSummary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import type {InfoViewerItem} from '../../../components/InfoViewer/InfoViewer';
import {LinkWithIcon} from '../../../components/LinkWithIcon/LinkWithIcon';
import SplitPane from '../../../components/SplitPane';
import routes, {createExternalUILink, createHref} from '../../../routes';
import {useGetSchemaQuery} from '../../../store/reducers/schema/schema';
import {overviewApi} from '../../../store/reducers/overview/overview';
import {TENANT_SUMMARY_TABS_IDS} from '../../../store/reducers/tenant/constants';
import {setSummaryTab} from '../../../store/reducers/tenant/tenant';
import {EPathSubType, EPathType} from '../../../types/api/schema';
Expand All @@ -27,7 +27,7 @@ import {
formatNumber,
formatSecondsToHours,
} from '../../../utils/dataFormatters/dataFormatters';
import {useTypedDispatch, useTypedSelector} from '../../../utils/hooks';
import {useAutoRefreshInterval, useTypedDispatch, useTypedSelector} from '../../../utils/hooks';
import {Acl} from '../Acl/Acl';
import {EntityTitle} from '../EntityTitle/EntityTitle';
import {SchemaViewer} from '../Schema/SchemaViewer/SchemaViewer';
Expand Down Expand Up @@ -77,6 +77,7 @@ export function ObjectSummary({
onExpandSummary,
isCollapsed,
}: ObjectSummaryProps) {
const [autoRefreshInterval] = useAutoRefreshInterval();
const dispatch = useTypedDispatch();
const [, setCurrentPath] = useQueryParam('schema', StringParam);
const [commonInfoVisibilityState, dispatchCommonInfoVisibilityState] = React.useReducer(
Expand All @@ -94,7 +95,16 @@ export function ObjectSummary({
ignoreQueryPrefix: true,
});

const {data: currentObjectData} = useGetSchemaQuery({path, database: tenantName});
const {currentData} = overviewApi.useGetOverviewQuery(
{
paths: [path],
database: tenantName,
},
{
pollingInterval: autoRefreshInterval,
},
);
const {data: currentObjectData} = currentData ?? {};
const currentSchemaData = currentObjectData?.PathDescription?.Self;

React.useEffect(() => {
Expand Down
16 changes: 14 additions & 2 deletions src/containers/Tenant/Schema/SchemaViewer/SchemaViewer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import {skipToken} from '@reduxjs/toolkit/query';

import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/ResizeableDataTable';
import {TableSkeleton} from '../../../../components/TableSkeleton/TableSkeleton';
import {useGetSchemaQuery} from '../../../../store/reducers/schema/schema';
import {overviewApi} from '../../../../store/reducers/overview/overview';
import {viewSchemaApi} from '../../../../store/reducers/viewSchema/viewSchema';
import type {EPathType} from '../../../../types/api/schema';
import {DEFAULT_TABLE_SETTINGS} from '../../../../utils/constants';
import {useAutoRefreshInterval} from '../../../../utils/hooks';
import {
isColumnEntityType,
isExternalTableType,
Expand Down Expand Up @@ -36,7 +37,18 @@ interface SchemaViewerProps {
}

export const SchemaViewer = ({type, path, tenantName, extended = false}: SchemaViewerProps) => {
const {data: schemaData, isLoading: loading} = useGetSchemaQuery({path, database: tenantName});
const [autoRefreshInterval] = useAutoRefreshInterval();
const {currentData, isLoading: loading} = overviewApi.useGetOverviewQuery(
{
paths: [path],
database: tenantName,
},
{
pollingInterval: autoRefreshInterval,
},
);

const {data: schemaData} = currentData ?? {};

const viewSchemaRequestParams = isViewType(type) ? {path, database: tenantName} : skipToken;

Expand Down
3 changes: 2 additions & 1 deletion src/containers/Tenant/Schema/SchemaViewer/prepareData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import type {
TTableDescription,
} from '../../../../types/api/schema';
import {EColumnCodec} from '../../../../types/api/schema';
import type {Nullable} from '../../../../utils/typecheckers';
import {isColumnEntityType, isExternalTableType, isRowTableType} from '../../utils/schema';

import type {SchemaData} from './types';
Expand Down Expand Up @@ -123,7 +124,7 @@ function prepareColumnTableSchema(data: TColumnTableDescription = {}): SchemaDat

export function prepareSchemaData(
type?: EPathType,
schema?: TEvDescribeSchemeResult,
schema?: Nullable<TEvDescribeSchemeResult>,
): SchemaData[] {
const {Table, ColumnTableDescription, ExternalTableDescription} = schema?.PathDescription || {};

Expand Down
13 changes: 10 additions & 3 deletions src/containers/Tenant/Tenant.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import {PageError, isAccessError} from '../../components/Errors/PageError/PageEr
import {LoaderWrapper} from '../../components/LoaderWrapper/LoaderWrapper';
import SplitPane from '../../components/SplitPane';
import {setHeaderBreadcrumbs} from '../../store/reducers/header/header';
import {useGetSchemaQuery} from '../../store/reducers/schema/schema';
import {overviewApi} from '../../store/reducers/overview/overview';
import type {AdditionalNodesProps, AdditionalTenantsProps} from '../../types/additionalProps';
import {cn} from '../../utils/cn';
import {DEFAULT_IS_TENANT_SUMMARY_COLLAPSED, DEFAULT_SIZE_TENANT_KEY} from '../../utils/constants';
import {useTypedDispatch} from '../../utils/hooks';
import {useAutoRefreshInterval, useTypedDispatch} from '../../utils/hooks';

import ObjectGeneral from './ObjectGeneral/ObjectGeneral';
import {ObjectSummary} from './ObjectSummary/ObjectSummary';
Expand Down Expand Up @@ -41,6 +41,7 @@ interface TenantProps {
}

export function Tenant(props: TenantProps) {
const [autoRefreshInterval] = useAutoRefreshInterval();
const [summaryVisibilityState, dispatchSummaryVisibilityAction] = React.useReducer(
paneVisibilityToggleReducerCreator(DEFAULT_IS_TENANT_SUMMARY_COLLAPSED),
undefined,
Expand Down Expand Up @@ -74,7 +75,13 @@ export function Tenant(props: TenantProps) {

const path = schema ?? tenantName;

const {data: currentItem, error, isLoading} = useGetSchemaQuery({path, database: tenantName});
const {currentData, error, isLoading} = overviewApi.useGetOverviewQuery(
{paths: [path], database: tenantName},
{
pollingInterval: autoRefreshInterval,
},
);
const {data: currentItem} = currentData ?? {};
const {PathType: currentPathType, PathSubType: currentPathSubType} =
currentItem?.PathDescription?.Self || {};

Expand Down
6 changes: 3 additions & 3 deletions src/services/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -365,9 +365,9 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
enums: true,
backup: false,
private: true,
partition_config: true,
partition_stats: true,
partitioning_info: true,
partition_config: false,
partition_stats: false,
partitioning_info: false,
subs: 1,
},
{concurrentId, requestConfig: {signal}},
Expand Down
28 changes: 0 additions & 28 deletions src/store/reducers/describe.ts

This file was deleted.

43 changes: 42 additions & 1 deletion src/store/reducers/overview/overview.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import {createSelector} from '@reduxjs/toolkit';

import type {IDescribeData} from '../../../types/store/describe';
import type {RootState} from '../../defaultStore';
import {api} from '../api';

export const overviewApi = api.injectEndpoints({
Expand All @@ -6,14 +10,51 @@ export const overviewApi = api.injectEndpoints({
queryFn: async ({paths, database}: {paths: string[]; database: string}, {signal}) => {
try {
const [data, ...additionalData] = await Promise.all(
paths.map((p) => window.api.getDescribe({path: p, database}, {signal})),
paths.map((p) =>
window.api.getDescribe(
{
path: p,
database,
},
{signal, concurrentId: 'overview'},
),
),
);
return {data: {data, additionalData}};
} catch (error) {
return {error};
}
},
keepUnusedDataFor: 0,
providesTags: ['All'],
}),
}),
});

const createGetOverviewSelector = createSelector(
(paths: string[], database: string) => ({paths, database}),
(params) => overviewApi.endpoints.getOverview.select(params),
);

const selectPathOverview = createSelector(
(state: RootState) => state,
(_state: RootState, paths: string[], database: string) =>
createGetOverviewSelector(paths, database),
(state, selectGetOverview) => selectGetOverview(state).data,
);

export const selectPreparedPathOverview = createSelector(selectPathOverview, (rawData) => {
if (!rawData) {
return undefined;
}

const mergedData = Object.values(rawData).flat();

const data = mergedData.reduce<IDescribeData>((acc, item) => {
if (item?.Path) {
acc[item.Path] = item;
}
return acc;
}, {});
return data;
});
1 change: 1 addition & 0 deletions src/store/reducers/schema/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ export const selectSchemaMergedChildrenPaths = createSelector(
);

export function useGetSchemaQuery({path, database}: {path: string; database: string}) {
console.log('IS HERE', path);
const {currentData, isFetching, error, refetch, originalArgs} = schemaApi.useGetSchemaQuery({
path,
database,
Expand Down
Loading