Skip to content

Commit 487adcb

Browse files
committed
feat: support additional values
1 parent 59d6287 commit 487adcb

File tree

1 file changed

+8
-24
lines changed

1 file changed

+8
-24
lines changed

src/components/AggregationPanel/AggregationPanelComponents.js

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,27 @@ export const TextElement = ({ text, style }) => (
1212

1313
// Key-Value Element Component
1414
export const KeyValueElement = ({ item, appName, style, showNote }) => {
15-
const values = Array.isArray(item.value) ? item.value : [item.value];
16-
const urls = Array.isArray(item.url)
17-
? item.url
18-
: typeof item.url !== 'undefined'
19-
? [item.url]
20-
: [];
21-
const isRelativeUrls = Array.isArray(item.isRelativeUrl)
22-
? item.isRelativeUrl
23-
: typeof item.isRelativeUrl !== 'undefined'
24-
? [item.isRelativeUrl]
25-
: [];
15+
const values = Array.isArray(item.values)
16+
? [{ value: item.value, url: item.url, isRelativeUrl: item.isRelativeUrl }, ...item.values]
17+
: [{ value: item.value, url: item.url, isRelativeUrl: item.isRelativeUrl }];
2618

2719
const handleCopy = () => {
28-
copy(values.join(' '));
20+
copy(String(item.value));
2921
if (showNote) {
3022
showNote('Value copied to clipboard', false);
3123
}
3224
};
3325

34-
const renderValue = (value, idx) => {
35-
const url = urls[idx];
36-
const isRelative = isRelativeUrls[idx];
37-
26+
const renderValue = ({ value, url, isRelativeUrl }) => {
3827
if (url) {
3928
return (
40-
<a
41-
key={idx}
42-
href={isRelative ? `apps/${appName}/${url}` : url}
43-
target="_blank"
44-
rel="noreferrer"
45-
>
29+
<a href={isRelativeUrl ? `apps/${appName}/${url}` : url} target="_blank" rel="noreferrer">
4630
{value}
4731
</a>
4832
);
4933
}
5034

51-
return <span key={idx}>{value}</span>;
35+
return <span>{value}</span>;
5236
};
5337

5438
return (
@@ -57,7 +41,7 @@ export const KeyValueElement = ({ item, appName, style, showNote }) => {
5741
{values.map((val, idx) => (
5842
<React.Fragment key={idx}>
5943
{idx > 0 && ' '}
60-
{renderValue(val, idx)}
44+
{renderValue(val)}
6145
</React.Fragment>
6246
))}
6347
<span className={styles.copyIcon} onClick={handleCopy}>

0 commit comments

Comments
 (0)