From 980d05be2330a44f85168fe6d954042f548d342f Mon Sep 17 00:00:00 2001
From: dummdidumm <5968653+dummdidumm@users.noreply.github.com>
Date: Thu, 8 Mar 2018 22:55:09 +0100
Subject: [PATCH] #853 removed instanceId generation to add support for persist

---
 modules/store-devtools/spec/extension.spec.ts | 17 +++++------------
 modules/store-devtools/src/extension.ts       | 19 +++++--------------
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/modules/store-devtools/spec/extension.spec.ts b/modules/store-devtools/spec/extension.spec.ts
index e9759cae7c..bbf745d14c 100644
--- a/modules/store-devtools/spec/extension.spec.ts
+++ b/modules/store-devtools/spec/extension.spec.ts
@@ -19,7 +19,6 @@ function createOptions(
   maxAge: false | number = false
 ) {
   const options: ReduxDevtoolsExtensionConfig = {
-    instanceId: 'ngrx-store-1509655064369',
     name,
     features,
     serialize,
@@ -70,7 +69,6 @@ describe('DevtoolsExtension', () => {
     (reduxDevtoolsExtension.connect as jasmine.Spy).and.returnValue(
       extensionConnection
     );
-    spyOn(Date, 'now').and.returnValue('1509655064369');
   });
 
   function myActionSanitizer(action: Action, idx: number) {
@@ -148,8 +146,7 @@ describe('DevtoolsExtension', () => {
       expect(reduxDevtoolsExtension.send).toHaveBeenCalledWith(
         null,
         state,
-        defaultOptions,
-        'ngrx-store-1509655064369'
+        defaultOptions
       );
     });
 
@@ -178,8 +175,7 @@ describe('DevtoolsExtension', () => {
       expect(reduxDevtoolsExtension.send).toHaveBeenCalledWith(
         null,
         state,
-        options,
-        'ngrx-store-1509655064369'
+        options
       );
     });
 
@@ -230,8 +226,7 @@ describe('DevtoolsExtension', () => {
           expect(reduxDevtoolsExtension.send).toHaveBeenCalledWith(
             null,
             state,
-            options,
-            'ngrx-store-1509655064369'
+            options
           );
         });
       });
@@ -276,8 +271,7 @@ describe('DevtoolsExtension', () => {
           expect(reduxDevtoolsExtension.send).toHaveBeenCalledWith(
             null,
             sanitizedState,
-            options,
-            'ngrx-store-1509655064369'
+            options
           );
         });
       });
@@ -320,8 +314,7 @@ describe('DevtoolsExtension', () => {
           expect(reduxDevtoolsExtension.send).toHaveBeenCalledWith(
             null,
             sanitizedState,
-            options,
-            'ngrx-store-1509655064369'
+            options
           );
         });
       });
diff --git a/modules/store-devtools/src/extension.ts b/modules/store-devtools/src/extension.ts
index 6766815396..fa11965ac3 100644
--- a/modules/store-devtools/src/extension.ts
+++ b/modules/store-devtools/src/extension.ts
@@ -39,7 +39,6 @@ export interface ReduxDevtoolsExtensionConnection {
 export interface ReduxDevtoolsExtensionConfig {
   features?: object | boolean;
   name: string | undefined;
-  instanceId: string;
   maxAge?: number;
   serialize?: boolean | SerializationOptions;
 }
@@ -48,17 +47,11 @@ export interface ReduxDevtoolsExtension {
   connect(
     options: ReduxDevtoolsExtensionConfig
   ): ReduxDevtoolsExtensionConnection;
-  send(
-    action: any,
-    state: any,
-    options: ReduxDevtoolsExtensionConfig,
-    instanceId?: string
-  ): void;
+  send(action: any, state: any, options: ReduxDevtoolsExtensionConfig): void;
 }
 
 @Injectable()
 export class DevtoolsExtension {
-  private instanceId = `ngrx-store-${Date.now()}`;
   private devtoolsExtension: ReduxDevtoolsExtension;
   private extensionConnection: ReduxDevtoolsExtensionConnection;
 
@@ -123,8 +116,7 @@ export class DevtoolsExtension {
       this.devtoolsExtension.send(
         null,
         sanitizedLiftedState,
-        this.getExtensionConfig(this.instanceId, this.config),
-        this.instanceId
+        this.getExtensionConfig(this.config)
       );
     }
   }
@@ -136,7 +128,7 @@ export class DevtoolsExtension {
 
     return new Observable(subscriber => {
       const connection = this.devtoolsExtension.connect(
-        this.getExtensionConfig(this.instanceId, this.config)
+        this.getExtensionConfig(this.config)
       );
       this.extensionConnection = connection;
       connection.init();
@@ -147,7 +139,7 @@ export class DevtoolsExtension {
   }
 
   private createActionStreams() {
-    // Listens to all changes based on our instanceId
+    // Listens to all changes
     const changes$ = this.createChangesObservable().pipe(share());
 
     // Listen for the start action
@@ -185,9 +177,8 @@ export class DevtoolsExtension {
     return typeof action === 'string' ? eval(`(${action})`) : action;
   }
 
-  private getExtensionConfig(instanceId: string, config: StoreDevtoolsConfig) {
+  private getExtensionConfig(config: StoreDevtoolsConfig) {
     const extensionOptions: ReduxDevtoolsExtensionConfig = {
-      instanceId: instanceId,
       name: config.name,
       features: config.features,
       serialize: config.serialize,