fix: project name, proxy, sonar

onecx · Jan 17, 2024 · 1a3eed9 · 1a3eed9
1 parent f3bee41
commit 1a3eed9
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/proxy.conf.js b/proxy.conf.js
@@ -17,25 +17,15 @@ const bypassFn = function (req, res) {
 }
 
 const PROXY_CONFIG = {
-  '/themes-bff': {
+  '/theme-bff': {
     target: 'http://onecx-theme-bff',
     secure: false,
     pathRewrite: {
-      '^.*/themes-bff': ''
+      '^.*/theme-bff': ''
     },
     changeOrigin: true,
     logLevel: 'debug',
     bypass: bypassFn
-  },
-  '/ahm-api': {
-    target: 'http://ahm',
-    secure: false,
-    pathRewrite: {
-      '^.*/ahm-api': ''
-    },
-    changeOrigin: true,
-    logLevel: 'debug',
-    bypass: logFn
   }
 }
 

diff --git a/sonar-local-project.properties b/sonar-local-project.properties
@@ -18,7 +18,7 @@ sonar.testExecutionReportPaths=reports/sonarqube_report.xml
 sonar.sourceEncoding=UTF-8
 #sonar.sources=src/app
 #sonar.working.directory=dist/sonar
-sonar.coverage.exclusions=*.ts,*.js,src/*.ts,src/**/*.module.ts,src/environments/*,src/assets/**/*,src/app/generated/**/*,src/test/*
+sonar.coverage.exclusions=*.ts,*.js,src/*.ts,src/**/*.module.ts,src/environments/*,src/assets/**/*,src/app/generated/**/*,src/app/test/*
 #sonar.exclusions=src/app/generated/**/*
 #sonar.cpd.exclusions=
 #sonar.tests=src/app

diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -1,5 +1,5 @@
 export const environment = {
   production: true,
-  BASE_PATH: '/themes-bff',
-  apiPrefix: 'themes-bff'
+  BASE_PATH: '/theme-bff',
+  apiPrefix: 'theme-bff'
 }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -9,7 +9,7 @@ export const environment = {
   KEYCLOAK_CLIENT_ID: 'portal-mf-shell',
   TKIT_PORTAL_ID: 'ADMIN',
   skipRemoteConfigLoad: true,
-  apiPrefix: 'themes-bff'
+  apiPrefix: 'theme-bff'
 }
 
 /*

diff --git a/webpack.config.js b/webpack.config.js
@@ -2,7 +2,7 @@ const { ModifyEntryPlugin } = require('@angular-architects/module-federation/src
 const { share, withModuleFederationPlugin } = require('@angular-architects/module-federation/webpack')
 
 const config = withModuleFederationPlugin({
-  name: 'theme-mgmt-ui',
+  name: 'onecx-theme-ui',
   filename: 'remoteEntry.js',
   exposes: {
     './ThemeMgmtModule': 'src/app/theme-mgmt-remote.module.ts'