netpyne-44 Add new action to drop last command

Author: aranega

webapp/components/general/CommandRecorder.js

@@ -1,5 +1,5 @@
 import { store } from '../../redux/actiondomainStore'
-import { recordCommand } from '../../redux/actions/actiondomain';
+import { recordCommand, dropLastCommand } from '../../redux/actions/actiondomain';
 import { execPythonMessageWithoutRecording } from './GeppettoJupyterUtils';
 
 
@@ -32,7 +32,6 @@ const registerKernelListeners = () => {
       return
     }
     const { kernel, content } = data;
-    console.log("Kernel", kernel.id, "execute", content.code)
     record(kernel.id, content.code);
   }
 
@@ -57,8 +56,6 @@ registerKernelListeners();
 
 const record = (kernelID, command) => {
   store.dispatch(recordCommand(kernelID, command))
-  const actionStore = store.getState();
-  console.log("store", actionStore)
 }
 
 const replayAll = (kernelID) => {
@@ -68,8 +65,13 @@ const replayAll = (kernelID) => {
     "from netpyne_ui.netpyne_geppetto import netpyne_geppetto",
     "netpyne_geppetto.deleteModel({})",
     ...store.getState()[kernelID]];
-  commands.pop()  // we drop the last command which is probably the faulty one
-  execPythonMessageWithoutRecording(commands.join('\n'))
+  const lastCommand = commands.pop()  // we drop the last command which is probably the faulty one
+  const script = commands.join('\n')
+  console.log("Playing", script)
+  console.log("Skipping last command", lastCommand)
+  execPythonMessageWithoutRecording(script).then(() => {
+    store.dispatch(dropLastCommand(kernelID))
+  })
 }
 
 export { record, replayAll }

webapp/components/general/GeppettoJupyterUtils.js

@@ -34,7 +34,6 @@ const handle_output = function (data) {
 
 const execPythonMessage = function (command, callback = handle_output, record = true) {
   const { kernel } = IPython.notebook;
-  console.log("Kernel", kernel.id, "executes", command)
   if (record) {
     recordCommand(kernel.id, command)
   }

webapp/redux/actiondomainStore.js

@@ -1,5 +1,6 @@
 // import action types
-import { RECORD_COMMAND, REPLAY_COMMANDS } from "./actions/actiondomain";
+import { DROP_LAST_COMMAND, FLUSH_COMMANDS, RECORD_COMMAND } from "./actions/actiondomain";
+// import redux from 'redux'
 
 // Default state for general
 export const ACTION_DOMAIN_DEFAULT_STATE = {
@@ -15,17 +16,29 @@ const recordCommand = (state, { kernel, command }) => {
   return newState;
 }
 
-const replayCommands = (state, { kernel }) => {
-  console.log("TODO, REPLAY COMMANDS")
+const dropLastCommand = (state, { kernel }) => {
+  const newState = { ...state };
+  if (!newState[kernel]) {
+    newState[kernel] = []
+    return newState
+  }
+  newState[kernel].pop()
+  return newState;
+}
+
+const flushCommands = (state, { kernel }) => {
+  return { ...state, [kernel]: [] };
 }
 
 // reducer
 const reducer = (state = ACTION_DOMAIN_DEFAULT_STATE, action) => {
   switch (action.type) {
     case RECORD_COMMAND:
       return recordCommand(state, action.payload)
-    case REPLAY_COMMANDS:
-      return replayCommands(state, action.payload)
+    case DROP_LAST_COMMAND:
+      return dropLastCommand(state, action.payload)
+    case FLUSH_COMMANDS:
+      return flushCommands(state, action.payload)
     default:
       return state
   }

webapp/redux/actions/actiondomain.js

@@ -1,6 +1,7 @@
 // Action Types
 export const RECORD_COMMAND = 'RECORD_COMMAND';
-export const REPLAY_COMMANDS = 'REPLAY_COMMANDS';
+export const DROP_LAST_COMMAND = 'DROP_LAST_COMMAND';
+export const FLUSH_COMMANDS = 'FLUSH_COMMANDS';
 
 // Actions
 export const recordCommand = (kernelID, command) => ({
@@ -11,8 +12,15 @@ export const recordCommand = (kernelID, command) => ({
     }
 });
 
-export const replayCommands = (kernelID) => ({
-    type: REPLAY_COMMANDS,
+export const dropLastCommand = (kernelID) => ({
+    type: DROP_LAST_COMMAND,
+    payload: {
+        kernel: kernelID
+    }
+})
+
+export const flushCommands = (kernelID) => ({
+    type: FLUSH_COMMANDS,
     payload: {
         kernel: kernelID
     }