From b57405b696e1efdaf6158fce95a3c78c14000059 Mon Sep 17 00:00:00 2001
From: John Mitchell <jmitchel@Johns-MacBook-Pro-46.local>
Date: Mon, 2 Mar 2020 10:00:27 -0500
Subject: [PATCH] assorted schedule list fixes: - remove pagesection and card
 from component...move to where called for root list - remove unnecessary
 placeholder schedule tab on job template detail

---
 .../components/ScheduleList/ScheduleList.jsx  | 115 +++++++++---------
 .../src/screens/Schedule/Schedules.jsx        |   7 +-
 awx/ui_next/src/screens/Template/Template.jsx |   4 -
 .../src/screens/Template/Template.test.jsx    |   2 +-
 4 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/awx/ui_next/src/components/ScheduleList/ScheduleList.jsx b/awx/ui_next/src/components/ScheduleList/ScheduleList.jsx
index e062fb0f75..e24e46e0b6 100644
--- a/awx/ui_next/src/components/ScheduleList/ScheduleList.jsx
+++ b/awx/ui_next/src/components/ScheduleList/ScheduleList.jsx
@@ -3,7 +3,6 @@ import { useLocation } from 'react-router-dom';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import { SchedulesAPI } from '@api';
-import { Card, PageSection } from '@patternfly/react-core';
 import AlertModal from '@components/AlertModal';
 import ErrorDetail from '@components/ErrorDetail';
 import DataListToolbar from '@components/DataListToolbar';
@@ -86,63 +85,61 @@ function ScheduleList({ i18n, loadSchedules }) {
   };
 
   return (
-    <PageSection>
-      <Card>
-        <PaginatedDataList
-          contentError={contentError}
-          hasContentLoading={isLoading || isDeleteLoading}
-          items={schedules}
-          itemCount={itemCount}
-          qsConfig={QS_CONFIG}
-          onRowClick={handleSelect}
-          renderItem={item => (
-            <ScheduleListItem
-              isSelected={selected.some(row => row.id === item.id)}
-              key={item.id}
-              onSelect={() => handleSelect(item)}
-              schedule={item}
-            />
-          )}
-          toolbarSearchColumns={[
-            {
-              name: i18n._(t`Name`),
-              key: 'name',
-              isDefault: true,
-            },
-          ]}
-          toolbarSortColumns={[
-            {
-              name: i18n._(t`Name`),
-              key: 'name',
-            },
-            {
-              name: i18n._(t`Next Run`),
-              key: 'next_run',
-            },
-            {
-              name: i18n._(t`Type`),
-              key: 'unified_job_template__polymorphic_ctype__model',
-            },
-          ]}
-          renderToolbar={props => (
-            <DataListToolbar
-              {...props}
-              showSelectAll
-              isAllSelected={isAllSelected}
-              onSelectAll={handleSelectAll}
-              qsConfig={QS_CONFIG}
-              additionalControls={[
-                <ToolbarDeleteButton
-                  key="delete"
-                  onDelete={handleDelete}
-                  itemsToDelete={selected}
-                  pluralizedItemName={i18n._(t`Schedules`)}
-                />,
-              ]}
-            />
-          )}
-        />
-      </Card>
+    <>
+      <PaginatedDataList
+        contentError={contentError}
+        hasContentLoading={isLoading || isDeleteLoading}
+        items={schedules}
+        itemCount={itemCount}
+        qsConfig={QS_CONFIG}
+        onRowClick={handleSelect}
+        renderItem={item => (
+          <ScheduleListItem
+            isSelected={selected.some(row => row.id === item.id)}
+            key={item.id}
+            onSelect={() => handleSelect(item)}
+            schedule={item}
+          />
+        )}
+        toolbarSearchColumns={[
+          {
+            name: i18n._(t`Name`),
+            key: 'name',
+            isDefault: true,
+          },
+        ]}
+        toolbarSortColumns={[
+          {
+            name: i18n._(t`Name`),
+            key: 'name',
+          },
+          {
+            name: i18n._(t`Next Run`),
+            key: 'next_run',
+          },
+          {
+            name: i18n._(t`Type`),
+            key: 'unified_job_template__polymorphic_ctype__model',
+          },
+        ]}
+        renderToolbar={props => (
+          <DataListToolbar
+            {...props}
+            showSelectAll
+            isAllSelected={isAllSelected}
+            onSelectAll={handleSelectAll}
+            qsConfig={QS_CONFIG}
+            additionalControls={[
+              <ToolbarDeleteButton
+                key="delete"
+                onDelete={handleDelete}
+                itemsToDelete={selected}
+                pluralizedItemName={i18n._(t`Schedules`)}
+              />,
+            ]}
+          />
+        )}
+      />
       {deletionError && (
         <AlertModal
           isOpen={deletionError}
@@ -154,7 +151,7 @@ function ScheduleList({ i18n, loadSchedules }) {
           <ErrorDetail error={deletionError} />
         </AlertModal>
       )}
-    </PageSection>
+    </>
   );
 }
 
diff --git a/awx/ui_next/src/screens/Schedule/Schedules.jsx b/awx/ui_next/src/screens/Schedule/Schedules.jsx
index 0127dab873..0f7c9b0ee0 100644
--- a/awx/ui_next/src/screens/Schedule/Schedules.jsx
+++ b/awx/ui_next/src/screens/Schedule/Schedules.jsx
@@ -6,6 +6,7 @@ import { t } from '@lingui/macro';
 import Breadcrumbs from '@components/Breadcrumbs';
 import ScheduleList from '@components/ScheduleList';
 import { SchedulesAPI } from '@api';
+import { PageSection, Card } from '@patternfly/react-core';
 
 function Schedules({ i18n }) {
   const loadSchedules = params => {
@@ -21,7 +22,11 @@ function Schedules({ i18n }) {
       />
       <Switch>
         <Route path="/schedules">
-          <ScheduleList loadSchedules={loadSchedules} />
+          <PageSection>
+            <Card>
+              <ScheduleList loadSchedules={loadSchedules} />
+            </Card>
+          </PageSection>
         </Route>
       </Switch>
     </>
diff --git a/awx/ui_next/src/screens/Template/Template.jsx b/awx/ui_next/src/screens/Template/Template.jsx
index 0818bea7cf..84839c1a3f 100644
--- a/awx/ui_next/src/screens/Template/Template.jsx
+++ b/awx/ui_next/src/screens/Template/Template.jsx
@@ -112,10 +112,6 @@ class Template extends Component {
     }
 
     tabsArray.push(
-      {
-        name: i18n._(t`Schedules`),
-        link: '/home',
-      },
       {
         name: i18n._(t`Completed Jobs`),
         link: `${match.url}/completed_jobs`,
diff --git a/awx/ui_next/src/screens/Template/Template.test.jsx b/awx/ui_next/src/screens/Template/Template.test.jsx
index 3e72dcd987..c4f0a36af5 100644
--- a/awx/ui_next/src/screens/Template/Template.test.jsx
+++ b/awx/ui_next/src/screens/Template/Template.test.jsx
@@ -61,7 +61,7 @@ describe('<Template />', () => {
     const tabs = await waitForElement(
       wrapper,
       '.pf-c-tabs__item',
-      el => el.length === 7
+      el => el.length === 6
     );
     expect(tabs.at(2).text()).toEqual('Notifications');
     done();