Skip to content

Commit 54c65cc

Browse files
#RI-3649-fix tooltip content
1 parent 4e21d25 commit 54c65cc

File tree

3 files changed

+32
-21
lines changed

3 files changed

+32
-21
lines changed

redisinsight/api/src/modules/core/encryption/strategies/keytar-encryption.strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export class KeytarEncryptionStrategy implements IEncryptionStrategy {
3333
// eslint-disable-next-line global-require
3434
this.keytar = require('keytar');
3535
} catch (e) {
36-
this.logger.error('Failed to initialize keytar module');
36+
this.logger.error('Failed to initialize keytar module', e);
3737
}
3838
}
3939

redisinsight/ui/src/pages/databaseAnalysis/components/top-keys/Table.tsx

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ import { useParams, useHistory } from 'react-router-dom'
1212
import { useDispatch, useSelector } from 'react-redux'
1313
import cx from 'classnames'
1414

15-
import { formatBytes, truncateNumberToDuration, truncateNumberToFirstUnit, truncateTTLToSeconds, stringToBuffer } from 'uiSrc/utils'
15+
import {
16+
formatBytes,
17+
formatLongName,
18+
truncateNumberToDuration,
19+
truncateNumberToFirstUnit,
20+
truncateTTLToSeconds,
21+
stringToBuffer
22+
} from 'uiSrc/utils'
1623
import { numberWithSpaces } from 'uiSrc/utils/numbers'
1724
import { GroupBadge } from 'uiSrc/components'
1825
import { setFilter, setSearchMatch, resetKeysData, fetchKeys, keysSelector } from 'uiSrc/slices/browser/keys'
@@ -86,23 +93,26 @@ const Table = (props: Props) => {
8693
height: '42px',
8794
sortable: true,
8895
truncateText: true,
89-
render: (name: string) => (
90-
<div data-testid="top-keys-table-name" className={cx(styles.delimiter, 'truncateText')}>
91-
<EuiToolTip
92-
anchorClassName={styles.tooltip}
93-
position="bottom"
94-
content={name}
95-
>
96-
<EuiButtonEmpty
97-
className={styles.link}
98-
style={{ height: 'auto' }}
99-
onClick={() => handleRedirect(name)}
96+
render: (name: string) => {
97+
const tooltipContent = formatLongName(name)
98+
return (
99+
<div data-testid="top-keys-table-name" className={cx(styles.delimiter, 'truncateText')}>
100+
<EuiToolTip
101+
anchorClassName={styles.tooltip}
102+
position="bottom"
103+
content={tooltipContent}
100104
>
101-
{name}
102-
</EuiButtonEmpty>
103-
</EuiToolTip>
104-
</div>
105-
)
105+
<EuiButtonEmpty
106+
className={styles.link}
107+
style={{ height: 'auto' }}
108+
onClick={() => handleRedirect(name)}
109+
>
110+
{name}
111+
</EuiButtonEmpty>
112+
</EuiToolTip>
113+
</div>
114+
)
115+
}
106116
},
107117
{
108118
name: 'TTL',

redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/Table.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import { useParams, useHistory } from 'react-router-dom'
1111
import { useDispatch, useSelector } from 'react-redux'
1212
import cx from 'classnames'
1313

14-
import { NspTypeSummary } from 'apiSrc/modules/database-analysis/models/nsp-type-summary'
15-
import { formatBytes, Nullable } from 'uiSrc/utils'
14+
import { formatBytes, formatLongName, Nullable } from 'uiSrc/utils'
1615
import { numberWithSpaces } from 'uiSrc/utils/numbers'
1716
import { GroupBadge } from 'uiSrc/components'
1817
import { Pages } from 'uiSrc/constants'
@@ -21,6 +20,7 @@ import { SCAN_COUNT_DEFAULT, SCAN_TREE_COUNT_DEFAULT } from 'uiSrc/constants/api
2120
import { KeyViewType } from 'uiSrc/slices/interfaces/keys'
2221
import { setBrowserTreeDelimiter, setBrowserKeyListDataLoaded, resetBrowserTree } from 'uiSrc/slices/app/context'
2322
import { NspSummary } from 'apiSrc/modules/database-analysis/models/nsp-summary'
23+
import { NspTypeSummary } from 'apiSrc/modules/database-analysis/models/nsp-type-summary'
2424

2525
import styles from './styles.module.scss'
2626

@@ -117,12 +117,13 @@ const NameSpacesTable = (props: Props) => {
117117
className: 'nsp-cell',
118118
render: (nsp: string, { types }: { types: any[] }) => {
119119
const filterType = types.length > 1 ? null : types[0].type
120+
const tooltipContent = formatLongName(`${nsp}${delimiter}*`)
120121
return (
121122
<div className={cx(styles.delimiter, 'truncateText')}>
122123
<EuiToolTip
123124
anchorClassName={styles.tooltip}
124125
position="bottom"
125-
content={`${nsp}${delimiter}*`}
126+
content={tooltipContent}
126127
>
127128
<EuiButtonEmpty
128129
className={styles.link}

0 commit comments

Comments
 (0)