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

Author: fbedarf

.github/workflows/docker-image-for-branch.yml

@@ -30,4 +30,4 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           push: true
-          tags: ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.event.pull_request.head.sha }} , ${{ env.REGISTRY }}/${{ github.repository }}:fe_context
+          tags: ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.event.pull_request.head.sha }}

.github/workflows/e2e-tests.yml .github/workflows/e2e-tests-xray.yml.github/workflows/e2e-tests.yml renamed to .github/workflows/e2e-tests-xray.yml

@@ -1,19 +1,26 @@
-name: E2E Tests
+# Require to set secrets:
+#  - ORG_IRS_JIRA_USERNAME
+#  - ORG_IRS_JIRA_PASSWORD
+name: E2E Tests - Xray
 
 on:
+  # triggered manually by Test Manager
+  workflow_dispatch:
+    inputs:
+      jira_filter_id:
+        description: 'Jira filter ID to fetch test scenarios'
+        required: false
+        # by default, we use this filter: https://jira.catena-x.net/issues/?filter=11645
+        default: 11645
+  # or automatically by merge to main
   push:
     branches: [ main ]
+  # or in PR
   pull_request:
 
 jobs:
   install:
     runs-on: ubuntu-latest
-    container:
-      # if you need to change image please make sure use the same version in all places
-      # (here and in cypress/Dockerfile)
-      image: cypress/browsers:node16.16.0-chrome107-ff107-edge
-      options: --user 1001
-
     # Install YARN dependencies, cache them correctly
     steps:
       - name: Checkout
@@ -29,10 +36,28 @@ jobs:
         with:
           cmd: install # will run `yarn install` command
 
+    # Fetch feature files
+      - name: Fetch .feature files from Jira Xray
+        env:
+          JIRA_USERNAME: ${{ secrets.ORG_IRS_JIRA_USERNAME }}
+          JIRA_PASSWORD: ${{ secrets.ORG_IRS_JIRA_PASSWORD }}
+          JIRA_FILTER_ID: ${{ github.event.inputs.jira_filter_id }}
+        run: |
+          ./scripts/xray-download-feature-files.sh
+
+      - name: Save cypress/e2e folder
+        uses: actions/upload-artifact@v3
+        with:
+          name: cypress - e2e
+          if-no-files-found: error
+          path: cypress/e2e
+
   cypress-run-chrome:
     timeout-minutes: 15
     runs-on: ubuntu-latest
     container:
+      # if you need to change image please make sure use the same version in all places
+      # (here and in cypress/Dockerfile)
       image: cypress/browsers:node16.16.0-chrome107-ff107-edge
       options: --user 1001
     needs: install
@@ -41,6 +66,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Download the cypress/e2e folder
+        uses: actions/download-artifact@v3
+        with:
+          name: cypress - e2e
+          path: cypress/e2e
+
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
@@ -54,6 +85,15 @@ jobs:
           wait-on-timeout: 120
           browser: chrome
 
+      - name: Submit results to Xray
+        # we don't want to submit results to xray when it was run by PR
+        if: github.event_name != 'pull_request' && (success() || failure())
+        env:
+          JIRA_USERNAME: ${{ secrets.ORG_IRS_JIRA_USERNAME }}
+          JIRA_PASSWORD: ${{ secrets.ORG_IRS_JIRA_PASSWORD }}
+        run: |
+          ./scripts/xray-push-test-results.sh
+
       - name: Archive cypress artifacts
         if: success() || failure()
         uses: actions/upload-artifact@v3
@@ -67,6 +107,8 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-latest
     container:
+      # if you need to change image please make sure use the same version in all places
+      # (here and in cypress/Dockerfile)
       image: cypress/browsers:node16.16.0-chrome107-ff107-edge
       options: --user 1001
     needs: install
@@ -75,6 +117,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Download the cypress/e2e folder
+        uses: actions/download-artifact@v3
+        with:
+          name: cypress - e2e
+          path: cypress/e2e
+
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
@@ -88,6 +136,15 @@ jobs:
           wait-on-timeout: 120
           browser: firefox
 
+      - name: Submit results to Xray
+        # we don't want to submit results to xray when it was run by PR
+        if: github.event_name != 'pull_request' && (success() || failure())
+        env:
+          JIRA_USERNAME: ${{ secrets.ORG_IRS_JIRA_USERNAME }}
+          JIRA_PASSWORD: ${{ secrets.ORG_IRS_JIRA_PASSWORD }}
+        run: |
+          ./scripts/xray-push-test-results.sh
+
       - name: Archive cypress artifacts
         if: success() || failure()
         uses: actions/upload-artifact@v3
@@ -106,6 +163,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Download the cypress/e2e folder
+        uses: actions/download-artifact@v3
+        with:
+          name: cypress - e2e
+          path: cypress/e2e
+
 # commented because if we use it here, we face with that problem:
 # "http://localhost:4200 timed out on retry 151 of 5, elapsed 150449ms, limit 150000ms
 #  Error: connect ECONNREFUSED 127.0.0.1:4200"
@@ -132,6 +195,15 @@ jobs:
           wait-on-timeout: 120
           browser: webkit
 
+      - name: Submit results to Xray
+        # we don't want to submit results to xray when it was run by PR
+        if: github.event_name != 'pull_request' && (success() || failure())
+        env:
+          JIRA_USERNAME: ${{ secrets.ORG_IRS_JIRA_USERNAME }}
+          JIRA_PASSWORD: ${{ secrets.ORG_IRS_JIRA_PASSWORD }}
+        run: |
+          ./scripts/xray-push-test-results.sh
+
       - name: Archive cypress artifacts
         if: success() || failure()
         uses: actions/upload-artifact@v3

.github/workflows/veracode.yaml

@@ -29,5 +29,5 @@ jobs:
           appname: "Traceability-Foss-Frontend"
           createprofile: false
           filepath: "./veracode-scan-target.zip"
-          vid: "${{ secrets.ORG_VERACODE_API_ID }}"
-          vkey: "${{ secrets.ORG_VERACODE_API_KEY }}"
+          vid: '${{ secrets.VERACODE_API_ID || secrets.ORG_VERACODE_API_ID }}'
+          vkey: '${{ secrets.VERACODE_API_KEY || secrets.ORG_VERACODE_API_KEY }}'

.github/workflows/veracode-upload.yml .github/workflows/veracode.yml.github/workflows/veracode-upload.yml renamed to .github/workflows/veracode.yml

@@ -36,12 +36,12 @@ testem.log
 /typings
 /audit-reports
 src/tests/test-report.xml
-cypress/videos
-cypress/screenshots
 
 # e2e
-/e2e/*.js
-/e2e/*.map
+cypress/videos
+cypress/screenshots
+cypress/reports/*
+cucumber-messages.ndjson
 
 # System Files
 .DS_Store

.gitignore

@@ -6,8 +6,6 @@ Support environment variables are:
 const ENV_VARS_MAPPING = {
   CATENAX_PORTAL_KEYCLOAK_URL: 'keycloakUrl',
   CATENAX_PORTAL_CLIENT_ID: 'clientId',
-  CATENAX_PORTAL_DEFAULT_REALM: 'defaultRealm',
-  CATENAX_PORTAL_REALM_LOGO: 'realmLogo',
   CATENAX_PORTAL_API_URL: 'apiUrl',
   CATENAX_PORTAL_BASE_URL: 'baseUrl',
   CATENAX_PORTAL_BACKEND_DOMAIN,
@@ -20,12 +18,6 @@ This variable is used to set up and use keycloak
 `CATENAX_PORTAL_CLIENT_ID`
 This variable is used to identify the client on keycloak
 
-`CATENAX_PORTAL_DEFAULT_REALM`
-This variable is used the set de default realm of the application
-
-`CATENAX_PORTAL_REALM_LOGO`
-This variable is used to replace the logo on the application
-
 `CATENAX_PORTAL_API_URL`
 This variable points to the desired api
 
@@ -131,7 +123,7 @@ To start a container in detached mode, you use `-d=true` or just `-d` option. By
 
 To expose a container’s internal port, an operator can start the container with the `-P` or `-p` flag. The exposed port is accessible on the host and the ports are available to any client that can reach the host.
 
-#### `-e ***`
+#### `-e ENV_VAR=VAR_VALUE`
 
 The operator can set any environment variable in the container by using one or more `-e` flags, even overriding already defined flags by the developer with a Dockerfile `ENV`.
 

INSTALL.md

@@ -99,6 +99,14 @@
                 }
               ]
             },
+            "localBackendNoAuth": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.localBackendNoAuth.ts"
+                }
+              ]
+            },
             "production": {
               "fileReplacements": [
                 {
@@ -154,6 +162,9 @@
             "localBackend": {
               "browserTarget": "trace-x:build:dev,localBackend"
             },
+            "localBackendNoAuth": {
+              "browserTarget": "trace-x:build:dev,localBackendNoAuth"
+            },
             "production": {
               "browserTarget": "trace-x:build:production"
             },

angular.json

@@ -49,12 +49,8 @@ spec:
               value: "{{ .Values.image.CATENAX_PORTAL_KEYCLOAK_URL }}"
             - name: CATENAX_PORTAL_CLIENT_ID
               value: "{{ .Values.image.CATENAX_PORTAL_CLIENT_ID }}"
-            - name: CATENAX_PORTAL_DEFAULT_REALM
-              value: "{{ .Values.image.CATENAX_PORTAL_DEFAULT_REALM }}"
             - name: CATENAX_PORTAL_BASE_URL
               value: "{{ .Values.image.CATENAX_PORTAL_BASE_URL }}"
-            - name: CATENAX_PORTAL_REALM_LOGO
-              value: "{{ .Values.image.CATENAX_PORTAL_REALM_LOGO }}"
             - name: CATENAX_PORTAL_BACKEND_DOMAIN
               value: "{{ .Values.image.CATENAX_PORTAL_BACKEND_DOMAIN }}"
           ports:

charts/traceability-foss-frontend/templates/deployment.yaml

@@ -3,8 +3,6 @@ image:
   tag: $ARGOCD_APP_REVISION
   CATENAX_PORTAL_API_URL: 'https://traceability-test.dev.demo.catena-x.net/api'
   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.net'
 
 nameOverride: "traceability-foss-test-frontend"

charts/traceability-foss-frontend/values-dev-test.yaml

@@ -2,8 +2,6 @@ image:
   tag: $ARGOCD_APP_REVISION
   CATENAX_PORTAL_API_URL: 'https://traceability.dev.demo.catena-x.net/api'
   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.net'
 
 ingress: