Skip to content

Commit

Permalink
Move Admin Portal to new path
Browse files Browse the repository at this point in the history
  • Loading branch information
manstis committed Jun 27, 2024
1 parent 7f7dac6 commit ba38bcc
Show file tree
Hide file tree
Showing 85 changed files with 33 additions and 33 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/code_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@ jobs:
with:
node-version: '20.x'
cache: 'npm'
cache-dependency-path: ./ansible_wisdom_console_react/package-lock.json
cache-dependency-path: ./ansible_ai_connect_admin_portal/package-lock.json

- name: Install Dependencies (TypeScript)
run: npm ci
working-directory: ./ansible_wisdom_console_react
working-directory: ./ansible_ai_connect_admin_portal

- name: Running Unit Tests (TypeScript)
run: npm run test
working-directory: ./ansible_wisdom_console_react
working-directory: ./ansible_ai_connect_admin_portal

#####################
# SonarCloud coverage
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/npm_audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ on:
branches:
- main
paths:
- ansible_wisdom_console_react/**
- ansible_ai_connect_admin_portal/**
pull_request:
branches:
- main
paths:
- ansible_wisdom_console_react/**
- ansible_ai_connect_admin_portal/**

jobs:
lint:
runs-on: ubuntu-latest

env:
WORKING_DIRECTORY: ./ansible_wisdom_console_react
WORKING_DIRECTORY: ./ansible_ai_connect_admin_portal

steps:
- name: Checkout commit
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ui_compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ on:
branches:
- main
paths:
- ansible_wisdom_console_react/**
- ansible_ai_connect_admin_portal/**
pull_request:
branches:
- main
paths:
- ansible_wisdom_console_react/**
- ansible_ai_connect_admin_portal/**

jobs:

lint:
runs-on: ubuntu-latest

env:
WORKING_DIRECTORY: ./ansible_wisdom_console_react
WORKING_DIRECTORY: ./ansible_ai_connect_admin_portal

steps:
- name: Checkout commit
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,14 @@ code-coverage:
# Compile and bundle Admin Portal into Django application
.PHONY: admin-portal-bundle
admin-portal-bundle:
npm --prefix ./ansible_wisdom_console_react run build
npm --prefix ./ansible_ai_connect_admin_portal run build

# Run tests for Admin Portal
.PHONY: admin-portal-test
admin-portal-test:
npm --prefix ./ansible_wisdom_console_react run test
npm --prefix ./ansible_ai_connect_admin_portal run test

# Run lint checks for Admin Portal
.PHONY: admin-portal-lint
admin-portal-lint:
npm --prefix ./ansible_wisdom_console_react run lint
npm --prefix ./ansible_ai_connect_admin_portal run lint
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ podman compose -f tools/docker-compose/compose.yaml down
## Development

### Project structure
| Path | Description |
|------|-------------|
| ansible_ai_connect | Service backend application |
| ansible_wisdom_console_react | Admin portal application |
| Path | Description |
|-----------------------------------------------------|-------------|
| ansible_ai_connect | Service backend application |
| ansible_ai_connect_admin_portal | Admin portal application |

### Service configuration

Expand Down Expand Up @@ -86,7 +86,7 @@ WCA_SECRET_MANAGER_SECRET_ACCESS_KEY=<secret-access-key>
See [here](#aws-config) for details.

### Admin Portal
This repository also contains a React/TypeScript webapp for the "Admin Portal". This is located in the `ansible_wisdom_console_react` directory. Further details can be found in `ansible_wisdom_console_react/README.md`. If you wish to run the "Admin Portal" locally it is important to read the instructions.
This repository also contains a React/TypeScript webapp for the "Admin Portal". This is located in the `ansible_ai_connect_admin_portal` directory. Further details can be found in `ansible_ai_connect_admin_portal/README.md`. If you wish to run the "Admin Portal" locally it is important to read the instructions.

## Debugging

Expand Down Expand Up @@ -617,13 +617,13 @@ chmod -R 777 ari/
If your django container build fails with the following error, you've
probably run out of memory running webpack.
```bash
STEP 30/46: RUN npm --prefix /tmp/ansible_wisdom_console_react run build
STEP 30/46: RUN npm --prefix /tmp/ansible_ai_connect_admin_portal run build
> [email protected] build
> node scripts/build.js
Creating an optimized production build...
npm ERR! path /tmp/ansible_wisdom_console_react
npm ERR! path /tmp/ansible_ai_connect_admin_portal
npm ERR! command failed
npm ERR! signal SIGKILL
npm ERR! command sh -c -- node scripts/build.js
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ sonar.python.coverage.reportPaths=coverage.xml
sonar.python.version=3.11

# Admin Portal specific settings
sonar.javascript.lcov.reportPaths=ansible_wisdom_console_react/coverage/lcov.info
sonar.javascript.lcov.reportPaths=ansible_ai_connect_admin_portal/coverage/lcov.info

# Define the same root directory for sources and tests
sonar.sources = ansible_ai_connect/,ansible_wisdom_console_react/
sonar.tests = ansible_ai_connect/,ansible_wisdom_console_react/
sonar.sources = ansible_ai_connect/,ansible_ai_connect_admin_portal/
sonar.tests = ansible_ai_connect/,ansible_ai_connect_admin_portal/

# Include test subdirectories in test scope
sonar.test.inclusions = ansible_ai_connect/**/test_*.py,ansible_ai_connect/users/migrations/*,ansible_ai_connect/organizations/migrations/*,ansible_wisdom_console_react/**/__tests__/
sonar.test.inclusions = ansible_ai_connect/**/test_*.py,ansible_ai_connect/users/migrations/*,ansible_ai_connect/organizations/migrations/*,ansible_ai_connect_admin_portal/**/__tests__/

# Exclude test subdirectories from source scope
sonar.exclusions = ansible_ai_connect/**/test_*.py,ansible_wisdom_console_react/**/__tests__/*.*,ansible_wisdom_console_react/config/**,ansible_wisdom_console_react/__mocks__/**,ansible_wisdom_console_react/scripts/**,ansible_wisdom_console_react/**/*.json
sonar.exclusions = ansible_ai_connect/**/test_*.py,ansible_ai_connect_admin_portal/**/__tests__/*.*,ansible_ai_connect_admin_portal/config/**,ansible_ai_connect_admin_portal/__mocks__/**,ansible_ai_connect_admin_portal/scripts/**,ansible_ai_connect_admin_portal/**/*.json

sonar.qualitygate.wait=true
18 changes: 9 additions & 9 deletions wisdom-service.Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ RUN echo -e "\

# Compile React/TypeScript Console application
# Copy each source folder individually to avoid copying 'node_modules'
COPY ansible_wisdom_console_react/config /tmp/ansible_wisdom_console_react/config
COPY ansible_wisdom_console_react/public /tmp/ansible_wisdom_console_react/public
COPY ansible_wisdom_console_react/scripts /tmp/ansible_wisdom_console_react/scripts
COPY ansible_wisdom_console_react/src /tmp/ansible_wisdom_console_react/src
COPY ansible_wisdom_console_react/package.json /tmp/ansible_wisdom_console_react/package.json
COPY ansible_wisdom_console_react/package-lock.json /tmp/ansible_wisdom_console_react/package-lock.json
COPY ansible_wisdom_console_react/tsconfig.json /tmp/ansible_wisdom_console_react/tsconfig.json
RUN npm --prefix /tmp/ansible_wisdom_console_react ci
RUN npm --prefix /tmp/ansible_wisdom_console_react run build
COPY ansible_ai_connect_admin_portal/config /tmp/ansible_ai_connect_admin_portal/config
COPY ansible_ai_connect_admin_portal/public /tmp/ansible_ai_connect_admin_portal/public
COPY ansible_ai_connect_admin_portal/scripts /tmp/ansible_ai_connect_admin_portal/scripts
COPY ansible_ai_connect_admin_portal/src /tmp/ansible_ai_connect_admin_portal/src
COPY ansible_ai_connect_admin_portal/package.json /tmp/ansible_ai_connect_admin_portal/package.json
COPY ansible_ai_connect_admin_portal/package-lock.json /tmp/ansible_ai_connect_admin_portal/package-lock.json
COPY ansible_ai_connect_admin_portal/tsconfig.json /tmp/ansible_ai_connect_admin_portal/tsconfig.json
RUN npm --prefix /tmp/ansible_ai_connect_admin_portal ci
RUN npm --prefix /tmp/ansible_ai_connect_admin_portal run build

# Copy configuration files
COPY tools/scripts/launch-wisdom.sh /usr/bin/launch-wisdom.sh
Expand Down

0 comments on commit ba38bcc

Please sign in to comment.