Skip to content

feat: resource pool – add proper icon #1982

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 5 commits into from
Feb 26, 2025
Merged

feat: resource pool – add proper icon #1982

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f725f8d
feat: resource pool – add proper icon
astandrik Feb 25, 2025
66e016f
Merge branch 'main' into astandrik.resource-pool-icon-1853
astandrik Feb 25, 2025
a06bc5a
fix: lint
astandrik Feb 25, 2025
5803af2
fix: lint
astandrik Feb 25, 2025
e7be60e
fix: schema actions
astandrik Feb 26, 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
9 changes: 5 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"use-query-params": "^2.2.1",
"uuid": "^10.0.0",
"web-vitals": "^1.1.2",
"ydb-ui-components": "^4.4.0",
"ydb-ui-components": "^4.5.0",
"zod": "^3.24.1"
},
"scripts": {
Expand Down
1 change: 1 addition & 0 deletions src/containers/Tenant/Diagnostics/DiagnosticsPages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ const pathTypeToPages: Record<EPathType, Page[] | undefined> = {
[EPathType.EPathTypeView]: VIEW_PAGES,

[EPathType.EPathTypeReplication]: ASYNC_REPLICATION_PAGES,
[EPathType.EPathTypeResourcePool]: DIR_PAGES,
};

export const getPagesByType = (type?: EPathType) => (type && pathTypeToPages[type]) || DIR_PAGES;
Expand Down
1 change: 1 addition & 0 deletions src/containers/Tenant/Diagnostics/Overview/Overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ function Overview({type, path, database}: OverviewProps) {
const pathTypeToComponent: Record<EPathType, (() => React.ReactNode) | undefined> = {
[EPathType.EPathTypeInvalid]: undefined,
[EPathType.EPathTypeDir]: undefined,
[EPathType.EPathTypeResourcePool]: undefined,
[EPathType.EPathTypeTable]: undefined,
[EPathType.EPathTypeSubDomain]: undefined,
[EPathType.EPathTypeTableIndex]: () => <TableIndexInfo data={data} />,
Expand Down
1 change: 1 addition & 0 deletions src/containers/Tenant/ObjectSummary/ObjectSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ export function ObjectSummary({
> = {
[EPathType.EPathTypeInvalid]: undefined,
[EPathType.EPathTypeDir]: undefined,
[EPathType.EPathTypeResourcePool]: undefined,
[EPathType.EPathTypeTable]: () => [
{
name: i18n('field_partitions'),
Expand Down
1 change: 1 addition & 0 deletions src/containers/Tenant/utils/controls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export const getSchemaControls =

database: undefined,
directory: undefined,
resource_pool: undefined,

table: openPreview,
column_table: openPreview,
Expand Down
7 changes: 7 additions & 0 deletions src/containers/Tenant/utils/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const pathTypeToNodeType: Record<EPathType, NavigationTreeNodeType | undefined>
[EPathType.EPathTypeView]: 'view',

[EPathType.EPathTypeReplication]: 'async_replication',
[EPathType.EPathTypeResourcePool]: 'resource_pool',
};

export const nodeTableTypeToPathType: Partial<Record<NavigationTreeNodeType, EPathType>> = {
Expand Down Expand Up @@ -86,6 +87,7 @@ const pathTypeToEntityName: Record<EPathType, string | undefined> = {
[EPathType.EPathTypeView]: 'View',

[EPathType.EPathTypeReplication]: 'Async Replication',
[EPathType.EPathTypeResourcePool]: 'Resource Pool',
};

export const mapPathTypeToEntityName = (
Expand Down Expand Up @@ -126,6 +128,7 @@ const pathTypeToIsTable: Record<EPathType, boolean> = {
[EPathType.EPathTypePersQueueGroup]: false,
[EPathType.EPathTypeExternalDataSource]: false,
[EPathType.EPathTypeReplication]: false,
[EPathType.EPathTypeResourcePool]: false,
};

//if add entity with tableType, make sure that Schema is available in Diagnostics section
Expand Down Expand Up @@ -166,6 +169,7 @@ const pathTypeToIsColumn: Record<EPathType, boolean> = {
[EPathType.EPathTypeView]: false,

[EPathType.EPathTypeReplication]: false,
[EPathType.EPathTypeResourcePool]: false,
};

export const isColumnEntityType = (type?: EPathType) => (type && pathTypeToIsColumn[type]) ?? false;
Expand All @@ -191,6 +195,7 @@ const pathTypeToIsDatabase: Record<EPathType, boolean> = {
[EPathType.EPathTypeView]: false,

[EPathType.EPathTypeReplication]: false,
[EPathType.EPathTypeResourcePool]: false,
};

export const isDatabaseEntityType = (type?: EPathType) =>
Expand Down Expand Up @@ -221,6 +226,7 @@ const pathTypeToEntityWithMergedImplementation: Record<EPathType, boolean> = {
[EPathType.EPathTypeView]: false,

[EPathType.EPathTypeReplication]: false,
[EPathType.EPathTypeResourcePool]: false,
};

export const isEntityWithMergedImplementation = (type?: EPathType) =>
Expand All @@ -244,6 +250,7 @@ const pathTypeToChildless: Record<EPathType, boolean> = {
[EPathType.EPathTypeExternalTable]: true,

[EPathType.EPathTypeView]: true,
[EPathType.EPathTypeResourcePool]: true,

[EPathType.EPathTypeReplication]: true,

Expand Down
1 change: 1 addition & 0 deletions src/containers/Tenant/utils/schemaActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ export const getActions =
database: DB_SET,

directory: DIR_SET,
resource_pool: DIR_SET,
Copy link
Member

@artemmufazalov artemmufazalov Feb 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

This includes create table / topic / dir / topic options, I doubt that resource pool has all of it (you set it as childless). Probably, only copy option should be here

Copy link
Member

@artemmufazalov artemmufazalov Feb 26, 2025

Choose a reason for hiding this comment

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

Maybe it should be similar to index table index_table: JUST_COPY,


table: ROW_TABLE_SET,
column_table: COLUMN_TABLE_SET,
Expand Down
1 change: 1 addition & 0 deletions src/types/api/schema/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ export enum EPathType {
EPathTypeView = 'EPathTypeView',

EPathTypeReplication = 'EPathTypeReplication',
EPathTypeResourcePool = 'EPathTypeResourcePool',
}

export enum EPathSubType {
Expand Down
Loading