From b421ef772710f998d98a6abc9363c8484687dc1d Mon Sep 17 00:00:00 2001
From: Mustafa <mustafa.abdelmogoud@gmail.com>
Date: Thu, 10 Oct 2019 10:10:15 +0000
Subject: [PATCH] Bug 1582719 - Hide the Waterfall column when left side bar
 opens. r=Honza

Differential Revision: https://phabricator.services.mozilla.com/D48529

--HG--
extra : moz-landing-system : lando
---
 .../netmonitor/src/components/RequestListItem.js       | 10 ++--------
 devtools/client/netmonitor/src/selectors/ui.js         |  7 ++++---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/devtools/client/netmonitor/src/components/RequestListItem.js b/devtools/client/netmonitor/src/components/RequestListItem.js
index 86bb3f420c0e..b3f1ebf20686 100644
--- a/devtools/client/netmonitor/src/components/RequestListItem.js
+++ b/devtools/client/netmonitor/src/components/RequestListItem.js
@@ -10,7 +10,6 @@ const {
 } = require("devtools/client/shared/vendor/react");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
-const { getVisibleColumns } = require("../selectors/index");
 const {
   fetchNetworkUpdatePacket,
   propertiesEqual,
@@ -280,7 +279,6 @@ class RequestListItem extends Component {
       isSelected,
       firstRequestStartedMs,
       fromCache,
-      networkDetailsOpen,
       onDoubleClick,
       onContextMenu,
       onMouseDown,
@@ -327,12 +325,8 @@ class RequestListItem extends Component {
           header,
         })
       ),
-      // Display the column if waterfall is enabled and the side panel is closed, or if waterfall is
-      // enabled, the side panel is opened and only 1 cloumn is displayed.
-      ((columns.waterfall && !networkDetailsOpen) ||
-        (networkDetailsOpen &&
-          columns.waterfall &&
-          getVisibleColumns(columns).length === 1)) &&
+      // The last column is Waterfall (aka Timeline)
+      columns.waterfall &&
         RequestListColumnWaterfall({
           connector,
           firstRequestStartedMs,
diff --git a/devtools/client/netmonitor/src/selectors/ui.js b/devtools/client/netmonitor/src/selectors/ui.js
index b6778f5d28df..579a654f08a6 100644
--- a/devtools/client/netmonitor/src/selectors/ui.js
+++ b/devtools/client/netmonitor/src/selectors/ui.js
@@ -43,12 +43,13 @@ function getVisibleColumns(columns) {
 
 const getColumns = createSelector(
   state => state.ui,
-  ui => {
+  state => state.search,
+  (ui, search) => {
     if (
-      (ui.networkDetailsOpen &&
+      ((ui.networkDetailsOpen || search.panelOpen) &&
         getVisibleColumns(ui.columns).length === 1 &&
         ui.columns.waterfall) ||
-      !ui.networkDetailsOpen
+      (!ui.networkDetailsOpen && !search.panelOpen)
     ) {
       return ui.columns;
     }