Skip to content

Commit f0ded3d

Browse files
committed
feat: support viewing all notifications
1 parent 11e7ad7 commit f0ded3d

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

frontend/src/app/app-management/utm-notification/components/notifications-view/utm-notification-view.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {TimeFilterComponent} from '../../../../shared/components/utm/filters/tim
66
import {ITEMS_PER_PAGE} from '../../../../shared/constants/pagination.constants';
77
import {TimeFilterType} from '../../../../shared/types/time-filter.type';
88
import {resolveRangeByTime} from '../../../../shared/util/resolve-date';
9+
import {AppLogTypeEnum} from '../../../app-logs/shared/enum/app-log-type.enum';
910
import {
1011
NotificationDTO,
1112
NotificationRequest,
@@ -14,7 +15,6 @@ import {
1415
} from '../../models/utm-notification.model';
1516
import {ComponentType, NotificationRefreshService} from '../../service/notification-refresh.service';
1617
import {NotificationService} from '../../service/notification.service';
17-
import {AppLogTypeEnum} from '../../../app-logs/shared/enum/app-log-type.enum';
1818

1919
@Component({
2020
selector: 'app-utm-notification-view',

frontend/src/app/shared/components/layout/header/utm-header-notification/utm-notification.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ <h6 class="mb-0 font-weight-bold label-header text-uppercase text-primary">Notif
8686

8787

8888
<div *ngIf="total > 0" class="text-center mt-3">
89-
<button routerLink="app-management/settings/notifications" class="btn utm-button utm-button-primary" (click)="viewAllNotifications()">View All</button>
89+
<button class="btn utm-button utm-button-primary" (click)="viewAllNotifications()">View All</button>
9090
</div>
9191
</div>
9292
</div>

frontend/src/app/shared/components/layout/header/utm-header-notification/utm-notification.component.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {AfterViewInit, ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild} from '@angular/core';
2+
import {Router} from '@angular/router';
23
import {NgbDropdown} from '@ng-bootstrap/ng-bootstrap';
34
import {Observable, of, Subject} from 'rxjs';
45
import {catchError, filter, map, startWith, switchMap, takeUntil, tap} from 'rxjs/operators';
@@ -30,7 +31,8 @@ export class UtmNotificationComponent implements OnInit, AfterViewInit, OnDestro
3031

3132
constructor(private notificationService: NotificationService,
3233
private utmToastService: UtmToastService,
33-
public notificationRefreshService: NotificationRefreshService) {
34+
public notificationRefreshService: NotificationRefreshService,
35+
private router: Router) {
3436
}
3537

3638
ngOnInit(): void {
@@ -77,6 +79,7 @@ export class UtmNotificationComponent implements OnInit, AfterViewInit, OnDestro
7779

7880
viewAllNotifications() {
7981
this.dropNotification.close();
82+
this.router.navigate(['app-management/settings/notifications']);
8083
}
8184

8285
markAllAsRead() {

frontend/src/app/shared/components/utm/config/app-config-sections/app-config-sections.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ <h6 class="font-weight-semibold mb-2">{{section.section | titlecase}}</h6>
188188

189189
<ng-container *ngIf="conf.confParamDatatype === ConfigDataTypeEnum.Cron">
190190
<app-utm-cp-cron-editor [(ngModel)]="conf.confParamValue" (ngModelChange)="save(conf.confParamValue,conf)"></app-utm-cp-cron-editor>
191-
{{ conf.confParamValue }}
192191
</ng-container>
193192

194193

frontend/src/app/shared/components/utm/filters/time-filter/time-filter.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<span class="font-weight-semibold"> {{label|translate}}</span>
33
<span #popover="ngbPopover"
44
[ngbPopover]="popContent"
5+
[container]="'body'"
56
autoClose="outside"
67
class="setting-filter
78
cursor-pointer text-blue-800 border-grey-100 ml-2"

0 commit comments

Comments
 (0)