From 31fdd5e85ce1315fabd8560c7ff620334136e56c Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Mon, 28 Oct 2019 10:25:10 -0400 Subject: [PATCH] Add scm refspec to project detail and remove org id from top level shared component --- awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx | 4 ++-- .../src/screens/Project/ProjectDetail/ProjectDetail.jsx | 2 ++ .../src/screens/Project/ProjectDetail/ProjectDetail.test.jsx | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx b/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx index b73ca373a3..5b978b2c66 100644 --- a/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx +++ b/awx/ui_next/src/components/Lookup/MultiCredentialsLookup.jsx @@ -101,7 +101,7 @@ class MultiCredentialsLookup extends React.Component { const { selectedCredentialType, credentialTypes } = this.state; const { tooltip, i18n, credentials } = this.props; return ( - + {tooltip && ( @@ -114,7 +114,7 @@ class MultiCredentialsLookup extends React.Component { selectedCategory={selectedCredentialType} onToggleItem={this.toggleCredentialSelection} onloadCategories={this.loadCredentialTypes} - id="org-credentials" + id="multiCredential" lookupHeader={i18n._(t`Credentials`)} name="credentials" value={credentials} diff --git a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx index 037092ae7f..ab738c97b3 100644 --- a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx +++ b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx @@ -30,6 +30,7 @@ function ProjectDetail({ project, i18n }) { scm_branch, scm_clean, scm_delete_on_update, + scm_refspec, scm_type, scm_update_on_launch, scm_update_cache_timeout, @@ -98,6 +99,7 @@ function ProjectDetail({ project, i18n }) { + {summary_fields.credential && ( ', () => { assertDetail('SCM Type', mockProject.scm_type); assertDetail('SCM URL', mockProject.scm_url); assertDetail('SCM Branch', mockProject.scm_branch); + assertDetail('SCM Refspec', mockProject.scm_refspec); assertDetail( 'SCM Credential', `Scm: ${mockProject.summary_fields.credential.name}`