Skip to content

Keep all spans expanded when uiFind param is present #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 6, 2023
Merged

Keep all spans expanded when uiFind param is present #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f65d506
Keep all spans expanded when uiFind param is present
kshmidt-digma Nov 29, 2023
c540bd9
Add search by exact string
kshmidt-digma Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/duck.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ function setTrace(state: TTraceTimeline, { uiFind, trace }: TTraceUiFindValue) {

return Object.assign(
{ ...newInitialState(), spanNameColumnWidth, traceID },
uiFind ? calculateFocusedFindRowStates(uiFind, spans) : null
uiFind ? calculateFocusedFindRowStates(uiFind, spans, false) : null
);
}

Expand Down
23 changes: 12 additions & 11 deletions packages/jaeger-ui/src/utils/filter-spans.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,18 @@ export default function filterSpans(textFilter: string, spans: Span[] | TNil) {
// values with keys that include text in any one of the excludeKeys will be ignored
const excludeKeys: string[] = [];

// split textFilter by whitespace, remove empty strings, and extract includeFilters and excludeKeys
textFilter
.split(/\s+/)
.filter(Boolean)
.forEach(w => {
if (w[0] === '-') {
excludeKeys.push(w.substr(1).toLowerCase());
} else {
includeFilters.push(w.toLowerCase());
}
});
// split textFilter by whitespace, but not that in double quotes, remove empty strings, and extract includeFilters and excludeKeys
const regex = /"[^"]+"|[^\s]+/g;
const match = textFilter.match(regex);
const results = match ? match.map(e => e.replace(/"(.*)"/, '$1')) : [];

results.filter(Boolean).forEach(w => {
if (w[0] === '-') {
excludeKeys.push(w.substr(1).toLowerCase());
} else {
includeFilters.push(w.toLowerCase());
}
});

const isTextInFilters = (filters: Array<string>, text: string) =>
filters.some(filter => text.toLowerCase().includes(filter));
Expand Down