Skip to content

feat: allow defining a list of links for cluster and database overviews #2359

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.

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 1 commit into from
Jun 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
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
17 changes: 0 additions & 17 deletions src/components/LogsButton/LogsButton.tsx

This file was deleted.

24 changes: 0 additions & 24 deletions src/components/MonitoringButton/MonitoringButton.tsx

This file was deleted.

18 changes: 6 additions & 12 deletions src/components/TenantNameWrapper/TenantNameWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {DefinitionList, Flex} from '@gravity-ui/uikit';
import {getTenantPath} from '../../containers/Tenant/TenantPages';
import type {PreparedTenant} from '../../store/reducers/tenants/types';
import type {AdditionalTenantsProps} from '../../types/additionalProps';
import {getDatabaseLinks} from '../../utils/additionalProps';
import {useIsUserAllowedToMakeChanges} from '../../utils/hooks/useIsUserAllowedToMakeChanges';
import {EntityStatus} from '../EntityStatus/EntityStatus';
import {LinkWithIcon} from '../LinkWithIcon/LinkWithIcon';
Expand Down Expand Up @@ -37,23 +38,16 @@ export function TenantNameWrapper({tenant, additionalTenantsProps}: TenantNameWr
const backend = getTenantBackend(tenant, additionalTenantsProps);
const isExternalLink = Boolean(backend);

const monitoringLink = additionalTenantsProps?.getMonitoringLink?.(tenant.Name, tenant.Type);
const logsLink = additionalTenantsProps?.getLogsLink?.(tenant.Name);
const links = getDatabaseLinks(additionalTenantsProps, tenant?.Name, tenant?.Type);

const infoPopoverContent =
(monitoringLink || logsLink) && isUserAllowedToMakeChanges ? (
links.length > 0 && isUserAllowedToMakeChanges ? (
<DefinitionList responsive>
<DefinitionList.Item name={i18n('field_links')}>
<Flex gap={2} wrap="wrap">
{monitoringLink && (
<LinkWithIcon
title={i18n('field_monitoring-link')}
url={monitoringLink}
/>
)}
{logsLink && (
<LinkWithIcon title={i18n('field_logs-link')} url={logsLink} />
)}
{links.map(({title, url}) => (
<LinkWithIcon key={title} title={title} url={url} />
))}
</Flex>
</DefinitionList.Item>
</DefinitionList>
Expand Down
3 changes: 3 additions & 0 deletions src/containers/AppWithClusters/AppWithClusters.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ export function AppWithClusters({store, history, userSettings, children}: AppWit
getLogsLink={uiFactory.getLogsLink}
getMonitoringLink={uiFactory.getMonitoringLink}
getMonitoringClusterLink={uiFactory.getMonitoringClusterLink}
getDatabaseLinks={uiFactory.getDatabaseLinks}
getClusterLinks={uiFactory.getClusterLinks}
/>
);
}}
Expand All @@ -39,6 +41,7 @@ export function AppWithClusters({store, history, userSettings, children}: AppWit
component={component}
getLogsLink={uiFactory.getLogsLink}
getMonitoringLink={uiFactory.getMonitoringLink}
getDatabaseLinks={uiFactory.getDatabaseLinks}
/>
);
}}
Expand Down
118 changes: 25 additions & 93 deletions src/containers/AppWithClusters/ExtendedCluster/ExtendedCluster.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
import {ClipboardButton} from '@gravity-ui/uikit';
import {isNil} from 'lodash';

import {useClusterBaseInfo} from '../../../store/reducers/cluster/cluster';
import type {AdditionalClusterProps, AdditionalTenantsProps} from '../../../types/additionalProps';
import type {ETenantType} from '../../../types/api/tenant';
import type {AdditionalClusterProps} from '../../../types/additionalProps';
import type {GetClusterLinks, GetDatabaseLinks} from '../../../uiFactory/types';
import {cn} from '../../../utils/cn';
import {USE_CLUSTER_BALANCER_AS_BACKEND_KEY} from '../../../utils/constants';
import {useSetting} from '../../../utils/hooks';
import {useAdditionalNodesProps} from '../../../utils/hooks/useAdditionalNodesProps';
import type {GetLogsLink} from '../../../utils/logs';
import type {GetMonitoringClusterLink, GetMonitoringLink} from '../../../utils/monitoring';
import {getCleanBalancerValue, prepareBackendFromBalancer} from '../../../utils/parseBalancer';
import {getBackendFromBalancerAndNodeId} from '../../../utils/prepareBackend';
import {getCleanBalancerValue} from '../../../utils/parseBalancer';
import type {Cluster} from '../../Cluster/Cluster';
import {useAdditionalTenantsProps} from '../utils/useAdditionalTenantsProps';

import './ExtendedCluster.scss';

Expand All @@ -33,133 +30,68 @@ const getAdditionalBalancerInfo = (balancer: string) => {
};

interface GetAdditionalClusterProps {
clusterName: string | undefined;
monitoring: string | undefined;
balancer: string | undefined;
getMonitoringClusterLink?: GetMonitoringClusterLink;
getClusterLinks?: GetClusterLinks;
}

const getAdditionalClusterProps = ({
clusterName,
monitoring,
balancer,
const useAdditionalClusterProps = ({
getMonitoringClusterLink,
getClusterLinks,
}: GetAdditionalClusterProps) => {
const additionalClusterProps: AdditionalClusterProps = {};
const clusterInfo = useClusterBaseInfo();
const {name: clusterName, balancer, monitoring} = clusterInfo;

const additionalClusterProps: AdditionalClusterProps = {};
additionalClusterProps.links = [];
if (monitoring && getMonitoringClusterLink) {
const clusterLink = getMonitoringClusterLink(monitoring, clusterName);

if (clusterLink) {
additionalClusterProps.links = [{title: 'Monitoring', url: clusterLink}];
additionalClusterProps.links.push({title: 'Monitoring', url: clusterLink});
}
}

if (getClusterLinks) {
const clusterLinks = getClusterLinks({clusterInfo});
additionalClusterProps.links.push(...clusterLinks);
}

if (balancer) {
additionalClusterProps.info = [getAdditionalBalancerInfo(balancer)];
}

return additionalClusterProps;
};

interface GetAdditionalTenantsProps {
clusterName: string | undefined;
monitoring: string | undefined;
balancer: string | undefined;
logging: string | undefined;
useClusterBalancerAsBackend: boolean | undefined;
getMonitoringLink?: GetMonitoringLink;
getLogsLink?: GetLogsLink;
}

const getAdditionalTenantsProps = ({
clusterName,
monitoring,
balancer,
logging,
useClusterBalancerAsBackend,
getMonitoringLink,
getLogsLink,
}: GetAdditionalTenantsProps) => {
const additionalTenantsProps: AdditionalTenantsProps = {};

additionalTenantsProps.prepareTenantBackend = (nodeId) => {
// Balancer value is used to create path, so it's necessary
if (!balancer) {
return undefined;
}

if (useClusterBalancerAsBackend) {
return prepareBackendFromBalancer(balancer);
}

if (isNil(nodeId)) {
return undefined;
}

return getBackendFromBalancerAndNodeId(nodeId, balancer) ?? undefined;
};

if (monitoring && getMonitoringLink) {
additionalTenantsProps.getMonitoringLink = (dbName?: string, dbType?: ETenantType) => {
if (dbName && dbType) {
return getMonitoringLink({monitoring, dbName, dbType, clusterName});
}

return null;
};
}

if (logging && getLogsLink) {
additionalTenantsProps.getLogsLink = (dbName?: string) => {
if (dbName) {
return getLogsLink({
dbName,
logging,
});
}

return null;
};
}

return additionalTenantsProps;
};

interface ExtendedClusterProps {
component: typeof Cluster;
getMonitoringLink?: GetMonitoringLink;
getMonitoringClusterLink?: GetMonitoringClusterLink;
getLogsLink?: GetLogsLink;
getDatabaseLinks?: GetDatabaseLinks;
getClusterLinks?: GetClusterLinks;
}
export function ExtendedCluster({
component: ClusterComponent,
getMonitoringLink,
getMonitoringClusterLink,
getLogsLink,
getDatabaseLinks,
getClusterLinks,
}: ExtendedClusterProps) {
const additionalNodesProps = useAdditionalNodesProps();
const {name, balancer, monitoring, logging} = useClusterBaseInfo();

const [useClusterBalancerAsBackend] = useSetting<boolean>(USE_CLUSTER_BALANCER_AS_BACKEND_KEY);

return (
<div className={b()}>
<ClusterComponent
additionalClusterProps={getAdditionalClusterProps({
clusterName: name,
monitoring,
balancer,
additionalClusterProps={useAdditionalClusterProps({
getMonitoringClusterLink,
getClusterLinks,
})}
additionalTenantsProps={getAdditionalTenantsProps({
clusterName: name,
monitoring,
balancer,
logging,
useClusterBalancerAsBackend,
additionalTenantsProps={useAdditionalTenantsProps({
getMonitoringLink,
getLogsLink,
getDatabaseLinks,
})}
additionalNodesProps={additionalNodesProps}
/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,47 +1,29 @@
import {useClusterBaseInfo} from '../../../store/reducers/cluster/cluster';
import type {ETenantType} from '../../../types/api/tenant';
import type {GetDatabaseLinks} from '../../../uiFactory/types';
import {useAdditionalNodesProps} from '../../../utils/hooks/useAdditionalNodesProps';
import type {GetLogsLink} from '../../../utils/logs';
import type {GetMonitoringLink} from '../../../utils/monitoring';
import type {Tenant} from '../../Tenant/Tenant';
import {useAdditionalTenantsProps} from '../utils/useAdditionalTenantsProps';

export interface ExtendedTenantProps {
component: typeof Tenant;
getMonitoringLink?: GetMonitoringLink;
getLogsLink?: GetLogsLink;
getDatabaseLinks?: GetDatabaseLinks;
}

export function ExtendedTenant({
component: TenantComponent,
getMonitoringLink,
getLogsLink,
getDatabaseLinks,
}: ExtendedTenantProps) {
const {monitoring, logging} = useClusterBaseInfo();
const additionalNodesProps = useAdditionalNodesProps();

const additionalTenantProps = {
getMonitoringLink: (dbName?: string, dbType?: ETenantType) => {
if (monitoring && dbName && dbType && getMonitoringLink) {
return getMonitoringLink({
monitoring,
dbName,
dbType,
});
}

return null;
},
getLogsLink: (dbName?: string) => {
if (logging && dbName && getLogsLink) {
return getLogsLink({
dbName,
logging,
});
}

return null;
},
};
const additionalTenantProps = useAdditionalTenantsProps({
getMonitoringLink,
getLogsLink,
getDatabaseLinks,
});

return (
<TenantComponent
Expand Down
Loading
Loading