hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 07:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

97425: Fix minor issues

Browse Source
This commit is contained in:
Yana De Pauw
2023-02-02 16:22:59 +01:00
parent 38063d617e
commit 36e10f87b3
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
View File

@@ -1,6 +1,8 @@
import { Component, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core';
import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
import { getAllCompletedRemoteData } from '../../core/shared/operators';
import {
getAllSucceededRemoteDataPayload
} from '../../core/shared/operators';
import { filter, map, switchMap } from 'rxjs/operators';
import { PaginatedList } from '../../core/data/paginated-list.model';
import { SystemWideAlert } from '../system-wide-alert.model';
@@ -54,14 +56,7 @@ export class SystemWideAlertBannerComponent implements OnInit, OnDestroy {
ngOnInit() {
this.subscriptions.push(this.systemWideAlertDataService.searchBy('active').pipe(
getAllCompletedRemoteData(),
map((rd) => {
if (rd.hasSucceeded) {
return rd.payload;
} else {
this.notificationsService.error('system-wide-alert-banner.retrieval.error');
}
}),
getAllSucceededRemoteDataPayload(),
map((payload: PaginatedList<SystemWideAlert>) => payload.page),
filter((page) => isNotEmpty(page)),
map((page) => page[0])

11
src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
View File

@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
import { getFirstCompletedRemoteData } from '../../core/shared/operators';
import { filter, map } from 'rxjs/operators';
import { PaginatedList } from '../../core/data/paginated-list.model';
import { SystemWideAlert } from '../system-wide-alert.model';
@@ -88,7 +88,14 @@ export class SystemWideAlertFormComponent implements OnInit {
ngOnInit() {
this.systemWideAlert$ = this.systemWideAlertDataService.findAll().pipe(
getFirstSucceededRemoteDataPayload(),
getFirstCompletedRemoteData(),
map((rd) => {
if (rd.hasSucceeded) {
return rd.payload;
} else {
this.notificationsService.error('system-wide-alert-form.retrieval.error');
}
}),
map((payload: PaginatedList<SystemWideAlert>) => payload.page),
filter((page) => isNotEmpty(page)),
map((page) => page[0])

2
src/assets/i18n/en.json5
View File

@@ -4860,6 +4860,8 @@
"system-wide-alert.form.header": "System-wide Alert",
"system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
"system-wide-alert.form.cancel": "Cancel",
"system-wide-alert.form.save": "Save",