diff --git a/src/app/modules/hebis/daia-availability/daia-availability.component.ts b/src/app/modules/hebis/daia-availability/daia-availability.component.ts index 6f8861b9..827906cc 100644 --- a/src/app/modules/hebis/daia-availability/daia-availability.component.ts +++ b/src/app/modules/hebis/daia-availability/daia-availability.component.ts @@ -35,7 +35,7 @@ export class DaiaAvailabilityComponent extends DataDetailComponent implements OnInit { - holdings: SCDaiaHoldings[]; + holdings: SCDaiaHoldings[] | undefined; /** * @@ -68,8 +68,10 @@ export class DaiaAvailabilityComponent * Initialize */ async ngOnInit() { - const uid = this.route.snapshot.paramMap.get('uid') || ''; - await this.getAvailability(uid ?? ''); + const uid = this.route.snapshot.paramMap.get('uid'); + if (uid) { + await this.getAvailability(uid); + } } /** diff --git a/src/app/modules/hebis/daia-availability/daia-availability.html b/src/app/modules/hebis/daia-availability/daia-availability.html index 9e16a025..1717f141 100644 --- a/src/app/modules/hebis/daia-availability/daia-availability.html +++ b/src/app/modules/hebis/daia-availability/daia-availability.html @@ -1,14 +1,14 @@ - {{ - 'hebisSearch.daia.availability' | translate - }} + + {{ 'hebisSearch.daia.availability' | translate }} + - {{ - holding.label - }} + + + {{ holding.label }} + + {{ @@ -23,7 +23,7 @@ " >{{ holding.signature }} - + {{ 'hebisSearch.daia.ejournal' | translate }} @@ -59,5 +59,11 @@ + + {{ 'hebisSearch.daia.unavailableAvailability' | translate }} + + + {{ 'hebisSearch.daia.unknownAvailability' | translate }} + diff --git a/src/app/modules/hebis/daia-data.provider.ts b/src/app/modules/hebis/daia-data.provider.ts index c6b2d52c..ade73256 100644 --- a/src/app/modules/hebis/daia-data.provider.ts +++ b/src/app/modules/hebis/daia-data.provider.ts @@ -51,7 +51,8 @@ export class DaiaDataProvider extends DataProvider { * @param stAppsWebHttpClient TODO * @param storageProvider TODO * @param httpClient TODO - * @param ConfigProvider TODO + * @param configProvider TODO + * @param logger TODO */ constructor( stAppsWebHttpClient: StAppsWebHttpClient, @@ -71,7 +72,7 @@ export class DaiaDataProvider extends DataProvider { ); } - async getAvailability(id: string): Promise { + async getAvailability(id: string): Promise { if (this.backendUrl === environment.backend_url) { try { const features = (await this.configProvider.getValue( @@ -81,11 +82,11 @@ export class DaiaDataProvider extends DataProvider { this.backendUrl = features.extern?.daia?.url; } else { this.logger.error('Daia service url undefined'); - return []; + return undefined; } } catch (error) { this.logger.error(error); - return []; + return undefined; } } return new Promise(resolve => @@ -143,7 +144,8 @@ export class DaiaDataProvider extends DataProvider { }, error => { this.logger.error(error); - resolve([]); + // eslint-disable-next-line unicorn/no-useless-undefined + resolve(undefined); }, ), ); diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 61b121f0..578a5549 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -274,7 +274,9 @@ "comment": "Kommentar", "order": "Bestellen", "issn": "ISSN", - "ejournal": "ejournal" + "ejournal": "ejournal", + "unknownAvailability": "Keine Information vorhanden", + "unavailableAvailability": "System nicht erreichbar" } }, "schedule": { diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 24c6c464..b9c67519 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -274,7 +274,9 @@ "comment": "Remark", "order": "Request", "issn": "ISSN", - "ejournal": "ejournal" + "ejournal": "ejournal", + "unknownAvailability": "No information available", + "unavailableAvailability": "System unreachable" } }, "schedule": {