Skip to content
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.

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

Fix traceIDs query params clobbering form search #83

Merged
merged 1 commit into from
Sep 26, 2017
Merged
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions src/components/SearchTracePage/TraceSearchForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@ const mapDispatchToProps = dispatch => {
minDuration,
maxDuration,
lookback,
traceIDs,
} = fields;
// Note: traceID is ignored when the form is submitted

store.set('lastSearch', { service, operation });

Expand Down Expand Up @@ -317,7 +317,6 @@ const mapDispatchToProps = dispatch => {
tag: tagsToQuery(tags) || undefined,
minDuration: minDuration || null,
maxDuration: maxDuration || null,
traceID: traceIDsToQuery(traceIDs) || undefined,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this remain? When the search is performed by external URL that contains trace IDs in it, we definitely want them to be used, but when the search is performed via the search form in the UI we don't want the IDs from the previous search to be used

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yurishkuro No, this doesn't need to be here. This is only taking them out of the form submission.

The LOC that handles traceIDs from the URL: src/components/SearchTracePage/index.js#L72

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

});
},
};
Expand Down