github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-29 02:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move truncation of docker ids to FE to allow full value in tooltips

Browse Source 
- 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:
Simon Howe
2016-09-26 15:46:19 +02:00
parent a3c5e1f153
commit 3c393c7808
5 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/app/scripts/utils/search-utils.js
View File

@@ -64,7 +64,7 @@ function matchPrefix(label, prefix) {
* no match).
* Returns a new instance of nodeMatches.
*/
function findNodeMatch(nodeMatches, keyPath, text, query, prefix, label) {
function findNodeMatch(nodeMatches, keyPath, text, query, prefix, label, truncate) {
if (!prefix || matchPrefix(label, prefix)) {
const queryRe = makeRegExp(query);
const matches = text.match(queryRe);
@@ -72,7 +72,7 @@ function findNodeMatch(nodeMatches, keyPath, text, query, prefix, label) {
const firstMatch = matches[0];
const index = text.search(queryRe);
nodeMatches = nodeMatches.setIn(keyPath,
{text, label, start: index, length: firstMatch.length});
{text, label, start: index, length: firstMatch.length, truncate});
}
}
return nodeMatches;
@@ -135,7 +135,7 @@ export function searchTopology(nodes, { prefix, query, metric, comp, value }) {
node.get('metadata').forEach(field => {
const keyPath = [nodeId, 'metadata', field.get('id')];
nodeMatches = findNodeMatch(nodeMatches, keyPath, field.get('value'),
query, prefix, field.get('label'));
query, prefix, field.get('label'), field.get('truncate'));
});
}