From d1370868700e07096660f17b6a4466b1139fd590 Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@users.noreply.github.com>
Date: Thu, 9 Mar 2023 10:41:00 -0500
Subject: [PATCH] Adds UI bits for new UI_NEXT system setting

---
 .../MiscSystemDetail/MiscSystemDetail.js        |  3 ++-
 .../MiscSystemDetail/MiscSystemDetail.test.js   |  2 ++
 .../MiscSystem/MiscSystemEdit/MiscSystemEdit.js |  4 +++-
 .../MiscSystemEdit/MiscSystemEdit.test.js       |  1 +
 .../Setting/shared/data.allSettingOptions.json  | 17 +++++++++++++++++
 .../Setting/shared/data.allSettings.json        |  3 ++-
 6 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.js b/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.js
index c3e1d04971..b7ed41969a 100644
--- a/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.js
+++ b/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.js
@@ -60,7 +60,8 @@ function MiscSystemDetail() {
         'DEFAULT_EXECUTION_ENVIRONMENT',
         'PROXY_IP_ALLOWED_LIST',
         'AUTOMATION_ANALYTICS_LAST_GATHER',
-        'AUTOMATION_ANALYTICS_LAST_ENTRIES'
+        'AUTOMATION_ANALYTICS_LAST_ENTRIES',
+        'UI_NEXT'
       );
 
       const mergedData = {};
diff --git a/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.js b/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.js
index 0a15b3bdad..909fb6ad6d 100644
--- a/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.js
+++ b/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.js
@@ -43,6 +43,7 @@ describe('<MiscSystemDetail />', () => {
         AUTOMATION_ANALYTICS_LAST_ENTRIES:
           '{"foo": "2021-11-24R06:35:15.179Z"}',
         AUTOMATION_ANALYTICS_GATHER_INTERVAL: 14400,
+        UI_NEXT: true,
       },
     });
     ExecutionEnvironmentsAPI.readDetail = jest.fn();
@@ -113,6 +114,7 @@ describe('<MiscSystemDetail />', () => {
     assertVariableDetail(wrapper, 'Remote Host Headers', '[]');
     assertVariableDetail(wrapper, 'Proxy IP Allowed List', '[]');
     assertDetail(wrapper, 'Global default execution environment', 'Foo');
+    assertDetail(wrapper, 'Enable Next Generation User Interface', 'On');
   });
 
   test('should render execution environment as not configured', async () => {
diff --git a/awx/ui/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.js b/awx/ui/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.js
index 4cb9604cb4..9f2bf48d09 100644
--- a/awx/ui/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.js
+++ b/awx/ui/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.js
@@ -52,7 +52,8 @@ function MiscSystemEdit() {
         'REMOTE_HOST_HEADERS',
         'TOWER_URL_BASE',
         'DEFAULT_EXECUTION_ENVIRONMENT',
-        'PROXY_IP_ALLOWED_LIST'
+        'PROXY_IP_ALLOWED_LIST',
+        'UI_NEXT'
       );
 
       const mergedData = {};
@@ -222,6 +223,7 @@ function MiscSystemEdit() {
                   type="number"
                   isRequired
                 />
+                <BooleanField name="UI_NEXT" config={system.UI_NEXT} />
                 <ObjectField
                   name="AUTOMATION_ANALYTICS_LAST_ENTRIES"
                   config={system.AUTOMATION_ANALYTICS_LAST_ENTRIES}
diff --git a/awx/ui/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.test.js b/awx/ui/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.test.js
index e81a11e3bf..b8adaeef86 100644
--- a/awx/ui/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.test.js
+++ b/awx/ui/src/screens/Setting/MiscSystem/MiscSystemEdit/MiscSystemEdit.test.js
@@ -39,6 +39,7 @@ const systemData = {
   REMOTE_HOST_HEADERS: ['REMOTE_ADDR', 'REMOTE_HOST'],
   TOWER_URL_BASE: 'https://localhost:3000',
   PROXY_IP_ALLOWED_LIST: [],
+  UI_NEXT: false,
 };
 
 describe('<MiscSystemEdit />', () => {
diff --git a/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json b/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json
index 3eaf93eff0..029140287c 100644
--- a/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json
+++ b/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json
@@ -639,6 +639,15 @@
         "unit": "seconds",
         "default": 14400
       },
+      "UI_NEXT": {
+        "type": "boolean",
+        "required": false,
+        "label": "Enable Next Generation User Interface",
+        "help_text": "Enable the next generation user interface.",
+        "category": "System",
+        "category_slug": "system",
+        "default": true
+      },
       "SESSION_COOKIE_AGE": {
         "type": "integer",
         "required": true,
@@ -4372,6 +4381,14 @@
         "defined_in_file": false,
         "unit": "seconds"
       },
+      "UI_NEXT": {
+        "type": "boolean",
+        "label": "Enable Next Generation User Interface",
+        "help_text": "Enable the next generation user interface.",
+        "category": "System",
+        "category_slug": "system",
+        "defined_in_file": false
+      },
       "SESSION_COOKIE_AGE": {
         "type": "integer",
         "label": "Idle Time Force Log Out",
diff --git a/awx/ui/src/screens/Setting/shared/data.allSettings.json b/awx/ui/src/screens/Setting/shared/data.allSettings.json
index b2eaea2a12..171b2423e3 100644
--- a/awx/ui/src/screens/Setting/shared/data.allSettings.json
+++ b/awx/ui/src/screens/Setting/shared/data.allSettings.json
@@ -307,5 +307,6 @@
     "instances":{"fields":["hostname"],"adj_list":[]}
   },
   "DEFAULT_EXECUTION_ENVIRONMENT": 1,
-  "AWX_MOUNT_ISOLATED_PATHS_ON_K8S": false
+  "AWX_MOUNT_ISOLATED_PATHS_ON_K8S": false,
+  "UI_NEXT": false
 }