Skip to content

Commit 567fdf8

Browse files
committed
Merged in dspace-cris-2023_02_x-DSC-1489 (pull request DSpace#1259)
Hide wide alert banner when no message is provided
2 parents c00ab39 + 2fcaad7 commit 567fdf8

File tree

2 files changed

+46
-1
lines changed

2 files changed

+46
-1
lines changed

src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div *ngIf="(systemWideAlert$ |async)?.active">
1+
<div *ngIf="(systemWideAlert$ |async)?.active && (systemWideAlert$ |async)?.message">
22
<div class="rounded-0 alert alert-warning w100">
33
<div class="container">
44
<span class="font-weight-bold">

src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ describe('SystemWideAlertBannerComponent', () => {
1919
let systemWideAlertDataService: SystemWideAlertDataService;
2020

2121
let systemWideAlert: SystemWideAlert;
22+
let systemWideAlertEmptyMessage: SystemWideAlert;
23+
let systemWideAlertNullMessage: SystemWideAlert;
24+
let systemWideAlertUndefinedMessage: SystemWideAlert;
2225
let scheduler: TestScheduler;
2326

2427
beforeEach(waitForAsync(() => {
@@ -36,6 +39,24 @@ describe('SystemWideAlertBannerComponent', () => {
3639
countdownTo: utcToZonedTime(countDownDate, 'UTC').toISOString()
3740
});
3841

42+
systemWideAlertEmptyMessage = Object.assign(new SystemWideAlert(), {
43+
alertId: 1,
44+
message: '',
45+
active: true
46+
});
47+
48+
systemWideAlertNullMessage = Object.assign(new SystemWideAlert(), {
49+
alertId: 1,
50+
message: null,
51+
active: true
52+
});
53+
54+
systemWideAlertUndefinedMessage = Object.assign(new SystemWideAlert(), {
55+
alertId: 1,
56+
message: undefined,
57+
active: true
58+
});
59+
3960
systemWideAlertDataService = jasmine.createSpyObj('systemWideAlertDataService', {
4061
searchBy: createSuccessfulRemoteDataObject$(createPaginatedList([systemWideAlert])),
4162
});
@@ -110,5 +131,29 @@ describe('SystemWideAlertBannerComponent', () => {
110131
const banner = fixture.debugElement.queryAll(By.css('span'));
111132
expect(banner.length).toEqual(0);
112133
});
134+
135+
it('should not display an alert when no message is present', () => {
136+
comp.systemWideAlert$.next(systemWideAlertEmptyMessage);
137+
fixture.detectChanges();
138+
139+
const banner = fixture.debugElement.queryAll(By.css('span'));
140+
expect(banner.length).toEqual(0);
141+
});
142+
143+
it('should not display an alert when null message is present', () => {
144+
comp.systemWideAlert$.next(systemWideAlertNullMessage);
145+
fixture.detectChanges();
146+
147+
const banner = fixture.debugElement.queryAll(By.css('span'));
148+
expect(banner.length).toEqual(0);
149+
});
150+
151+
it('should not display an alert when undefined message is present', () => {
152+
comp.systemWideAlert$.next(systemWideAlertUndefinedMessage);
153+
fixture.detectChanges();
154+
155+
const banner = fixture.debugElement.queryAll(By.css('span'));
156+
expect(banner.length).toEqual(0);
157+
});
113158
});
114159
});

0 commit comments

Comments
 (0)