fix: use pia lib v4 and code refactoring (#18)

onecx · Jan 31, 2024 · eb3e0cf · eb3e0cf
1 parent 021ac41
commit eb3e0cf
Show file tree

Hide file tree

Showing 69 changed files with 276 additions and 489 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -9,7 +9,7 @@
     "dist/**",
     "helm/**",
     "node_modules/**",
-    "src/app/generated/**",
+    "src/app/shared/generated/**",
     "src/app/api/*",
     "src/app/model/*",
     "src/**/*.ico",
@@ -39,15 +39,15 @@
           "error",
           {
             "type": "attribute",
-            "prefix": "hm",
+            "prefix": "app",
             "style": "camelCase"
           }
         ],
         "@angular-eslint/component-selector": [
           "warn",
           {
             "type": "element",
-            "prefix": "hm",
+            "prefix": "app",
             "style": "kebab-case"
           }
         ],

diff --git a/.prettierignore b/.prettierignore
@@ -15,6 +15,6 @@ README.md
 Dockerfile
 *.log
 *.sh
-src/app/generated/**
+src/app/shared/generated/**
 src/app/api/*
 src/app/model/*
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ COPY dist/onecx-help-ui/ $DIR_HTML
 
 # Application environments default values
 ENV BFF_URL http://onecx-help-bff:8080/
-ENV APP_BASE_HREF /help/
+ENV APP_BASE_HREF /
 
 RUN chmod 775 -R $DIR_HTML/assets
 USER 1001
diff --git a/angular.json b/angular.json
@@ -8,7 +8,7 @@
       "schematics": {},
       "root": "",
       "sourceRoot": "src",
-      "prefix": "hm",
+      "prefix": "app",
       "architect": {
         "build": {
           "builder": "ngx-build-plus:browser",
@@ -109,12 +109,7 @@
             "assets": ["src/favicon.ico", "src/assets"],
             "styles": ["src/styles.scss"],
             "scripts": [],
-            "codeCoverageExclude": [
-              "**/*.module.ts",
-              "src/app/test/**",
-              "src/app/environments/**",
-              "src/app/generated/**"
-            ]
+            "codeCoverageExclude": ["**/*.module.ts", "src/app/environments/**", "src/app/shared/generated/**"]
           }
         },
         "lint": {

diff --git a/helm/microfrontend.json b/helm/microfrontend.json
diff --git a/helm/permissions.csv b/helm/permissions.csv
diff --git a/helm/templates/apm-csv.cm.yaml b/helm/templates/apm-csv.cm.yaml
diff --git a/helm/templates/mf-config.yaml b/helm/templates/mf-config.yaml
diff --git a/nginx/locations.conf b/nginx/locations.conf
@@ -1,4 +1,4 @@
-location @@APP_BASE_HREF {
+location @@APP_BASE_HREFbff {
   proxy_pass @@BFF_URL;
   proxy_set_header Host            $host;
   proxy_set_header X-Forwarded-For $remote_addr;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   ],
   "config": {
     "openapiYaml": "src/assets/api/help-bff-api.yaml",
-    "openapiOutput": "src/app/generated"
+    "openapiOutput": "src/app/shared/generated"
   },
   "scripts": {
     "build": "ng build",
@@ -49,11 +49,11 @@
     "@ngneat/falso": "^6.4.0",
     "@ngx-translate/core": "^14.0.0",
     "@ngx-translate/http-loader": "^7.0.0",
-    "@onecx/accelerator": "^3.7.1",
-    "@onecx/integration-interface": "^3.7.1",
-    "@onecx/keycloak-auth": "^3.7.1",
-    "@onecx/portal-integration-angular": "^3.7.1",
-    "@onecx/portal-layout-styles": "^3.7.1",
+    "@onecx/accelerator": "^4.1.2",
+    "@onecx/integration-interface": "^4.1.2",
+    "@onecx/keycloak-auth": "^4.1.2",
+    "@onecx/portal-integration-angular": "^4.1.2",
+    "@onecx/portal-layout-styles": "^4.1.2",
     "file-saver": "^2.0.5",
     "i18n-iso-countries": "^7.6.0",
     "ngx-color": "^8.0.3",

diff --git a/proxy.conf.js b/proxy.conf.js
@@ -17,11 +17,11 @@ const bypassFn = function (req, res) {
 }
 
 const PROXY_CONFIG = {
-  '/help-bff': {
+  '/bff': {
     target: 'http://onecx-help-bff',
     secure: false,
     pathRewrite: {
-      '^.*/help-bff': ''
+      '^.*/bff': ''
     },
     changeOrigin: true,
     logLevel: 'debug',

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/shared/generated/**/*
 #sonar.exclusions=src/app/generated/**/*
 #sonar.cpd.exclusions=
 #sonar.tests=src/app

diff --git a/src/app/app.component.scss b/src/app/app.component.scss
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
@@ -16,10 +16,10 @@ describe('AppComponent', () => {
     expect(app).toBeTruthy()
   })
 
-  it(`should have as title 'help-mgmt'`, () => {
+  it(`should have as title 'onecx-help-ui'`, () => {
     const fixture = TestBed.createComponent(AppComponent)
     const app = fixture.componentInstance
-    expect(app.title).toEqual('help-mgmt')
+    expect(app.title).toEqual('onecx-help-ui')
   })
 
   /*

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,10 +1,9 @@
 import { Component } from '@angular/core'
 
 @Component({
-  selector: 'hm-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss']
+  selector: 'app-root',
+  templateUrl: './app.component.html'
 })
 export class AppComponent {
-  title = 'help-mgmt'
+  title = 'onecx-help-ui'
 }