diff --git a/CHANGELOG.md b/CHANGELOG.md index 2af97ea8a..2abd97c61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,11 +21,20 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). - Fixed naming of EDC variable in instructions ([#195](https://github.com/sovity/authority-portal/issues/195)) - Fixed error message for already existing CaaS subdomains ([#196](https://github.com/sovity/authority-portal/issues/196)) - Removed possibility to provide a connector for oneself as a Service Partner ([#191](https://github.com/sovity/authority-portal/issues/191)) +- Added an environment variable to enable configuration of the support page URL. See deployment migration notes. ([#203](https://github.com/sovity/authority-portal/issues/203)) ### Known issues ### Deployment Migration Notes +- Portal Frontend + - Environment variables + ```yaml + # Added + # Variable to set the support page URL + AUTHORITY_PORTAL_FRONTEND_SUPPORT_URL: https://support.mobility-dataspace.eu + ``` + #### Compatible Versions - Authority Portal Backend Docker Image: `ghcr.io/sovity/authority-portal-backend:{{ version }}` diff --git a/authority-portal-frontend/.env.local-dev b/authority-portal-frontend/.env.local-dev index a3111842d..f3a720730 100644 --- a/authority-portal-frontend/.env.local-dev +++ b/authority-portal-frontend/.env.local-dev @@ -8,4 +8,4 @@ AUTHORITY_PORTAL_FRONTEND_USE_FAKE_BACKEND=true AUTHORITY_PORTAL_FRONTEND_IFRAME_URL=https://mobility-dataspa-5n9px2qi7r.live-website.com/mds-news AUTHORITY_PORTAL_FRONTEND_PRIVACY_POLICY_URL=https://mobility-dataspace.online/privacy-policy-mds-portal/ AUTHORITY_PORTAL_FRONTEND_LEGAL_NOTICE_URL=https://mobility-dataspace.eu/legal-notice - +AUTHORITY_PORTAL_FRONTEND_SUPPORT_URL=https://support.mobility-dataspace.eu diff --git a/authority-portal-frontend/.env.local-e2e-dev b/authority-portal-frontend/.env.local-e2e-dev index f55eb7442..e3f7bb12c 100644 --- a/authority-portal-frontend/.env.local-e2e-dev +++ b/authority-portal-frontend/.env.local-e2e-dev @@ -8,3 +8,4 @@ AUTHORITY_PORTAL_FRONTEND_USE_LOCAL_BACKEND=true AUTHORITY_PORTAL_FRONTEND_IFRAME_URL=https://mobility-dataspa-5n9px2qi7r.live-website.com/mds-news AUTHORITY_PORTAL_FRONTEND_PRIVACY_POLICY_URL=https://mobility-dataspace.online/privacy-policy-mds-portal/ AUTHORITY_PORTAL_FRONTEND_LEGAL_NOTICE_URL=https://mobility-dataspace.eu/legal-notice +AUTHORITY_PORTAL_FRONTEND_SUPPORT_URL=https://support.mobility-dataspace.eu diff --git a/authority-portal-frontend/src/app/common/layouts/portal-layout/sidebar/sidebar.component.ts b/authority-portal-frontend/src/app/common/layouts/portal-layout/sidebar/sidebar.component.ts index b16017de8..206211de0 100644 --- a/authority-portal-frontend/src/app/common/layouts/portal-layout/sidebar/sidebar.component.ts +++ b/authority-portal-frontend/src/app/common/layouts/portal-layout/sidebar/sidebar.component.ts @@ -10,13 +10,14 @@ * Contributors: * sovity GmbH - initial implementation */ -import {Component, HostListener, OnDestroy, OnInit} from '@angular/core'; +import {Component, HostListener, Inject, OnDestroy, OnInit} from '@angular/core'; import {Subject, distinctUntilChanged, takeUntil} from 'rxjs'; import {combineLatest} from 'rxjs'; import {map} from 'rxjs/operators'; import {DeploymentEnvironmentDto} from '@sovity.de/authority-portal-client'; import {GlobalStateUtils} from 'src/app/core/global-state/global-state-utils'; import {SidebarSection} from './sidebar.model'; +import {APP_CONFIG, AppConfig} from "../../../../core/config/app-config"; @Component({ selector: 'app-sidebar', @@ -27,7 +28,10 @@ export class SidebarComponent implements OnInit, OnDestroy { sidebarSections: SidebarSection[] = []; private ngOnDestroy$ = new Subject(); - constructor(private globalStateUtils: GlobalStateUtils) {} + constructor( + @Inject(APP_CONFIG) public config: AppConfig, + private globalStateUtils: GlobalStateUtils + ) {} ngOnInit() { this.startListeningToEnvironmentChanges(); @@ -166,7 +170,7 @@ export class SidebarComponent implements OnInit, OnDestroy { { title: 'MDS Support', icon: 'question-mark-circle', - rLink: 'https://mobility-dataspace.online/', + rLink: this.config.supportUrl, isExternalLink: true, }, ], diff --git a/authority-portal-frontend/src/app/core/config/app-config.ts b/authority-portal-frontend/src/app/core/config/app-config.ts index 60db7f1dc..12a0f862e 100644 --- a/authority-portal-frontend/src/app/core/config/app-config.ts +++ b/authority-portal-frontend/src/app/core/config/app-config.ts @@ -30,6 +30,7 @@ export interface AppConfig { iframeUrl: string; privacyPolicyUrl: string; legalNoticeUrl: string; + supportUrl: string; } /** @@ -47,6 +48,7 @@ export interface AppConfigEnv { AUTHORITY_PORTAL_FRONTEND_IFRAME_URL: string; AUTHORITY_PORTAL_FRONTEND_PRIVACY_POLICY_URL: string; AUTHORITY_PORTAL_FRONTEND_LEGAL_NOTICE_URL: string; + AUTHORITY_PORTAL_FRONTEND_SUPPORT_URL: string; } /** @@ -67,5 +69,6 @@ export function buildAppConfig(envVars: AppConfigEnv): AppConfig { iframeUrl: envVars.AUTHORITY_PORTAL_FRONTEND_IFRAME_URL, privacyPolicyUrl: envVars.AUTHORITY_PORTAL_FRONTEND_PRIVACY_POLICY_URL, legalNoticeUrl: envVars.AUTHORITY_PORTAL_FRONTEND_LEGAL_NOTICE_URL, + supportUrl: envVars.AUTHORITY_PORTAL_FRONTEND_SUPPORT_URL, }; } diff --git a/docs/deployment-guide/goals/production/README.md b/docs/deployment-guide/goals/production/README.md index ee456e389..0924bce35 100644 --- a/docs/deployment-guide/goals/production/README.md +++ b/docs/deployment-guide/goals/production/README.md @@ -215,6 +215,7 @@ AUTHORITY_PORTAL_FRONTEND_INVALIDATE_SESSION_COOKIES_URL: https://[AP_FQDN]/oaut AUTHORITY_PORTAL_FRONTEND_IFRAME_URL: https://mobility-dataspa-5n9px2qi7r.live-website.com/mds-news # MDS Dashboard iFrame URL AUTHORITY_PORTAL_FRONTEND_LEGAL_NOTICE_URL: https://mobility-dataspace.eu/legal-notice # Authority Portal Legal Notice URL AUTHORITY_PORTAL_FRONTEND_PRIVACY_POLICY_URL: https://mobility-dataspace.online/privacy-policy-mds-portal # MDS Privacy Policy URL +AUTHORITY_PORTAL_FRONTEND_SUPPORT_URL: https://support.mobility-dataspace.eu # Support page URL ``` ## Initial Setup