feat(notifications): UX changes to match API endpoint changes.

Author: xmlking

apps/api/src/app/notifications/notification/dto/notification-list.model.ts

@@ -1,7 +1,10 @@
 import { IPagination } from '../../../core';
 import { Notification } from '../notification.entity';
+import { ApiModelProperty } from '@nestjs/swagger';
 
 export class NotificationList implements IPagination<Notification> {
+  @ApiModelProperty({ type: Notification, isArray: true })
   readonly items: Notification[];
+  @ApiModelProperty({ type: Number, readOnly: true })
   readonly total: number;
 }

apps/api/src/app/notifications/subscription/dto/subscription-list.model.ts

@@ -1,7 +1,10 @@
 import { IPagination } from '../../../core';
 import { Subscription } from '../subscription.entity';
+import { ApiModelProperty } from '@nestjs/swagger';
 
 export class SubscriptionList implements IPagination<Subscription> {
+  @ApiModelProperty({ type: Subscription, isArray: true })
   readonly items: Subscription[];
+  @ApiModelProperty({ type: Number, readOnly: true })
   readonly total: number;
 }

apps/api/src/app/project/cluster/dto/cluster-list.model.ts

@@ -1,7 +1,10 @@
 import { IPagination } from '../../../core';
 import { Cluster } from '../cluster.entity';
+import { ApiModelProperty } from '@nestjs/swagger';
 
 export class ClusterList implements IPagination<Cluster> {
+  @ApiModelProperty({ type: Cluster, isArray: true })
   readonly items: Cluster[];
+  @ApiModelProperty({ type: Number, readOnly: true })
   readonly total: number;
 }

apps/api/src/app/project/dto/project-list.model.ts

@@ -1,7 +1,10 @@
 import { IPagination } from '../../core';
 import { Project } from '../project.entity';
+import { ApiModelProperty } from '@nestjs/swagger';
 
 export class ProjectList implements IPagination<Project> {
+  @ApiModelProperty({ type: Project, isArray: true })
   readonly items: Project[];
+  @ApiModelProperty({ type: Number, readOnly: true })
   readonly total: number;
 }

apps/api/src/app/user/profile/dto/profile-list.model.ts

@@ -1,7 +1,10 @@
 import { IPagination } from '../../../core'
 import { Profile } from '../profile.entity';
+import { ApiModelProperty } from '@nestjs/swagger';
 
 export class ProfileList implements IPagination<Profile> {
+  @ApiModelProperty({ type: Profile, isArray: true })
   readonly items: Profile[];
+  @ApiModelProperty({ type: Number, readOnly: true })
   readonly total: number;
 }

apps/webapp/src/assets/data/notifications.json

@@ -1,5 +1,5 @@
-[
-  [
+{
+  "items": [
     {
       "id": 9,
       "title": "title for sumo3 2",
@@ -127,5 +127,5 @@
       "updatedAt": "2018-12-09T06:00:41.401Z"
     }
   ],
-  9
-]
+  "total": 9
+}

apps/webapp/src/assets/data/notifications.user.json

@@ -1,5 +1,5 @@
-[
-  [
+{
+  "items": [
     {
       "id": 9,
       "title": "title for sumo3 2",
@@ -71,5 +71,5 @@
       "updatedAt": "2018-12-09T06:00:41.401Z"
     }
   ],
-  5
-]
+  "total": 9
+}

apps/webapp/src/assets/data/subscription.json

@@ -1,5 +1,5 @@
-[
-  [
+{
+  "items": [
     {
       "id": 13,
       "endpoint": "https://fcm.googleapis.com/fcm/send/c8eq7G-b2mc:APA91bFp2Gof...",
@@ -11,5 +11,5 @@
       "updatedAt": "2018-11-21T18:50:45.325Z"
     }
   ],
-  1
-]
+  "total": 1
+}

libs/admin/src/lib/services/notification.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { catchError, finalize, map, retry } from 'rxjs/operators';
-import { EntityService } from '@ngx-starter-kit/shared';
+import { EntityService, IPagination } from '@ngx-starter-kit/shared';
 import { environment } from '@env/environment';
 import { AppNotification } from '@ngx-starter-kit/notifications';
 
@@ -19,13 +19,14 @@ export class NotificationService extends EntityService<AppNotification> {
   }
 
   getAll(): Observable<AppNotification[]> {
+    const params = new HttpParams().set('order', 'ASC').set('read', 'false');
     this.loadingSubject.next(true);
-    return this.httpClient.get<[AppNotification[], number]>(`${this.baseUrl}/${this.entityPath}`).pipe(
+    return this.httpClient.get<IPagination<AppNotification>>(`${this.baseUrl}/${this.entityPath}`, { params }).pipe(
       retry(3), // retry a failed request up to 3 times
       catchError(this.handleError),
       finalize(() => this.loadingSubject.next(false)),
       // return without count
-      map(data => data[0]),
+      map(data => data.items),
     );
   }
 

libs/admin/src/lib/services/subscription.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { catchError, finalize, map, retry } from 'rxjs/operators';
-import { EntityService } from '@ngx-starter-kit/shared';
+import { EntityService, IPagination } from '@ngx-starter-kit/shared';
 import { environment } from '@env/environment';
 import { Subscription } from '../models/subscription.model';
 
@@ -20,12 +20,12 @@ export class SubscriptionService extends EntityService<Subscription> {
 
   getAll(): Observable<Subscription[]> {
     this.loadingSubject.next(true);
-    return this.httpClient.get<[Subscription[], number]>(`${this.baseUrl}/${this.entityPath}`).pipe(
+    return this.httpClient.get<IPagination<Subscription>>(`${this.baseUrl}/${this.entityPath}`).pipe(
       retry(3), // retry a failed request up to 3 times
       catchError(this.handleError),
       finalize(() => this.loadingSubject.next(false)),
       // return without count
-      map(data => data[0]),
+      map(data => data.items),
     );
   }
 }