From 5790aa97803d0b9cf7efd6822ee9ed842e7657a1 Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Wed, 29 Jan 2020 11:01:57 -0500
Subject: [PATCH] Adds TemplateList of Project

---
 .../ProjectJobTemplates.jsx                   | 13 ++++---
 .../Template/TemplateList/TemplateList.jsx    | 17 +++++----
 .../TemplateList/TemplatesList.test.jsx       | 36 +++++++++++++++++++
 3 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/awx/ui_next/src/screens/Project/ProjectJobTemplates/ProjectJobTemplates.jsx b/awx/ui_next/src/screens/Project/ProjectJobTemplates/ProjectJobTemplates.jsx
index b80f1a4c61..72b9af7989 100644
--- a/awx/ui_next/src/screens/Project/ProjectJobTemplates/ProjectJobTemplates.jsx
+++ b/awx/ui_next/src/screens/Project/ProjectJobTemplates/ProjectJobTemplates.jsx
@@ -1,10 +1,9 @@
-import React, { Component } from 'react';
-import { CardBody } from '@components/Card';
+import React from 'react';
+import { withRouter } from 'react-router-dom';
+import TemplateList from '../../Template/TemplateList/TemplateList';
 
-class ProjectJobTemplates extends Component {
-  render() {
-    return <CardBody>Coming soon :)</CardBody>;
-  }
+function ProjectJobTemplates() {
+  return <TemplateList />;
 }
 
-export default ProjectJobTemplates;
+export default withRouter(ProjectJobTemplates);
diff --git a/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx b/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx
index 8c99916999..9406866468 100644
--- a/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx
+++ b/awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx
@@ -109,12 +109,14 @@ class TemplatesList extends Component {
   }
 
   async loadTemplates() {
-    const { location } = this.props;
+    const { location, match } = this.props;
     const {
       jtActions: cachedJTActions,
       wfjtActions: cachedWFJTActions,
     } = this.state;
-    const params = parseQueryString(QS_CONFIG, location.search);
+    const params = {
+      ...parseQueryString(QS_CONFIG, location.search),
+    };
 
     let jtOptionsPromise;
     if (cachedJTActions) {
@@ -133,6 +135,9 @@ class TemplatesList extends Component {
     } else {
       wfjtOptionsPromise = WorkflowJobTemplatesAPI.readOptions();
     }
+    if (match.url.startsWith('/projects') && match.params.id) {
+      params.jobtemplate__project = match.params.id;
+    }
 
     const promises = Promise.all([
       UnifiedJobTemplatesAPI.read(params),
@@ -189,13 +194,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,7 +209,7 @@ class TemplatesList extends Component {
       <AddDropDownButton key="add" dropdownItems={addButtonOptions} />
     );
     return (
-      <PageSection>
+      <>
         <Card>
           <PaginatedDataList
             contentError={contentError}
@@ -292,7 +297,7 @@ class TemplatesList extends Component {
           {i18n._(t`Failed to delete one or more templates.`)}
           <ErrorDetail error={deletionError} />
         </AlertModal>
-      </PageSection>
+      </>
     );
   }
 }
diff --git a/awx/ui_next/src/screens/Template/TemplateList/TemplatesList.test.jsx b/awx/ui_next/src/screens/Template/TemplateList/TemplatesList.test.jsx
index ab923d471d..108caece3a 100644
--- a/awx/ui_next/src/screens/Template/TemplateList/TemplatesList.test.jsx
+++ b/awx/ui_next/src/screens/Template/TemplateList/TemplatesList.test.jsx
@@ -1,4 +1,6 @@
 import React from 'react';
+import { createMemoryHistory } from 'history';
+import { Route } from 'react-router-dom';
 import {
   JobTemplatesAPI,
   UnifiedJobTemplatesAPI,
@@ -229,4 +231,38 @@ describe('<TemplatesList />', () => {
 
     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 waitForElement(
+      wrapper,
+      'TemplatesList',
+      el => el.state('hasContentLoading') === true
+    );
+    expect(UnifiedJobTemplatesAPI.read).toBeCalledWith({
+      jobtemplate__project: '6',
+      order_by: 'name',
+      page: 1,
+      page_size: 20,
+      type: 'job_template,workflow_job_template',
+    });
+  });
 });