From 4a8791693f2aebf6d7a28c3569bd9d118f4fc278 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Fri, 14 Dec 2018 09:55:59 -0500
Subject: [PATCH 1/2] Adds option to hide expand/collapse in toolbar and hides
 it for the org list

---
 src/components/DataListToolbar/DataListToolbar.jsx   | 5 +++--
 src/pages/Organizations/views/Organizations.list.jsx | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/DataListToolbar/DataListToolbar.jsx b/src/components/DataListToolbar/DataListToolbar.jsx
index eb8b913911..f8ca09c6c7 100644
--- a/src/components/DataListToolbar/DataListToolbar.jsx
+++ b/src/components/DataListToolbar/DataListToolbar.jsx
@@ -85,7 +85,8 @@ class DataListToolbar extends React.Component {
       onSort,
       sortedColumnKey,
       sortOrder,
-      addUrl
+      addUrl,
+      hideExpandCollapse
     } = this.props;
     const {
       // isActionDropdownOpen,
@@ -202,7 +203,7 @@ class DataListToolbar extends React.Component {
                       </Button>
                     </ToolbarItem>
                   </ToolbarGroup>
-                  <ToolbarGroup>
+                  <ToolbarGroup className={hideExpandCollapse ? 'pf-u-display-none' : null}>
                     <ToolbarItem>
                       <Button variant="plain" aria-label={i18n._(t`Expand`)}>
                         <BarsIcon />
diff --git a/src/pages/Organizations/views/Organizations.list.jsx b/src/pages/Organizations/views/Organizations.list.jsx
index 5ca2809911..2a03a61cf8 100644
--- a/src/pages/Organizations/views/Organizations.list.jsx
+++ b/src/pages/Organizations/views/Organizations.list.jsx
@@ -205,6 +205,7 @@ class Organizations extends Component {
             onSearch={this.onSearch}
             onSort={this.onSort}
             onSelectAll={this.onSelectAll}
+            hideExpandCollapse
           />
           <I18n>
             {({ i18n }) => (

From 14f1c4b6527784fd5f2b94d4ef353ccd3a6473da Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 17 Dec 2018 11:28:34 -0500
Subject: [PATCH 2/2] Conditionally render rather than show expand/collapse

---
 .../DataListToolbar/DataListToolbar.jsx       | 28 ++++++++++---------
 .../views/Organizations.list.jsx              |  1 -
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/components/DataListToolbar/DataListToolbar.jsx b/src/components/DataListToolbar/DataListToolbar.jsx
index f8ca09c6c7..c48d855dd7 100644
--- a/src/components/DataListToolbar/DataListToolbar.jsx
+++ b/src/components/DataListToolbar/DataListToolbar.jsx
@@ -86,7 +86,7 @@ class DataListToolbar extends React.Component {
       sortedColumnKey,
       sortOrder,
       addUrl,
-      hideExpandCollapse
+      showExpandCollapse
     } = this.props;
     const {
       // isActionDropdownOpen,
@@ -203,18 +203,20 @@ class DataListToolbar extends React.Component {
                       </Button>
                     </ToolbarItem>
                   </ToolbarGroup>
-                  <ToolbarGroup className={hideExpandCollapse ? 'pf-u-display-none' : null}>
-                    <ToolbarItem>
-                      <Button variant="plain" aria-label={i18n._(t`Expand`)}>
-                        <BarsIcon />
-                      </Button>
-                    </ToolbarItem>
-                    <ToolbarItem>
-                      <Button variant="plain" aria-label={i18n._(t`Collapse`)}>
-                        <EqualsIcon />
-                      </Button>
-                    </ToolbarItem>
-                  </ToolbarGroup>
+                  { showExpandCollapse && (
+                    <ToolbarGroup>
+                      <ToolbarItem>
+                        <Button variant="plain" aria-label={i18n._(t`Expand`)}>
+                          <BarsIcon />
+                        </Button>
+                      </ToolbarItem>
+                      <ToolbarItem>
+                        <Button variant="plain" aria-label={i18n._(t`Collapse`)}>
+                          <EqualsIcon />
+                        </Button>
+                      </ToolbarItem>
+                    </ToolbarGroup>
+                  )}
                 </Toolbar>
               </LevelItem>
               <LevelItem>
diff --git a/src/pages/Organizations/views/Organizations.list.jsx b/src/pages/Organizations/views/Organizations.list.jsx
index 2a03a61cf8..5ca2809911 100644
--- a/src/pages/Organizations/views/Organizations.list.jsx
+++ b/src/pages/Organizations/views/Organizations.list.jsx
@@ -205,7 +205,6 @@ class Organizations extends Component {
             onSearch={this.onSearch}
             onSort={this.onSort}
             onSelectAll={this.onSelectAll}
-            hideExpandCollapse
           />
           <I18n>
             {({ i18n }) => (