Finalize merge

Author: davidbrochart

jupyter_collaboration/handlers.py

@@ -12,8 +12,8 @@
 from jupyter_server.auth import authorized
 from jupyter_server.base.handlers import APIHandler, JupyterHandler
 from jupyter_ydoc import ydocs as YDOCS
-from pycrdt import Doc
-from pycrdt_websocket.websocket_server import YRoom
+from pycrdt import Doc, Map
+from pycrdt_websocket.yroom import YRoom
 from pycrdt_websocket.ystore import BaseYStore
 from pycrdt_websocket.yutils import YMessageType, write_var_uint
 from tornado import web
@@ -409,7 +409,7 @@ async def put(self, room_id):
         update = root_room.ydoc.get_update()
         fork_ydoc = Doc()
         fork_ydoc.apply_update(update)
-        fork_room = YRoom(fork_ydoc)
+        fork_room = YRoom(ydoc=fork_ydoc)
         self._websocket_server.add_room(idx, fork_room)
         root_room.fork_ydocs.add(fork_ydoc)
         data = json.dumps({
@@ -440,8 +440,21 @@ async def put(self):
         Merges back a fork into a root document.
         """
         model = self.get_json_body()
-        fork_room = await self._websocket_server.get_room(model["fork_roomid"])
+        fork_roomid = model["fork_roomid"]
         root_room = await self._websocket_server.get_room(model["root_roomid"])
-        update = fork_room.ydoc.get_update()
-        root_room.ydoc.apply_update(update)
+        root_ydoc = root_room.ydoc
+        idx = f"fork_{fork_roomid}"
+        root_state = root_ydoc.get("state", type=Map)
+        if idx in root_state:
+            del root_state[idx]
+        else:
+            raise RuntimeError(f"Could not find root document fork with ID: {fork_roomid}")
+        fork_room = await self._websocket_server.get_room(fork_roomid)
+        fork_ydoc = fork_room.ydoc
+        update = fork_ydoc.get_update()
+        root_ydoc.apply_update(update)
+        root_room.fork_ydocs.remove(fork_ydoc)
+        fork_state = fork_ydoc.get("state", type=Map)
+        fork_state["merge"] = fork_roomid
+        #self._websocket_server.delete_room(name=fork_roomid)
         self.set_status(200)

packages/collaboration-extension/src/collaboration.ts

@@ -248,6 +248,7 @@ export class EditingModeExtension implements DocumentRegistry.IWidgetExtension<N
     const reviewMenu = new Menu({ commands: reviewCommands });
 
     const sharedModel = context.model.sharedModel;
+    const suggestions: {[key: string]: Menu.IItem} = {};
     var myForkId = '';  // curently allows only one suggestion per user
 
     editingMenu.title.label = 'Editing';
@@ -321,49 +322,77 @@ export class EditingModeExtension implements DocumentRegistry.IWidgetExtension<N
       if (changes.stateChange) {
         changes.stateChange.forEach(value => {
           const forkPrefix = 'fork_';
-          if (value.name.startsWith(forkPrefix)) {
-            const newForkId = value.name.slice(forkPrefix.length);
-            suggestionCommands.addCommand(newForkId, {
-              label: newForkId,
-              execute: () => {
-                if (myForkId === newForkId) {
-                  editingMenu.title.label = 'Suggesting';
-                  // our suggestion, cannot be reviewed
-                  reviewMenu.clearItems();
-                }
-                else {
-                  editingMenu.title.label = 'Editing';
-                  // not our suggestion, can be reviewed
-                  reviewMenu.clearItems();
-                  reviewMenu.addItem({type: 'command', command: 'merge'});
-                  reviewMenu.addItem({type: 'command', command: 'discard'});
-                }
-                suggestionMenu.title.label = newForkId;
-                sharedModel.provider.connectFork(newForkId);
-                open_dialog('Suggesting', this._trans);
-              }
-            });
-            suggestionMenu.addItem({type: 'command', command: newForkId});
-            if ((myForkId !== 'pending') && (myForkId !== newForkId)) {
-              const dialog = new Dialog({
-                title: this._trans.__('New suggestion'),
-                body: this._trans.__('View suggestion?'),
-                buttons: [
-                  Dialog.okButton({ label: 'View' }),
-                  Dialog.cancelButton({ label: 'Discard' }),
-                ],
-              });
-              dialog.launch().then(resp => {
-                dialog.close();
-                if (resp.button.label === 'View') {
-                  sharedModel.provider.connectFork(newForkId);
-                  suggestionMenu.title.label = newForkId;
-                  editingMenu.title.label = 'Editing';
-                  reviewMenu.clearItems();
-                  reviewMenu.addItem({type: 'command', command: 'merge'});
-                  reviewMenu.addItem({type: 'command', command: 'discard'});
+          if (value.name === 'merge') {
+            // FIXME: a client who is not connected to the fork should not see this update
+            if (sharedModel.currentRoomId === value.newValue) {
+              editingMenu.title.label = 'Editing';
+              suggestionMenu.title.label = 'Root';
+              const item: Menu.IItem = suggestions[value.newValue];
+              delete suggestions[value.newValue];
+              suggestionMenu.removeItem(item);
+              reviewMenu.clearItems();
+              sharedModel.provider.connectFork(sharedModel.rootRoomId);
+              open_dialog('Editing', this._trans);
+            }
+          }
+          else if (value.name.startsWith(forkPrefix)) {
+            const forkId = value.name.slice(forkPrefix.length);
+            if (value.newValue === 'new') {
+              suggestionCommands.addCommand(forkId, {
+                label: forkId,
+                execute: () => {
+                  if (myForkId === forkId) {
+                    editingMenu.title.label = 'Suggesting';
+                    // our suggestion, cannot be reviewed
+                    reviewMenu.clearItems();
+                  }
+                  else {
+                    editingMenu.title.label = 'Editing';
+                    // not our suggestion, can be reviewed
+                    reviewMenu.clearItems();
+                    reviewMenu.addItem({type: 'command', command: 'merge'});
+                    reviewMenu.addItem({type: 'command', command: 'discard'});
+                  }
+                  suggestionMenu.title.label = forkId;
+                  sharedModel.provider.connectFork(forkId);
+                  open_dialog('Suggesting', this._trans);
                 }
               });
+              const item = suggestionMenu.addItem({type: 'command', command: forkId});
+              suggestions[forkId] = item;
+              if ((myForkId !== 'pending') && (myForkId !== forkId)) {
+                const dialog = new Dialog({
+                  title: this._trans.__('New suggestion'),
+                  body: this._trans.__('View suggestion?'),
+                  buttons: [
+                    Dialog.okButton({ label: 'View' }),
+                    Dialog.cancelButton({ label: 'Discard' }),
+                  ],
+                });
+                dialog.launch().then(resp => {
+                  dialog.close();
+                  if (resp.button.label === 'View') {
+                    sharedModel.provider.connectFork(forkId);
+                    suggestionMenu.title.label = forkId;
+                    editingMenu.title.label = 'Editing';
+                    reviewMenu.clearItems();
+                    reviewMenu.addItem({type: 'command', command: 'merge'});
+                    reviewMenu.addItem({type: 'command', command: 'discard'});
+                  }
+                });
+              }
+            }
+            else if (value.newValue === undefined) {
+              if (sharedModel.currentRoomId === forkId) {
+                editingMenu.title.label = 'Editing';
+                suggestionMenu.title.label = 'Root';
+                const item: Menu.IItem = suggestions[value.newValue];
+                delete suggestions[value.newValue];
+                suggestionMenu.removeItem(item);
+                reviewMenu.clearItems();
+                sharedModel.provider.connectFork(sharedModel.rootRoomId);
+                open_dialog('Editing', this._trans);
+              }
             }
           }
         });