Merge pull request #693 from infinitered/connection-based-clearing

Clear only selected connection
infinitered · Jun 10, 2018 · 275c8bd · 275c8bd
2 parents 0dd58e6 + f427b33
commit 275c8bd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/packages/reactotron-app/App/Lib/commands.js b/packages/reactotron-app/App/Lib/commands.js
@@ -1,4 +1,6 @@
 import { action, observable } from "mobx"
+import { pipe, reject } from "ramda"
+import { dotPath } from "ramdasauce"
 
 export const MAX_COMMANDS = 500
 
@@ -40,6 +42,19 @@ class Commands {
   addCommand(command) {
     this.buffer.push(command)
   }
+
+  /**
+   * Clear commands for a clientId
+   */
+  clearClientsCommands(clientId) {
+    const newCommands = pipe(
+      dotPath("all"),
+      reject(c => c.clientId === clientId)
+    )(this)
+
+    this.all.clear()
+    this.all.push(...newCommands)
+  }
 }
 
 export default Commands
diff --git a/packages/reactotron-app/App/Stores/SessionStore.js b/packages/reactotron-app/App/Stores/SessionStore.js
@@ -187,13 +187,7 @@ class Session {
   @action
   handleCommand = command => {
     if (command.type === "clear") {
-      const newCommands = pipe(
-        dotPath("commandsManager.all"),
-        reject(c => c.clientId === command.clientId)
-      )(this)
-
-      this.commandsManager.all.clear()
-      this.commandsManager.all.push(...newCommands)
+      this.commandsManager.clearClientsCommands(command.clientId)
 
       return
     } else if (command.type === "customCommand.register") {

diff --git a/packages/reactotron-app/App/Stores/UiStore.js b/packages/reactotron-app/App/Stores/UiStore.js
@@ -338,7 +338,11 @@ class UI {
 
   @action
   reset = () => {
-    this.commandsManager.all.clear()
+    const selectedConnection = this.getSelectedConnection()
+
+    if (!selectedConnection) return
+
+    this.commandsManager.clearClientsCommands(selectedConnection.clientId)
   }
 
   @action