Address PR feedback and merge conflicts

src/components/AnsibleSelect/AnsibleSelect.jsx

@@ -33,7 +33,7 @@ class AnsibleSelect extends React.Component {
             key={datum.value}
             value={datum.value}
             label={datum.label}
-            isDisabled={datum.disabled}
+            isDisabled={datum.isDisabled}
           />
         ))}
       </FormSelect>

src/components/AnsibleSelect/AnsibleSelect.test.jsx

@@ -49,7 +49,7 @@ describe('<AnsibleSelect />', () => {
         data={mockData}
       />
     );
-    // console.log(wrapper.debug());
+
     expect(wrapper.find('FormSelect')).toHaveLength(1);
     expect(wrapper.find('FormSelectOption')).toHaveLength(2);
   });

src/screens/Organization/shared/OrganizationForm.jsx

@@ -139,7 +139,7 @@ class OrganizationForm extends Component {
                           position="right"
                           content={i18n._(t`The maximum number of hosts allowed
                           to be managed by this organization. Value defaults to
-                          0 which means no limit. Refer tothe Ansible
+                          0 which means no limit. Refer to the Ansible
                           documentation for more details.`)}
                         >
                           <QuestionCircleIcon />

src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx

@@ -75,6 +75,7 @@ class JobTemplateDetail extends Component {
       },
       hasTemplateLoading,
       i18n,
+      match,
     } = this.props;
     const { instanceGroups, hasContentLoading, contentError } = this.state;
     const verbosityOptions = [
@@ -307,7 +308,7 @@ class JobTemplateDetail extends Component {
             {summary_fields.user_capabilities.edit && (
               <Button
                 component={Link}
-                to="/home"
+                to={`/templates/${match.params.templateType}/${match.params.id}/edit`}
                 aria-label={i18n._(t`Edit`)}
 
               >

src/screens/Template/Template.jsx

@@ -27,7 +27,6 @@ class Template extends Component {
       hasContentError: false,
       hasContentLoading: true,
       template: null,
-      actions: null,
     };
     this.loadTemplate = this.loadTemplate.bind(this);
   }
@@ -44,29 +43,15 @@ class Template extends Component {
   }
 
   async loadTemplate () {
-    const { actions: cachedActions } = this.state;
     const { setBreadcrumb, match } = this.props;
     const { id } = match.params;
 
-    let optionsPromise;
-    if (cachedActions) {
-      optionsPromise = Promise.resolve({ data: { actions: cachedActions } });
-    } else {
-      optionsPromise = JobTemplatesAPI.readOptions();
-    }
-
-    const promises = Promise.all([
-      JobTemplatesAPI.readDetail(id),
-      optionsPromise
-    ]);
-
     this.setState({ hasContentError: false, hasContentLoading: true });
     try {
-      const [{ data }, { data: { actions } }] = await promises;
+      const { data } = await JobTemplatesAPI.readDetail(id);
       setBreadcrumb(data);
       this.setState({
         template: data,
-        actions
       });
     } catch {
       this.setState({ hasContentError: true });
@@ -82,16 +67,12 @@ class Template extends Component {
       location,
       match,
     } = this.props;
-
     const {
-      actions,
       hasContentError,
       hasContentLoading,
       template
     } = this.state;
 
-    const canAdd = actions && Object.prototype.hasOwnProperty.call(actions, 'POST');
-
     const tabsArray = [
       { name: i18n._(t`Details`), link: `${match.url}/details`, id: 0 },
       { name: i18n._(t`Access`), link: '/home', id: 1 },
@@ -154,7 +135,6 @@ class Template extends Component {
                 render={() => (
                   <TemplateEdit
                     template={template}
-                    hasPermissions={canAdd}
                   />
                 )}
               />

src/screens/Template/Template.test.jsx

@@ -7,10 +7,10 @@ describe('<Template />', () => {
     mountWithContexts(<Template />);
   });
   test('When component mounts API is called and the response is put in state', async (done) => {
-    const readTemplate = jest.spyOn(_Template.prototype, 'readTemplate');
+    const loadTemplate = jest.spyOn(_Template.prototype, 'loadTemplate');
     const wrapper = mountWithContexts(<Template />);
     await waitForElement(wrapper, 'Template', (el) => el.state('hasContentLoading') === true);
-    expect(readTemplate).toHaveBeenCalled();
+    expect(loadTemplate).toHaveBeenCalled();
     await waitForElement(wrapper, 'Template', (el) => el.state('hasContentLoading') === true);
     done();
   });

src/screens/Template/TemplateEdit/TemplateEdit.jsx

@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
 import { withRouter, Redirect } from 'react-router-dom';
 import { CardBody } from '@patternfly/react-core';
 import TemplateForm from '../shared/TemplateForm';
@@ -9,7 +8,6 @@ import { JobTemplate } from '@types';
 class TemplateEdit extends Component {
   static propTypes = {
     template: JobTemplate.isRequired,
-    hasPermissions: PropTypes.bool.isRequired,
   };
 
   constructor (props) {
@@ -40,10 +38,11 @@ class TemplateEdit extends Component {
   }
 
   render () {
-    const { template, hasPermissions } = this.props;
+    const { template } = this.props;
     const { error } = this.state;
+    const canEdit = template.summary_fields.user_capabilities.edit;
 
-    if (!hasPermissions) {
+    if (!canEdit) {
       const { template: { id, type } } = this.props;
       return <Redirect to={`/templates/${type}/${id}/details`} />;
     }

src/screens/Template/TemplateEdit/TemplateEdit.test.jsx

@@ -14,14 +14,18 @@ describe('<TemplateEdit />', () => {
     inventory: 2,
     project: 3,
     playbook: 'Baz',
-    type: 'job_template'
+    type: 'job_template',
+    summary_fields: {
+      user_capabilities: {
+        edit: true
+      }
+    }
   };
 
   test('initially renders successfully', () => {
     mountWithContexts(
       <TemplateEdit
         template={mockData}
-        hasPermissions
       />
     );
   });
@@ -30,7 +34,6 @@ describe('<TemplateEdit />', () => {
     const wrapper = mountWithContexts(
       <TemplateEdit
         template={mockData}
-        hasPermissions
       />
     );
     const updatedTemplateData = {
@@ -50,7 +53,6 @@ describe('<TemplateEdit />', () => {
     const wrapper = mountWithContexts(
       <TemplateEdit
         template={mockData}
-        hasPermissions
       />,
       { context: { router: { history } } }
     );

src/screens/Template/shared/TemplateForm.jsx

@@ -38,9 +38,9 @@ class TemplateForm extends Component {
     } = this.props;
 
     const jobTypeOptions = [
-      { value: '', label: i18n._(t`Choose a job type`), disabled: true },
-      { value: 'run', label: i18n._(t`Run`), disabled: false },
-      { value: 'check', label: i18n._(t`Check`), disabled: false }
+      { value: '', label: i18n._(t`Choose a job type`), isDisabled: true },
+      { value: 'run', label: i18n._(t`Run`), isDisabled: false },
+      { value: 'check', label: i18n._(t`Check`), isDisabled: false }
     ];
 
     return (