Merge pull request #11724 from nixocio/ui_issue_11708

Bump node to LTS version
This commit is contained in:
Kersom
2022-02-14 13:11:57 -05:00
committed by GitHub
7 changed files with 7 additions and 26 deletions

View File

@@ -366,7 +366,7 @@ clean-ui:
rm -rf $(UI_BUILD_FLAG_FILE) rm -rf $(UI_BUILD_FLAG_FILE)
awx/ui/node_modules: 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 $(UI_BUILD_FLAG_FILE): awx/ui/node_modules
$(PYTHON) tools/scripts/compilemessages.py $(PYTHON) tools/scripts/compilemessages.py

View File

@@ -56,8 +56,8 @@ The UI is built using [ReactJS](https://reactjs.org/docs/getting-started.html) a
The AWX UI requires the following: The AWX UI requires the following:
- Node 14.x LTS - Node >= 16.14.0 LTS
- NPM 7.x LTS - NPM 8.x
Run the following to install all the dependencies: Run the following to install all the dependencies:

View File

@@ -1,4 +1,4 @@
FROM node:14.18.3 FROM node:16.14.0
ARG NPMRC_FILE=.npmrc ARG NPMRC_FILE=.npmrc
ENV NPMRC_FILE=${NPMRC_FILE} ENV NPMRC_FILE=${NPMRC_FILE}
ARG TARGET='https://awx:8043' ARG TARGET='https://awx:8043'

View File

@@ -1,7 +1,7 @@
# AWX-UI # AWX-UI
## Requirements ## Requirements
- node 14.18.3, npm 7.24.2, make, git - node >= 16.14.0, npm >= 8.x make, git
## Development ## Development
The API development server will need to be running. See [CONTRIBUTING.md](../../CONTRIBUTING.md). The API development server will need to be running. See [CONTRIBUTING.md](../../CONTRIBUTING.md).

View File

@@ -3,7 +3,7 @@
"homepage": ".", "homepage": ".",
"private": true, "private": true,
"engines": { "engines": {
"node": "14.x" "node": ">=16.14.0"
}, },
"dependencies": { "dependencies": {
"@lingui/react": "3.9.0", "@lingui/react": "3.9.0",

View File

@@ -275,25 +275,6 @@ describe('<JobDetail />', () => {
expect(errorModal.length).toBe(1); 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', () => { test('should display Playbook Check detail', () => {
wrapper = mountWithContexts( wrapper = mountWithContexts(
<JobDetail <JobDetail

View File

@@ -154,7 +154,7 @@ RUN dnf -y install \
wget \ wget \
diffutils \ diffutils \
unzip && \ 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 RUN pip3 install black git+https://github.com/coderanger/supervisor-stdout