diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e42af9d7c..387af63dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: java-version: '17' distribution: 'temurin' - name: "Gradle: Validate Gradle Wrapper" - uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3 + uses: gradle/actions/wrapper-validation@v3 - name: "Gradle: Build" uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 env: @@ -133,7 +133,7 @@ jobs: java-version: '17' distribution: 'temurin' - name: "Gradle: Validate Gradle Wrapper" - uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3 + uses: gradle/actions/wrapper-validation@v3 - name: "Gradle: Generate TypeScript Library Code" uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 env: diff --git a/CHANGELOG.md b/CHANGELOG.md index 077146340..269942a68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). #### Major - The Catalog Crawler has been moved to the AP repository. +- Removed MDS theme and MDS specific flags in the UI. #### Minor @@ -60,6 +61,9 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). # Direct URL to the UPDATE_PASSWORD required action in Keycloak AUTHORITY_PORTAL_FRONTEND_UPDATE_PASSWORD_URL: https://[KC_FQDN]/realms/authority-portal/protocol/openid-connect/auth?response_type=code&client_id=oauth2-proxy&scope=openid&kc_action=UPDATE_PASSWORD&redirect_uri=[AP_FQDN_URL_ENCODED]%2Foauth2%2Fcallback ``` + - Removed variables: + - `AUTHORITY_PORTAL_FRONTEND_IFRAME_URL` + - The MDS theme is no longer available, so configurations using `mds-open-source` will revert to the default sovity theme #### Compatible Versions diff --git a/authority-portal-frontend/.env.local-dev b/authority-portal-frontend/.env.local-dev index fe9fc3596..e4cd72312 100644 --- a/authority-portal-frontend/.env.local-dev +++ b/authority-portal-frontend/.env.local-dev @@ -5,7 +5,6 @@ AUTHORITY_PORTAL_FRONTEND_LOGIN_URL=https://this-is-your-keycloak-login-url AUTHORITY_PORTAL_FRONTEND_LOGOUT_URL=https://this-is-your-keycloak-logout-url AUTHORITY_PORTAL_FRONTEND_INVALIDATE_SESSION_COOKIES_URL=https://your-session-is-invalidated-now.com 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://privacy-policy-url/ AUTHORITY_PORTAL_FRONTEND_LEGAL_NOTICE_URL=https://legal-notice-url AUTHORITY_PORTAL_FRONTEND_SUPPORT_URL=https://support-url diff --git a/authority-portal-frontend/.env.local-e2e-dev b/authority-portal-frontend/.env.local-e2e-dev index 08ab77bbd..dc7fdee0c 100644 --- a/authority-portal-frontend/.env.local-e2e-dev +++ b/authority-portal-frontend/.env.local-e2e-dev @@ -5,10 +5,9 @@ AUTHORITY_PORTAL_FRONTEND_LOGIN_URL=https://this-is-your-keycloak-login-url AUTHORITY_PORTAL_FRONTEND_LOGOUT_URL=https://this-is-your-keycloak-logout-url AUTHORITY_PORTAL_FRONTEND_INVALIDATE_SESSION_COOKIES_URL=https://your-session-is-invalidated-now.com 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 +AUTHORITY_PORTAL_FRONTEND_PRIVACY_POLICY_URL=https://sovity.de/en/privacy-policy/ +AUTHORITY_PORTAL_FRONTEND_LEGAL_NOTICE_URL=https://sovity.de/en/imprint/ +AUTHORITY_PORTAL_FRONTEND_SUPPORT_URL=https://support.sovity.de/ AUTHORITY_PORTAL_FRONTEND_ACTIVE_PROFILE=sovity-open-source AUTHORITY_PORTAL_FRONTEND_BRAND_SHORT_NAME=sovity AUTHORITY_PORTAL_FRONTEND_PORTAL_DISPLAY_NAME=Authority Portal diff --git a/authority-portal-frontend/src/app/app-routing.module.ts b/authority-portal-frontend/src/app/app-routing.module.ts index 44d01107c..8047ed633 100644 --- a/authority-portal-frontend/src/app/app-routing.module.ts +++ b/authority-portal-frontend/src/app/app-routing.module.ts @@ -31,7 +31,6 @@ import {DashboardPageComponent} from './pages/dashboard-page/dashboard-page/dash import {LoadingPageComponent} from './pages/empty-pages/loading-page/loading-page/loading-page.component'; import {PageNotFoundPageComponent} from './pages/empty-pages/page-not-found-page/page-not-found-page/page-not-found-page.component'; import {UnauthenticatedPageComponent} from './pages/empty-pages/unauthenticated-page/unauthenticated-page/unauthenticated-page.component'; -import {HomePageComponent} from './pages/home/home/home.component'; import {ParticipantOwnConnectorDetailPageComponent} from './pages/participant-own-connector-detail-page/participant-own-connector-detail-page/participant-own-connector-detail-page.component'; import {ParticipantOwnConnectorListPageComponent} from './pages/participant-own-connector-list-page/participant-own-connector-list-page/participant-own-connector-list-page.component'; import {OrganizationCreatePageComponent} from './pages/registration-pages/organization-create-page/organization-create-page/organization-create-page.component'; @@ -94,23 +93,6 @@ export const CATALOG_REDIRECTS: Routes = REDIRECT_TO_HOME.map((path) => ({ pathMatch: 'full', })); -export const HOME_REDIRECTS: Routes = REDIRECT_TO_HOME.map((path) => ({ - path, - redirectTo: (() => getProperRedirectUrl('home'))(), - pathMatch: 'full', -})); - -export const FEATURE_HOME_ROUTE: Routes = [ - { - path: 'home', - component: HomePageComponent, - data: { - requiresRole: ['USER'] satisfies UserRoleDto[], - }, - canActivate: [requiresRole], - }, -]; - export const FEATURE_DASHBOARD_ROUTE: Routes = [ { path: 'dashboard', diff --git a/authority-portal-frontend/src/app/app.module.ts b/authority-portal-frontend/src/app/app.module.ts index 68591f74a..5c055dd74 100644 --- a/authority-portal-frontend/src/app/app.module.ts +++ b/authority-portal-frontend/src/app/app.module.ts @@ -50,7 +50,6 @@ import {DashboardPageModule} from './pages/dashboard-page/dashboard.module'; import {LoadingPageModule} from './pages/empty-pages/loading-page/loading-page.module'; import {PageNotFoundPageModule} from './pages/empty-pages/page-not-found-page/page-not-found-page.module'; import {UnauthenticatedPageModule} from './pages/empty-pages/unauthenticated-page/unauthenticated-page.module'; -import {MdsHomePageModule} from './pages/home/home.module'; import {ParticipantOwnConnectorDetailPageModule} from './pages/participant-own-connector-detail-page/participant-own-connector-detail-page.module'; import {ParticipantOwnConnectorListPageModule} from './pages/participant-own-connector-list-page/participant-own-connector-list-page.module'; import {OrganizationCreatePageModule} from './pages/registration-pages/organization-create-page/organization-create-page.module'; @@ -107,7 +106,6 @@ import {SharedModule} from './shared/shared.module'; ControlCenterUserProfilePageModule, DashboardPageModule, LoadingPageModule, - MdsHomePageModule, OrganizationCreatePageModule, OrganizationOnboardPageModule, OrganizationPendingPageModule, diff --git a/authority-portal-frontend/src/app/core/global-state/routes/route-config-service.ts b/authority-portal-frontend/src/app/core/global-state/routes/route-config-service.ts index 8e02d3d19..3e9e09b9d 100644 --- a/authority-portal-frontend/src/app/core/global-state/routes/route-config-service.ts +++ b/authority-portal-frontend/src/app/core/global-state/routes/route-config-service.ts @@ -18,8 +18,6 @@ import { AUTHORITY_PORTAL_ROUTES, CATALOG_REDIRECTS, FEATURE_DASHBOARD_ROUTE, - FEATURE_HOME_ROUTE, - HOME_REDIRECTS, LOADING_ROUTES, ONBOARDING_ROUTES, PENDING_ROUTES, @@ -41,9 +39,7 @@ export class RouteConfigService { AUTHORITY_PORTAL: AUTHORITY_PORTAL_ROUTES, }; - defaultRoute = this.activeFeatureSet.isHomePageEnabled() - ? '/home' - : '/catalog'; + readonly defaultRoute = '/catalog'; constructor( private router: Router, @@ -93,9 +89,7 @@ export class RouteConfigService { const existingChildren = rootRoute.children || []; // Add home route depending on feature set - const newChildren = this.activeFeatureSet.isHomePageEnabled() - ? [...existingChildren, ...HOME_REDIRECTS, ...FEATURE_HOME_ROUTE] - : [...existingChildren, ...CATALOG_REDIRECTS]; + const newChildren = [...existingChildren, ...CATALOG_REDIRECTS]; // Add additional routes depending on feature set & configuration if (this.activeFeatureSet.isDashboardEnabled()) { diff --git a/authority-portal-frontend/src/app/core/services/config/active-feature-set.ts b/authority-portal-frontend/src/app/core/services/config/active-feature-set.ts index 9538175c5..d5124953d 100644 --- a/authority-portal-frontend/src/app/core/services/config/active-feature-set.ts +++ b/authority-portal-frontend/src/app/core/services/config/active-feature-set.ts @@ -18,18 +18,6 @@ import {UiFeature} from './profiles/ui-feature'; export class ActiveFeatureSet { constructor(@Inject(APP_CONFIG) private config: AppConfig) {} - usesMdsId(): boolean { - return this.has('mds-id'); - } - - usesBritishCatalogue(): boolean { - return this.has('catalogue'); - } - - isHomePageEnabled(): boolean { - return this.has('enable-home'); - } - // This is configurable via environment variable, not via theme isDashboardEnabled(): boolean { return this.config.enableDashboard; diff --git a/authority-portal-frontend/src/app/core/services/config/app-config.ts b/authority-portal-frontend/src/app/core/services/config/app-config.ts index 9b1e3c30f..576a9229a 100644 --- a/authority-portal-frontend/src/app/core/services/config/app-config.ts +++ b/authority-portal-frontend/src/app/core/services/config/app-config.ts @@ -48,7 +48,6 @@ export interface AppConfig { privacyPolicyUrl: string; legalNoticeUrl: string; supportUrl: string; - iframeUrl: string; backendUrl: string; loginUrl: string; @@ -75,7 +74,6 @@ export interface AppConfigEnv { AUTHORITY_PORTAL_FRONTEND_USE_FAKE_BACKEND: string; AUTHORITY_PORTAL_FRONTEND_USE_LOCAL_BACKEND: string; AUTHORITY_PORTAL_FRONTEND_INVALIDATE_SESSION_COOKIES_URL: string; - 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; @@ -108,8 +106,6 @@ export function buildAppConfig(envVars: AppConfigEnv): AppConfig { envVars.AUTHORITY_PORTAL_FRONTEND_USE_FAKE_BACKEND === 'true', useLocalBackend: envVars.AUTHORITY_PORTAL_FRONTEND_USE_LOCAL_BACKEND === 'true', - - 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/authority-portal-frontend/src/app/core/services/config/profiles/feature-sets/mds-features.ts b/authority-portal-frontend/src/app/core/services/config/profiles/feature-sets/mds-features.ts deleted file mode 100644 index f33c4af8a..000000000 --- a/authority-portal-frontend/src/app/core/services/config/profiles/feature-sets/mds-features.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2024 sovity GmbH - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * sovity GmbH - initial implementation - */ -import {UiFeature} from '../ui-feature'; - -export const MDS_FEATURES: UiFeature[] = [ - 'mds-id', - 'catalogue', - 'iframe-in-home', - 'enable-home', - 'uses-logging-house', -]; diff --git a/authority-portal-frontend/src/app/core/services/config/profiles/ui-color-theme.ts b/authority-portal-frontend/src/app/core/services/config/profiles/ui-color-theme.ts index 89a861d7d..870c379ee 100644 --- a/authority-portal-frontend/src/app/core/services/config/profiles/ui-color-theme.ts +++ b/authority-portal-frontend/src/app/core/services/config/profiles/ui-color-theme.ts @@ -11,4 +11,4 @@ * sovity GmbH - initial implementation */ -export type UiColorTheme = 'theme-sovity' | 'theme-mds'; +export type UiColorTheme = 'theme-sovity'; diff --git a/authority-portal-frontend/src/app/core/services/config/profiles/ui-feature.ts b/authority-portal-frontend/src/app/core/services/config/profiles/ui-feature.ts index 676a2cfeb..fcd630a7d 100644 --- a/authority-portal-frontend/src/app/core/services/config/profiles/ui-feature.ts +++ b/authority-portal-frontend/src/app/core/services/config/profiles/ui-feature.ts @@ -12,18 +12,9 @@ */ export type UiFeature = - // Replaces 'Organization ID' with MDS ID. Keep in mind that the actual ID format is generated by the backend and needs to be configured there - | 'mds-id' - - // Enables the homepage. If this is not enabled, the default page will be the Catalog - | 'enable-home' - // Show an iFrame on the homepage. The URL needs to be configured in the theme. Requires 'enable-home' | 'iframe-in-home' - // Replaces 'Catalog' with 'Catalogue' - | 'catalogue' - // Enables the 'Powered by sovity' footer to be used in instances hosted by sovity | 'powered-by-sovity' diff --git a/authority-portal-frontend/src/app/core/services/config/profiles/ui-profile-data.ts b/authority-portal-frontend/src/app/core/services/config/profiles/ui-profile-data.ts index c0fe1e334..b68bcd1a3 100644 --- a/authority-portal-frontend/src/app/core/services/config/profiles/ui-profile-data.ts +++ b/authority-portal-frontend/src/app/core/services/config/profiles/ui-profile-data.ts @@ -10,9 +10,8 @@ * Contributors: * sovity GmbH - initial implementation */ -import {MDS_FEATURES} from './feature-sets/mds-features'; import {inferUiProfileType} from './infer-ui-profile-type'; -import {MDS_THEME, SOVITY_THEME} from './ui-theme-data'; +import {SOVITY_THEME} from './ui-theme-data'; /** * List of available profiles. @@ -24,8 +23,4 @@ export const UI_PROFILE_DATA = inferUiProfileType({ ...SOVITY_THEME, features: new Set(), }, - 'mds-open-source': { - ...MDS_THEME, - features: new Set([...MDS_FEATURES]), - }, }); diff --git a/authority-portal-frontend/src/app/core/services/config/profiles/ui-theme-data.ts b/authority-portal-frontend/src/app/core/services/config/profiles/ui-theme-data.ts index 0c2b730aa..dd4aeaa85 100644 --- a/authority-portal-frontend/src/app/core/services/config/profiles/ui-theme-data.ts +++ b/authority-portal-frontend/src/app/core/services/config/profiles/ui-theme-data.ts @@ -34,25 +34,3 @@ export const SOVITY_THEME: UiThemeConfig = { caasResellerBrandLogoSrc: 'assets/images/sovity_caas_logo.svg', copyrightCompanyName: 'sovity GmbH', }; - -export const MDS_THEME: UiThemeConfig = { - theme: 'theme-mds', - brandFaviconSrc: 'assets/images/logo_light.svg', - brandLogo: {src: 'assets/images/mds_logo_yellow.svg', class: 'scale-100'}, - brandLogoSmall: { - src: '/assets/images/mds_logo_no_text.svg', - class: 'scale-[0.7]', - }, - brandLogoUnauthenticatedPage: { - src: 'assets/images/mds_logo_black.svg', - class: 'scale-150 mb-14', - }, - brandLogoOnboardingPage: { - src: '/assets/images/mds_logo_black.svg', - class: '', - }, - connectorSelfOwnedIconSrc: 'assets/images/mds_self-hosted-connector_logo.svg', - connectorCaasIconSrc: 'assets/images/mds_request-caas_logo.svg', - caasResellerBrandLogoSrc: 'assets/images/mds_caas_logo.svg', - copyrightCompanyName: 'DRM Datenraum Mobilität GmbH', -}; diff --git a/authority-portal-frontend/src/app/pages/authority-connector-list-page/authority-connector-list-page/authority-connector-list-page.component.ts b/authority-portal-frontend/src/app/pages/authority-connector-list-page/authority-connector-list-page/authority-connector-list-page.component.ts index c62167a3b..d232196e6 100644 --- a/authority-portal-frontend/src/app/pages/authority-connector-list-page/authority-connector-list-page/authority-connector-list-page.component.ts +++ b/authority-portal-frontend/src/app/pages/authority-connector-list-page/authority-connector-list-page/authority-connector-list-page.component.ts @@ -17,7 +17,6 @@ import {takeUntil} from 'rxjs/operators'; import {Store} from '@ngxs/store'; import {ConnectorOverviewEntryDto} from '@sovity.de/authority-portal-client'; import {GlobalStateUtils} from 'src/app/core/global-state/global-state-utils'; -import {ActiveFeatureSet} from 'src/app/core/services/config/active-feature-set'; import {SlideOverService} from 'src/app/core/services/slide-over.service'; import {sliderOverNavigation} from 'src/app/core/utils/helper'; import {getConnectorsTypeClasses} from 'src/app/core/utils/ui-utils'; @@ -63,11 +62,8 @@ export class AuthorityConnectorListPageComponent implements OnInit, OnDestroy { private globalStateUtils: GlobalStateUtils, private slideOverService: SlideOverService, private titleService: Title, - private activeFeatureSet: ActiveFeatureSet, ) { - this.activeFeatureSet.usesMdsId() - ? this.titleService.setTitle('MDS Connectors') - : this.titleService.setTitle('All Connectors'); + this.titleService.setTitle('All Connectors'); } ngOnInit() { diff --git a/authority-portal-frontend/src/app/pages/authority-organization-list-page/authority-organization-list-page/authority-organization-list-page.component.html b/authority-portal-frontend/src/app/pages/authority-organization-list-page/authority-organization-list-page/authority-organization-list-page.component.html index bd7e3f78c..57d38fa6c 100644 --- a/authority-portal-frontend/src/app/pages/authority-organization-list-page/authority-organization-list-page/authority-organization-list-page.component.html +++ b/authority-portal-frontend/src/app/pages/authority-organization-list-page/authority-organization-list-page/authority-organization-list-page.component.html @@ -16,9 +16,7 @@ - {{ - ('mds-id' | isActiveFeature) ? 'MDS ID' : 'Organization ID' - }} + Organization ID diff --git a/authority-portal-frontend/src/app/pages/dashboard-page/dashboard-page/dashboard-page.component.ts b/authority-portal-frontend/src/app/pages/dashboard-page/dashboard-page/dashboard-page.component.ts index 7f830b336..d585e18ce 100644 --- a/authority-portal-frontend/src/app/pages/dashboard-page/dashboard-page/dashboard-page.component.ts +++ b/authority-portal-frontend/src/app/pages/dashboard-page/dashboard-page/dashboard-page.component.ts @@ -20,7 +20,6 @@ import { } from '@sovity.de/authority-portal-client'; import {ApiService} from 'src/app/core/api/api.service'; import {GlobalStateUtils} from 'src/app/core/global-state/global-state-utils'; -import {ActiveFeatureSet} from 'src/app/core/services/config/active-feature-set'; import {APP_CONFIG, AppConfig} from 'src/app/core/services/config/app-config'; import {Fetched} from 'src/app/core/utils/fetched'; import {HeaderBarConfig} from 'src/app/shared/common/header-bar/header-bar.model'; @@ -46,11 +45,8 @@ export class DashboardPageComponent implements OnInit, OnDestroy { private globalStateUtils: GlobalStateUtils, private apiService: ApiService, private titleService: Title, - private activeFeatureSet: ActiveFeatureSet, ) { - this.activeFeatureSet.usesMdsId() - ? this.titleService.setTitle('MDS Dashboard') - : this.titleService.setTitle('Dashboard'); + this.titleService.setTitle('Dashboard'); } ngOnInit(): void { diff --git a/authority-portal-frontend/src/app/pages/home/home.module.ts b/authority-portal-frontend/src/app/pages/home/home.module.ts deleted file mode 100644 index 98573ad24..000000000 --- a/authority-portal-frontend/src/app/pages/home/home.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2024 sovity GmbH - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * sovity GmbH - initial implementation - */ -import {CommonModule} from '@angular/common'; -import {NgModule} from '@angular/core'; -import {SharedModule} from 'src/app/shared/shared.module'; -import {HomePageComponent} from './home/home.component'; - -@NgModule({ - imports: [ - // Angular - CommonModule, - - // Authority Portal - SharedModule, - ], - declarations: [HomePageComponent], - exports: [HomePageComponent], -}) -export class MdsHomePageModule {} diff --git a/authority-portal-frontend/src/app/pages/home/home/home.component.html b/authority-portal-frontend/src/app/pages/home/home/home.component.html deleted file mode 100644 index e0bb0074d..000000000 --- a/authority-portal-frontend/src/app/pages/home/home/home.component.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - -
-

Placeholder

-
diff --git a/authority-portal-frontend/src/app/pages/home/home/home.component.ts b/authority-portal-frontend/src/app/pages/home/home/home.component.ts deleted file mode 100644 index 83fc254d6..000000000 --- a/authority-portal-frontend/src/app/pages/home/home/home.component.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2024 sovity GmbH - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * sovity GmbH - initial implementation - */ -import {Component, HostBinding, Inject} from '@angular/core'; -import {DomSanitizer, SafeResourceUrl, Title} from '@angular/platform-browser'; -import {APP_CONFIG, AppConfig} from 'src/app/core/services/config/app-config'; - -@Component({ - selector: 'app-mds-home', - templateUrl: './home.component.html', -}) -export class HomePageComponent { - @HostBinding('class.flex-1') - @HostBinding('class.flex') - @HostBinding('class.items-stretch') - cls = true; - - loaded = false; - - iframeUrl: SafeResourceUrl | null = null; - - constructor( - @Inject(APP_CONFIG) public appConfig: AppConfig, - private sanitizer: DomSanitizer, - private titleService: Title, - ) { - this.titleService.setTitle('Home'); - if (this.appConfig.iframeUrl) { - this.iframeUrl = this.sanitizer.bypassSecurityTrustResourceUrl( - this.appConfig.iframeUrl, - ); - } - } -} diff --git a/authority-portal-frontend/src/app/pages/participant-own-connector-list-page/participant-own-connector-list-page/participant-own-connector-list-page.component.ts b/authority-portal-frontend/src/app/pages/participant-own-connector-list-page/participant-own-connector-list-page/participant-own-connector-list-page.component.ts index b214150aa..1def461a9 100644 --- a/authority-portal-frontend/src/app/pages/participant-own-connector-list-page/participant-own-connector-list-page/participant-own-connector-list-page.component.ts +++ b/authority-portal-frontend/src/app/pages/participant-own-connector-list-page/participant-own-connector-list-page/participant-own-connector-list-page.component.ts @@ -21,7 +21,6 @@ import { UserRoleDto, } from '@sovity.de/authority-portal-client'; import {GlobalStateUtils} from 'src/app/core/global-state/global-state-utils'; -import {ActiveFeatureSet} from 'src/app/core/services/config/active-feature-set'; import {SlideOverService} from 'src/app/core/services/slide-over.service'; import {sliderOverNavigation} from 'src/app/core/utils/helper'; import {getConnectorsTypeClasses} from 'src/app/core/utils/ui-utils'; @@ -72,11 +71,8 @@ export class ParticipantOwnConnectorListPageComponent private router: Router, private slideOverService: SlideOverService, private titleService: Title, - private activeFeatureSet: ActiveFeatureSet, ) { - this.activeFeatureSet.usesMdsId() - ? this.titleService.setTitle('MDS Connectors') - : this.titleService.setTitle('Connectors'); + this.titleService.setTitle('Connectors'); } ngOnInit() { diff --git a/authority-portal-frontend/src/app/pages/registration-pages/organization-onboard-page/organization-onboard-page/organization-onboard-page.component.html b/authority-portal-frontend/src/app/pages/registration-pages/organization-onboard-page/organization-onboard-page/organization-onboard-page.component.html index 6cbf08a49..0e629f99f 100644 --- a/authority-portal-frontend/src/app/pages/registration-pages/organization-onboard-page/organization-onboard-page/organization-onboard-page.component.html +++ b/authority-portal-frontend/src/app/pages/registration-pages/organization-onboard-page/organization-onboard-page/organization-onboard-page.component.html @@ -106,13 +106,7 @@

Organization Profile

Confirmation

- {{ - ('mds-id' | isActiveFeature) - ? 'Thank you for onboarding on the MDS Portal!' - : 'Thank you for onboarding on the ' + - appConfig.portalName + - '!' - }} + Thank you for onboarding on the {{ appConfig.portalName }}!

Congratulations on successfully onboarding to our platform! We're diff --git a/authority-portal-frontend/src/app/pages/registration-pages/organization-pending-page/organization-pending-page/organization-pending-page.component.html b/authority-portal-frontend/src/app/pages/registration-pages/organization-pending-page/organization-pending-page/organization-pending-page.component.html index 7c7c9d4bc..881011fb7 100644 --- a/authority-portal-frontend/src/app/pages/registration-pages/organization-pending-page/organization-pending-page/organization-pending-page.component.html +++ b/authority-portal-frontend/src/app/pages/registration-pages/organization-pending-page/organization-pending-page/organization-pending-page.component.html @@ -7,28 +7,7 @@ alt="Logo" [attr.src]="appConfig.brandLogoUnauthenticatedPage.src" [class]="appConfig.brandLogoUnauthenticatedPage.class" /> -

-

- Thank you for signing up to be a part of the Mobility Data Space Portal! -

-

- Our community team will review your profile and confirm your access - within the next 2-3 business days. You will receive a confirmation - email with a link to the portal where you can sign in using your - credentials. In the meantime, feel free to check out some interesting MDS - resources: -

-
- MDS Main Page -
-
-
+

Thank you for signing up!

Our team will review your profile and confirm your access diff --git a/authority-portal-frontend/src/app/pages/registration-pages/organization-rejected-page/organization-rejected-page/organization-rejected-page.component.html b/authority-portal-frontend/src/app/pages/registration-pages/organization-rejected-page/organization-rejected-page/organization-rejected-page.component.html index 7ee8598f9..9cb071594 100644 --- a/authority-portal-frontend/src/app/pages/registration-pages/organization-rejected-page/organization-rejected-page/organization-rejected-page.component.html +++ b/authority-portal-frontend/src/app/pages/registration-pages/organization-rejected-page/organization-rejected-page/organization-rejected-page.component.html @@ -7,32 +7,7 @@ alt="logo" [attr.src]="appConfig.brandLogoUnauthenticatedPage.src" [class]="appConfig.brandLogoUnauthenticatedPage.class" /> -

-

- Thank you for signing up to be a part of the Mobility Data Space Portal! -

-

- Our community team has thoroughly reviewed your profile, but - unfortunately, we are currently unable to grant you access to the - MDS Portal. Please note that access to the MDS Portal is exclusive to MDS - members. For further information, please reach out to our community team - at - community@mobility-dataspace.eu. -

- -
- MDS Main Page -
-
-
+

Thank you for signing up!

Our team has thoroughly reviewed your profile, but diff --git a/authority-portal-frontend/src/app/pages/sp-connector-list-page/sp-connector-list-page/sp-connector-list-page.component.ts b/authority-portal-frontend/src/app/pages/sp-connector-list-page/sp-connector-list-page/sp-connector-list-page.component.ts index 9659adc10..9fbbc7622 100644 --- a/authority-portal-frontend/src/app/pages/sp-connector-list-page/sp-connector-list-page/sp-connector-list-page.component.ts +++ b/authority-portal-frontend/src/app/pages/sp-connector-list-page/sp-connector-list-page/sp-connector-list-page.component.ts @@ -22,7 +22,6 @@ import { UserRoleDto, } from '@sovity.de/authority-portal-client'; import {GlobalStateUtils} from 'src/app/core/global-state/global-state-utils'; -import {ActiveFeatureSet} from 'src/app/core/services/config/active-feature-set'; import {SlideOverService} from 'src/app/core/services/slide-over.service'; import {sliderOverNavigation} from 'src/app/core/utils/helper'; import {getConnectorsTypeClasses} from 'src/app/core/utils/ui-utils'; @@ -70,11 +69,8 @@ export class SpConnectorListPageComponent implements OnInit, OnDestroy { private router: Router, private slideOverService: SlideOverService, private titleService: Title, - private activeFeatureSet: ActiveFeatureSet, ) { - this.activeFeatureSet.usesMdsId() - ? this.titleService.setTitle('MDS Provided Connectors') - : this.titleService.setTitle('Provided Connectors'); + this.titleService.setTitle('Provided Connectors'); } ngOnInit() { diff --git a/authority-portal-frontend/src/app/shared/business/connector-registering-success-message-page/connector-registering-success-message-page.component.html b/authority-portal-frontend/src/app/shared/business/connector-registering-success-message-page/connector-registering-success-message-page.component.html index 85ba13763..f3c256b78 100644 --- a/authority-portal-frontend/src/app/shared/business/connector-registering-success-message-page/connector-registering-success-message-page.component.html +++ b/authority-portal-frontend/src/app/shared/business/connector-registering-success-message-page/connector-registering-success-message-page.component.html @@ -1,11 +1,7 @@

Finish setting up your connector!

To setup the connector, you will have to follow the Deployment Guide in the - {{ - ('mds-id' | isActiveFeature) - ? 'MDS Wiki' - : 'EDC repository which you can find by clicking the button below' - }}.
+ EDC repository which you can find by clicking the button below.
To get you started, we have prepared the following:

diff --git a/authority-portal-frontend/src/app/shared/business/shared-organization-detail/shared-organization-detail.component.html b/authority-portal-frontend/src/app/shared/business/shared-organization-detail/shared-organization-detail.component.html index d8dadd3e4..f3b98eb2c 100644 --- a/authority-portal-frontend/src/app/shared/business/shared-organization-detail/shared-organization-detail.component.html +++ b/authority-portal-frontend/src/app/shared/business/shared-organization-detail/shared-organization-detail.component.html @@ -2,7 +2,7 @@
label - {{ ('mds-id' | isActiveFeature) ? 'MDS ID' : 'Organization ID' }} + Organization ID
{{ organization.id }} diff --git a/authority-portal-frontend/src/app/shared/common/portal-layout/breadcrumb/breadcrumb.service.ts b/authority-portal-frontend/src/app/shared/common/portal-layout/breadcrumb/breadcrumb.service.ts index 75f124297..180c1ef31 100644 --- a/authority-portal-frontend/src/app/shared/common/portal-layout/breadcrumb/breadcrumb.service.ts +++ b/authority-portal-frontend/src/app/shared/common/portal-layout/breadcrumb/breadcrumb.service.ts @@ -52,16 +52,6 @@ export class BreadcrumbService { .split('/') .filter((segment) => segment !== '' && segment !== 'control-center'); - if (segments.length === 1 && segments[0] === 'mds-home') { - segments = []; - } - - if (this.activeFeatureSet.usesBritishCatalogue()) { - segments = segments.map((segment) => - segment === 'catalog' ? 'catalogue' : segment, - ); - } - return [ {label: 'Home', link: '', isLinkable: true}, ...segments.map((segment) => ({ diff --git a/authority-portal-frontend/src/app/shared/common/portal-layout/sidebar/sidebar.component.ts b/authority-portal-frontend/src/app/shared/common/portal-layout/sidebar/sidebar.component.ts index 7b7cf6de5..1682abb23 100644 --- a/authority-portal-frontend/src/app/shared/common/portal-layout/sidebar/sidebar.component.ts +++ b/authority-portal-frontend/src/app/shared/common/portal-layout/sidebar/sidebar.component.ts @@ -67,28 +67,17 @@ export class SidebarComponent implements OnInit, OnDestroy { } navigateHome() { - const defaultRoute = this.activeFeatureSet.isHomePageEnabled() - ? 'home' - : 'catalog'; - window.open(defaultRoute, '_self'); + window.open('catalog', '_self'); } setSideBarSections(organizationName: string): void { this.sidebarSections = [ { - title: this.activeFeatureSet.usesMdsId() ? 'MDS' : 'Home', + title: 'Home', userRoles: ['USER'], menus: [ { - title: 'Home', - icon: 'home', - rLink: '/home', - isDisabled: !this.activeFeatureSet.isHomePageEnabled(), - }, - { - title: this.activeFeatureSet.usesBritishCatalogue() - ? 'Data Catalogue' - : 'Data Catalog', + title: 'Data Catalog', icon: 'tag', rLink: '/catalog', }, @@ -169,9 +158,7 @@ export class SidebarComponent implements OnInit, OnDestroy { userRoles: ['USER'], menus: [ { - title: this.activeFeatureSet.usesMdsId() - ? 'MDS Support' - : 'Support', + title: 'Support', icon: 'question-mark-circle', rLink: this.appConfig.supportUrl, isExternalLink: true, diff --git a/authority-portal-frontend/src/assets/images/logo_light.svg b/authority-portal-frontend/src/assets/images/logo_light.svg deleted file mode 100644 index c62c21bd0..000000000 --- a/authority-portal-frontend/src/assets/images/logo_light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/authority-portal-frontend/src/assets/images/mds_caas_logo.svg b/authority-portal-frontend/src/assets/images/mds_caas_logo.svg deleted file mode 100644 index 75c55a4ad..000000000 --- a/authority-portal-frontend/src/assets/images/mds_caas_logo.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/authority-portal-frontend/src/assets/images/mds_logo_black.svg b/authority-portal-frontend/src/assets/images/mds_logo_black.svg deleted file mode 100644 index ea1846364..000000000 --- a/authority-portal-frontend/src/assets/images/mds_logo_black.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/authority-portal-frontend/src/assets/images/mds_logo_no_text.svg b/authority-portal-frontend/src/assets/images/mds_logo_no_text.svg deleted file mode 100644 index 082f2e321..000000000 --- a/authority-portal-frontend/src/assets/images/mds_logo_no_text.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/authority-portal-frontend/src/assets/images/mds_logo_white.svg b/authority-portal-frontend/src/assets/images/mds_logo_white.svg deleted file mode 100644 index 81dee7a53..000000000 --- a/authority-portal-frontend/src/assets/images/mds_logo_white.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/authority-portal-frontend/src/assets/images/mds_logo_yellow.svg b/authority-portal-frontend/src/assets/images/mds_logo_yellow.svg deleted file mode 100644 index 2d7e59428..000000000 --- a/authority-portal-frontend/src/assets/images/mds_logo_yellow.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/authority-portal-frontend/src/assets/images/mds_request-caas_logo.svg b/authority-portal-frontend/src/assets/images/mds_request-caas_logo.svg deleted file mode 100644 index c3ccaf433..000000000 --- a/authority-portal-frontend/src/assets/images/mds_request-caas_logo.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/authority-portal-frontend/src/assets/images/mds_self-hosted-connector_logo.svg b/authority-portal-frontend/src/assets/images/mds_self-hosted-connector_logo.svg deleted file mode 100644 index 79f99e0fc..000000000 --- a/authority-portal-frontend/src/assets/images/mds_self-hosted-connector_logo.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/authority-portal-frontend/src/theme-mds.scss b/authority-portal-frontend/src/theme-mds.scss deleted file mode 100644 index 6b18fa226..000000000 --- a/authority-portal-frontend/src/theme-mds.scss +++ /dev/null @@ -1,119 +0,0 @@ -// Custom Theming for Angular Material -// For more information: https://material.angular.io/guide/theming -@use '@angular/material' as mat; -// Plus imports for other components in your app. - -// Include the common styles for Angular Material. We include this here so that you only -// have to load a single css file for Angular Material in your app. -// Be sure that you only ever include this mixin once! -@include mat.core(); - -// Define the palettes for your theme using the Material Design palettes available in palette.scss -// (imported above). For each palette, you can optionally specify a default, lighter, and darker -// hue. Available color palettes: https://material.io/design/color/ -/* For use in src/lib/core/theming/_palette.scss */ -/* For use in src/lib/core/theming/_palette.scss */ -$md-primary-palette: ( - 50: #fdf8e6, - 100: #fbedc2, - 200: #f8e199, - 300: #f5d470, - 400: #f3cb51, - 500: #f1c232, - 600: #efbc2d, - 700: #edb426, - 800: #ebac1f, - 900: #e79f13, - A100: #ffffff, - A200: #fff4e2, - A400: #ffe2af, - A700: #ffd896, - contrast: ( - 50: #000000, - 100: #000000, - 200: #000000, - 300: #000000, - 400: #000000, - 500: #000000, - 600: #000000, - 700: #000000, - 800: #000000, - 900: #000000, - A100: #000000, - A200: #000000, - A400: #000000, - A700: #000000, - ), -); - -$md-black-palette: ( - 50: #e0e0e0, - 100: #bdbdbd, - 200: #9e9e9e, - 300: #757575, - 400: #616161, - 500: #000000, - // Primary black - 600: #3a3a3a, - 700: #333333, - 800: #2c2c2c, - 900: #262626, - A100: #ffffff, - A200: #f5f5f5, - A400: #cccccc, - A700: #b2b2b2, - contrast: ( - 50: #000000, - 100: #000000, - 200: #000000, - 300: #ffffff, - // High contrast for readability - 400: #ffffff, - 500: #ffffff, - 600: #ffffff, - 700: #ffffff, - 800: #ffffff, - 900: #ffffff, - A100: #000000, - A200: #000000, - A400: #000000, - A700: #000000, - ), -); - -$app-primary: mat.define-palette($md-primary-palette); -$app-accent: mat.define-palette($md-black-palette); - -// The warn palette is optional (defaults to red). -$app-warn: mat.define-palette(mat.$red-palette); - -// Create the theme object. A theme consists of configurations for individual -// theming systems such as "color" or "typography". -$app-theme: mat.define-light-theme( - ( - color: ( - primary: $app-primary, - accent: $app-accent, - warn: $app-warn, - ), - ) -); - -// Include theme styles for core and each component used in your app. -// Alternatively, you can import and @include the theme mixins for each component -// that you are using. -@include mat.all-component-themes($app-theme); - -$color-brand-400: 255 238 0; -$color-brand-500: 255 192 0; -$color-brand-primary: 255 254 0; -$color-brand-black: 0 0 0; -$color-brand-highlight: 189 125 0; - -$color-sidebar-bg: 0 0 0; -$color-sidebar-selected: 55 65 81; -$color-sidebar-text: 255 255 255; -$color-sidebar-text-selected: 255 255 255; -$color-sidebar-section: 209 213 219; - -$color-background: 255 255 255; diff --git a/authority-portal-frontend/src/theme.scss b/authority-portal-frontend/src/theme.scss index 8db92805c..97b0644d1 100644 --- a/authority-portal-frontend/src/theme.scss +++ b/authority-portal-frontend/src/theme.scss @@ -1,6 +1,5 @@ @use '@angular/material' as mat; @use 'theme-sovity' as sovityColors; -@use 'theme-mds' as mdsColors; @use 'theme-generated-variables' as themeGeneratedVars; // Import theme and theme-dependent styles @@ -24,24 +23,3 @@ --color-background: #{sovityColors.$color-background}; } - -.theme-mds { - @include mat.all-component-themes(mdsColors.$app-theme); - @include themeGeneratedVars.theme-vars( - mdsColors.$app-theme, - ); - - --color-brand-400: #{mdsColors.$color-brand-400}; - --color-brand-500: #{mdsColors.$color-brand-500}; - --color-brand-primary: #{mdsColors.$color-brand-primary}; - --color-brand-black: #{mdsColors.$color-brand-black}; - --color-brand-highlight: #{mdsColors.$color-brand-highlight}; - - --color-sidebar-bg: #{mdsColors.$color-sidebar-bg}; - --color-sidebar-selected: #{mdsColors.$color-sidebar-selected}; - --color-sidebar-text: #{mdsColors.$color-sidebar-text}; - --color-sidebar-text-selected: #{mdsColors.$color-sidebar-text-selected}; - --color-sidebar-section: #{mdsColors.$color-sidebar-section}; - - --color-background: #{mdsColors.$color-background}; -} diff --git a/docs/deployment-guide/goals/production/README.md b/docs/deployment-guide/goals/production/README.md index 127290829..128eb2f68 100644 --- a/docs/deployment-guide/goals/production/README.md +++ b/docs/deployment-guide/goals/production/README.md @@ -71,8 +71,8 @@ The respective compatible versions can be found in the [CHANGELOG.md](../../../. ```yaml # Variables to set privacy policy and legal notice URLs on Keycloak pages - KEYCLOAK_PRIVACY_POLICY_URL: https://mobility-dataspace.online/privacy-policy-mds-portal - KEYCLOAK_LEGAL_NOTICE_URL: https://mobility-dataspace.eu/legal-notice + KEYCLOAK_PRIVACY_POLICY_URL: https://sovity.de/en/privacy-policy/ + KEYCLOAK_LEGAL_NOTICE_URL: https://sovity.de/en/imprint/ ``` - Consider consulting Keycloak's [server administration guide](https://www.keycloak.org/docs/latest/server_admin/). @@ -307,11 +307,10 @@ AUTHORITY_PORTAL_FRONTEND_LOGIN_URL: https://[AP_FQDN]/oauth2/start?rd=https%3A% # Example: https://[AP_FQDN]/oauth2/sign_out?rd=https%3A%2F%2F[KC_FQDN]%2Frealms%2F[KC_REALM]l%2Fprotocol%2Fopenid-connect%2Flogout%3Fclient_id%3Doauth2-proxy%26post_logout_redirect_uri%3Dhttps%253A%252F%252F[AP_FQDN] AUTHORITY_PORTAL_FRONTEND_LOGOUT_URL: (...) # Auth Proxy: Logout URL AUTHORITY_PORTAL_FRONTEND_INVALIDATE_SESSION_COOKIES_URL: https://[AP_FQDN]/oauth2/sign_out # Auth Proxy: URL to invalidate sessions cookies -AUTHORITY_PORTAL_FRONTEND_IFRAME_URL: https://news.yourdataspace.com # iFrame URL for the "Home" page if it's used AUTHORITY_PORTAL_FRONTEND_LEGAL_NOTICE_URL: https://yourdataspace.com/legal-notice # Legal Notice URL AUTHORITY_PORTAL_FRONTEND_PRIVACY_POLICY_URL: https://yourdataspace.com/privacy-policy # Privacy policy URL AUTHORITY_PORTAL_FRONTEND_SUPPORT_URL: https://support.yourdataspace.com # Support page URL -AUTHORITY_PORTAL_FRONTEND_ACTIVE_PROFILE: sovity-open-source # UI Branding profile (sovity-open-source or mds-open-source) +AUTHORITY_PORTAL_FRONTEND_ACTIVE_PROFILE: sovity-open-source # UI Branding profile (sovity-open-source) AUTHORITY_PORTAL_FRONTEND_DATASPACE_SHORT_NAME: ExDS # Short Dataspace name, used in some explanatory texts AUTHORITY_PORTAL_FRONTEND_PORTAL_DISPLAY_NAME: "Authority Portal" # Portal name displayed in various texts AUTHORITY_PORTAL_FRONTEND_ENABLE_DASHBOARD: true # Enables or disables the status uptime dashboard @@ -357,8 +356,8 @@ CRAWLER_DB_JDBC_USER: portal CRAWLER_DB_JDBC_PASSWORD: portal # Required: DAPS credentials -EDC_OAUTH_TOKEN_URL: 'https://daps.test.mobility-dataspace.eu/token' -EDC_OAUTH_PROVIDER_JWKS_URL: 'https://daps.test.mobility-dataspace.eu/jwks' +EDC_OAUTH_TOKEN_URL: 'https://daps.yourdataspace.com/token' +EDC_OAUTH_PROVIDER_JWKS_URL: 'https://daps.yourdataspace.com/jwks' EDC_OAUTH_CLIENT_ID: '_your SKI/AKI_' EDC_KEYSTORE: '_your keystore file_' # Needs to be available as file in the running container EDC_KEYSTORE_PASSWORD: '_your keystore password_' diff --git a/docs/product/user-documentation/MDS/Administration and Support.md b/docs/product/user-documentation/MDS/Administration and Support.md deleted file mode 100644 index 3b2c48368..000000000 --- a/docs/product/user-documentation/MDS/Administration and Support.md +++ /dev/null @@ -1,66 +0,0 @@ -# Administration and Support - -## Profile & Roles - -A user can see their profile by clicking on their name in the top right corner and then "My Profile". - -Any user is able to edit their own information by maneuvering to his own profile and clicking "Edit". -First name, last name, job title, email and phone number can be updated and changes persisted by clicking "Update". - -Also, a user can see the roles assigned to them here. -As a participant in the MDS, you can have one of the following roles: - -- _User_: The basic role that allows a person to open multiple participant related sections in the MDS Portal, but basically cannot change anything -- _Key User_: The role allows creating and editing connectors for the user's organization -- _Admin_: Can additionally manage users, invite new users and deactivate existing users - -## User Management - -To manage the users in your organization, maneuver to the list of users by - -a) clicking on your name in the top right corner and then "Users and Roles" -or b) Click on "My Organization" and then "Users and Roles" - -![user-management](images/administration-and-support/user-management.png) - -The "User & Roles" list shows a list of all registered members in your organization. -To manage a user, click somewhere in the row the user of interest is listed in. - -Only Admins have the rights to make changes here! - -![users-list](images/administration-and-support/users-list.png) - -As an Admin you are able to: - -- Change user roles (via user details) -- Delete, deactivate or reactivate users (via user details) -- Invite new users to your organization - -### User Invitation - -As described above, to invite new users into your organization, you must have the role Admin! -New users can be invited by clicking on "Invite User". - -![invitation-form](images/administration-and-support/invitation-form.png) - -Specify the user's name, email and role. -Click on "Send invitation" to add the user to the list of registered users. - -![invited-user](images/administration-and-support/invited-user.png) - -The invited user will receive an invitation email with a link. -When clicking the link, the user will be asked to set a password for their account and to set up two-factor authentication. - -## Dashboard & Reporting - -The Dashboard provides an overview over the current status of central Data Space Components as well as the organization's connectors. -Also, it is possible to download reports about connectors, data offers and system stability from here. - -_Note_: As the MDS Portal is the instance, which tracks the status of the Data Space Components and connectors, downtimes that occur when the MDS Portal is offline, are not captured. - -![dashboard](images/administration-and-support/dashboard.png) - -## Ticket System - -In case of any need for support, e.g. when encountering malfunctions, problems finding information or questions regarding the provided information, click on “MDS Support” to access the Fault Management system. -Find further support [here](https://mobility-dataspace.eu/). diff --git a/docs/product/user-documentation/MDS/Authority Section.md b/docs/product/user-documentation/MDS/Authority Section.md deleted file mode 100644 index d83412ecc..000000000 --- a/docs/product/user-documentation/MDS/Authority Section.md +++ /dev/null @@ -1,56 +0,0 @@ -# Authority Section - -## Organization management - -Organization management is only available to Authority Admins and Authority Users. If you have one of these application roles you can see the Authority section on the navigation bar. - -![organizations-page](images/authority-section/organizations-list.png) - -On the Organization page you can see all organizations registered in the MDS Portal. They can be filtered by: - -- _Active_: Fully registered organizations -- _Invited_: Organization invitation has been sent, but was not yet accepted -- _Onboarding_: The Admin of an invited organization has already logged-in at least once and needs to fill in organization details -- _Pending_: Organization has sent a registration request -- _Rejected_: Organization registration request has been rejected - -Click in the row of an organization to view the organization details. Quickly switch between two organization detail pages by using the arrows at the top. - -![organization-detail-page](images/authority-section/organization-detail-page.png) - -From the organization detail page, Authority Users and Admins are able to manage the organization of interest and e.g. approve or reject an organization or see the different users of it. - -![manage-organizations](images/authority-section/manage-organization.png) - -As an Authority User you have the rights to: - -- See the list of all registered, pending & invited organizations -- Invite new organizations and their respective initial Admin -- Accept & reject pending organizations' requests -- Access any organization's profile - -As an Authority Admin you can additionally: - -- Manage application roles (Authority Admin/User, Service Partner and Operator) of users of any organization via the user list of each organization - -### Organization invitation - -Organizations can be invited by Authority Users and Authority Admins. -The process is as follows: - -1. In the organization list, click on "Invite Organization". -2. Fill out the form with the organization details and the first user's details. -3. Submit the form. An email will be sent to the first user with a link to the user registration process. - -## Connector overview - -Under "All Connectors", Authority Users and Admins can see all registered connectors of all organizations in the MDS Portal. -Also, the connector details can be accessed from here. - -## Dashboard & Reporting - -Additionally to the features listed in [Administration and Support](Administration%20and%20Support.md#dashboard--reporting), Authority Users and Admins have access to the following features. - -- They can download a report about all users and their roles. -- Instead of only their own, all connectors are respected in the connector report. -- Instead of only their own, they see the status of all connectors. diff --git a/docs/product/user-documentation/MDS/Connect to the MDS.md b/docs/product/user-documentation/MDS/Connect to the MDS.md deleted file mode 100644 index 08fa6276f..000000000 --- a/docs/product/user-documentation/MDS/Connect to the MDS.md +++ /dev/null @@ -1,89 +0,0 @@ -# Connect to the MDS - -## Environments - -The MDS Portal provides different deployment environments for you to use. -Environments can be switched via the selector in the top bar of the MDS Portal. - -![environment-selector](images/connect-to-the-mds/environment-selector.png) - -The selection is global and affects all areas of the portal that deal with connectors. -Also, the amount of free CaaS is limited per environment. - -## Connectors - -The Eclipse Dataspace Components (EDC) Connector is the key component for connecting to the MDS and providing and consuming data. -There are two options to access the MDS with: - -- Connector-as-a-Service (CaaS) -- On-premise installation - -### Connector-as-a-Service - -The CaaS is the simplest way to receive a registered and compliant connector. - -If you seek to add a CaaS to your organization in the MDS, click "Add Connector". - -![add-connector](images/connect-to-the-mds/add-connector.png) - -Select "I need a connector". - -![choose-connector](images/connect-to-the-mds/choose-connector-registration.png) - -In case the amount of free connectors for the selected environment is not exceeded, you will be able to proceed with the registration. - -![request-caas](images/connect-to-the-mds/request-caas.png) - -Fill out the CaaS details and click "Request CaaS". - -![request-caas-form](images/connect-to-the-mds/request-caas-form.png) - -After the registration, you will find your newly registered CaaS in the "Connectors" list. -The provisioning process of your new connector may take some time and the current status can be tracked in the connector details. - -![connector-list-with-example-caas](images/connect-to-the-mds/connector-list-with-example-caas.png) - -### On-premise installation - -The installation of an on-premise connector consists of two steps: - -1. Register your connector -2. Set up and configure the connector - -#### 1. Register your connector - -If you seek to add a Connector to your organization in the MDS, click "Add Connector". - -![add-connector](images/connect-to-the-mds/add-connector.png) - -Select "I have a connector". - -![choose-connector](images/connect-to-the-mds/choose-connector-registration.png) - -Fill out the "Add Connector Details" form and click "Next" to proceed. - -![register-connector-form](images/connect-to-the-mds/register-connector-form.png) - -After entering your Connector details, you now need to give the stated information in the "Generate Certificate" form and click "Generate & Download Certificate". - -![register-connector-generate-certificate](images/connect-to-the-mds/register-connector-generate-certificate.png) - -The certificate will automatically be filled into the respective field in the registration form and the download will be triggered. -Click on “Register Connector” to finalize the connector registration process. - -![register-connector-finish](images/connect-to-the-mds/register-connector-finish.png) - -On the following page you will find further instructions on how to set up your on-premise Connector and a link to the open-source repository edc-ce (sovity EDC Community Edition) providing all you need to set up your Connector. - -Find your newly registered Connector in the "Connectors" list. - -![connector-list-with-example-edc](images/connect-to-the-mds/connector-list-with-example-edc.png) - -#### 2. Setup and configure the connector - -We recommend using the MDS version of the Eclipse Dataspace Connector, which is used as reference for configuration. Nevertheless, you can use any other connector which is compatible with the EDC, MDS Catalogue and MDS Logging House. - -A deployment guide for self-hosting a functional MDS CE EDC Connector can be found in the [MDS Wiki](https://github.com/Mobility-Data-Space/mobility-data-space/wiki) under Connector On-Premise - 2. Step (Configuration). - - - diff --git a/docs/product/user-documentation/MDS/Manage Data Space components.md b/docs/product/user-documentation/MDS/Manage Data Space components.md deleted file mode 100644 index a62b0e9b4..000000000 --- a/docs/product/user-documentation/MDS/Manage Data Space components.md +++ /dev/null @@ -1,81 +0,0 @@ -# Manage the Data Space components - -Besides the Data Space Authority roles, there are two other application roles that are able to manage elements of the Data Space. - -- Service Partner Admin -- Operator Admin - -## Application role: Service Partner Admin - -### General - -The Service Partner Admin is an application role to represent the provider of connectors of the Mobility Data Space. A service partner of the Mobility Data Space provides connectors for Data Space participants by deploying and registering these connectors for other entities within the Data Space. -As such, the service partner has direct access to all provided connectors and the application role of Service Partner Admin aims to mirror those capabilities within the MDS Portal. -The Service Partner Admin role is an application role and assigned to certain users individually by Authority Admins. - -### Rights for Service Partner Admins - -Currently, the Service Partner Admin role grants the following rights in addition to a user's organization role: - -1. View a list of provided connectors -2. Provide and delete provided connectors -3. Assign Service Partner Admin role to users within own organization - -#### 1. View a list of provided connectors - -As a Service Partner Admin a user is able to access the "Provided Connectors" page where all provided connectors are displayed. - -#### 2. Register and delete connectors - -When clicking on the button "Provide Connector" in the upper right corner a mask to register a new connector opens. - -![provide-connector](images/manage-dataspace-components/provide-connector.png) - -To provide a connector in the MDS Portal all fields of the mask must be submitted. The process is identical to the registration of connectors for users without any application role but registers the connector for another organization who is named in the slightly changed registration mask. -After clicking on the register button the list of provided connectors appears, where the added connector can be found. - -#### 3. Assign Service Partner Admin role to users within own organization - -1. Click on "My Organization" in the sidebar menu. -2. Head to the "Users and Roles" page. -3. Select a user's profile of the user that shall become a Service Partner Admin. -4. Edit the application role and change it to Service Partner Admin. -5. Result: An additional Service Partner Admin has been created. - -## Application role: Operator Admin - -### General - -The Operator Admin is an application role to represent the operator of the Mobility Data Space. The operator of the Mobility Data Space deploys the central components of the Data Space in the infrastructure and manages the different environments of the Data Space. As such, the operator has direct access to all central components and the application role of Operator Admin aims to mirror those capabilities within the MDS Portal. -The Operator Admin role is an application role and assigned to certain users individually by Authority Admins. - -### Rights for Operator Admins - -Currently, the Operator Admin role grants the following rights in addition to a user's organization role: - -1. View a list of central components -2. Register and delete central components -3. Assign Operator Admin role to users within own organization - -#### 1. View a list of central components - -As an Operator Admin a user is able to access the "Central Components" page where all registered central components are displayed. - -![central-components](images/manage-dataspace-components/central-components-list.png) - -#### 2. Register and delete central components - -When clicking on the button "Provide Central Component" in the upper right corner a mask to register a central component opens. - -![provide-central-component](images/manage-dataspace-components/provide-central-component.png) - -To register a central component in the MDS Portal all fields of the mask must be submitted. The process is identical to the registration of connectors but does not register the added central component at the MDS Broker. -After clicking on the register button the list of central components appears, where the added central component can be found. - -#### 3. Assign Operator Admin role to users within own organization - -1. Click on "My Organization" in the sidebar menu. -2. Head to the "Users and Roles" page. -3. Select a user's profile of the user that shall become an Operator Admin. -4. Edit the application role and change it to Operator Admin. -5. Result: An additional Operator Admin has been created. diff --git a/docs/product/user-documentation/MDS/Registration in MDS Portal.md b/docs/product/user-documentation/MDS/Registration in MDS Portal.md deleted file mode 100644 index 4c02536a7..000000000 --- a/docs/product/user-documentation/MDS/Registration in MDS Portal.md +++ /dev/null @@ -1,34 +0,0 @@ -# Registration in the MDS Portal - -## Organization Registration - -If your organization is not yet registered in the MDS Portal, there are two possibilities to get started. - -### Invitation - -The first option is to receive an invitation from the Data Space Authority (MDS). -This would be an email invitation to the organization representative, which will contain a link to the registration process. - -### Self-registration - -The other option is to register your organization yourself. -To do so, click on “Register Organization” in the MDS Portal and follow the registration process. -During this process, you will be asked to provide information about the organization and the user who will be the organization representative. - -![self-registration](images/registration-in-mds-portal/self-registration.png) - -After you finish entering your user and organization details, you will receive a verification email including the finalization of your account by setting up a two-factor authentication. - -Once received, click on the verification link in the email and wait for your organization to be approved or rejected by the Data Space Authority. - -## User Registration - -If your organization is already registered in the MDS Portal, you can register as a user by receiving an invitation from an organization Admin. -Therefore, please ask one of your Admins to send you an invitation. -The user invitation process is described at the [User Invitation section](Administration%20and%20Support.md#user-invitation) in "Administration & Support" - -## The Portal - -After finishing the registration process, you will be able to log in to the MDS Portal. -Depending on your role, you will have access to different sections and functionalities. -In general this includes the management of your connectors, organization and users. \ No newline at end of file diff --git a/docs/product/user-documentation/MDS/images/administration-and-support/dashboard.png b/docs/product/user-documentation/MDS/images/administration-and-support/dashboard.png deleted file mode 100644 index 9d2a4e41d..000000000 Binary files a/docs/product/user-documentation/MDS/images/administration-and-support/dashboard.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/administration-and-support/invitation-form.png b/docs/product/user-documentation/MDS/images/administration-and-support/invitation-form.png deleted file mode 100644 index d8a487261..000000000 Binary files a/docs/product/user-documentation/MDS/images/administration-and-support/invitation-form.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/administration-and-support/invite-user.png b/docs/product/user-documentation/MDS/images/administration-and-support/invite-user.png deleted file mode 100644 index 98f79b0da..000000000 Binary files a/docs/product/user-documentation/MDS/images/administration-and-support/invite-user.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/administration-and-support/invited-user.png b/docs/product/user-documentation/MDS/images/administration-and-support/invited-user.png deleted file mode 100644 index 7efa6dbcb..000000000 Binary files a/docs/product/user-documentation/MDS/images/administration-and-support/invited-user.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/administration-and-support/user-management.png b/docs/product/user-documentation/MDS/images/administration-and-support/user-management.png deleted file mode 100644 index f2dd08192..000000000 Binary files a/docs/product/user-documentation/MDS/images/administration-and-support/user-management.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/administration-and-support/users-list.png b/docs/product/user-documentation/MDS/images/administration-and-support/users-list.png deleted file mode 100644 index a6bd438b7..000000000 Binary files a/docs/product/user-documentation/MDS/images/administration-and-support/users-list.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/authority-section/manage-organization.png b/docs/product/user-documentation/MDS/images/authority-section/manage-organization.png deleted file mode 100644 index 1256825bc..000000000 Binary files a/docs/product/user-documentation/MDS/images/authority-section/manage-organization.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/authority-section/organization-detail-page.png b/docs/product/user-documentation/MDS/images/authority-section/organization-detail-page.png deleted file mode 100644 index f04fd13ab..000000000 Binary files a/docs/product/user-documentation/MDS/images/authority-section/organization-detail-page.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/authority-section/organizations-list.png b/docs/product/user-documentation/MDS/images/authority-section/organizations-list.png deleted file mode 100644 index 6b0c5d0f6..000000000 Binary files a/docs/product/user-documentation/MDS/images/authority-section/organizations-list.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/connect-to-the-mds/add-connector.png b/docs/product/user-documentation/MDS/images/connect-to-the-mds/add-connector.png deleted file mode 100644 index c4306ac92..000000000 Binary files a/docs/product/user-documentation/MDS/images/connect-to-the-mds/add-connector.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/connect-to-the-mds/choose-connector-registration.png b/docs/product/user-documentation/MDS/images/connect-to-the-mds/choose-connector-registration.png deleted file mode 100644 index 9528dec4e..000000000 Binary files a/docs/product/user-documentation/MDS/images/connect-to-the-mds/choose-connector-registration.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/connect-to-the-mds/connector-list-with-example-caas.png b/docs/product/user-documentation/MDS/images/connect-to-the-mds/connector-list-with-example-caas.png deleted file mode 100644 index ad4ca2ba5..000000000 Binary files a/docs/product/user-documentation/MDS/images/connect-to-the-mds/connector-list-with-example-caas.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/connect-to-the-mds/connector-list-with-example-edc.png b/docs/product/user-documentation/MDS/images/connect-to-the-mds/connector-list-with-example-edc.png deleted file mode 100644 index 3c4aa764d..000000000 Binary files a/docs/product/user-documentation/MDS/images/connect-to-the-mds/connector-list-with-example-edc.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/connect-to-the-mds/environment-selector.png b/docs/product/user-documentation/MDS/images/connect-to-the-mds/environment-selector.png deleted file mode 100644 index 05c13ab14..000000000 Binary files a/docs/product/user-documentation/MDS/images/connect-to-the-mds/environment-selector.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/connect-to-the-mds/register-connector-finish.png b/docs/product/user-documentation/MDS/images/connect-to-the-mds/register-connector-finish.png deleted file mode 100644 index 1dbadafa3..000000000 Binary files a/docs/product/user-documentation/MDS/images/connect-to-the-mds/register-connector-finish.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/connect-to-the-mds/register-connector-form.png b/docs/product/user-documentation/MDS/images/connect-to-the-mds/register-connector-form.png deleted file mode 100644 index ce598260f..000000000 Binary files a/docs/product/user-documentation/MDS/images/connect-to-the-mds/register-connector-form.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/connect-to-the-mds/register-connector-generate-certificate.png b/docs/product/user-documentation/MDS/images/connect-to-the-mds/register-connector-generate-certificate.png deleted file mode 100644 index b7de3f720..000000000 Binary files a/docs/product/user-documentation/MDS/images/connect-to-the-mds/register-connector-generate-certificate.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/connect-to-the-mds/request-caas-form.png b/docs/product/user-documentation/MDS/images/connect-to-the-mds/request-caas-form.png deleted file mode 100644 index 36e25c926..000000000 Binary files a/docs/product/user-documentation/MDS/images/connect-to-the-mds/request-caas-form.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/connect-to-the-mds/request-caas.png b/docs/product/user-documentation/MDS/images/connect-to-the-mds/request-caas.png deleted file mode 100644 index cb45476b1..000000000 Binary files a/docs/product/user-documentation/MDS/images/connect-to-the-mds/request-caas.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/manage-dataspace-components/central-components-list.png b/docs/product/user-documentation/MDS/images/manage-dataspace-components/central-components-list.png deleted file mode 100644 index 6b5401881..000000000 Binary files a/docs/product/user-documentation/MDS/images/manage-dataspace-components/central-components-list.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/manage-dataspace-components/provide-central-component.png b/docs/product/user-documentation/MDS/images/manage-dataspace-components/provide-central-component.png deleted file mode 100644 index 00904c85e..000000000 Binary files a/docs/product/user-documentation/MDS/images/manage-dataspace-components/provide-central-component.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/manage-dataspace-components/provide-connector.png b/docs/product/user-documentation/MDS/images/manage-dataspace-components/provide-connector.png deleted file mode 100644 index 30ce2c46a..000000000 Binary files a/docs/product/user-documentation/MDS/images/manage-dataspace-components/provide-connector.png and /dev/null differ diff --git a/docs/product/user-documentation/MDS/images/registration-in-mds-portal/self-registration.png b/docs/product/user-documentation/MDS/images/registration-in-mds-portal/self-registration.png deleted file mode 100644 index 00c0f49dc..000000000 Binary files a/docs/product/user-documentation/MDS/images/registration-in-mds-portal/self-registration.png and /dev/null differ