Merge branch 'dev' into Pytest-Setup

Author: Manik-Khajuria-5

js/api/ApiProvider.js

@@ -178,6 +178,9 @@ const ApiProvider = ({ children }) => {
       case 'env_update':
         apiHandlers.current.onEnvUpdate(cmd.data);
         break;
+      case 'undo_state':
+        apiHandlers.current.onUndoState(cmd);
+        break;
 
       default:
         // eslint-disable-next-line no-console
@@ -264,6 +267,13 @@ const ApiProvider = ({ children }) => {
     });
   };
 
+  const sendUndo = (envID) => {
+    sendSocketMessage({
+      cmd: 'undo',
+      eid: envID,
+    });
+  };
+
   // Send request to delete an environment
   const sendEnvDelete = (envID, previousEnv) => {
     sendSocketMessage({
@@ -362,6 +372,7 @@ const ApiProvider = ({ children }) => {
         sendPaneLayoutUpdate,
         sendPaneMessage,
         sendSaveAll,
+        sendUndo,
         sessionInfo,
         setConnected,
         toggleOnlineState,

js/main.js

@@ -112,6 +112,7 @@ const App = () => {
     sendEnvSave,
     sendLayoutsSave,
     sendPaneClose,
+    sendUndo,
     sendPaneLayoutUpdate,
     sessionInfo,
     toggleOnlineState,
@@ -134,6 +135,8 @@ const App = () => {
     layout: [],
   });
 
+  const [undoCounts, setUndoCounts] = useState({});
+
   // user-changeable
   const [showEnvModal, setShowEnvModal] = useState(false);
   const [showViewModal, setShowViewModal] = useState(false);
@@ -343,6 +346,10 @@ const App = () => {
     else relayout();
   };
 
+  const onUndoState = ({ eid, count }) => {
+    setUndoCounts((prev) => ({ ...prev, [eid]: count }));
+  };
+
   const onEnvUpdate = (data) => {
     var layoutLists = storeMeta.layoutLists;
     for (var envIdx in data) {
@@ -976,6 +983,11 @@ const App = () => {
       }}
       onViewChange={updateToLayout}
       onViewManageButton={() => setShowViewModal(!showViewModal)}
+      canUndo={
+        selection.envIDs.length === 1 &&
+        (undoCounts[selection.envIDs[0]] || 0) > 0
+      }
+      onUndoButton={() => sendUndo(selection.envIDs[0])}
       onEnvSelect={onEnvSelect}
       onExportHtml={exportCurrentEnvToHtml}
     />
@@ -1011,6 +1023,7 @@ const App = () => {
     onReloadMessage,
     onEnvUpdate,
     onCloseMessage,
+    onUndoState,
     onDisconnect,
   };
 

js/topbar/EnvControls.js

@@ -155,7 +155,7 @@ function EnvControls(props) {
           data-toggle="tooltip"
           title={confirmClear ? 'Are you sure?' : 'Clear Current Environment'}
           data-placement="bottom"
-          className={confirmClear ? 'btn btn-warning' : 'btn btn-default'}
+          className={confirmClear ? 'btn btn-warning btn-sm' : 'btn btn-default btn-sm'}
           disabled={!(connected && envIDs.length > 0 && !readonly)}
           onClick={() => {
             if (confirmClear) {
@@ -171,7 +171,7 @@ function EnvControls(props) {
           data-toggle="tooltip"
           title="Save All Environments"
           data-placement="bottom"
-          className="btn btn-default"
+          className="btn btn-default btn-sm"
           disabled={!(connected && !readonly)}
           onClick={sendSaveAll}
         >
@@ -181,7 +181,7 @@ function EnvControls(props) {
           data-toggle="tooltip"
           title="Manage Environments"
           data-placement="bottom"
-          className="btn btn-default"
+          className="btn btn-default btn-sm"
           disabled={!(connected && envIDs.length > 0 && !readonly)}
           onClick={onEnvManageButton}
         >
@@ -193,7 +193,7 @@ function EnvControls(props) {
             title="Show All Windows from All Environments"
             data-placement="bottom"
             className={
-              showAllEnvWindows ? 'btn btn-primary' : 'btn btn-default'
+              showAllEnvWindows ? 'btn btn-primary btn-sm' : 'btn btn-default btn-sm'
             }
             onClick={onToggleShowAll}
           >

js/topbar/ViewControls.js

@@ -20,6 +20,8 @@ function ViewControls(props) {
     onViewManageButton,
     onRepackButton,
     onViewChange,
+    onUndoButton,
+    canUndo,
     onExportHtml,
   } = props;
 
@@ -100,7 +102,7 @@ function ViewControls(props) {
       <div className="btn-group navbar-btn" role="group" aria-label="View:">
         <div className="btn-group" role="group">
           <button
-            className="btn btn-default dropdown-toggle"
+            className="btn btn-default btn-sm dropdown-toggle"
             type="button"
             id="viewDropdown"
             data-toggle="dropdown"
@@ -120,7 +122,7 @@ function ViewControls(props) {
           data-toggle="tooltip"
           title="Repack"
           data-placement="bottom"
-          className="btn btn-default"
+          className="btn btn-default btn-sm"
           onClick={onRepackButton}
         >
           <span className="glyphicon glyphicon-th" />
@@ -129,17 +131,30 @@ function ViewControls(props) {
           data-toggle="tooltip"
           title="Manage Views"
           data-placement="bottom"
-          className="btn btn-default"
+          className="btn btn-default btn-sm"
           disabled={!(connected && envIDs.length > 0 && !readonly)}
           onClick={onViewManageButton}
         >
           <span className="glyphicon glyphicon-folder-open" />
         </button>
+        <button
+          data-toggle="tooltip"
+          title="Undo Close"
+          data-placement="bottom"
+          className="btn btn-default btn-sm"
+          disabled={!(connected && envIDs.length === 1 && !readonly && canUndo)}
+          onClick={onUndoButton}
+        >
+          <span
+            className="glyphicon glyphicon-share-alt"
+            style={{ transform: 'scaleX(-1)' }}
+          />
+        </button>
         <button
           data-toggle="tooltip"
           title="Upload Dashboard JSON"
           data-placement="bottom"
-          className="btn btn-default"
+          className="btn btn-default btn-sm"
           onClick={() => fileInputRef.current && fileInputRef.current.click()}
           disabled={!(connected && !readonly)}
           aria-label="Upload JSON file"
@@ -158,7 +173,7 @@ function ViewControls(props) {
           data-toggle="tooltip"
           title="Export as HTML"
           data-placement="bottom"
-          className="btn btn-default"
+          className="btn btn-default btn-sm"
           disabled={!(connected && envIDs.length > 0)}
           onClick={onExportHtml}
           aria-label="Export as HTML"

py/visdom/server/defaults.py

@@ -17,3 +17,5 @@
 DEFAULT_MAX_IMAGE_HISTORY = 4
 DEFAULT_MAX_OLD_CONTENT = 50
 DEFAULT_MAX_TEXT_LINES = 500
+DEFAULT_MAX_UNDO_HISTORY = 4
+UNDO_DIRNAME = ".undo"

py/visdom/server/handlers/socket_handlers.py

@@ -35,6 +35,10 @@
     send_to_sources,
     broadcast,
     escape_eid,
+    push_deleted,
+    pop_deleted,
+    clear_deleted,
+    broadcast_undo_state,
 )
 from visdom.server.defaults import MAX_SOCKET_WAIT
 
@@ -101,17 +105,45 @@ def on_message(self, message):
         elif cmd == "close":
             if "data" in msg and "eid" in msg:
                 logging.info(f"closing window {msg['data']}")
+                eid = escape_eid(msg["eid"])
+                if eid not in self.state:
+                    return
+                p_data = self.state[eid]["jsons"].pop(msg["data"], None)
+                if p_data is not None:
+                    push_deleted(self.env_path, eid, msg["data"], p_data)
                 env = self.state.get(msg["eid"])
                 if env is None:
                     return
                 p_data = env["jsons"].pop(msg["data"], None)
                 event = {
                     "event_type": "close",
                     "target": msg["data"],
-                    "eid": msg["eid"],
+                    "eid": eid,
                     "pane_data": p_data,
                 }
                 send_to_sources(self, event)
+                broadcast_undo_state(self, eid, self.env_path)
+
+        elif cmd == "undo":
+            if "eid" in msg:
+                eid = escape_eid(msg["eid"])
+                if eid not in self.state:
+                    return
+                popped = pop_deleted(self.env_path, eid)
+                if popped:
+                    win_id, p_data = popped
+                    env = self.state[eid]["jsons"]
+                    max_i = max((p.get("i", -1) for p in env.values()), default=-1)
+                    p_data["i"] = max_i + 1
+                    env[win_id] = p_data
+                    broadcast_msg = dict(p_data)
+                    broadcast_msg["eid"] = eid
+                    broadcast(
+                        self,
+                        json.dumps(broadcast_msg, cls=NanSafeEncoder),
+                        eid,
+                    )
+                broadcast_undo_state(self, eid, self.env_path)
 
         elif cmd == "save":
             # save localStorage window metadata
@@ -137,6 +169,7 @@ def on_message(self, message):
                     return
                 logging.info(f"closing environment {eid}")
                 self.state.pop(eid, None)
+                clear_deleted(self.env_path, eid)
                 if self.env_path is not None:
                     p = os.path.join(self.env_path, "{0}.json".format(eid))
                     if os.path.exists(p):

py/visdom/server/handlers/web_handlers.py

@@ -48,6 +48,8 @@
     update_window,
     hash_password,
     stringify,
+    push_deleted,
+    clear_deleted,
 )
 from visdom.server.handlers.base_handlers import BaseHandler
 
@@ -410,12 +412,10 @@ def wrap_func(handler, args):
 
         keys = list(handler.state[eid]["jsons"].keys()) if win is None else [win]
         for win in keys:
-            handler.state[eid]["jsons"].pop(win, None)
-            broadcast(
-                handler,
-                json.dumps({"command": "close", "data": win}, cls=NanSafeEncoder),
-                eid,
-            )
+            p_data = handler.state[eid]["jsons"].pop(win, None)
+            if p_data is not None:
+                push_deleted(handler.env_path, eid, win, p_data)
+            broadcast(handler, json.dumps({"command": "close", "data": win}), eid)
 
     @check_auth
     def post(self):
@@ -434,6 +434,7 @@ def wrap_func(handler, args):
             if eid == "main":
                 return
             handler.state.pop(eid, None)
+            clear_deleted(handler.env_path, eid)
             if handler.env_path is not None:
                 p = os.path.join(handler.env_path, "{0}.json".format(eid))
                 if os.path.exists(p):