Merge branch 'main' of github.com:catenax-ng/product-traceability-foss-frontend into TRACEFOSS-565-docker

fbedarf · fbedarf · commit 59fbe8a890df · 2023-02-03T09:21:42.000+01:00
diff --git a/.github/workflows/docker-image-for-branch.yml b/.github/workflows/docker-image-for-branch.yml
@@ -27,7 +27,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -27,7 +27,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: ${{ env.REGISTRY }}/${{ github.repository }}:latest , ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.sha }}
diff --git a/.github/workflows/docker-release.yaml b/.github/workflows/docker-release.yaml
@@ -29,7 +29,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: ${{ env.REGISTRY }}/${{ github.repository }}:${{ env.RELEASE_VERSION }}
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -47,7 +47,7 @@ jobs:
           node-version: 18.x
 
       - name: Cypress run all tests
-        uses: cypress-io/github-action@v5.0.5 # use the explicit version number
+        uses: cypress-io/github-action@v5.0.7 # use the explicit version number
         with:
           start: npm start
           wait-on: "http://localhost:4200"
@@ -81,7 +81,7 @@ jobs:
           node-version: 18.x
 
       - name: Cypress run all tests
-        uses: cypress-io/github-action@v5.0.5 # use the explicit version number
+        uses: cypress-io/github-action@v5.0.7 # use the explicit version number
         with:
           start: npm start
           wait-on: "http://localhost:4200"
@@ -125,7 +125,7 @@ jobs:
         run: npx playwright install --with-deps webkit
 
       - name: Cypress run all tests
-        uses: cypress-io/github-action@v5.0.5 # use the explicit version number
+        uses: cypress-io/github-action@v5.0.7 # use the explicit version number
         with:
           start: npm start
           wait-on: "http://localhost:4200"
diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
@@ -1,6 +1,7 @@
 name: "KICS"
 
 on:
+  workflow_dispatch:
   push:
     branches: [main, master]
   # pull_request:
@@ -29,6 +30,10 @@ jobs:
         with:
           # Scanning directory .
           path: "."
+          # Excluded paths:
+          # - docker-compose.yml - used only on local env
+          # - in cypress dir docker related files used only on local env
+          exclude_paths: "docker-compose.yml,cypress/docker-compose.yml,cypress/Dockerfile"
           # Fail on HIGH severity results
           fail_on: high
           # Disable secrets detection - we use GitGuardian
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -24,7 +24,19 @@ jobs:
         cmd: install # will run `yarn install` command
     - name: Run npm test:ci
       run: CHROMIUM_BIN=$(which chrome) npm run test:ci # will run `test:ci` command
-    - uses: SonarSource/sonarcloud-github-action@master
+    - name: Run SonarCloud with organzation and project key from environment
+      uses: SonarSource/sonarcloud-github-action@master
+      if: ${{ env.SONAR_ORGANIZATION != '' && env.SONAR_PROJECT_KEY != '' }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      with:
+        args: >
+          -Dsonar.organization=${{ env.SONAR_ORGANIZATION }}
+          -Dsonar.projectKey=${{ env.SONAR_PROJECT_KEY }}
+    - name: Run SonarCloud with hardcoded organization and project key
+      uses: SonarSource/sonarcloud-github-action@master # Fallback for the catenax-ng/product-traceability-foss-frontend
+      if: ${{ env.SONAR_ORGANIZATION == '' || env.SONAR_PROJECT_KEY == '' }}
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -0,0 +1,18 @@
+#Authors
+
+The following people have contributed to this repository:
+
+- Blazej Kepa,doubleSlash Net-Business GmbH,https://github.com/ds-ext-bkepa
+- Dirk Blank,evia consulting GmbH,https://github.com/dblankevia
+- Fabian Bedarf,evia consulting GmbH,https://github.com/evia-fbedarf
+- Jedrzej Serwa,doubleSlash Net-Business GmbH,https://github.com/ds-ext-jserwa
+- Martin Kanal,doubleSlash Net-Business GmbH,https://github.com/mkanal
+- Anton Kononenko,doubleSlash Net-Business GmbH,https://github.com/ds-ext-akononenko
+- Sebastian Scherer,Mercedes-Benz Group AG,https://github.com/the-tatanka
+- Ivan Emelianov,T-Systems International GmbH,https://github.com/Anacin
+- Sebastian Bezold,Mercedes-Benz Group AG,https://github.com/SebastianBezold
+- Gregor Stelzer,msg DAVID GmbH,https://github.com/gregors101
+- Darek Skrzypczak,doubleSlash Net-Business GmbH,https://github.com/ds-ext-dskrzypczak
+- Nobert Geczi,msg Systems Romania SRL,https://github.com/norbertgeczi
+- Markus Kreuz,FEV Consulting GmbH,https://github.com/CXkreuz
+- Thomas Braun,ZF Friedrichshafen AG,https://github.com/tbraun-zf
diff --git a/INSTALL.md b/INSTALL.md
@@ -43,7 +43,7 @@ This variable is used to set the base path of the application. (Should be set if
 `CATENAX_PORTAL_BACKEND_DOMAIN`
 This variable is needed for security, to be more explicit, for the security headers of a request.  
 The domain of the corresponding backend should be used here.  
-An example value could be: `catena-x.com`
+An example value could be: `catena-x.net`
 
 ### Example command:
 
diff --git a/charts/product-traceability-foss-frontend/values-dev-test.yaml b/charts/product-traceability-foss-frontend/values-dev-test.yaml
@@ -5,7 +5,7 @@ image:
   CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.dev.demo.catena-x.net/auth'
   CATENAX_PORTAL_CLIENT_ID: 'Cl17-CX-Part'
   CATENAX_PORTAL_DEFAULT_REALM: 'CX-Central'
-  CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.com'
+  CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.net'
 
 nameOverride: "product-traceability-foss-test-frontend"
 fullnameOverride: "product-traceability-foss-test-frontend"
diff --git a/charts/product-traceability-foss-frontend/values-dev.yaml b/charts/product-traceability-foss-frontend/values-dev.yaml
@@ -4,7 +4,7 @@ image:
   CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.dev.demo.catena-x.net/auth'
   CATENAX_PORTAL_CLIENT_ID: 'Cl17-CX-Part'
   CATENAX_PORTAL_DEFAULT_REALM: 'CX-Central'
-  CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.com'
+  CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.net'
 
 autoscaling:
   enabled: false
diff --git a/charts/product-traceability-foss-frontend/values-int-test.yaml b/charts/product-traceability-foss-frontend/values-int-test.yaml
@@ -4,7 +4,7 @@ image:
   CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.int.demo.catena-x.net/auth'
   CATENAX_PORTAL_CLIENT_ID: 'Cl17-CX-Part'
   CATENAX_PORTAL_DEFAULT_REALM: 'CX-Central'
-  CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.com'
+  CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.net'
 
 nameOverride: "product-traceability-foss-test-frontend"
 fullnameOverride: "product-traceability-foss-test-frontend"
diff --git a/charts/product-traceability-foss-frontend/values-int.yaml b/charts/product-traceability-foss-frontend/values-int.yaml
@@ -4,7 +4,7 @@ image:
   CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.int.demo.catena-x.net/auth'
   CATENAX_PORTAL_CLIENT_ID: 'Cl17-CX-Part'
   CATENAX_PORTAL_DEFAULT_REALM: 'CX-Central'
-  CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.com'
+  CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.net'
 
 autoscaling:
   enabled: false
diff --git a/charts/product-traceability-foss-frontend/values-pen.yaml b/charts/product-traceability-foss-frontend/values-pen.yaml
@@ -4,7 +4,7 @@ image:
   CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp-pen.dev.demo.catena-x.net/auth'
   CATENAX_PORTAL_CLIENT_ID: 'Cl17-CX-Part'
   CATENAX_PORTAL_DEFAULT_REALM: 'CX-Central'
-  CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.com'
+  CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.net'
 
 # important to not conflict with dev env (both use same ArgoCD instance)
 namespace: product-traceability-foss-pen
diff --git a/cypress/Dockerfile b/cypress/Dockerfile
@@ -1,3 +1,7 @@
+# DISCLAIMER!
+# purpose of this file is to run cypress E2E tests locally, we don't use it in other env
+# because of statement above, we don't need to change settings to comply with some KICS requirements
+
 
 # if you need to change image please make sure use the same version in all places
 # (here and in .github/workflows/e2e-tests.yml)
@@ -8,6 +12,7 @@
 # but cypress/included:12.3.0 version base on cypress/browsers:node16.16.0-chrome107-ff107-edge
 FROM cypress/included:12.3.0
 
+USER root
 RUN mkdir /ng-app
 WORKDIR /ng-app
 
@@ -18,4 +23,3 @@ COPY yarn.lock /ng-app/yarn.lock
 RUN yarn install
 # https://docs.cypress.io/guides/guides/launching-browsers#Linux-Dependencies
 RUN npx playwright install --with-deps webkit
-
diff --git a/cypress/docker-compose.yml b/cypress/docker-compose.yml
@@ -1,13 +1,29 @@
+# DISCLAIMER!
+# purpose of this file is to run cypress E2E tests locally, we don't use it in other env
+# because of statement above, we don't need to change settings to comply with some KICS requirements
+
 version: "3.9"
 services:
   cypress:
     build:
       context: ../
       dockerfile: cypress/Dockerfile
+
     volumes:
       - ../:/ng-app/
       - /ng-app/node_modules/ # we don't want to override it by host machine
+    security_opt:
+      - label:user:testuser
+      - no-new-privileges:true
     network_mode: host # important to be able to connect to localhost url on host machine
-
-networks:
- TRACE_X_FE:
+    # to comply with KICS requirement:
+    # [MEDIUM] Memory Not Limited
+    # Memory limits should be defined for each container. This prevents potential resource exhaustion by ensuring that containers consume not more than the designated amount of memory
+    deploy:
+      resources:
+        limits:
+          cpus: "4"
+          memory: "1024M"
+        reservations:
+          cpus: "2"
+          memory: "512M"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,3 +1,7 @@
+# DISCLAIMER!
+# purpose of this file is to run services locally, we don't use it in other env
+# because of statement above, we don't need to change settings to comply with some KICS requirements
+
 version: "3.9"
 services:
   keycloak:
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -317,7 +317,7 @@ This variable is used to set the base path of the application. (Should be set if
 `CATENAX_PORTAL_BACKEND_DOMAIN`
 This variable is needed for security, to be more explicit, for the security headers of a request.  
 The domain of the corresponding backend should be used here.  
-An example value could be: `catena-x.com`
+An example value could be: `catena-x.net`
 
 ## Deployment
 
diff --git a/package.json b/package.json
@@ -84,15 +84,15 @@
     "@testing-library/jasmine-dom": "1.2.0",
     "@types/d3": "7.4.0",
     "@types/jasmine": "4.3.1",
-    "@types/luxon": "2.3.2",
+    "@types/luxon": "3.2.0",
     "@types/node": "18.11.4",
     "@types/testing-library__jasmine-dom": "^1.0.3",
     "@typescript-eslint/eslint-plugin": "5.48.0",
     "@typescript-eslint/parser": "5.49.0",
     "cypress": "^12.4.0",
     "eslint": "8.28.0",
     "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-import": "2.27.5",
     "eslint-plugin-jsdoc": "39.6.4",
     "eslint-plugin-prefer-arrow": "1.2.3",
     "husky": "8.0.2",
@@ -104,13 +104,13 @@
     "karma-jasmine-html-reporter": "2.0.0",
     "karma-sonarqube-reporter": "1.4.0",
     "lint-staged": "13.0.3",
-    "msw": "0.48.0",
+    "msw": "1.0.0",
     "playwright-webkit": "^1.29.2",
     "postcss-import": "15.1.0",
     "postcss-loader": "7.0.2",
     "postcss-scss": "4.0.4",
     "prettier": "2.7.1",
-    "stylelint": "14.8.2",
+    "stylelint": "14.16.1",
     "stylelint-config-standard-scss": "4.0.0",
     "ts-loader": "^9.4.2",
     "ts-node": "10.9.1",
diff --git a/src/app/modules/page/investigations/presentation/investigations.component.spec.ts b/src/app/modules/page/investigations/presentation/investigations.component.spec.ts
@@ -48,7 +48,7 @@ describe('InvestigationsComponent', () => {
     const viewDetailsButton = await waitFor(() => screen.getByTestId('table-menu-button--actions.viewDetails'));
     viewDetailsButton.click();
 
-    expect(spy).toHaveBeenCalledWith(['/context/investigations/id-1']);
+    expect(spy).toHaveBeenCalledWith(['/mock/investigations/id-1']);
   });
 
   it('should call change pagination of received notification', async () => {
diff --git a/src/assets/locales/de/common.json b/src/assets/locales/de/common.json
@@ -127,7 +127,12 @@
     "status": {
       "RECEIVED": "Erhalten",
       "CREATED": "Erstellt",
-      "APPROVED": "Zugestellt"
+      "APPROVED": "Zugestellt",
+      "CANCELED": "Abgebrochen",
+      "CLOSED": "Abgeschlossen",
+      "ACCEPTED": "Akzeptiert",
+      "ACKNOWLEDGED": "Bestätigt",
+      "DECLINED": "Abgelehnt"
     },
     "modal": {
       "acceptTitle": "Annehmen der Untersuchung",
diff --git a/yarn.lock b/yarn.lock
