From 87b1f0d0de1b410480310fa23f7286140d4d43c0 Mon Sep 17 00:00:00 2001
From: nixocio <nixocio@gmail.com>
Date: Thu, 10 Feb 2022 15:44:02 -0500
Subject: [PATCH] Bump node to LTS version

Bump node to LTS version
---
 Makefile                                      |  2 +-
 awx/ui/CONTRIBUTING.md                        |  4 ++--
 awx/ui/Dockerfile                             |  2 +-
 awx/ui/README.md                              |  2 +-
 awx/ui/package.json                           |  2 +-
 .../screens/Job/JobDetail/JobDetail.test.js   | 19 -------------------
 .../roles/dockerfile/templates/Dockerfile.j2  |  2 +-
 7 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 9d2e4e040b..6f4680399d 100644
--- a/Makefile
+++ b/Makefile
@@ -366,7 +366,7 @@ clean-ui:
 	rm -rf $(UI_BUILD_FLAG_FILE)
 
 awx/ui/node_modules:
-	NODE_OPTIONS=--max-old-space-size=4096 $(NPM_BIN) --prefix awx/ui --loglevel warn ci
+	NODE_OPTIONS=--max-old-space-size=6144 $(NPM_BIN) --prefix awx/ui --loglevel warn ci
 
 $(UI_BUILD_FLAG_FILE): awx/ui/node_modules
 	$(PYTHON) tools/scripts/compilemessages.py
diff --git a/awx/ui/CONTRIBUTING.md b/awx/ui/CONTRIBUTING.md
index a45a4269f0..b1eb156d56 100644
--- a/awx/ui/CONTRIBUTING.md
+++ b/awx/ui/CONTRIBUTING.md
@@ -56,8 +56,8 @@ The UI is built using [ReactJS](https://reactjs.org/docs/getting-started.html) a
 
 The AWX UI requires the following:
 
-- Node 14.x LTS
-- NPM 7.x LTS
+- Node >= 16.14.0 LTS
+- NPM 8.x 
 
 Run the following to install all the dependencies:
 
diff --git a/awx/ui/Dockerfile b/awx/ui/Dockerfile
index eafe0a7dd1..9e15524b38 100644
--- a/awx/ui/Dockerfile
+++ b/awx/ui/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14.18.3
+FROM node:16.14.0
 ARG NPMRC_FILE=.npmrc
 ENV NPMRC_FILE=${NPMRC_FILE}
 ARG TARGET='https://awx:8043'
diff --git a/awx/ui/README.md b/awx/ui/README.md
index 5d3444abb6..8f92ca7807 100644
--- a/awx/ui/README.md
+++ b/awx/ui/README.md
@@ -1,7 +1,7 @@
 # AWX-UI
 
 ## Requirements
-- node 14.18.3, npm 7.24.2, make, git
+- node >= 16.14.0, npm >= 8.x make, git
 
 ## Development
 The API development server will need to be running. See [CONTRIBUTING.md](../../CONTRIBUTING.md).
diff --git a/awx/ui/package.json b/awx/ui/package.json
index 22495d0fcd..040d6c14d1 100644
--- a/awx/ui/package.json
+++ b/awx/ui/package.json
@@ -3,7 +3,7 @@
   "homepage": ".",
   "private": true,
   "engines": {
-    "node": "14.x"
+    "node": ">=16.14.0"
   },
   "dependencies": {
     "@lingui/react": "3.9.0",
diff --git a/awx/ui/src/screens/Job/JobDetail/JobDetail.test.js b/awx/ui/src/screens/Job/JobDetail/JobDetail.test.js
index d1e7c846ef..da8b7048fe 100644
--- a/awx/ui/src/screens/Job/JobDetail/JobDetail.test.js
+++ b/awx/ui/src/screens/Job/JobDetail/JobDetail.test.js
@@ -275,25 +275,6 @@ describe('<JobDetail />', () => {
     expect(errorModal.length).toBe(1);
   });
 
-  test('DELETED is shown for required Job resources that have been deleted', () => {
-    const newMockData = {
-      ...mockJobData,
-      summary_fields: {
-        ...mockJobData.summary_fields,
-        inventory: null,
-        project: null,
-      },
-    };
-    wrapper = mountWithContexts(<JobDetail job={newMockData} />);
-    const detail = wrapper.find('JobDetail');
-    async function assertMissingDetail(label) {
-      expect(detail.length).toBe(1);
-      expect(detail.find(`Detail[label="${label}"] dt`).text()).toBe(label);
-      expect(detail.find(`Detail[label="${label}"] dd`).text()).toBe('DELETED');
-    }
-    assertMissingDetail('Project');
-    assertMissingDetail('Inventory');
-  });
   test('should display Playbook Check detail', () => {
     wrapper = mountWithContexts(
       <JobDetail
diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
index aefd8260bd..c75616540d 100644
--- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
+++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
@@ -154,7 +154,7 @@ RUN dnf -y install \
     wget \
     diffutils \
     unzip && \
-    npm install -g n && n 14.18.3 && npm install -g npm@7.24.2 && dnf remove -y nodejs
+    npm install -g n && n 16.14.0 && npm install -g npm@8.5.0 && dnf remove -y nodejs
 
 RUN pip3 install black git+https://github.com/coderanger/supervisor-stdout