Merge branch 'master' into switch-to-ngrx-platform

src/app/pagenotfound/pagenotfound.component.ts

-import { Component } from '@angular/core';
+import { ServerResponseService } from '../shared/server-response.service';
+import { Component, ChangeDetectionStrategy } from '@angular/core';
 
 @Component({
   selector: 'ds-pagenotfound',
   styleUrls: ['./pagenotfound.component.scss'],
-  templateUrl: './pagenotfound.component.html'
+  templateUrl: './pagenotfound.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class PageNotFoundComponent {
-
-  data: any = {};
-
+  constructor(responseService: ServerResponseService) {
+    responseService.setNotFound();
+  }
 }

src/app/shared/server-response.service.ts

+import { RESPONSE } from '@nguniversal/express-engine/tokens';
+import { Inject, Injectable, Optional } from '@angular/core';
+import { Response } from 'express';
+
+@Injectable()
+export class ServerResponseService {
+  private response: Response;
+
+  constructor(@Optional() @Inject(RESPONSE) response: any) {
+    this.response = response;
+  }
+
+  setStatus(code: number, message?: string): this {
+    if (this.response) {
+      this.response.statusCode = code;
+      if (message) {
+        this.response.statusMessage = message;
+      }
+    }
+    return this;
+  }
+
+  setNotFound(message = 'Not found'): this {
+    return this.setStatus(404, message)
+  }
+}

src/app/shared/shared.module.ts

@@ -24,6 +24,7 @@ import { ItemListElementComponent } from '../object-list/item-list-element/item-
 import { CommunityListElementComponent } from '../object-list/community-list-element/community-list-element.component';
 import { CollectionListElementComponent } from '../object-list/collection-list-element/collection-list-element.component';
 import { TruncatePipe } from './utils/truncate.pipe';
+import { ServerResponseService } from './server-response.service';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -61,7 +62,8 @@ const COMPONENTS = [
 const PROVIDERS = [
   ApiService,
   HostWindowService,
-  { provide: NativeWindowService, useFactory: NativeWindowFactory }
+  { provide: NativeWindowService, useFactory: NativeWindowFactory },
+  ServerResponseService
 ];
 
 @NgModule({