Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-21 17:12:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: avoid errors in daia availability UI

Browse Source
This commit is contained in:
Rainer Killinger
2022-02-08 13:03:21 +01:00
parent 988236e646
commit 6ce435fc05
5 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/modules/hebis/daia-availability/daia-availability.component.ts
View File

@@ -35,7 +35,7 @@ export class DaiaAvailabilityComponent
extends DataDetailComponent extends DataDetailComponent
implements OnInit implements OnInit
{ {
holdings: SCDaiaHoldings[]; holdings: SCDaiaHoldings[] | undefined;
/** /**
* *
@@ -68,8 +68,10 @@ export class DaiaAvailabilityComponent
* Initialize * Initialize
*/ */
async ngOnInit() { async ngOnInit() {
const uid = this.route.snapshot.paramMap.get('uid') || ''; const uid = this.route.snapshot.paramMap.get('uid');
await this.getAvailability(uid ?? ''); if (uid) {
await this.getAvailability(uid);
}
} }
/** /**

24
src/app/modules/hebis/daia-availability/daia-availability.html
View File

@@ -1,14 +1,14 @@
<ion-card> <ion-card>
<ion-card-header>{{ <ion-card-header>
'hebisSearch.daia.availability' | translate {{ 'hebisSearch.daia.availability' | translate }}
}}</ion-card-header> </ion-card-header>
<ion-card-content> <ion-card-content>
<ng-container *ngFor="let holding of holdings"> <ng-container *ngFor="let holding of holdings">
<ion-label <ion-label>
><a [href]="holding.href" target="_blank">{{ <a [href]="holding.href" target="_blank">
holding.label {{ holding.label }}
}}</a></ion-label </a>
> </ion-label>
<ion-grid> <ion-grid>
<ion-row *ngIf="holding.signature"> <ion-row *ngIf="holding.signature">
<ion-col size="3">{{ <ion-col size="3">{{
@@ -23,7 +23,7 @@
" "
>{{ holding.signature }}</ion-col >{{ holding.signature }}</ion-col
> >
<ion-col size="9" *ngIf="holding.available.service === 'openaccess'"> <ion-col size="9" *ngIf="holding.available?.service === 'openaccess'">
<a [href]="holding.available.href" target="_blank">{{ <a [href]="holding.available.href" target="_blank">{{
'hebisSearch.daia.ejournal' | translate 'hebisSearch.daia.ejournal' | translate
}}</a> }}</a>
@@ -59,5 +59,11 @@
</ion-row> </ion-row>
</ion-grid> </ion-grid>
</ng-container> </ng-container>
<ion-label *ngIf="!holdings">
{{ 'hebisSearch.daia.unavailableAvailability' | translate }}
</ion-label>
<ion-label *ngIf="holdings?.length === 0">
{{ 'hebisSearch.daia.unknownAvailability' | translate }}
</ion-label>
</ion-card-content> </ion-card-content>
</ion-card> </ion-card>

12
src/app/modules/hebis/daia-data.provider.ts
View File

@@ -51,7 +51,8 @@ export class DaiaDataProvider extends DataProvider {
* @param stAppsWebHttpClient TODO * @param stAppsWebHttpClient TODO
* @param storageProvider TODO * @param storageProvider TODO
* @param httpClient TODO * @param httpClient TODO
* @param ConfigProvider TODO * @param configProvider TODO
* @param logger TODO
*/ */
constructor( constructor(
stAppsWebHttpClient: StAppsWebHttpClient, stAppsWebHttpClient: StAppsWebHttpClient,
@@ -71,7 +72,7 @@ export class DaiaDataProvider extends DataProvider {
); );
} }
async getAvailability(id: string): Promise<SCDaiaHoldings[]> { async getAvailability(id: string): Promise<SCDaiaHoldings[] | undefined> {
if (this.backendUrl === environment.backend_url) { if (this.backendUrl === environment.backend_url) {
try { try {
const features = (await this.configProvider.getValue( const features = (await this.configProvider.getValue(
@@ -81,11 +82,11 @@ export class DaiaDataProvider extends DataProvider {
this.backendUrl = features.extern?.daia?.url; this.backendUrl = features.extern?.daia?.url;
} else { } else {
this.logger.error('Daia service url undefined'); this.logger.error('Daia service url undefined');
return []; return undefined;
} }
} catch (error) { } catch (error) {
this.logger.error(error); this.logger.error(error);
return []; return undefined;
} }
} }
return new Promise(resolve => return new Promise(resolve =>
@@ -143,7 +144,8 @@ export class DaiaDataProvider extends DataProvider {
}, },
error => { error => {
this.logger.error(error); this.logger.error(error);
resolve([]); // eslint-disable-next-line unicorn/no-useless-undefined
resolve(undefined);
}, },
), ),
); );

4
src/assets/i18n/de.json
View File

@@ -274,7 +274,9 @@
"comment": "Kommentar", "comment": "Kommentar",
"order": "Bestellen", "order": "Bestellen",
"issn": "ISSN", "issn": "ISSN",
"ejournal": "ejournal" "ejournal": "ejournal",
"unknownAvailability": "Keine Information vorhanden",
"unavailableAvailability": "System nicht erreichbar"
} }
}, },
"schedule": { "schedule": {

4
src/assets/i18n/en.json
View File

@@ -274,7 +274,9 @@
"comment": "Remark", "comment": "Remark",
"order": "Request", "order": "Request",
"issn": "ISSN", "issn": "ISSN",
"ejournal": "ejournal" "ejournal": "ejournal",
"unknownAvailability": "No information available",
"unavailableAvailability": "System unreachable"
} }
}, },
"schedule": { "schedule": {