diff --git a/src/app/core/coar-notify/notify-info/notify-info.component.html b/src/app/core/coar-notify/notify-info/notify-info.component.html index 101cf867cc..2123396cd2 100644 --- a/src/app/core/coar-notify/notify-info/notify-info.component.html +++ b/src/app/core/coar-notify/notify-info/notify-info.component.html @@ -8,7 +8,7 @@

{{ 'coar-notify-support.ldn-inbox.title' | translate }}

-

+

{{ 'coar-notify-support.message-moderation.title' | translate }}

diff --git a/src/app/core/coar-notify/notify-info/notify-info.component.ts b/src/app/core/coar-notify/notify-info/notify-info.component.ts index 1abb54c11e..2ff4b0bf2c 100644 --- a/src/app/core/coar-notify/notify-info/notify-info.component.ts +++ b/src/app/core/coar-notify/notify-info/notify-info.component.ts @@ -1,26 +1,24 @@ import { Component, OnInit } from '@angular/core'; import { NotifyInfoService } from './notify-info.service'; - +import { Observable, of } from 'rxjs'; @Component({ - selector: 'ds-notify-info', - templateUrl: './notify-info.component.html', - styleUrls: ['./notify-info.component.scss'] + selector: 'ds-notify-info', + templateUrl: './notify-info.component.html', + styleUrls: ['./notify-info.component.scss'], }) +/** + * Component for displaying COAR notification information. + */ export class NotifyInfoComponent implements OnInit { - coarLdnEnabled: boolean; - coarRestApiUrl: string; + /** + * Observable containing the COAR REST INBOX API URLs. + */ + coarRestApiUrl: Observable = of([]); - constructor( - public notifyInfoService: NotifyInfoService, - ) { - } + constructor(public notifyInfoService: NotifyInfoService) {} - ngOnInit() { - this.coarRestApiUrl = this.notifyInfoService.getCoarLdnRestApiUrl(); - - this.notifyInfoService.isCoarConfigEnabled().subscribe(value => { - this.coarLdnEnabled = value; - }); - } + ngOnInit() { + this.coarRestApiUrl = this.notifyInfoService.getCoarLdnLocalInboxUrls(); + } } diff --git a/src/app/core/coar-notify/notify-info/notify-info.service.ts b/src/app/core/coar-notify/notify-info/notify-info.service.ts index 87bbc0a9cd..8690a07565 100644 --- a/src/app/core/coar-notify/notify-info/notify-info.service.ts +++ b/src/app/core/coar-notify/notify-info/notify-info.service.ts @@ -2,7 +2,6 @@ import { Injectable } from '@angular/core'; import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../shared/operators'; import { ConfigurationDataService } from '../../data/configuration-data.service'; import { map, Observable } from 'rxjs'; -import { DefaultAppConfig } from '../../../../config/default-app-config'; import { ConfigurationProperty } from '../../shared/configuration-property.model'; @Injectable({ @@ -44,18 +43,6 @@ export class NotifyInfoService { ); } - getCoarLdnRestApiUrl(): string { - const appConfig = new DefaultAppConfig(); - const restConfig = appConfig.rest; - - const ssl = restConfig.ssl; - const host = restConfig.host; - const port = restConfig.port; - const namespace = restConfig.nameSpace; - - return `${ssl ? 'https' : 'http'}://${host}:${port}${namespace}`; - } - /** * Method to get the relation link for the inbox * @returns the relation link for the inbox diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index be244bbb1e..108433de21 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -896,7 +896,7 @@ "coar-notify-support.ldn-inbox.title": "LDN InBox", - "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {restApiUrl}ldn/inbox. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.", + "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {ldnInboxUrl}ldn/inbox. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.", "coar-notify-support.message-moderation.title": "Message Moderation",