Bug 1495380 - Allow to select network runtimes;r=ladybenko
authorJulian Descottes <jdescottes@mozilla.com>
Fri, 30 Nov 2018 15:15:29 +0000
changeset 505412 77a11b6a13ec51370c1d3bec60d9b77783fb90e0
parent 505411 5cbf345f59e22896245f7b4bf948189af02ab845
child 505413 1e6a6598ffed79bd9c90870ea153108c7988aba5
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersladybenko
bugs1495380
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1495380 - Allow to select network runtimes;r=ladybenko Depends on D12946 Differential Revision: https://phabricator.services.mozilla.com/D13513
devtools/client/aboutdebugging-new/src/components/App.js
--- a/devtools/client/aboutdebugging-new/src/components/App.js
+++ b/devtools/client/aboutdebugging-new/src/components/App.js
@@ -75,17 +75,20 @@ class App extends PureComponent {
     const isDeviceFirstPage =
       !this.props.selectedPage &&
       match.params.runtimeId !== RUNTIMES.THIS_FIREFOX;
     if (!match.params.runtimeId || isDeviceFirstPage) {
       return Redirect({ to: `/runtime/${RUNTIMES.THIS_FIREFOX}` });
     }
 
     const isRuntimeAvailable = id => {
-      const runtimes = this.props.usbRuntimes;
+      const runtimes = [
+        ...this.props.networkRuntimes,
+        ...this.props.usbRuntimes,
+      ];
       return !!runtimes.find(x => x.id === id);
     };
 
     const { dispatch } = this.props;
 
     let runtimeId = match.params.runtimeId || RUNTIMES.THIS_FIREFOX;
     if (match.params.runtimeId !== RUNTIMES.THIS_FIREFOX) {
       const rawId = decodeURIComponent(match.params.runtimeId);