Merge pull request #310 from everett980/issue-307-add-node-search-to-…

…tracegraph-and-tracediffgraph Move filter to query param and highlight filter matches on graphs
jaegertracing · Mar 12, 2019 · 2d5edfd · 2d5edfd
2 parents 31a8a45 + d3965dc
commit 2d5edfd
Show file tree

Hide file tree

Showing 63 changed files with 5,650 additions and 866 deletions.
diff --git a/.flowconfig b/.flowconfig
@@ -13,6 +13,7 @@
 ./flow-typed/npm
 
 [options]
+suppress_comment= \\(.\\|\n\\)*\\$FlowIgnore
 
 [version]
 0.71.0
diff --git a/packages/jaeger-ui/package.json b/packages/jaeger-ui/package.json
@@ -19,8 +19,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",

diff --git a/packages/jaeger-ui/src/components/TraceDiff/TraceDiff.js b/packages/jaeger-ui/src/components/TraceDiff/TraceDiff.js
@@ -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);
   }
 }