From 1f91773a3c70aeac62c809c6c317c88b30efc25a Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Fri, 15 Sep 2023 15:56:50 -0400 Subject: [PATCH] Simplify docs string base generation --- awx/ui/src/util/getDocsBaseUrl.js | 13 +++---------- awx/ui/src/util/getDocsBaseUrl.test.js | 12 ++++++------ 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/awx/ui/src/util/getDocsBaseUrl.js b/awx/ui/src/util/getDocsBaseUrl.js index 6b408ca8d3..415f361cff 100644 --- a/awx/ui/src/util/getDocsBaseUrl.js +++ b/awx/ui/src/util/getDocsBaseUrl.js @@ -2,16 +2,9 @@ export default function getDocsBaseUrl(config) { let version = 'latest'; const licenseType = config?.license_info?.license_type; - if (licenseType && licenseType !== 'open') { - if (config?.version) { - if (parseFloat(config?.version.split('-')[0]) >= 4.3) { - version = parseFloat(config?.version.split('-')[0]); - } else { - version = config?.version.split('-')[0]; - } - } - } else { - version = 'latest'; + if (licenseType && licenseType !== 'open' && config?.version) { + version = parseFloat(config?.version.split('-')[0]).toFixed(1); } + return `https://docs.ansible.com/automation-controller/${version}`; } diff --git a/awx/ui/src/util/getDocsBaseUrl.test.js b/awx/ui/src/util/getDocsBaseUrl.test.js index ea4c8a4e5a..1851cd9eef 100644 --- a/awx/ui/src/util/getDocsBaseUrl.test.js +++ b/awx/ui/src/util/getDocsBaseUrl.test.js @@ -6,7 +6,7 @@ describe('getDocsBaseUrl', () => { license_info: { license_type: 'open', }, - version: '18.0.0', + version: '18.4.4', }); expect(result).toEqual( @@ -19,11 +19,11 @@ describe('getDocsBaseUrl', () => { license_info: { license_type: 'enterprise', }, - version: '4.0.0', + version: '18.4.4', }); expect(result).toEqual( - 'https://docs.ansible.com/automation-controller/4.0.0' + 'https://docs.ansible.com/automation-controller/18.4' ); }); @@ -32,17 +32,17 @@ describe('getDocsBaseUrl', () => { license_info: { license_type: 'enterprise', }, - version: '4.0.0-beta', + version: '7.0.0-beta', }); expect(result).toEqual( - 'https://docs.ansible.com/automation-controller/4.0.0' + 'https://docs.ansible.com/automation-controller/7.0' ); }); it('should return latest version if license info missing', () => { const result = getDocsBaseUrl({ - version: '18.0.0', + version: '18.4.4', }); expect(result).toEqual(