Merge branch 'main' into l10n

Author: canova

package.json

@@ -115,15 +115,15 @@
     "@babel/preset-env": "^7.28.5",
     "@babel/preset-react": "^7.28.5",
     "@babel/preset-typescript": "^7.28.5",
-    "@eslint/js": "^9.37.0",
+    "@eslint/js": "^9.39.1",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.0",
     "@types/clamp": "^1.0.3",
     "@types/common-tags": "^1.8.4",
     "@types/jest": "^30.0.0",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^22.19.0",
+    "@types/node": "^22.19.1",
     "@types/query-string": "^6.3.0",
     "@types/react": "^18.3.26",
     "@types/react-dom": "^18.3.1",
@@ -144,9 +144,9 @@
     "copy-webpack-plugin": "^13.0.1",
     "cross-env": "^10.1.0",
     "css-loader": "^7.1.2",
-    "cssnano": "^7.1.1",
+    "cssnano": "^7.1.2",
     "devtools-license-check": "^0.9.0",
-    "eslint": "^9.37.0",
+    "eslint": "^9.39.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-import": "^2.32.0",
@@ -160,7 +160,7 @@
     "fetch-mock": "^12.5.5",
     "file-loader": "^6.2.0",
     "glob": "^11.0.3",
-    "globals": "^16.4.0",
+    "globals": "^16.5.0",
     "html-webpack-plugin": "^5.6.4",
     "husky": "^4.3.8",
     "jest": "^30.2.0",

src/reducers/app.ts

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import { combineReducers } from 'redux';
-import { tabSlugs } from '../app-logic/tabs-handling';
+import { tabSlugs, tabsShowingSampleData } from '../app-logic/tabs-handling';
 
 import type { TabSlug } from '../app-logic/tabs-handling';
 import type { BrowserConnectionStatus } from '../app-logic/browser-connection';
@@ -170,6 +170,10 @@ const lastVisibleThreadTabSlug: Reducer<TabSlug> = (
       }
       return state;
     case 'FOCUS_CALL_TREE':
+      if (tabsShowingSampleData.includes(state)) {
+        // Don't switch to call tree if the tab is already showing sample data.
+        return state;
+      }
       return 'calltree';
     default:
       return state;

src/reducers/url-state.ts

@@ -5,7 +5,7 @@
 import { combineReducers } from 'redux';
 import { oneLine } from 'common-tags';
 import { objectEntries } from '../utils/types';
-import { tabSlugs } from '../app-logic/tabs-handling';
+import { tabSlugs, tabsShowingSampleData } from '../app-logic/tabs-handling';
 
 import type {
   ThreadIndex,
@@ -98,6 +98,10 @@ const selectedTab: Reducer<TabSlug> = (state = 'calltree', action) => {
     case 'CHANGE_TAB_FILTER':
       return action.selectedTab;
     case 'FOCUS_CALL_TREE':
+      if (tabsShowingSampleData.includes(state)) {
+        // Don't switch to call tree if the tab is already showing sample data.
+        return state;
+      }
       return 'calltree';
     default:
       return state;

src/test/components/ThreadActivityGraph.test.tsx

@@ -264,7 +264,7 @@ describe('ThreadActivityGraph', function () {
     expect(getCallNodePath()).toEqual([]);
   });
 
-  it('when clicking a stack, this selects the call tree panel', function () {
+  it('when clicking a stack while on a tab that does not show sample data, this selects the call tree panel', function () {
     const { dispatch, getState, clickActivityGraph } = setup();
 
     expect(getSelectedTab(getState())).toBe('calltree');
@@ -277,6 +277,19 @@ describe('ThreadActivityGraph', function () {
     expect(getLastVisibleThreadTabSlug(getState())).toBe('calltree');
   });
 
+  it('when clicking a stack while on a tab that shows sample data, it should not change the selected panel', function () {
+    const { dispatch, getState, clickActivityGraph } = setup();
+
+    expect(getSelectedTab(getState())).toBe('calltree');
+    dispatch(changeSelectedTab('flame-graph'));
+
+    // The full call node at this sample is:
+    //  A -> B -> C -> F -> G
+    clickActivityGraph(1, 0.2);
+    expect(getSelectedTab(getState())).toBe('flame-graph');
+    expect(getLastVisibleThreadTabSlug(getState())).toBe('flame-graph');
+  });
+
   it(`when clicking outside of the graph, this doesn't select the call tree panel`, function () {
     const { dispatch, getState, clickActivityGraph } = setup();