Merge 98dd355 into 9a4d655

grafana · Jan 12, 2022 · 728cc37 · 728cc37
2 parents 9a4d655 + 98dd355
commit 728cc37
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/tests-js-snapshot.yml b/.github/workflows/tests-js-snapshot.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Run Webapp Snapshot tests
-        run: UPDATE_SNAPSHOTS=true ./scripts/jest-snapshots/run-snapshots.sh
+        run: UPDATE_SNAPSHOTS=false ./scripts/jest-snapshots/run-snapshots.sh
       # since there are snapshot tests (for the flamegraph)
       # store their diff when it fails, plus the original image
       # to make it easier to compare

diff --git a/cypress/snapshots/basic.ts/simple-golang-app-cpu-highlight.snap.png b/cypress/snapshots/basic.ts/simple-golang-app-cpu-highlight.snap.png
diff --git a/webapp/javascript/components/FlameGraph/FlameGraphComponent/Flamegraph_render.ts b/webapp/javascript/components/FlameGraph/FlameGraphComponent/Flamegraph_render.ts
@@ -351,10 +351,10 @@ function getColor(cfg: getColorCfg) {
 
   // We are in a search
   if (cfg.highlightModeOn) {
-    if (cfg.isHighlighted) {
-      return highlightColor;
+    if (!cfg.isHighlighted) {
+      return colorGreyscale(200, 0.66);
     }
-    return colorGreyscale(200, 0.66);
+    // it's a highlighted node, so color it as normally
   }
 
   // Diff mode

diff --git a/.../flamegraph-render-spec-tsx-render-group-snapshot-focused-also-zooms-1-snap.png b/.../flamegraph-render-spec-tsx-render-group-snapshot-focused-also-zooms-1-snap.png
diff --git a/...ender-group-snapshot-focused-renders-a-focused-node-in-the-beginning-1-snap.png b/...ender-group-snapshot-focused-renders-a-focused-node-in-the-beginning-1-snap.png
diff --git a/...hot-focused-renders-a-focused-node-when-node-is-not-in-the-beginning-1-snap.png b/...hot-focused-renders-a-focused-node-when-node-is-not-in-the-beginning-1-snap.png
diff --git a/...h-render-spec-tsx-render-group-snapshot-renders-a-complex-flamegraph-1-snap.png b/...h-render-spec-tsx-render-group-snapshot-renders-a-complex-flamegraph-1-snap.png
diff --git a/...ec-tsx-render-group-snapshot-renders-a-highlighted-double-flamegraph-1-snap.png b/...ec-tsx-render-group-snapshot-renders-a-highlighted-double-flamegraph-1-snap.png
diff --git a/...nder-spec-tsx-render-group-snapshot-renders-a-highlighted-flamegraph-1-snap.png b/...nder-spec-tsx-render-group-snapshot-renders-a-highlighted-flamegraph-1-snap.png
diff --git a/...ph-render-spec-tsx-render-group-snapshot-renders-a-simple-flamegraph-1-snap.png b/...ph-render-spec-tsx-render-group-snapshot-renders-a-simple-flamegraph-1-snap.png
diff --git a/...ph-render-spec-tsx-render-group-snapshot-renders-a-zoomed-flamegraph-1-snap.png b/...ph-render-spec-tsx-render-group-snapshot-renders-a-zoomed-flamegraph-1-snap.png
diff --git a/...r-spec-tsx-render-group-snapshot-renders-a-zoomed-with-fit-mode-tail-1-snap.png b/...r-spec-tsx-render-group-snapshot-renders-a-zoomed-with-fit-mode-tail-1-snap.png