Merge pull request #5806 from AlexSCorey/5777-JTTabOnProjectsAndTemplateListRefactor

5777 Projects JobTemplateList and template list refactor

Reviewed-by: Alex Corey <Alex.swansboro@gmail.com>
             https://github.com/AlexSCorey

awx/ui_next/src/screens/Project/ProjectJobTemplates/ProjectJobTemplates.jsx

@@ -1,10 +1,9 @@
-import React, { Component } from 'react';
+import React from 'react';
-import { CardBody } from '@components/Card';
+import { withRouter } from 'react-router-dom';
+import TemplateList from '../../Template/TemplateList/TemplateList';
 
-class ProjectJobTemplates extends Component {
+function ProjectJobTemplates() {
-  render() {
+  return <TemplateList />;
-    return <CardBody>Coming soon :)</CardBody>;
-  }
 }
 
-export default ProjectJobTemplates;
+export default withRouter(ProjectJobTemplates);

awx/ui_next/src/screens/Template/JobTemplateAdd/JobTemplateAdd.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { useHistory } from 'react-router-dom';
-import { Card, PageSection } from '@patternfly/react-core';
+import { Card } from '@patternfly/react-core';
 import { CardBody } from '@components/Card';
 import JobTemplateForm from '../shared/JobTemplateForm';
 import { JobTemplatesAPI } from '@api';
@@ -61,7 +61,6 @@ function JobTemplateAdd() {
   }
 
   return (
-    <PageSection>
     <Card>
       <CardBody>
         <JobTemplateForm
@@ -71,7 +70,6 @@ function JobTemplateAdd() {
       </CardBody>
       {formSubmitError ? <div>formSubmitError</div> : ''}
     </Card>
-    </PageSection>
   );
 }
 

awx/ui_next/src/screens/Template/Template.jsx

@@ -150,7 +150,6 @@ class Template extends Component {
     }
 
     return (
-      <PageSection>
       <Card className="awx-c-card">
         {cardHeader}
         <Switch>
@@ -221,7 +220,6 @@ class Template extends Component {
           />
         </Switch>
       </Card>
-      </PageSection>
     );
   }
 }

awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx

@@ -1,8 +1,8 @@
-import React, { Component } from 'react';
+import React, { useEffect, useState } from 'react';
-import { withRouter } from 'react-router-dom';
+import { useParams, useLocation } from 'react-router-dom';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
-import { Card, PageSection } from '@patternfly/react-core';
+import { Card } from '@patternfly/react-core';
 
 import {
   JobTemplatesAPI,
@@ -29,65 +29,96 @@ const QS_CONFIG = getQSConfig('template', {
   type: 'job_template,workflow_job_template',
 });
 
-class TemplatesList extends Component {
+function TemplatesList({ i18n }) {
-  constructor(props) {
+  const { id: projectId } = useParams();
-    super(props);
+  const { pathname, search } = useLocation();
 
-    this.state = {
+  const [deletionError, setDeletionError] = useState(null);
-      hasContentLoading: true,
+  const [contentError, setContentError] = useState(null);
-      contentError: null,
+  const [hasContentLoading, setHasContentLoading] = useState(true);
-      deletionError: null,
+  const [jtActions, setJTActions] = useState(null);
-      selected: [],
+  const [wfjtActions, setWFJTActions] = useState(null);
-      templates: [],
+  const [count, setCount] = useState(0);
-      itemCount: 0,
+  const [templates, setTemplates] = useState([]);
+  const [selected, setSelected] = useState([]);
+
+  useEffect(
+    () => {
+      const loadTemplates = async () => {
+        const params = {
+          ...parseQueryString(QS_CONFIG, search),
         };
 
-    this.loadTemplates = this.loadTemplates.bind(this);
+        let jtOptionsPromise;
-    this.handleSelectAll = this.handleSelectAll.bind(this);
+        if (jtActions) {
-    this.handleSelect = this.handleSelect.bind(this);
+          jtOptionsPromise = Promise.resolve({
-    this.handleTemplateDelete = this.handleTemplateDelete.bind(this);
+            data: { actions: jtActions },
-    this.handleDeleteErrorClose = this.handleDeleteErrorClose.bind(this);
+          });
-  }
-
-  componentDidMount() {
-    this.loadTemplates();
-  }
-
-  componentDidUpdate(prevProps) {
-    const { location } = this.props;
-
-    if (location !== prevProps.location) {
-      this.loadTemplates();
-    }
-  }
-
-  componentWillUnmount() {
-    document.removeEventListener('click', this.handleAddToggle, false);
-  }
-
-  handleDeleteErrorClose() {
-    this.setState({ deletionError: null });
-  }
-
-  handleSelectAll(isSelected) {
-    const { templates } = this.state;
-    const selected = isSelected ? [...templates] : [];
-    this.setState({ selected });
-  }
-
-  handleSelect(template) {
-    const { selected } = this.state;
-    if (selected.some(s => s.id === template.id)) {
-      this.setState({ selected: selected.filter(s => s.id !== template.id) });
         } else {
-      this.setState({ selected: selected.concat(template) });
+          jtOptionsPromise = JobTemplatesAPI.readOptions();
-    }
         }
 
-  async handleTemplateDelete() {
+        let wfjtOptionsPromise;
-    const { selected, itemCount } = this.state;
+        if (wfjtActions) {
+          wfjtOptionsPromise = Promise.resolve({
+            data: { actions: wfjtActions },
+          });
+        } else {
+          wfjtOptionsPromise = WorkflowJobTemplatesAPI.readOptions();
+        }
+        if (pathname.startsWith('/projects') && projectId) {
+          params.jobtemplate__project = projectId;
+        }
 
-    this.setState({ hasContentLoading: true });
+        const promises = Promise.all([
+          UnifiedJobTemplatesAPI.read(params),
+          jtOptionsPromise,
+          wfjtOptionsPromise,
+        ]);
+        setDeletionError(null);
+
+        try {
+          const [
+            {
+              data: { count: itemCount, results },
+            },
+            {
+              data: { actions: jobTemplateActions },
+            },
+            {
+              data: { actions: workFlowJobTemplateActions },
+            },
+          ] = await promises;
+          setJTActions(jobTemplateActions);
+          setWFJTActions(workFlowJobTemplateActions);
+          setCount(itemCount);
+          setTemplates(results);
+          setHasContentLoading(false);
+        } catch (err) {
+          setContentError(err);
+        }
+      };
+      loadTemplates();
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [pathname, search, count, projectId]
+  );
+
+  const handleSelectAll = isSelected => {
+    const selectedItems = isSelected ? [...templates] : [];
+    setSelected(selectedItems);
+  };
+
+  const handleSelect = template => {
+    if (selected.some(s => s.id === template.id)) {
+      setSelected(selected.filter(s => s.id !== template.id));
+    } else {
+      setSelected(selected.concat(template));
+    }
+  };
+
+  const handleTemplateDelete = async () => {
+    setHasContentLoading(true);
     try {
       await Promise.all(
         selected.map(({ type, id }) => {
@@ -100,87 +131,12 @@ class TemplatesList extends Component {
           return deletePromise;
         })
       );
-      this.setState({ itemCount: itemCount - selected.length });
+      setCount(count - selected.length);
     } catch (err) {
-      this.setState({ deletionError: err });
+      setDeletionError(err);
-    } finally {
-      await this.loadTemplates();
-    }
     }
+  };
 
-  async loadTemplates() {
-    const { location } = this.props;
-    const {
-      jtActions: cachedJTActions,
-      wfjtActions: cachedWFJTActions,
-    } = this.state;
-    const params = parseQueryString(QS_CONFIG, location.search);
-
-    let jtOptionsPromise;
-    if (cachedJTActions) {
-      jtOptionsPromise = Promise.resolve({
-        data: { actions: cachedJTActions },
-      });
-    } else {
-      jtOptionsPromise = JobTemplatesAPI.readOptions();
-    }
-
-    let wfjtOptionsPromise;
-    if (cachedWFJTActions) {
-      wfjtOptionsPromise = Promise.resolve({
-        data: { actions: cachedWFJTActions },
-      });
-    } else {
-      wfjtOptionsPromise = WorkflowJobTemplatesAPI.readOptions();
-    }
-
-    const promises = Promise.all([
-      UnifiedJobTemplatesAPI.read(params),
-      jtOptionsPromise,
-      wfjtOptionsPromise,
-    ]);
-
-    this.setState({ contentError: null, hasContentLoading: true });
-
-    try {
-      const [
-        {
-          data: { count, results },
-        },
-        {
-          data: { actions: jtActions },
-        },
-        {
-          data: { actions: wfjtActions },
-        },
-      ] = await promises;
-
-      this.setState({
-        jtActions,
-        wfjtActions,
-        itemCount: count,
-        templates: results,
-        selected: [],
-      });
-    } catch (err) {
-      this.setState({ contentError: err });
-    } finally {
-      this.setState({ hasContentLoading: false });
-    }
-  }
-
-  render() {
-    const {
-      contentError,
-      hasContentLoading,
-      deletionError,
-      templates,
-      itemCount,
-      selected,
-      jtActions,
-      wfjtActions,
-    } = this.state;
-    const { match, i18n } = this.props;
   const canAddJT =
     jtActions && Object.prototype.hasOwnProperty.call(jtActions, 'POST');
   const canAddWFJT =
@@ -189,13 +145,13 @@ class TemplatesList extends Component {
   if (canAddJT) {
     addButtonOptions.push({
       label: i18n._(t`Template`),
-        url: `${match.url}/job_template/add/`,
+      url: `/templates/job_template/add/`,
     });
   }
   if (canAddWFJT) {
     addButtonOptions.push({
       label: i18n._(t`Workflow Template`),
-        url: `${match.url}/workflow_job_template/add/`,
+      url: `/templates/workflow_job_template/add/`,
     });
   }
   const isAllSelected =
@@ -204,16 +160,16 @@ class TemplatesList extends Component {
     <AddDropDownButton key="add" dropdownItems={addButtonOptions} />
   );
   return (
-      <PageSection>
+    <>
       <Card>
         <PaginatedDataList
           contentError={contentError}
           hasContentLoading={hasContentLoading}
           items={templates}
-            itemCount={itemCount}
+          itemCount={count}
           pluralizedItemName={i18n._(t`Templates`)}
           qsConfig={QS_CONFIG}
-            onRowClick={this.handleSelect}
+          onRowClick={handleSelect}
           toolbarSearchColumns={[
             {
               name: i18n._(t`Name`),
@@ -257,12 +213,12 @@ class TemplatesList extends Component {
               showSelectAll
               showExpandCollapse
               isAllSelected={isAllSelected}
-                onSelectAll={this.handleSelectAll}
+              onSelectAll={handleSelectAll}
               qsConfig={QS_CONFIG}
               additionalControls={[
                 <ToolbarDeleteButton
                   key="delete"
-                    onDelete={this.handleTemplateDelete}
+                  onDelete={handleTemplateDelete}
                   itemsToDelete={selected}
                   pluralizedItemName="Templates"
                 />,
@@ -275,8 +231,8 @@ class TemplatesList extends Component {
               key={template.id}
               value={template.name}
               template={template}
-                detailUrl={`${match.url}/${template.type}/${template.id}`}
+              detailUrl={`${pathname}/${template.type}/${template.id}`}
-                onSelect={() => this.handleSelect(template)}
+              onSelect={() => handleSelect(template)}
               isSelected={selected.some(row => row.id === template.id)}
             />
           )}
@@ -287,15 +243,14 @@ class TemplatesList extends Component {
         isOpen={deletionError}
         variant="danger"
         title={i18n._(t`Error!`)}
-          onClose={this.handleDeleteErrorClose}
+        onClose={() => setDeletionError(null)}
       >
         {i18n._(t`Failed to delete one or more templates.`)}
         <ErrorDetail error={deletionError} />
       </AlertModal>
-      </PageSection>
+    </>
   );
-  }
 }
 
 export { TemplatesList as _TemplatesList };
-export default withI18n()(withRouter(TemplatesList));
+export default withI18n()(TemplatesList);

awx/ui_next/src/screens/Template/TemplateList/TemplateListItem.jsx

@@ -59,7 +59,7 @@ const RightActionButtonCell = styled(ActionButtonCell)`
   ${rightStyle}
 `;
 
-function TemplateListItem({ i18n, template, isSelected, onSelect }) {
+function TemplateListItem({ i18n, template, isSelected, onSelect, detailUrl }) {
   const canLaunch = template.summary_fields.user_capabilities.start;
 
   const missingResourceIcon =
@@ -86,7 +86,7 @@ function TemplateListItem({ i18n, template, isSelected, onSelect }) {
             <LeftDataListCell key="divider">
               <VerticalSeparator />
               <span>
-                <Link to={`/templates/${template.type}/${template.id}`}>
+                <Link to={`${detailUrl}`}>
                   <b>{template.name}</b>
                 </Link>
               </span>

awx/ui_next/src/screens/Template/TemplateList/TemplatesList.test.jsx

@@ -1,4 +1,7 @@
 import React from 'react';
+import { act } from 'react-dom/test-utils';
+import { createMemoryHistory } from 'history';
+import { Route } from 'react-router-dom';
 import {
   JobTemplatesAPI,
   UnifiedJobTemplatesAPI,
@@ -6,7 +9,7 @@ import {
 } from '@api';
 import { mountWithContexts, waitForElement } from '@testUtils/enzymeHelpers';
 
-import TemplatesList, { _TemplatesList } from './TemplateList';
+import TemplatesList from './TemplateList';
 
 jest.mock('@api');
 
@@ -88,7 +91,8 @@ describe('<TemplatesList />', () => {
     jest.clearAllMocks();
   });
 
-  test('initially renders successfully', () => {
+  test('initially renders successfully', async () => {
+    await act(async () => {
       mountWithContexts(
         <TemplatesList
           match={{ path: '/templates', url: '/templates' }}
@@ -96,111 +100,172 @@ describe('<TemplatesList />', () => {
         />
       );
     });
-
-  test('Templates are retrieved from the api and the components finishes loading', async done => {
-    const loadTemplates = jest.spyOn(_TemplatesList.prototype, 'loadTemplates');
-    const wrapper = mountWithContexts(<TemplatesList />);
-    await waitForElement(
-      wrapper,
-      'TemplatesList',
-      el => el.state('hasContentLoading') === true
-    );
-    expect(loadTemplates).toHaveBeenCalled();
-    await waitForElement(
-      wrapper,
-      'TemplatesList',
-      el => el.state('hasContentLoading') === false
-    );
-    done();
   });
 
-  test('handleSelect is called when a template list item is selected', async done => {
+  test('Templates are retrieved from the api and the components finishes loading', async () => {
-    const handleSelect = jest.spyOn(_TemplatesList.prototype, 'handleSelect');
+    let wrapper;
-    const wrapper = mountWithContexts(<TemplatesList />);
+    await act(async () => {
-    await waitForElement(
+      wrapper = mountWithContexts(<TemplatesList />);
-      wrapper,
+    });
-      'TemplatesList',
+    expect(UnifiedJobTemplatesAPI.read).toBeCalled();
-      el => el.state('hasContentLoading') === false
+    await act(async () => {
-    );
+      await waitForElement(wrapper, 'ContentLoading', el => el.length === 0);
-    await wrapper
+    });
-      .find('input#select-jobTemplate-1')
+    expect(wrapper.find('TemplateListItem').length).toEqual(5);
-      .closest('DataListCheck')
-      .props()
-      .onChange();
-    expect(handleSelect).toBeCalled();
-    await waitForElement(
-      wrapper,
-      'TemplatesList',
-      el => el.state('selected').length === 1
-    );
-    done();
   });
 
-  test('handleSelectAll is called when a template list item is selected', async done => {
+  test('handleSelect is called when a template list item is selected', async () => {
-    const handleSelectAll = jest.spyOn(
-      _TemplatesList.prototype,
-      'handleSelectAll'
-    );
     const wrapper = mountWithContexts(<TemplatesList />);
-    await waitForElement(
+    await act(async () => {
-      wrapper,
+      await waitForElement(wrapper, 'ContentLoading', el => el.length === 0);
-      'TemplatesList',
+    });
-      el => el.state('hasContentLoading') === false
+    const checkBox = wrapper
-    );
+      .find('TemplateListItem')
+      .at(1)
+      .find('input');
+
+    checkBox.simulate('change', {
+      target: {
+        id: 2,
+        name: 'Job Template 2',
+        url: '/templates/job_template/2',
+        type: 'job_template',
+        summary_fields: { user_capabilities: { delete: true } },
+      },
+    });
+
+    expect(
       wrapper
-      .find('Checkbox#select-all')
+        .find('TemplateListItem')
-      .props()
+        .at(1)
-      .onChange(true);
+        .prop('isSelected')
-    expect(handleSelectAll).toBeCalled();
+    ).toBe(true);
-    await waitForElement(
-      wrapper,
-      'TemplatesList',
-      el => el.state('selected').length === 5
-    );
-    done();
   });
 
-  test('delete button is disabled if user does not have delete capabilities on a selected template', async done => {
+  test('handleSelectAll is called when a template list item is selected', async () => {
     const wrapper = mountWithContexts(<TemplatesList />);
-    wrapper.find('TemplatesList').setState({
+    await act(async () => {
-      templates: mockTemplates,
+      await waitForElement(wrapper, 'ContentLoading', el => el.length === 0);
-      itemCount: 5,
-      isInitialized: true,
-      selected: mockTemplates.slice(0, 4),
     });
-    await waitForElement(
+    expect(wrapper.find('Checkbox#select-all').prop('isChecked')).toBe(false);
-      wrapper,
+
-      'ToolbarDeleteButton * button',
+    const toolBarCheckBox = wrapper.find('Checkbox#select-all');
-      el => el.getDOMNode().disabled === false
+    act(() => {
-    );
+      toolBarCheckBox.prop('onChange')(true);
-    wrapper.find('TemplatesList').setState({
-      selected: mockTemplates,
     });
-    await waitForElement(
+    wrapper.update();
-      wrapper,
+    expect(wrapper.find('Checkbox#select-all').prop('isChecked')).toBe(true);
-      'ToolbarDeleteButton * button',
-      el => el.getDOMNode().disabled === true
-    );
-    done();
   });
 
-  test('api is called to delete templates for each selected template.', () => {
+  test('delete button is disabled if user does not have delete capabilities on a selected template', async () => {
-    JobTemplatesAPI.destroy = jest.fn();
-    WorkflowJobTemplatesAPI.destroy = jest.fn();
     const wrapper = mountWithContexts(<TemplatesList />);
-    wrapper.find('TemplatesList').setState({
+    await act(async () => {
-      templates: mockTemplates,
+      await waitForElement(wrapper, 'ContentLoading', el => el.length === 0);
-      itemCount: 5,
-      isInitialized: true,
-      isModalOpen: true,
-      selected: mockTemplates.slice(0, 4),
     });
-    wrapper.find('ToolbarDeleteButton').prop('onDelete')();
+    const deleteableItem = wrapper
-    expect(JobTemplatesAPI.destroy).toHaveBeenCalledTimes(3);
+      .find('TemplateListItem')
-    expect(WorkflowJobTemplatesAPI.destroy).toHaveBeenCalledTimes(1);
+      .at(0)
+      .find('input');
+    const nonDeleteableItem = wrapper
+      .find('TemplateListItem')
+      .at(4)
+      .find('input');
+
+    deleteableItem.simulate('change', {
+      id: 1,
+      name: 'Job Template 1',
+      url: '/templates/job_template/1',
+      type: 'job_template',
+      summary_fields: {
+        user_capabilities: {
+          delete: true,
+        },
+      },
     });
 
-  test('error is shown when template not successfully deleted from api', async done => {
+    expect(wrapper.find('Button[aria-label="Delete"]').prop('isDisabled')).toBe(
+      false
+    );
+    deleteableItem.simulate('change', {
+      id: 1,
+      name: 'Job Template 1',
+      url: '/templates/job_template/1',
+      type: 'job_template',
+      summary_fields: {
+        user_capabilities: {
+          delete: true,
+        },
+      },
+    });
+    expect(wrapper.find('Button[aria-label="Delete"]').prop('isDisabled')).toBe(
+      true
+    );
+    nonDeleteableItem.simulate('change', {
+      id: 5,
+      name: 'Workflow Job Template 2',
+      url: '/templates/workflow_job_template/5',
+      type: 'workflow_job_template',
+      summary_fields: {
+        user_capabilities: {
+          delete: false,
+        },
+      },
+    });
+    expect(wrapper.find('Button[aria-label="Delete"]').prop('isDisabled')).toBe(
+      true
+    );
+  });
+
+  test('api is called to delete templates for each selected template.', async () => {
+    const wrapper = mountWithContexts(<TemplatesList />);
+    await act(async () => {
+      await waitForElement(wrapper, 'ContentLoading', el => el.length === 0);
+    });
+    const jobTemplate = wrapper
+      .find('TemplateListItem')
+      .at(1)
+      .find('input');
+    const workflowJobTemplate = wrapper
+      .find('TemplateListItem')
+      .at(3)
+      .find('input');
+
+    jobTemplate.simulate('change', {
+      target: {
+        id: 2,
+        name: 'Job Template 2',
+        url: '/templates/job_template/2',
+        type: 'job_template',
+        summary_fields: { user_capabilities: { delete: true } },
+      },
+    });
+
+    workflowJobTemplate.simulate('change', {
+      target: {
+        id: 4,
+        name: 'Workflow Job Template 1',
+        url: '/templates/workflow_job_template/4',
+        type: 'workflow_job_template',
+        summary_fields: {
+          user_capabilities: {
+            delete: true,
+          },
+        },
+      },
+    });
+
+    wrapper.find('button[aria-label="Delete"]').prop('onClick')();
+    wrapper.update();
+    await act(async () => {
+      await wrapper
+        .find('button[aria-label="confirm delete"]')
+        .prop('onClick')();
+    });
+    expect(JobTemplatesAPI.destroy).toBeCalledWith(2);
+    expect(WorkflowJobTemplatesAPI.destroy).toBeCalledWith(4);
+  });
+
+  test('error is shown when template not successfully deleted from api', async () => {
     JobTemplatesAPI.destroy.mockRejectedValue(
       new Error({
         response: {
@@ -213,20 +278,66 @@ describe('<TemplatesList />', () => {
       })
     );
     const wrapper = mountWithContexts(<TemplatesList />);
-    wrapper.find('TemplatesList').setState({
+    await act(async () => {
-      templates: mockTemplates,
+      await waitForElement(wrapper, 'ContentLoading', el => el.length === 0);
-      itemCount: 1,
+    });
-      isInitialized: true,
+    const checkBox = wrapper
-      isModalOpen: true,
+      .find('TemplateListItem')
-      selected: mockTemplates.slice(0, 1),
+      .at(1)
+      .find('input');
+
+    checkBox.simulate('change', {
+      target: {
+        id: 'a',
+        name: 'Job Template 2',
+        url: '/templates/job_template/2',
+        type: 'job_template',
+        summary_fields: { user_capabilities: { delete: true } },
+      },
+    });
+    wrapper.find('button[aria-label="Delete"]').prop('onClick')();
+    wrapper.update();
+    await act(async () => {
+      await wrapper
+        .find('button[aria-label="confirm delete"]')
+        .prop('onClick')();
     });
-    wrapper.find('ToolbarDeleteButton').prop('onDelete')();
     await waitForElement(
       wrapper,
       'Modal',
       el => el.props().isOpen === true && el.props().title === 'Error!'
     );
-
+  });
-    done();
+  test('Calls API with jobtemplate__project id', async () => {
+    const history = createMemoryHistory({
+      initialEntries: ['/projects/6/job_templates'],
+    });
+    const wrapper = mountWithContexts(
+      <Route
+        path="/projects/:id/job_templates"
+        component={() => <TemplatesList />}
+      />,
+      {
+        context: {
+          router: {
+            history,
+            route: {
+              location: history.location,
+              match: { params: { id: 6 } },
+            },
+          },
+        },
+      }
+    );
+    await act(async () => {
+      await waitForElement(wrapper, 'ContentLoading', el => el.length === 1);
+    });
+    expect(UnifiedJobTemplatesAPI.read).toBeCalledWith({
+      jobtemplate__project: '6',
+      order_by: 'name',
+      page: 1,
+      page_size: 20,
+      type: 'job_template,workflow_job_template',
+    });
   });
 });

awx/ui_next/src/screens/Template/Templates.jsx

@@ -1,7 +1,8 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
 import { Route, withRouter, Switch } from 'react-router-dom';
+import { PageSection } from '@patternfly/react-core';
 
 import { Config } from '@contexts/Config';
 import Breadcrumbs from '@components/Breadcrumbs/Breadcrumbs';
@@ -50,8 +51,9 @@ class Templates extends Component {
     const { match, history, location } = this.props;
     const { breadcrumbConfig } = this.state;
     return (
-      <Fragment>
+      <>
         <Breadcrumbs breadcrumbConfig={breadcrumbConfig} />
+        <PageSection>
           <Switch>
             <Route
               path={`${match.path}/job_template/add`}
@@ -91,7 +93,8 @@ class Templates extends Component {
             />
             <Route path={`${match.path}`} render={() => <TemplateList />} />
           </Switch>
-      </Fragment>
+        </PageSection>
+      </>
     );
   }
 }

awx/ui_next/src/screens/Template/WorkflowJobTemplate.jsx

@@ -94,7 +94,6 @@ class WorkflowJobTemplate extends Component {
     }
 
     return (
-      <PageSection>
       <Card className="awx-c-card">
         {cardHeader}
         <Switch>
@@ -147,7 +146,6 @@ class WorkflowJobTemplate extends Component {
           />
         </Switch>
       </Card>
-      </PageSection>
     );
   }
 }