Skip to content

Commit 1744b7b

Browse files
mkanalmkanal
committed
Merge branch 'main' of https://github.com/catenax-ng/product-traceability-foss-frontend into TRACEFOSS-761-prepare-for-repos-move
# Conflicts: # charts/tx-traceability-foss-frontend/values-dev-test.yaml # charts/tx-traceability-foss-frontend/values-int-test.yaml
2 parents c346682 + c46a21e commit 1744b7b

File tree

117 files changed

+2289
-694
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+2289
-694
lines changed

‎.github/workflows/chart-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
helm repo add runix https://helm.runix.net
6969
7070
- name: Run chart-releaser
71-
uses: helm/chart-releaser-action@v1.4.1
71+
uses: helm/chart-releaser-action@v1.5.0
7272
env:
7373
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
7474
CR_RELEASE_NAME_TEMPLATE: "${{ env.RELEASE_VERSION }}"

‎.github/workflows/e2e-tests.yml‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
name: E2E Tests
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
8+
jobs:
9+
install:
10+
runs-on: ubuntu-latest
11+
container:
12+
# if you need to change image please make sure use the same version in all places
13+
# (here and in cypress/Dockerfile)
14+
image: cypress/browsers:node16.16.0-chrome107-ff107-edge
15+
options: --user 1001
16+
17+
# Install YARN dependencies, cache them correctly
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v3
21+
22+
- name: Use Node.js 18.x
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: 18.x
26+
27+
- name: Run yarn install
28+
uses: Borales/[email protected]
29+
with:
30+
cmd: install # will run `yarn install` command
31+
32+
cypress-run-chrome:
33+
timeout-minutes: 15
34+
runs-on: ubuntu-latest
35+
container:
36+
image: cypress/browsers:node16.16.0-chrome107-ff107-edge
37+
options: --user 1001
38+
needs: install
39+
40+
steps:
41+
- name: Checkout
42+
uses: actions/checkout@v3
43+
44+
- name: Use Node.js 18.x
45+
uses: actions/setup-node@v3
46+
with:
47+
node-version: 18.x
48+
49+
- name: Cypress run all tests
50+
uses: cypress-io/[email protected] # use the explicit version number
51+
with:
52+
start: npm start
53+
wait-on: "http://localhost:4200"
54+
wait-on-timeout: 120
55+
browser: chrome
56+
57+
- name: Archive cypress artifacts
58+
if: success() || failure()
59+
uses: actions/upload-artifact@v3
60+
with:
61+
name: cypress generated files - chrome
62+
path: |
63+
cypress/videos/
64+
cypress/screenshots/
65+
66+
cypress-run-firefox:
67+
timeout-minutes: 15
68+
runs-on: ubuntu-latest
69+
container:
70+
image: cypress/browsers:node16.16.0-chrome107-ff107-edge
71+
options: --user 1001
72+
needs: install
73+
74+
steps:
75+
- name: Checkout
76+
uses: actions/checkout@v3
77+
78+
- name: Use Node.js 18.x
79+
uses: actions/setup-node@v3
80+
with:
81+
node-version: 18.x
82+
83+
- name: Cypress run all tests
84+
uses: cypress-io/[email protected] # use the explicit version number
85+
with:
86+
start: npm start
87+
wait-on: "http://localhost:4200"
88+
wait-on-timeout: 120
89+
browser: firefox
90+
91+
- name: Archive cypress artifacts
92+
if: success() || failure()
93+
uses: actions/upload-artifact@v3
94+
with:
95+
name: cypress generated files - firefox
96+
path: |
97+
cypress/videos/
98+
cypress/screenshots/
99+
100+
cypress-run-webkit:
101+
timeout-minutes: 15
102+
runs-on: ubuntu-latest
103+
needs: install
104+
105+
steps:
106+
- name: Checkout
107+
uses: actions/checkout@v3
108+
109+
# commented because if we use it here, we face with that problem:
110+
# "http://localhost:4200 timed out on retry 151 of 5, elapsed 150449ms, limit 150000ms
111+
# Error: connect ECONNREFUSED 127.0.0.1:4200"
112+
113+
# - name: Use Node.js 18.x
114+
# uses: actions/setup-node@v3
115+
# with:
116+
# node-version: 18.x
117+
118+
- name: Use Node.js 16.x
119+
uses: actions/setup-node@v3
120+
with:
121+
node-version: 16.x
122+
123+
# https://docs.cypress.io/guides/guides/launching-browsers#Linux-Dependencies
124+
- name: Install additional dependencies
125+
run: npx playwright install --with-deps webkit
126+
127+
- name: Cypress run all tests
128+
uses: cypress-io/[email protected] # use the explicit version number
129+
with:
130+
start: npm start
131+
wait-on: "http://localhost:4200"
132+
wait-on-timeout: 120
133+
browser: webkit
134+
135+
- name: Archive cypress artifacts
136+
if: success() || failure()
137+
uses: actions/upload-artifact@v3
138+
with:
139+
name: cypress generated files - webkit
140+
path: |
141+
cypress/videos/
142+
cypress/screenshots/

‎.github/workflows/kics.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: "KICS"
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches: [main, master]
67
# pull_request:
@@ -29,6 +30,10 @@ jobs:
2930
with:
3031
# Scanning directory .
3132
path: "."
33+
# Excluded paths:
34+
# - docker-compose.yml - used only on local env
35+
# - in cypress dir docker related files used only on local env
36+
exclude_paths: "docker-compose.yml,cypress/docker-compose.yml,cypress/Dockerfile"
3237
# Fail on HIGH severity results
3338
fail_on: high
3439
# Disable secrets detection - we use GitGuardian

‎.github/workflows/test.yml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Tests
1+
name: Unit Tests
22

33
on:
44
push:
@@ -10,16 +10,12 @@ jobs:
1010

1111
runs-on: ubuntu-latest
1212

13-
strategy:
14-
matrix:
15-
node-version: [16.x, 18.x]
16-
1713
steps:
1814
- uses: actions/checkout@v3
19-
- name: Use Node.js ${{ matrix.node-version }}
15+
- name: Use Node.js 18.x
2016
uses: actions/setup-node@v3
2117
with:
22-
node-version: ${{ matrix.node-version }}
18+
node-version: 18.x
2319
- name: Install chrome
2420
uses: browser-actions/setup-chrome@latest
2521
- name: Run yarn install
@@ -28,7 +24,19 @@ jobs:
2824
cmd: install # will run `yarn install` command
2925
- name: Run npm test:ci
3026
run: CHROMIUM_BIN=$(which chrome) npm run test:ci # will run `test:ci` command
31-
- uses: SonarSource/sonarcloud-github-action@master
27+
- name: Run SonarCloud with organzation and project key from environment
28+
uses: SonarSource/sonarcloud-github-action@master
29+
if: ${{ env.SONAR_ORGANIZATION != '' && env.SONAR_PROJECT_KEY != '' }}
30+
env:
31+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
32+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
33+
with:
34+
args: >
35+
-Dsonar.organization=${{ env.SONAR_ORGANIZATION }}
36+
-Dsonar.projectKey=${{ env.SONAR_PROJECT_KEY }}
37+
- name: Run SonarCloud with hardcoded organization and project key
38+
uses: SonarSource/sonarcloud-github-action@master # Fallback for the catenax-ng/product-traceability-foss-frontend
39+
if: ${{ env.SONAR_ORGANIZATION == '' || env.SONAR_PROJECT_KEY == '' }}
3240
env:
3341
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
3442
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

‎AUTHORS.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#Authors
2+
3+
The following people have contributed to this repository:
4+
5+
- Blazej Kepa,doubleSlash Net-Business GmbH,https://github.com/ds-ext-bkepa
6+
- Dirk Blank,evia consulting GmbH,https://github.com/dblankevia
7+
- Fabian Bedarf,evia consulting GmbH,https://github.com/evia-fbedarf
8+
- Jedrzej Serwa,doubleSlash Net-Business GmbH,https://github.com/ds-ext-jserwa
9+
- Martin Kanal,doubleSlash Net-Business GmbH,https://github.com/mkanal
10+
- Anton Kononenko,doubleSlash Net-Business GmbH,https://github.com/ds-ext-akononenko
11+
- Sebastian Scherer,Mercedes-Benz Group AG,https://github.com/the-tatanka
12+
- Ivan Emelianov,T-Systems International GmbH,https://github.com/Anacin
13+
- Sebastian Bezold,Mercedes-Benz Group AG,https://github.com/SebastianBezold
14+
- Gregor Stelzer,msg DAVID GmbH,https://github.com/gregors101
15+
- Darek Skrzypczak,doubleSlash Net-Business GmbH,https://github.com/ds-ext-dskrzypczak
16+
- Nobert Geczi,msg Systems Romania SRL,https://github.com/norbertgeczi
17+
- Markus Kreuz,FEV Consulting GmbH,https://github.com/CXkreuz
18+
- Thomas Braun,ZF Friedrichshafen AG,https://github.com/tbraun-zf
19+
20+

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
image:
3+
tag: $ARGOCD_APP_REVISION
4+
CATENAX_PORTAL_API_URL: 'https://traceability-test.dev.demo.catena-x.net/api'
5+
CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.dev.demo.catena-x.net/auth'
6+
CATENAX_PORTAL_CLIENT_ID: 'Cl17-CX-Part'
7+
CATENAX_PORTAL_DEFAULT_REALM: 'CX-Central'
8+
9+
nameOverride: "product-traceability-foss-test-frontend"
10+
fullnameOverride: "product-traceability-foss-test-frontend"
11+
12+
autoscaling:
13+
enabled: false
14+
15+
ingress:
16+
enabled: true
17+
className: "nginx"
18+
annotations:
19+
cert-manager.io/cluster-issuer: letsencrypt-prod
20+
hosts:
21+
- host: "traceability-portal-test.dev.demo.catena-x.net"
22+
paths:
23+
- path: /
24+
pathType: ImplementationSpecific
25+
tls:
26+
- hosts:
27+
- "traceability-portal-test.dev.demo.catena-x.net"
28+
secretName: "traceability-portal-test.dev.demo.catena-x.net-tls"

‎charts/tx-traceability-foss-frontend/values-dev.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ingress:
1717
- host: "traceability-portal.dev.demo.catena-x.net"
1818
paths:
1919
- path: /
20-
pathType: Prefix
20+
pathType: ImplementationSpecific
2121
tls:
2222
- hosts:
2323
- "traceability-portal.dev.demo.catena-x.net"

‎charts/tx-traceability-foss-frontend/values-int-test.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
image:
2+
tag: $ARGOCD_APP_REVISION
3+
CATENAX_PORTAL_API_URL: 'https://traceability-test.int.demo.catena-x.net/api'
4+
CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.int.demo.catena-x.net/auth'
5+
CATENAX_PORTAL_CLIENT_ID: 'Cl17-CX-Part'
6+
CATENAX_PORTAL_DEFAULT_REALM: 'CX-Central'
7+
8+
nameOverride: "product-traceability-foss-test-frontend"
9+
fullnameOverride: "product-traceability-foss-test-frontend"
10+
11+
autoscaling:
12+
enabled: false
13+
14+
ingress:
15+
enabled: true
16+
className: "nginx"
17+
annotations:
18+
cert-manager.io/cluster-issuer: letsencrypt-prod
19+
hosts:
20+
- host: "traceability-portal-test.int.demo.catena-x.net"
21+
paths:
22+
- path: /
23+
pathType: ImplementationSpecific
24+
tls:
25+
- hosts:
26+
- "traceability-portal-test.int.demo.catena-x.net"
27+
secretName: "traceability-portal-test.int.demo.catena-x.net-tls"

‎charts/tx-traceability-foss-frontend/values-int.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ingress:
1717
- host: "traceability-portal.int.demo.catena-x.net"
1818
paths:
1919
- path: /
20-
pathType: Prefix
20+
pathType: ImplementationSpecific
2121
tls:
2222
- hosts:
2323
- "traceability-portal.int.demo.catena-x.net"

‎cypress.config.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { defineConfig } from 'cypress';
2-
import * as createBundler from '@bahmutov/cypress-esbuild-preprocessor';
31
import { addCucumberPreprocessorPlugin } from '@badeball/cypress-cucumber-preprocessor';
42
import { createEsbuildPlugin } from '@badeball/cypress-cucumber-preprocessor/esbuild';
3+
import * as createBundler from '@bahmutov/cypress-esbuild-preprocessor';
4+
import { defineConfig } from 'cypress';
55

66
async function setupNodeEvents(
77
on: Cypress.PluginEvents,
@@ -28,6 +28,7 @@ export default defineConfig({
2828
supportFile: false,
2929
viewportWidth: 1366,
3030
viewportHeight: 768,
31+
experimentalWebKitSupport: true, // https://docs.cypress.io/guides/guides/launching-browsers#WebKit-Experimental
3132
setupNodeEvents,
3233
},
3334
});

0 commit comments

Comments
 (0)