From f502fbfad690986ed38ac4e4ad496037f8e61c20 Mon Sep 17 00:00:00 2001 From: mabashian Date: Thu, 3 Oct 2019 09:57:36 -0400 Subject: [PATCH] Put project related tabs in the correct order --- awx/ui_next/src/screens/Project/Project.jsx | 21 ++++++++++++------- .../src/screens/Project/Project.test.jsx | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/awx/ui_next/src/screens/Project/Project.jsx b/awx/ui_next/src/screens/Project/Project.jsx index 53b2506f97..1b509992cd 100644 --- a/awx/ui_next/src/screens/Project/Project.jsx +++ b/awx/ui_next/src/screens/Project/Project.jsx @@ -129,22 +129,29 @@ class Project extends Component { const tabsArray = [ { name: i18n._(t`Details`), link: `${match.url}/details`, id: 0 }, { name: i18n._(t`Access`), link: `${match.url}/access`, id: 1 }, - { name: i18n._(t`Schedules`), link: `${match.url}/schedules`, id: 2 }, - { - name: i18n._(t`Job Templates`), - link: `${match.url}/job_templates`, - id: 3, - }, ]; if (canSeeNotificationsTab) { tabsArray.push({ name: i18n._(t`Notifications`), link: `${match.url}/notifications`, - id: 4, + id: 2, }); } + tabsArray.push( + { + name: i18n._(t`Job Templates`), + link: '/job_templates', + id: canSeeNotificationsTab ? 3 : 2, + }, + { + name: i18n._(t`Schedules`), + link: '/schedules', + id: canSeeNotificationsTab ? 4 : 3, + } + ); + const CardHeader = styled(PFCardHeader)` --pf-c-card--first-child--PaddingTop: 0; --pf-c-card--child--PaddingLeft: 0; diff --git a/awx/ui_next/src/screens/Project/Project.test.jsx b/awx/ui_next/src/screens/Project/Project.test.jsx index d4a9ea3cc5..5205276ac3 100644 --- a/awx/ui_next/src/screens/Project/Project.test.jsx +++ b/awx/ui_next/src/screens/Project/Project.test.jsx @@ -45,7 +45,7 @@ describe.only('', () => { '.pf-c-tabs__item', el => el.length === 5 ); - expect(tabs.last().text()).toEqual('Notifications'); + expect(tabs.at(2).text()).toEqual('Notifications'); done(); });