Skip to content

Commit f9d2876

Browse files
committed
Update merged file
1 parent c9f8da9 commit f9d2876

File tree

1 file changed

+26
-36
lines changed

1 file changed

+26
-36
lines changed

plugins/kiali/src/components/DetailDescription/DetailDescription.tsx

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as React from 'react';
2+
import { Link } from 'react-router-dom';
23

34
import { Tooltip } from '@material-ui/core';
45

@@ -16,7 +17,6 @@ import { JanusObjectLink } from '../../utils/janusLinks';
1617
import { renderTrafficStatus } from '../Health/HealthDetails';
1718
import { MissingSidecar } from '../MissingSidecar/MissingSidecar';
1819
import { PFBadge, PFBadges } from '../Pf/PfBadges';
19-
import {Link} from "react-router-dom";
2020

2121
type Props = {
2222
entity?: boolean;
@@ -77,7 +77,6 @@ export const DetailDescription: React.FC<Props> = (props: Props) => {
7777
namespace: string,
7878
appName: string,
7979
): React.ReactNode => {
80-
8180
let link: React.ReactNode;
8281

8382
link = (
@@ -103,8 +102,7 @@ export const DetailDescription: React.FC<Props> = (props: Props) => {
103102
if (props.view === DRAWER) {
104103
href = `#application/${namespace}_${appName}`;
105104

106-
107-
link = <Link to={href}>{appName}</Link>;
105+
link = <Link to={href}>{appName}</Link>;
108106
}
109107

110108
return (
@@ -122,10 +120,9 @@ export const DetailDescription: React.FC<Props> = (props: Props) => {
122120
namespace: string,
123121
serviceName: string,
124122
): React.ReactNode => {
123+
let link: React.ReactNode;
125124

126-
let link: React.ReactNode;
127-
128-
link = (
125+
link = (
129126
<JanusObjectLink
130127
entity={props.entity}
131128
namespace={namespace}
@@ -139,19 +136,17 @@ export const DetailDescription: React.FC<Props> = (props: Props) => {
139136
</JanusObjectLink>
140137
);
141138

142-
143139
if (props.view === DRAWER) {
144-
let href = `/namespaces/${namespace}/services/${serviceName}`;
140+
let href = `/namespaces/${namespace}/services/${serviceName}`;
145141

146-
if (props.cluster && isMultiCluster) {
147-
href = `${href}?clusterName=${props.cluster}`;
148-
}
142+
if (props.cluster && isMultiCluster) {
143+
href = `${href}?clusterName=${props.cluster}`;
144+
}
149145

150-
href = `#service/${namespace}_${serviceName}`;
151-
link = <Link to={href}>{serviceName}</Link>;
146+
href = `#service/${namespace}_${serviceName}`;
147+
link = <Link to={href}>{serviceName}</Link>;
152148
}
153149

154-
155150
return (
156151
<li key={`Service_${serviceName}`} className={itemStyle}>
157152
<div className={iconStyle}>
@@ -219,9 +214,9 @@ export const DetailDescription: React.FC<Props> = (props: Props) => {
219214
};
220215

221216
const renderWorkloadItem = (workload: AppWorkload): React.ReactNode => {
222-
let link: React.ReactNode;
217+
let link: React.ReactNode;
223218

224-
link = (
219+
link = (
225220
<JanusObjectLink
226221
entity={props.entity}
227222
namespace={props.namespace}
@@ -235,17 +230,15 @@ let link: React.ReactNode;
235230
</JanusObjectLink>
236231
);
237232

238-
if (props.view === DRAWER) {
239-
240-
let href = `/namespaces/${props.namespace}/workloads/${workload.workloadName}`;
241-
242-
if (props.cluster && isMultiCluster) {
243-
href = `${href}?clusterName=${props.cluster}`;
244-
}
233+
if (props.view === DRAWER) {
234+
let href = `/namespaces/${props.namespace}/workloads/${workload.workloadName}`;
245235

236+
if (props.cluster && isMultiCluster) {
237+
href = `${href}?clusterName=${props.cluster}`;
238+
}
246239

247240
href = `#workload/${props.namespace}_${workload.workloadName}`;
248-
link = <Link to={href}>{workload.workloadName}</Link>;
241+
link = <Link to={href}>{workload.workloadName}</Link>;
249242
}
250243

251244
return (
@@ -288,9 +281,8 @@ let link: React.ReactNode;
288281
}
289282

290283
if (workload) {
291-
292-
let link: React.ReactNode;
293-
link = (
284+
let link: React.ReactNode;
285+
link = (
294286
<JanusObjectLink
295287
entity={props.entity}
296288
namespace={props.namespace}
@@ -306,19 +298,17 @@ let link: React.ReactNode;
306298
</JanusObjectLink>
307299
);
308300

309-
if (props.view === DRAWER) {
310-
let href = `/namespaces/${props.namespace}/workloads/${workload.workloadName}`;
311-
312-
if (props.cluster && isMultiCluster) {
313-
href = `${href}?clusterName=${props.cluster}`;
314-
}
301+
if (props.view === DRAWER) {
302+
let href = `/namespaces/${props.namespace}/workloads/${workload.workloadName}`;
315303

304+
if (props.cluster && isMultiCluster) {
305+
href = `${href}?clusterName=${props.cluster}`;
306+
}
316307

317308
href = `#workload/${props.namespace}_${workload.workloadName}`;
318-
link = <Link to={href}>{workload.workloadName}</Link>;
309+
link = <Link to={href}>{workload.workloadName}</Link>;
319310
}
320311

321-
322312
return (
323313
<span key={`WorkloadItem_${workload.workloadName}`}>
324314
<div className={iconStyle}>

0 commit comments

Comments
 (0)