From 33d7342ffec4fe967f14d06711012722fe4062b2 Mon Sep 17 00:00:00 2001 From: nixocio Date: Tue, 2 Mar 2021 13:04:30 -0500 Subject: [PATCH] Linkify reference to EE on details page Linkify reference to EE on a few details page. See: https://github.com/ansible/awx/issues/9189 --- .../OrganizationDetail/OrganizationDetail.jsx | 8 +++++++- .../src/screens/Project/ProjectDetail/ProjectDetail.jsx | 9 +++++++-- .../Template/JobTemplateDetail/JobTemplateDetail.jsx | 8 +++++++- .../JobTemplateDetail/JobTemplateDetail.test.jsx | 2 +- .../WorkflowJobTemplateDetail.jsx | 8 +++++++- .../WorkflowJobTemplateDetail.test.jsx | 9 ++++----- 6 files changed, 33 insertions(+), 11 deletions(-) diff --git a/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx b/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx index a1abee28a8..e3b544c091 100644 --- a/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx +++ b/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx @@ -97,7 +97,13 @@ function OrganizationDetail({ i18n, organization }) { {summary_fields?.default_environment?.name && ( + {summary_fields.default_environment.name} + + } /> )} + {summary_fields.default_environment.name} + + } /> )} - {({ project_base_dir }) => ( + {summary_fields.execution_environment.name} + + } /> )} ', () => { 1 ); expect( - wrapper.find('Detail[label="Execution Environment"]').prop('value') + wrapper.find(`Detail[label="Execution Environment"] dd`).text() ).toBe('Default EE'); }); }); diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx index 60331770ca..4f8237e8c2 100644 --- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx +++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx @@ -128,7 +128,13 @@ function WorkflowJobTemplateDetail({ template, i18n }) { {summary_fields?.execution_environment && ( + {summary_fields.execution_environment.name} + + } /> )} diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.test.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.test.jsx index 17a6593fda..0c1be1e8e9 100644 --- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.test.jsx +++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.test.jsx @@ -134,11 +134,6 @@ describe('', () => { prop: 'value', value: 'Workflow Job Template', }, - { - element: 'Detail[label="Execution Environment"]', - prop: 'value', - value: 'Demo EE', - }, ]; const organization = wrapper @@ -162,6 +157,10 @@ describe('', () => { }; renderedValues.map(value => assertValue(value)); + + expect( + wrapper.find(`Detail[label="Execution Environment"] dd`).text() + ).toBe('Demo EE'); }); test('link out resource have the correct url', () => {