diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 0945ef993..098bc6e1f 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -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 diff --git a/.github/workflows/npm_audit.yml b/.github/workflows/npm_audit.yml index 0fac3d89d..04379ca28 100644 --- a/.github/workflows/npm_audit.yml +++ b/.github/workflows/npm_audit.yml @@ -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 diff --git a/.github/workflows/ui_compile.yml b/.github/workflows/ui_compile.yml index 6fb3ae542..fbf947f51 100644 --- a/.github/workflows/ui_compile.yml +++ b/.github/workflows/ui_compile.yml @@ -5,12 +5,12 @@ 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: @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest env: - WORKING_DIRECTORY: ./ansible_wisdom_console_react + WORKING_DIRECTORY: ./ansible_ai_connect_admin_portal steps: - name: Checkout commit diff --git a/Makefile b/Makefile index 9df2bc102..4fc5f5c88 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/README.md b/README.md index b44dd1f2c..abbab62d9 100644 --- a/README.md +++ b/README.md @@ -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 @@ -86,7 +86,7 @@ WCA_SECRET_MANAGER_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 @@ -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 > admin-portal@0.1.0 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 diff --git a/ansible_wisdom_console_react/.eslintrc.js b/ansible_ai_connect_admin_portal/.eslintrc.js similarity index 100% rename from ansible_wisdom_console_react/.eslintrc.js rename to ansible_ai_connect_admin_portal/.eslintrc.js diff --git a/ansible_wisdom_console_react/.gitignore b/ansible_ai_connect_admin_portal/.gitignore similarity index 100% rename from ansible_wisdom_console_react/.gitignore rename to ansible_ai_connect_admin_portal/.gitignore diff --git a/ansible_wisdom_console_react/.prettierignore b/ansible_ai_connect_admin_portal/.prettierignore similarity index 100% rename from ansible_wisdom_console_react/.prettierignore rename to ansible_ai_connect_admin_portal/.prettierignore diff --git a/ansible_wisdom_console_react/README.md b/ansible_ai_connect_admin_portal/README.md similarity index 100% rename from ansible_wisdom_console_react/README.md rename to ansible_ai_connect_admin_portal/README.md diff --git a/ansible_wisdom_console_react/__mocks__/monaco-editor.ts b/ansible_ai_connect_admin_portal/__mocks__/monaco-editor.ts similarity index 100% rename from ansible_wisdom_console_react/__mocks__/monaco-editor.ts rename to ansible_ai_connect_admin_portal/__mocks__/monaco-editor.ts diff --git a/ansible_wisdom_console_react/__mocks__/react-i18next.ts b/ansible_ai_connect_admin_portal/__mocks__/react-i18next.ts similarity index 100% rename from ansible_wisdom_console_react/__mocks__/react-i18next.ts rename to ansible_ai_connect_admin_portal/__mocks__/react-i18next.ts diff --git a/ansible_wisdom_console_react/config/env.js b/ansible_ai_connect_admin_portal/config/env.js similarity index 100% rename from ansible_wisdom_console_react/config/env.js rename to ansible_ai_connect_admin_portal/config/env.js diff --git a/ansible_wisdom_console_react/config/getHttpsConfig.js b/ansible_ai_connect_admin_portal/config/getHttpsConfig.js similarity index 100% rename from ansible_wisdom_console_react/config/getHttpsConfig.js rename to ansible_ai_connect_admin_portal/config/getHttpsConfig.js diff --git a/ansible_wisdom_console_react/config/jest/babelTransform.js b/ansible_ai_connect_admin_portal/config/jest/babelTransform.js similarity index 100% rename from ansible_wisdom_console_react/config/jest/babelTransform.js rename to ansible_ai_connect_admin_portal/config/jest/babelTransform.js diff --git a/ansible_wisdom_console_react/config/jest/cssTransform.js b/ansible_ai_connect_admin_portal/config/jest/cssTransform.js similarity index 100% rename from ansible_wisdom_console_react/config/jest/cssTransform.js rename to ansible_ai_connect_admin_portal/config/jest/cssTransform.js diff --git a/ansible_wisdom_console_react/config/jest/fileTransform.js b/ansible_ai_connect_admin_portal/config/jest/fileTransform.js similarity index 100% rename from ansible_wisdom_console_react/config/jest/fileTransform.js rename to ansible_ai_connect_admin_portal/config/jest/fileTransform.js diff --git a/ansible_wisdom_console_react/config/jest/matchMedia.js b/ansible_ai_connect_admin_portal/config/jest/matchMedia.js similarity index 100% rename from ansible_wisdom_console_react/config/jest/matchMedia.js rename to ansible_ai_connect_admin_portal/config/jest/matchMedia.js diff --git a/ansible_wisdom_console_react/config/modules.js b/ansible_ai_connect_admin_portal/config/modules.js similarity index 100% rename from ansible_wisdom_console_react/config/modules.js rename to ansible_ai_connect_admin_portal/config/modules.js diff --git a/ansible_wisdom_console_react/config/paths.js b/ansible_ai_connect_admin_portal/config/paths.js similarity index 100% rename from ansible_wisdom_console_react/config/paths.js rename to ansible_ai_connect_admin_portal/config/paths.js diff --git a/ansible_wisdom_console_react/config/webpack.config.js b/ansible_ai_connect_admin_portal/config/webpack.config.js similarity index 100% rename from ansible_wisdom_console_react/config/webpack.config.js rename to ansible_ai_connect_admin_portal/config/webpack.config.js diff --git a/ansible_wisdom_console_react/config/webpack.mock.api.keys.ts b/ansible_ai_connect_admin_portal/config/webpack.mock.api.keys.ts similarity index 100% rename from ansible_wisdom_console_react/config/webpack.mock.api.keys.ts rename to ansible_ai_connect_admin_portal/config/webpack.mock.api.keys.ts diff --git a/ansible_wisdom_console_react/config/webpack.mock.api.modelids.ts b/ansible_ai_connect_admin_portal/config/webpack.mock.api.modelids.ts similarity index 100% rename from ansible_wisdom_console_react/config/webpack.mock.api.modelids.ts rename to ansible_ai_connect_admin_portal/config/webpack.mock.api.modelids.ts diff --git a/ansible_wisdom_console_react/config/webpack.mock.api.telemetry.ts b/ansible_ai_connect_admin_portal/config/webpack.mock.api.telemetry.ts similarity index 100% rename from ansible_wisdom_console_react/config/webpack.mock.api.telemetry.ts rename to ansible_ai_connect_admin_portal/config/webpack.mock.api.telemetry.ts diff --git a/ansible_wisdom_console_react/config/webpack.mock.globals.ts b/ansible_ai_connect_admin_portal/config/webpack.mock.globals.ts similarity index 100% rename from ansible_wisdom_console_react/config/webpack.mock.globals.ts rename to ansible_ai_connect_admin_portal/config/webpack.mock.globals.ts diff --git a/ansible_wisdom_console_react/config/webpack/persistentCache/createEnvironmentHash.js b/ansible_ai_connect_admin_portal/config/webpack/persistentCache/createEnvironmentHash.js similarity index 100% rename from ansible_wisdom_console_react/config/webpack/persistentCache/createEnvironmentHash.js rename to ansible_ai_connect_admin_portal/config/webpack/persistentCache/createEnvironmentHash.js diff --git a/ansible_wisdom_console_react/config/webpackDevServer.config.js b/ansible_ai_connect_admin_portal/config/webpackDevServer.config.js similarity index 100% rename from ansible_wisdom_console_react/config/webpackDevServer.config.js rename to ansible_ai_connect_admin_portal/config/webpackDevServer.config.js diff --git a/ansible_wisdom_console_react/package-lock.json b/ansible_ai_connect_admin_portal/package-lock.json similarity index 100% rename from ansible_wisdom_console_react/package-lock.json rename to ansible_ai_connect_admin_portal/package-lock.json diff --git a/ansible_wisdom_console_react/package.json b/ansible_ai_connect_admin_portal/package.json similarity index 100% rename from ansible_wisdom_console_react/package.json rename to ansible_ai_connect_admin_portal/package.json diff --git a/ansible_wisdom_console_react/public/denied.html b/ansible_ai_connect_admin_portal/public/denied.html similarity index 100% rename from ansible_wisdom_console_react/public/denied.html rename to ansible_ai_connect_admin_portal/public/denied.html diff --git a/ansible_wisdom_console_react/public/index.html b/ansible_ai_connect_admin_portal/public/index.html similarity index 100% rename from ansible_wisdom_console_react/public/index.html rename to ansible_ai_connect_admin_portal/public/index.html diff --git a/ansible_wisdom_console_react/public/static/console/static/locales/en/translation.json b/ansible_ai_connect_admin_portal/public/static/console/static/locales/en/translation.json similarity index 100% rename from ansible_wisdom_console_react/public/static/console/static/locales/en/translation.json rename to ansible_ai_connect_admin_portal/public/static/console/static/locales/en/translation.json diff --git a/ansible_wisdom_console_react/scripts/build.js b/ansible_ai_connect_admin_portal/scripts/build.js similarity index 100% rename from ansible_wisdom_console_react/scripts/build.js rename to ansible_ai_connect_admin_portal/scripts/build.js diff --git a/ansible_wisdom_console_react/scripts/start.js b/ansible_ai_connect_admin_portal/scripts/start.js similarity index 100% rename from ansible_wisdom_console_react/scripts/start.js rename to ansible_ai_connect_admin_portal/scripts/start.js diff --git a/ansible_wisdom_console_react/scripts/test.js b/ansible_ai_connect_admin_portal/scripts/test.js similarity index 100% rename from ansible_wisdom_console_react/scripts/test.js rename to ansible_ai_connect_admin_portal/scripts/test.js diff --git a/ansible_wisdom_console_react/src/Alerts.tsx b/ansible_ai_connect_admin_portal/src/Alerts.tsx similarity index 100% rename from ansible_wisdom_console_react/src/Alerts.tsx rename to ansible_ai_connect_admin_portal/src/Alerts.tsx diff --git a/ansible_wisdom_console_react/src/App.css b/ansible_ai_connect_admin_portal/src/App.css similarity index 100% rename from ansible_wisdom_console_react/src/App.css rename to ansible_ai_connect_admin_portal/src/App.css diff --git a/ansible_wisdom_console_react/src/App.tsx b/ansible_ai_connect_admin_portal/src/App.tsx similarity index 100% rename from ansible_wisdom_console_react/src/App.tsx rename to ansible_ai_connect_admin_portal/src/App.tsx diff --git a/ansible_wisdom_console_react/src/AppHeader.tsx b/ansible_ai_connect_admin_portal/src/AppHeader.tsx similarity index 100% rename from ansible_wisdom_console_react/src/AppHeader.tsx rename to ansible_ai_connect_admin_portal/src/AppHeader.tsx diff --git a/ansible_wisdom_console_react/src/BusyButton.tsx b/ansible_ai_connect_admin_portal/src/BusyButton.tsx similarity index 100% rename from ansible_wisdom_console_react/src/BusyButton.tsx rename to ansible_ai_connect_admin_portal/src/BusyButton.tsx diff --git a/ansible_wisdom_console_react/src/ErrorModal.css b/ansible_ai_connect_admin_portal/src/ErrorModal.css similarity index 100% rename from ansible_wisdom_console_react/src/ErrorModal.css rename to ansible_ai_connect_admin_portal/src/ErrorModal.css diff --git a/ansible_wisdom_console_react/src/ErrorModal.tsx b/ansible_ai_connect_admin_portal/src/ErrorModal.tsx similarity index 100% rename from ansible_wisdom_console_react/src/ErrorModal.tsx rename to ansible_ai_connect_admin_portal/src/ErrorModal.tsx diff --git a/ansible_wisdom_console_react/src/ModelSettings.css b/ansible_ai_connect_admin_portal/src/ModelSettings.css similarity index 100% rename from ansible_wisdom_console_react/src/ModelSettings.css rename to ansible_ai_connect_admin_portal/src/ModelSettings.css diff --git a/ansible_wisdom_console_react/src/ModelSettings.tsx b/ansible_ai_connect_admin_portal/src/ModelSettings.tsx similarity index 100% rename from ansible_wisdom_console_react/src/ModelSettings.tsx rename to ansible_ai_connect_admin_portal/src/ModelSettings.tsx diff --git a/ansible_wisdom_console_react/src/ModelSettingsEditor.tsx b/ansible_ai_connect_admin_portal/src/ModelSettingsEditor.tsx similarity index 100% rename from ansible_wisdom_console_react/src/ModelSettingsEditor.tsx rename to ansible_ai_connect_admin_portal/src/ModelSettingsEditor.tsx diff --git a/ansible_wisdom_console_react/src/ModelSettingsKey.tsx b/ansible_ai_connect_admin_portal/src/ModelSettingsKey.tsx similarity index 100% rename from ansible_wisdom_console_react/src/ModelSettingsKey.tsx rename to ansible_ai_connect_admin_portal/src/ModelSettingsKey.tsx diff --git a/ansible_wisdom_console_react/src/ModelSettingsModelId.tsx b/ansible_ai_connect_admin_portal/src/ModelSettingsModelId.tsx similarity index 100% rename from ansible_wisdom_console_react/src/ModelSettingsModelId.tsx rename to ansible_ai_connect_admin_portal/src/ModelSettingsModelId.tsx diff --git a/ansible_wisdom_console_react/src/ModelSettingsOverview.tsx b/ansible_ai_connect_admin_portal/src/ModelSettingsOverview.tsx similarity index 100% rename from ansible_wisdom_console_react/src/ModelSettingsOverview.tsx rename to ansible_ai_connect_admin_portal/src/ModelSettingsOverview.tsx diff --git a/ansible_wisdom_console_react/src/PageApp.css b/ansible_ai_connect_admin_portal/src/PageApp.css similarity index 100% rename from ansible_wisdom_console_react/src/PageApp.css rename to ansible_ai_connect_admin_portal/src/PageApp.css diff --git a/ansible_wisdom_console_react/src/PageApp.tsx b/ansible_ai_connect_admin_portal/src/PageApp.tsx similarity index 100% rename from ansible_wisdom_console_react/src/PageApp.tsx rename to ansible_ai_connect_admin_portal/src/PageApp.tsx diff --git a/ansible_wisdom_console_react/src/PageMastheadDropdown.tsx b/ansible_ai_connect_admin_portal/src/PageMastheadDropdown.tsx similarity index 100% rename from ansible_wisdom_console_react/src/PageMastheadDropdown.tsx rename to ansible_ai_connect_admin_portal/src/PageMastheadDropdown.tsx diff --git a/ansible_wisdom_console_react/src/PageSidebar.tsx b/ansible_ai_connect_admin_portal/src/PageSidebar.tsx similarity index 100% rename from ansible_wisdom_console_react/src/PageSidebar.tsx rename to ansible_ai_connect_admin_portal/src/PageSidebar.tsx diff --git a/ansible_wisdom_console_react/src/SingleInlineEdit.tsx b/ansible_ai_connect_admin_portal/src/SingleInlineEdit.tsx similarity index 100% rename from ansible_wisdom_console_react/src/SingleInlineEdit.tsx rename to ansible_ai_connect_admin_portal/src/SingleInlineEdit.tsx diff --git a/ansible_wisdom_console_react/src/TelemetrySettings.tsx b/ansible_ai_connect_admin_portal/src/TelemetrySettings.tsx similarity index 100% rename from ansible_wisdom_console_react/src/TelemetrySettings.tsx rename to ansible_ai_connect_admin_portal/src/TelemetrySettings.tsx diff --git a/ansible_wisdom_console_react/src/__tests__/App.test.tsx b/ansible_ai_connect_admin_portal/src/__tests__/App.test.tsx similarity index 100% rename from ansible_wisdom_console_react/src/__tests__/App.test.tsx rename to ansible_ai_connect_admin_portal/src/__tests__/App.test.tsx diff --git a/ansible_wisdom_console_react/src/__tests__/AppHeader.test.tsx b/ansible_ai_connect_admin_portal/src/__tests__/AppHeader.test.tsx similarity index 100% rename from ansible_wisdom_console_react/src/__tests__/AppHeader.test.tsx rename to ansible_ai_connect_admin_portal/src/__tests__/AppHeader.test.tsx diff --git a/ansible_wisdom_console_react/src/__tests__/BusyButton.test.tsx b/ansible_ai_connect_admin_portal/src/__tests__/BusyButton.test.tsx similarity index 100% rename from ansible_wisdom_console_react/src/__tests__/BusyButton.test.tsx rename to ansible_ai_connect_admin_portal/src/__tests__/BusyButton.test.tsx diff --git a/ansible_wisdom_console_react/src/__tests__/ModelSettings.test.tsx b/ansible_ai_connect_admin_portal/src/__tests__/ModelSettings.test.tsx similarity index 100% rename from ansible_wisdom_console_react/src/__tests__/ModelSettings.test.tsx rename to ansible_ai_connect_admin_portal/src/__tests__/ModelSettings.test.tsx diff --git a/ansible_wisdom_console_react/src/__tests__/ModelSettingsKey.test.tsx b/ansible_ai_connect_admin_portal/src/__tests__/ModelSettingsKey.test.tsx similarity index 100% rename from ansible_wisdom_console_react/src/__tests__/ModelSettingsKey.test.tsx rename to ansible_ai_connect_admin_portal/src/__tests__/ModelSettingsKey.test.tsx diff --git a/ansible_wisdom_console_react/src/__tests__/ModelSettingsModelId.test.tsx b/ansible_ai_connect_admin_portal/src/__tests__/ModelSettingsModelId.test.tsx similarity index 100% rename from ansible_wisdom_console_react/src/__tests__/ModelSettingsModelId.test.tsx rename to ansible_ai_connect_admin_portal/src/__tests__/ModelSettingsModelId.test.tsx diff --git a/ansible_wisdom_console_react/src/__tests__/ModelSettingsOverview.test.tsx b/ansible_ai_connect_admin_portal/src/__tests__/ModelSettingsOverview.test.tsx similarity index 100% rename from ansible_wisdom_console_react/src/__tests__/ModelSettingsOverview.test.tsx rename to ansible_ai_connect_admin_portal/src/__tests__/ModelSettingsOverview.test.tsx diff --git a/ansible_wisdom_console_react/src/__tests__/PageSidebar.test.tsx b/ansible_ai_connect_admin_portal/src/__tests__/PageSidebar.test.tsx similarity index 100% rename from ansible_wisdom_console_react/src/__tests__/PageSidebar.test.tsx rename to ansible_ai_connect_admin_portal/src/__tests__/PageSidebar.test.tsx diff --git a/ansible_wisdom_console_react/src/__tests__/SingleInlineEdit.test.tsx b/ansible_ai_connect_admin_portal/src/__tests__/SingleInlineEdit.test.tsx similarity index 100% rename from ansible_wisdom_console_react/src/__tests__/SingleInlineEdit.test.tsx rename to ansible_ai_connect_admin_portal/src/__tests__/SingleInlineEdit.test.tsx diff --git a/ansible_wisdom_console_react/src/__tests__/TelemetrySettings.test.tsx b/ansible_ai_connect_admin_portal/src/__tests__/TelemetrySettings.test.tsx similarity index 100% rename from ansible_wisdom_console_react/src/__tests__/TelemetrySettings.test.tsx rename to ansible_ai_connect_admin_portal/src/__tests__/TelemetrySettings.test.tsx diff --git a/ansible_wisdom_console_react/src/api/__tests__/api.test.ts b/ansible_ai_connect_admin_portal/src/api/__tests__/api.test.ts similarity index 100% rename from ansible_wisdom_console_react/src/api/__tests__/api.test.ts rename to ansible_ai_connect_admin_portal/src/api/__tests__/api.test.ts diff --git a/ansible_wisdom_console_react/src/api/api.ts b/ansible_ai_connect_admin_portal/src/api/api.ts similarity index 100% rename from ansible_wisdom_console_react/src/api/api.ts rename to ansible_ai_connect_admin_portal/src/api/api.ts diff --git a/ansible_wisdom_console_react/src/api/globals.ts b/ansible_ai_connect_admin_portal/src/api/globals.ts similarity index 100% rename from ansible_wisdom_console_react/src/api/globals.ts rename to ansible_ai_connect_admin_portal/src/api/globals.ts diff --git a/ansible_wisdom_console_react/src/api/types.ts b/ansible_ai_connect_admin_portal/src/api/types.ts similarity index 100% rename from ansible_wisdom_console_react/src/api/types.ts rename to ansible_ai_connect_admin_portal/src/api/types.ts diff --git a/ansible_wisdom_console_react/src/denied/AppDenied.tsx b/ansible_ai_connect_admin_portal/src/denied/AppDenied.tsx similarity index 100% rename from ansible_wisdom_console_react/src/denied/AppDenied.tsx rename to ansible_ai_connect_admin_portal/src/denied/AppDenied.tsx diff --git a/ansible_wisdom_console_react/src/denied/PageAppDenied.tsx b/ansible_ai_connect_admin_portal/src/denied/PageAppDenied.tsx similarity index 100% rename from ansible_wisdom_console_react/src/denied/PageAppDenied.tsx rename to ansible_ai_connect_admin_portal/src/denied/PageAppDenied.tsx diff --git a/ansible_wisdom_console_react/src/denied/PageDenied.tsx b/ansible_ai_connect_admin_portal/src/denied/PageDenied.tsx similarity index 100% rename from ansible_wisdom_console_react/src/denied/PageDenied.tsx rename to ansible_ai_connect_admin_portal/src/denied/PageDenied.tsx diff --git a/ansible_wisdom_console_react/src/denied/__tests__/AppDenied.test.tsx b/ansible_ai_connect_admin_portal/src/denied/__tests__/AppDenied.test.tsx similarity index 100% rename from ansible_wisdom_console_react/src/denied/__tests__/AppDenied.test.tsx rename to ansible_ai_connect_admin_portal/src/denied/__tests__/AppDenied.test.tsx diff --git a/ansible_wisdom_console_react/src/denied/__tests__/PageDenied.test.tsx b/ansible_ai_connect_admin_portal/src/denied/__tests__/PageDenied.test.tsx similarity index 100% rename from ansible_wisdom_console_react/src/denied/__tests__/PageDenied.test.tsx rename to ansible_ai_connect_admin_portal/src/denied/__tests__/PageDenied.test.tsx diff --git a/ansible_wisdom_console_react/src/denied/denied.tsx b/ansible_ai_connect_admin_portal/src/denied/denied.tsx similarity index 100% rename from ansible_wisdom_console_react/src/denied/denied.tsx rename to ansible_ai_connect_admin_portal/src/denied/denied.tsx diff --git a/ansible_wisdom_console_react/src/hooks/useTelemetryAPI.tsx b/ansible_ai_connect_admin_portal/src/hooks/useTelemetryAPI.tsx similarity index 100% rename from ansible_wisdom_console_react/src/hooks/useTelemetryAPI.tsx rename to ansible_ai_connect_admin_portal/src/hooks/useTelemetryAPI.tsx diff --git a/ansible_wisdom_console_react/src/hooks/useWcaKeyAPI.tsx b/ansible_ai_connect_admin_portal/src/hooks/useWcaKeyAPI.tsx similarity index 100% rename from ansible_wisdom_console_react/src/hooks/useWcaKeyAPI.tsx rename to ansible_ai_connect_admin_portal/src/hooks/useWcaKeyAPI.tsx diff --git a/ansible_wisdom_console_react/src/hooks/useWcaModelIdAPI.tsx b/ansible_ai_connect_admin_portal/src/hooks/useWcaModelIdAPI.tsx similarity index 100% rename from ansible_wisdom_console_react/src/hooks/useWcaModelIdAPI.tsx rename to ansible_ai_connect_admin_portal/src/hooks/useWcaModelIdAPI.tsx diff --git a/ansible_wisdom_console_react/src/i18n.tsx b/ansible_ai_connect_admin_portal/src/i18n.tsx similarity index 100% rename from ansible_wisdom_console_react/src/i18n.tsx rename to ansible_ai_connect_admin_portal/src/i18n.tsx diff --git a/ansible_wisdom_console_react/src/index.css b/ansible_ai_connect_admin_portal/src/index.css similarity index 100% rename from ansible_wisdom_console_react/src/index.css rename to ansible_ai_connect_admin_portal/src/index.css diff --git a/ansible_wisdom_console_react/src/index.tsx b/ansible_ai_connect_admin_portal/src/index.tsx similarity index 100% rename from ansible_wisdom_console_react/src/index.tsx rename to ansible_ai_connect_admin_portal/src/index.tsx diff --git a/ansible_wisdom_console_react/src/lightspeed-logo.png b/ansible_ai_connect_admin_portal/src/lightspeed-logo.png similarity index 100% rename from ansible_wisdom_console_react/src/lightspeed-logo.png rename to ansible_ai_connect_admin_portal/src/lightspeed-logo.png diff --git a/ansible_wisdom_console_react/src/react-app-env.d.ts b/ansible_ai_connect_admin_portal/src/react-app-env.d.ts similarity index 100% rename from ansible_wisdom_console_react/src/react-app-env.d.ts rename to ansible_ai_connect_admin_portal/src/react-app-env.d.ts diff --git a/ansible_wisdom_console_react/src/redhat-logo.svg b/ansible_ai_connect_admin_portal/src/redhat-logo.svg similarity index 100% rename from ansible_wisdom_console_react/src/redhat-logo.svg rename to ansible_ai_connect_admin_portal/src/redhat-logo.svg diff --git a/ansible_wisdom_console_react/tsconfig.json b/ansible_ai_connect_admin_portal/tsconfig.json similarity index 100% rename from ansible_wisdom_console_react/tsconfig.json rename to ansible_ai_connect_admin_portal/tsconfig.json diff --git a/sonar-project.properties b/sonar-project.properties index 52d52afa8..8e16e1b72 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -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 diff --git a/wisdom-service.Containerfile b/wisdom-service.Containerfile index 8427c8004..8dace26ff 100644 --- a/wisdom-service.Containerfile +++ b/wisdom-service.Containerfile @@ -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