mirror of
https://github.com/weaveworks/scope.git
synced 2026-08-19 04:16:21 +00:00
Move truncation of docker ids to FE to allow full value in tooltips
- Reveals full id if you search for it. - Difficult to copy and paste the full id if you want it for some reason
This commit is contained in:
@@ -18,7 +18,8 @@ class MatchedResults extends React.Component {
|
||||
<span className="matched-results-match-label">
|
||||
{match.label}:
|
||||
</span>
|
||||
<MatchedText text={text} match={match} maxLength={MAX_MATCH_LENGTH} />
|
||||
<MatchedText text={text} match={match} maxLength={MAX_MATCH_LENGTH}
|
||||
truncate={match.truncate} />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -82,15 +82,20 @@ function truncateChunks(chunks, text, maxLength) {
|
||||
class MatchedText extends React.Component {
|
||||
|
||||
render() {
|
||||
const { match, text, maxLength } = this.props;
|
||||
const { match, text, truncate, maxLength } = this.props;
|
||||
|
||||
const showFullValue = !truncate || match && match.start + match.length > truncate;
|
||||
const displayText = showFullValue ? text : text.slice(0, truncate);
|
||||
|
||||
if (!match) {
|
||||
return <span>{text}</span>;
|
||||
return <span>{displayText}</span>;
|
||||
}
|
||||
|
||||
const chunks = chunkText(displayText, match);
|
||||
|
||||
return (
|
||||
<span className="matched-text" title={text}>
|
||||
{truncateChunks(chunkText(text, match), text, maxLength).map((chunk, index) => {
|
||||
{truncateChunks(chunks, displayText, maxLength).map((chunk, index) => {
|
||||
if (chunk.match) {
|
||||
return (
|
||||
<span className="match" key={index}>
|
||||
|
||||
@@ -42,7 +42,10 @@ export default class NodeDetailsInfo extends React.Component {
|
||||
{field.label}
|
||||
</div>
|
||||
<div className="node-details-info-field-value truncate" title={field.value}>
|
||||
<MatchedText text={field.value} match={matches.get(field.id)} />
|
||||
<MatchedText
|
||||
text={field.value}
|
||||
truncate={field.truncate}
|
||||
match={matches.get(field.id)} />
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
|
||||
Reference in New Issue
Block a user