Skip to content

Commit 8144ba4

Browse files
authored
Merge pull request #27 from catenax-ng/feature/TRACEFOSS-893_UUX_FE_Rework_user_menu_to_align_with_CX_guidelines
TRACEFOSS-893 [UUX][FE] Rework user menu to align with CX guidelines
2 parents bf6a05f + 4c760e1 commit 8144ba4

26 files changed

+406
-28
lines changed

INSTALL.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const ENV_VARS_MAPPING = {
99
CATENAX_PORTAL_API_URL: 'apiUrl',
1010
CATENAX_PORTAL_BASE_URL: 'baseUrl',
1111
CATENAX_PORTAL_BACKEND_DOMAIN,
12+
CATENAX_PORTAL_URL: 'portalUrl',
1213
};
1314
```
1415

@@ -29,6 +30,9 @@ This variable is needed for security, to be more explicit, for the security head
2930
The domain of the corresponding backend should be used here.
3031
An example value could be: `catena-x.net`
3132

33+
`CATENAX_PORTAL_URL`
34+
This variable is optional and points to the CX Portal instance
35+
3236
# Helm deployment
3337

3438
## Configuration of values.yaml

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ spec:
5353
value: "{{ .Values.image.CATENAX_PORTAL_BASE_URL }}"
5454
- name: CATENAX_PORTAL_BACKEND_DOMAIN
5555
value: "{{ .Values.image.CATENAX_PORTAL_BACKEND_DOMAIN }}"
56+
- name: CATENAX_PORTAL_URL
57+
value: "{{ .Values.image.CATENAX_PORTAL_URL }}"
5658
ports:
5759
- name: http
5860
containerPort: {{ .Values.service.port }}

charts/traceability-foss-frontend/values-beta.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ image:
33
CATENAX_PORTAL_API_URL: 'https://traceability.beta.demo.catena-x.net/api'
44
CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.beta.demo.catena-x.net/auth'
55
CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.net'
6+
CATENAX_PORTAL_URL: 'https://portal.beta.demo.catena-x.net/'
67

78
ingress:
89
enabled: true

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ image:
44
CATENAX_PORTAL_API_URL: 'https://traceability-test.dev.demo.catena-x.net/api'
55
CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.dev.demo.catena-x.net/auth'
66
CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.net'
7+
CATENAX_PORTAL_URL: 'https://portal.dev.demo.catena-x.net/'
78

89
nameOverride: "traceability-foss-test-frontend"
910
fullnameOverride: "traceability-foss-test-frontend"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ image:
33
CATENAX_PORTAL_API_URL: 'https://traceability.dev.demo.catena-x.net/api'
44
CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.dev.demo.catena-x.net/auth'
55
CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.net'
6+
CATENAX_PORTAL_URL: 'https://portal.dev.demo.catena-x.net/'
67

78
ingress:
89
enabled: true

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ image:
33
CATENAX_PORTAL_API_URL: 'https://traceability-test.int.demo.catena-x.net/api'
44
CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.int.demo.catena-x.net/auth'
55
CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.net'
6+
CATENAX_PORTAL_URL: 'https://portal.int.demo.catena-x.net/'
67

78
nameOverride: "traceability-foss-test-frontend"
89
fullnameOverride: "traceability-foss-test-frontend"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ image:
33
CATENAX_PORTAL_API_URL: 'https://traceability.int.demo.catena-x.net/api'
44
CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.int.demo.catena-x.net/auth'
55
CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.net'
6+
CATENAX_PORTAL_URL: 'https://portal.int.demo.catena-x.net/'
67

78
ingress:
89
enabled: true

charts/traceability-foss-frontend/values-pen.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ image:
33
CATENAX_PORTAL_API_URL: 'https://traceability-pen.dev.demo.catena-x.net/api'
44
CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp-pen.dev.demo.catena-x.net/auth'
55
CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.net'
6+
CATENAX_PORTAL_URL: 'https://portal.dev.demo.catena-x.net/'
67

78
# important to not conflict with dev env (both use same ArgoCD instance)
89
namespace: product-traceability-foss-pen

charts/traceability-foss-frontend/values-pre-prod.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ image:
33
CATENAX_PORTAL_API_URL: 'https://traceability.pre-prod.demo.catena-x.net/api'
44
CATENAX_PORTAL_KEYCLOAK_URL: 'https://centralidp.pre-prod.demo.catena-x.net/auth'
55
CATENAX_PORTAL_BACKEND_DOMAIN: 'catena-x.net'
6+
CATENAX_PORTAL_URL: 'https://portal.pre-prod.demo.catena-x.net/'
67

78
ingress:
89
enabled: true

docs/configuration.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ const ENV_VARS_MAPPING = {
290290
CATENAX_PORTAL_API_URL: 'apiUrl',
291291
CATENAX_PORTAL_BASE_URL: 'baseUrl',
292292
CATENAX_PORTAL_BACKEND_DOMAIN,
293+
CATENAX_PORTAL_URL: 'portalUrl',
293294
};
294295
```
295296

@@ -310,6 +311,9 @@ This variable is needed for security, to be more explicit, for the security head
310311
The domain of the corresponding backend should be used here.
311312
An example value could be: `catena-x.net`
312313

314+
`CATENAX_PORTAL_URL`
315+
This variable is optional and points to the CX Portal instance
316+
313317
## Deployment
314318

315319
The app is deployed on hotel budapest.

0 commit comments

Comments
 (0)