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.

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

Jump to bottom

Update enzyme, Re-enable and add TracePage/index.test.js tests #1

Merged
merged 8 commits into from
Mar 8, 2019
Merged

Update enzyme, Re-enable and add TracePage/index.test.js tests #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
50db264
Update enzyme, Re-enable and add TracePage/index.test.js tests
everett980 Jan 25, 2019
ef880c7
Merge branch 'issue-307-add-node-search-to-tracegraph-and-tracediffgr…
everett980 Jan 25, 2019
e531d6e
Add tests to TraceDiff/
everett980 Feb 6, 2019
4313988
Merge branch 'issue-307-add-node-search-to-tracegraph-and-tracediffgr…
everett980 Feb 26, 2019
1f5421d
Merge updated graph find, maintain increased test coverage
everett980 Feb 26, 2019
7422720
Merge branch 'issue-307-add-node-search-to-tracegraph-and-tracediffgr…
everett980 Mar 6, 2019
bf3386f
Merge branch 'issue-307-add-node-search-to-tracegraph-and-tracediffgr…
everett980 Mar 8, 2019
b4afe2d
Update tests after merge
everett980 Mar 8, 2019
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
4 changes: 2 additions & 2 deletions packages/jaeger-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"babel-plugin-import": "1.11.0",
"bluebird": "^3.5.0",
"customize-cra": "0.2.9",
"enzyme": "^3.2.0",
"enzyme-adapter-react-16": "^1.1.0",
"enzyme": "^3.8.0",
"enzyme-adapter-react-16": "^1.2.0",
"enzyme-to-json": "^3.3.0",
"http-proxy-middleware": "^0.19.1",
"less": "3.9.0",
Expand Down
80 changes: 38 additions & 42 deletions ...-ui/src/components/SearchTracePage/SearchResults/__snapshots__/DiffSelection.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,23 @@ exports[`DiffSelection renders a trace as expected 1`] = `
<div
className="DiffSelection--message"
>
<React.Fragment>
<Button
block={false}
className="ub-right"
disabled={true}
ghost={false}
loading={false}
prefixCls="ant-btn"
type="primary"
>
Compare Traces
</Button>
<h2
className="ub-m0"
>
1
Selected for comparison
</h2>
</React.Fragment>
<Button
block={false}
className="ub-right"
disabled={true}
ghost={false}
loading={false}
prefixCls="ant-btn"
type="primary"
>
Compare Traces
</Button>
<h2
className="ub-m0"
>
1
Selected for comparison
</h2>
</div>
</div>
`;
Expand Down Expand Up @@ -97,30 +95,28 @@ exports[`DiffSelection renders multiple traces as expected 1`] = `
<div
className="DiffSelection--message"
>
<React.Fragment>
<Link
replace={false}
to="/trace/trace-id-0...trace-id-1?cohort=trace-id-0&cohort=trace-id-1"
>
<Button
block={false}
className="ub-right"
disabled={false}
ghost={false}
loading={false}
prefixCls="ant-btn"
type="primary"
>
Compare Traces
</Button>
</Link>
<h2
className="ub-m0"
<Link
replace={false}
to="/trace/trace-id-0...trace-id-1?cohort=trace-id-0&cohort=trace-id-1"
>
<Button
block={false}
className="ub-right"
disabled={false}
ghost={false}
loading={false}
prefixCls="ant-btn"
type="primary"
>
2
Selected for comparison
</h2>
</React.Fragment>
Compare Traces
</Button>
</Link>
<h2
className="ub-m0"
>
2
Selected for comparison
</h2>
</div>
</div>
`;
16 changes: 8 additions & 8 deletions packages/jaeger-ui/src/components/TraceDiff/TraceDiff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,22 @@ type State = {
graphTopOffset: number,
};

function syncStates(urlSt, reduxSt, forceState) {
const { a: urlA, b: urlB } = urlSt;
const { a: reduxA, b: reduxB } = reduxSt;
function syncStates(urlValues, reduxValues, forceState) {
const { a: urlA, b: urlB } = urlValues;
const { a: reduxA, b: reduxB } = reduxValues;
if (urlA !== reduxA || urlB !== reduxB) {
forceState(urlSt);
forceState(urlValues);
return;
}
const urlCohort = new Set(urlSt.cohort || []);
const reduxCohort = new Set(reduxSt.cohort || []);
const urlCohort = new Set(urlValues.cohort);
const reduxCohort = new Set(reduxValues.cohort || []);
if (urlCohort.size !== reduxCohort.size) {
forceState(urlSt);
forceState(urlValues);
return;
}
const needSync = Array.from(urlCohort).some(id => !reduxCohort.has(id));
if (needSync) {
forceState(urlSt);
forceState(urlValues);
}
}

Expand Down
Loading