Skip to content

Commit 3aef421

Browse files
ValeraSValeraS
authored
feat: allow defining a list of links for cluster and database overviews (#2359)
1 parent f140002 commit 3aef421

File tree

15 files changed

+212
-183
lines changed

15 files changed

+212
-183
lines changed

‎src/components/LogsButton/LogsButton.tsx‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/components/MonitoringButton/MonitoringButton.tsx‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/components/TenantNameWrapper/TenantNameWrapper.tsx‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {DefinitionList, Flex} from '@gravity-ui/uikit';
33
import {getTenantPath} from '../../containers/Tenant/TenantPages';
44
import type {PreparedTenant} from '../../store/reducers/tenants/types';
55
import type {AdditionalTenantsProps} from '../../types/additionalProps';
6+
import {getDatabaseLinks} from '../../utils/additionalProps';
67
import {useIsUserAllowedToMakeChanges} from '../../utils/hooks/useIsUserAllowedToMakeChanges';
78
import {EntityStatus} from '../EntityStatus/EntityStatus';
89
import {LinkWithIcon} from '../LinkWithIcon/LinkWithIcon';
@@ -37,23 +38,16 @@ export function TenantNameWrapper({tenant, additionalTenantsProps}: TenantNameWr
3738
const backend = getTenantBackend(tenant, additionalTenantsProps);
3839
const isExternalLink = Boolean(backend);
3940

40-
const monitoringLink = additionalTenantsProps?.getMonitoringLink?.(tenant.Name, tenant.Type);
41-
const logsLink = additionalTenantsProps?.getLogsLink?.(tenant.Name);
41+
const links = getDatabaseLinks(additionalTenantsProps, tenant?.Name, tenant?.Type);
4242

4343
const infoPopoverContent =
44-
(monitoringLink || logsLink) && isUserAllowedToMakeChanges ? (
44+
links.length > 0 && isUserAllowedToMakeChanges ? (
4545
<DefinitionList responsive>
4646
<DefinitionList.Item name={i18n('field_links')}>
4747
<Flex gap={2} wrap="wrap">
48-
{monitoringLink && (
49-
<LinkWithIcon
50-
title={i18n('field_monitoring-link')}
51-
url={monitoringLink}
52-
/>
53-
)}
54-
{logsLink && (
55-
<LinkWithIcon title={i18n('field_logs-link')} url={logsLink} />
56-
)}
48+
{links.map(({title, url}) => (
49+
<LinkWithIcon key={title} title={title} url={url} />
50+
))}
5751
</Flex>
5852
</DefinitionList.Item>
5953
</DefinitionList>

‎src/containers/AppWithClusters/AppWithClusters.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ export function AppWithClusters({store, history, userSettings, children}: AppWit
2828
getLogsLink={uiFactory.getLogsLink}
2929
getMonitoringLink={uiFactory.getMonitoringLink}
3030
getMonitoringClusterLink={uiFactory.getMonitoringClusterLink}
31+
getDatabaseLinks={uiFactory.getDatabaseLinks}
32+
getClusterLinks={uiFactory.getClusterLinks}
3133
/>
3234
);
3335
}}
@@ -39,6 +41,7 @@ export function AppWithClusters({store, history, userSettings, children}: AppWit
3941
component={component}
4042
getLogsLink={uiFactory.getLogsLink}
4143
getMonitoringLink={uiFactory.getMonitoringLink}
44+
getDatabaseLinks={uiFactory.getDatabaseLinks}
4245
/>
4346
);
4447
}}

‎src/containers/AppWithClusters/ExtendedCluster/ExtendedCluster.tsx‎

Lines changed: 25 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
import {ClipboardButton} from '@gravity-ui/uikit';
2-
import {isNil} from 'lodash';
32

43
import {useClusterBaseInfo} from '../../../store/reducers/cluster/cluster';
5-
import type {AdditionalClusterProps, AdditionalTenantsProps} from '../../../types/additionalProps';
6-
import type {ETenantType} from '../../../types/api/tenant';
4+
import type {AdditionalClusterProps} from '../../../types/additionalProps';
5+
import type {GetClusterLinks, GetDatabaseLinks} from '../../../uiFactory/types';
76
import {cn} from '../../../utils/cn';
8-
import {USE_CLUSTER_BALANCER_AS_BACKEND_KEY} from '../../../utils/constants';
9-
import {useSetting} from '../../../utils/hooks';
107
import {useAdditionalNodesProps} from '../../../utils/hooks/useAdditionalNodesProps';
118
import type {GetLogsLink} from '../../../utils/logs';
129
import type {GetMonitoringClusterLink, GetMonitoringLink} from '../../../utils/monitoring';
13-
import {getCleanBalancerValue, prepareBackendFromBalancer} from '../../../utils/parseBalancer';
14-
import {getBackendFromBalancerAndNodeId} from '../../../utils/prepareBackend';
10+
import {getCleanBalancerValue} from '../../../utils/parseBalancer';
1511
import type {Cluster} from '../../Cluster/Cluster';
12+
import {useAdditionalTenantsProps} from '../utils/useAdditionalTenantsProps';
1613

1714
import './ExtendedCluster.scss';
1815

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

3532
interface GetAdditionalClusterProps {
36-
clusterName: string | undefined;
37-
monitoring: string | undefined;
38-
balancer: string | undefined;
3933
getMonitoringClusterLink?: GetMonitoringClusterLink;
34+
getClusterLinks?: GetClusterLinks;
4035
}
4136

42-
const getAdditionalClusterProps = ({
43-
clusterName,
44-
monitoring,
45-
balancer,
37+
const useAdditionalClusterProps = ({
4638
getMonitoringClusterLink,
39+
getClusterLinks,
4740
}: GetAdditionalClusterProps) => {
48-
const additionalClusterProps: AdditionalClusterProps = {};
41+
const clusterInfo = useClusterBaseInfo();
42+
const {name: clusterName, balancer, monitoring} = clusterInfo;
4943

44+
const additionalClusterProps: AdditionalClusterProps = {};
45+
additionalClusterProps.links = [];
5046
if (monitoring && getMonitoringClusterLink) {
5147
const clusterLink = getMonitoringClusterLink(monitoring, clusterName);
5248

5349
if (clusterLink) {
54-
additionalClusterProps.links = [{title: 'Monitoring', url: clusterLink}];
50+
additionalClusterProps.links.push({title: 'Monitoring', url: clusterLink});
5551
}
5652
}
5753

54+
if (getClusterLinks) {
55+
const clusterLinks = getClusterLinks({clusterInfo});
56+
additionalClusterProps.links.push(...clusterLinks);
57+
}
58+
5859
if (balancer) {
5960
additionalClusterProps.info = [getAdditionalBalancerInfo(balancer)];
6061
}
6162

6263
return additionalClusterProps;
6364
};
6465

65-
interface GetAdditionalTenantsProps {
66-
clusterName: string | undefined;
67-
monitoring: string | undefined;
68-
balancer: string | undefined;
69-
logging: string | undefined;
70-
useClusterBalancerAsBackend: boolean | undefined;
71-
getMonitoringLink?: GetMonitoringLink;
72-
getLogsLink?: GetLogsLink;
73-
}
74-
75-
const getAdditionalTenantsProps = ({
76-
clusterName,
77-
monitoring,
78-
balancer,
79-
logging,
80-
useClusterBalancerAsBackend,
81-
getMonitoringLink,
82-
getLogsLink,
83-
}: GetAdditionalTenantsProps) => {
84-
const additionalTenantsProps: AdditionalTenantsProps = {};
85-
86-
additionalTenantsProps.prepareTenantBackend = (nodeId) => {
87-
// Balancer value is used to create path, so it's necessary
88-
if (!balancer) {
89-
return undefined;
90-
}
91-
92-
if (useClusterBalancerAsBackend) {
93-
return prepareBackendFromBalancer(balancer);
94-
}
95-
96-
if (isNil(nodeId)) {
97-
return undefined;
98-
}
99-
100-
return getBackendFromBalancerAndNodeId(nodeId, balancer) ?? undefined;
101-
};
102-
103-
if (monitoring && getMonitoringLink) {
104-
additionalTenantsProps.getMonitoringLink = (dbName?: string, dbType?: ETenantType) => {
105-
if (dbName && dbType) {
106-
return getMonitoringLink({monitoring, dbName, dbType, clusterName});
107-
}
108-
109-
return null;
110-
};
111-
}
112-
113-
if (logging && getLogsLink) {
114-
additionalTenantsProps.getLogsLink = (dbName?: string) => {
115-
if (dbName) {
116-
return getLogsLink({
117-
dbName,
118-
logging,
119-
});
120-
}
121-
122-
return null;
123-
};
124-
}
125-
126-
return additionalTenantsProps;
127-
};
128-
12966
interface ExtendedClusterProps {
13067
component: typeof Cluster;
13168
getMonitoringLink?: GetMonitoringLink;
13269
getMonitoringClusterLink?: GetMonitoringClusterLink;
13370
getLogsLink?: GetLogsLink;
71+
getDatabaseLinks?: GetDatabaseLinks;
72+
getClusterLinks?: GetClusterLinks;
13473
}
13574
export function ExtendedCluster({
13675
component: ClusterComponent,
13776
getMonitoringLink,
13877
getMonitoringClusterLink,
13978
getLogsLink,
79+
getDatabaseLinks,
80+
getClusterLinks,
14081
}: ExtendedClusterProps) {
14182
const additionalNodesProps = useAdditionalNodesProps();
142-
const {name, balancer, monitoring, logging} = useClusterBaseInfo();
143-
144-
const [useClusterBalancerAsBackend] = useSetting<boolean>(USE_CLUSTER_BALANCER_AS_BACKEND_KEY);
14583

14684
return (
14785
<div className={b()}>
14886
<ClusterComponent
149-
additionalClusterProps={getAdditionalClusterProps({
150-
clusterName: name,
151-
monitoring,
152-
balancer,
87+
additionalClusterProps={useAdditionalClusterProps({
15388
getMonitoringClusterLink,
89+
getClusterLinks,
15490
})}
155-
additionalTenantsProps={getAdditionalTenantsProps({
156-
clusterName: name,
157-
monitoring,
158-
balancer,
159-
logging,
160-
useClusterBalancerAsBackend,
91+
additionalTenantsProps={useAdditionalTenantsProps({
16192
getMonitoringLink,
16293
getLogsLink,
94+
getDatabaseLinks,
16395
})}
16496
additionalNodesProps={additionalNodesProps}
16597
/>

‎src/containers/AppWithClusters/ExtendedTenant/ExtendedTenant.tsx‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,29 @@
1-
import {useClusterBaseInfo} from '../../../store/reducers/cluster/cluster';
2-
import type {ETenantType} from '../../../types/api/tenant';
1+
import type {GetDatabaseLinks} from '../../../uiFactory/types';
32
import {useAdditionalNodesProps} from '../../../utils/hooks/useAdditionalNodesProps';
43
import type {GetLogsLink} from '../../../utils/logs';
54
import type {GetMonitoringLink} from '../../../utils/monitoring';
65
import type {Tenant} from '../../Tenant/Tenant';
6+
import {useAdditionalTenantsProps} from '../utils/useAdditionalTenantsProps';
77

88
export interface ExtendedTenantProps {
99
component: typeof Tenant;
1010
getMonitoringLink?: GetMonitoringLink;
1111
getLogsLink?: GetLogsLink;
12+
getDatabaseLinks?: GetDatabaseLinks;
1213
}
1314

1415
export function ExtendedTenant({
1516
component: TenantComponent,
1617
getMonitoringLink,
1718
getLogsLink,
19+
getDatabaseLinks,
1820
}: ExtendedTenantProps) {
19-
const {monitoring, logging} = useClusterBaseInfo();
2021
const additionalNodesProps = useAdditionalNodesProps();
21-
22-
const additionalTenantProps = {
23-
getMonitoringLink: (dbName?: string, dbType?: ETenantType) => {
24-
if (monitoring && dbName && dbType && getMonitoringLink) {
25-
return getMonitoringLink({
26-
monitoring,
27-
dbName,
28-
dbType,
29-
});
30-
}
31-
32-
return null;
33-
},
34-
getLogsLink: (dbName?: string) => {
35-
if (logging && dbName && getLogsLink) {
36-
return getLogsLink({
37-
dbName,
38-
logging,
39-
});
40-
}
41-
42-
return null;
43-
},
44-
};
22+
const additionalTenantProps = useAdditionalTenantsProps({
23+
getMonitoringLink,
24+
getLogsLink,
25+
getDatabaseLinks,
26+
});
4527

4628
return (
4729
<TenantComponent

0 commit comments

Comments
 (0)