fix reload not updating frontend

Author: sebastian-goeldi

src/kweb/layout_server.py

@@ -462,35 +462,19 @@ async def connection(self, websocket: WebSocket, path: str | None = None) -> Non
         self.layout_view.max_hier()
 
         if self.layout_view.active_cellview().layout().cells():
-            await websocket.send_text(
-                json.dumps(
-                    {
-                        "msg": "loaded",
-                        "modes": self.mode_dump(),
-                        "annotations": self.annotation_dump(),
-                        "layers": self.layer_dump(),
-                        "hierarchy": self.hierarchy_dump(),
-                        "ci": self.current_cell().cell_index(),
-                    }
-                )
+            await self._send_loaded(
+                websocket=websocket,
+                cell_index=self.current_cell().cell_index(),
             )
             await self.send_metainfo(
                 cell=self.current_cell(),
                 websocket=websocket,
                 splitter=self.meta_splitter,
             )
         else:
-            await websocket.send_text(
-                json.dumps(
-                    {
-                        "msg": "loaded",
-                        "modes": self.mode_dump(),
-                        "annotations": self.annotation_dump(),
-                        "layers": self.layer_dump(),
-                        "hierarchy": self.hierarchy_dump(),
-                        "ci": 0,
-                    }
-                )
+            await self._send_loaded(
+                websocket=websocket,
+                cell_index=0,
             )
 
         if loaded_rdb:
@@ -680,12 +664,50 @@ async def reader(self, websocket: WebSocket, data: str) -> None:
             case "rdb-selected":
                 await self.draw_items(js["items"])
             case "reload":
+                cname = self.current_cell().name
                 self.layout_view.reload_layout(
                     self.layout_view.active_cellview().index()
                 )
+                c = self.layout_view.active_cellview().layout().cell(cname)
+                if c is None:
+                    tcs = self.layout_view.active_cellview().layout().top_cells()
+                    if len(tcs) > 0:
+                        c = tcs[0]
+
+                ci = 0
+                if c is not None:
+                    ci = c.cell_index()
+                await self.set_current_cell(ci, websocket=websocket)
                 if self.rdb_file is not None:
                     self.db.load(self.rdb_file)
 
+                await self._send_reloaded(
+                    websocket=websocket,
+                    cell_index=self.current_cell().cell_index(),
+                )
+
+    async def _send_loaded(self, websocket: WebSocket, cell_index: int = 0) -> None:
+        await websocket.send_json(
+            {
+                "msg": "loaded",
+                "modes": self.mode_dump(),
+                "annotations": self.annotation_dump(),
+                "layers": self.layer_dump(),
+                "hierarchy": self.hierarchy_dump(),
+                "ci": cell_index,
+            }
+        )
+
+    async def _send_reloaded(self, websocket: WebSocket, cell_index: int = 0) -> None:
+        await websocket.send_json(
+            {
+                "msg": "reloaded",
+                "layers": self.layer_dump(),
+                "hierarchy": self.hierarchy_dump(),
+                "ci": cell_index,
+            }
+        )
+
 
 def meta_json_serializer(obj: object) -> str:
     return str(obj)

src/kweb/static/viewer.js

@@ -49,6 +49,11 @@ socket.onmessage = async function(evt) {
       showLayers(js.layers);
       showMenu(js.modes, js.annotations);
       showCells(js.hierarchy, js.ci)
+    } else if (js.msg == "reloaded") {
+      console.log(js.hierarchy)
+      console.log(js.ci)
+      showLayers(js.layers);
+      showCells(js.hierarchy, js.ci)
     } else if (js.msg == "layer-u") {
       updateLayerImages(js.layers);
     } else if (js.msg == "metainfo") {
@@ -414,6 +419,7 @@ function showLayers(layers) {
   let layerTable = document.getElementById("table-layer") || document.createElement("div");
   layerTable.id = "table-layer";
   layerTable.className = "container-fluid text-left px-0 pb-2";
+  layerTable.replaceChildren();
   layerElement.replaceChildren(layerButtons, layerTable);
 
   appendLayers(layerTable, layers, addempty=!layerSwitch.checked, addpaddings=true);