feat(data viewer): Allow reusing data viewer instead of opening a new… (#1707)

* feat(data viewer): Allow reusing data viewer instead of opening a new one

* Remove rows in data viewer panel title

---------

Co-authored-by: Kun Ren <renkun@outlook.com>

Author: Fred-Wu

sess/R/handlers.R

@@ -261,12 +261,25 @@ dataview_columns <- function(state) {
   }, list(state$headers, state$types, seq_along(state$headers), state$columns), NULL)
 }
 
-dataview_register <- function(data) {
+dataview_new_id <- function() {
+  repeat {
+    ts <- gsub("[^0-9]", "", format(Sys.time(), "%Y%m%d%H%M%OS6"), perl = TRUE)
+    view_id <- sprintf("dv_%s_%06d", ts, sample.int(999999L, 1L))
+    if (is.null(.sess_env$dataviews) || is.null(.sess_env$dataviews[[view_id]])) {
+      return(view_id)
+    }
+  }
+}
+
+dataview_register <- function(data, view_id = NULL) {
   if (is.null(.sess_env$dataviews)) {
     .sess_env$dataviews <- list()
   }
-  ts <- gsub("[^0-9]", "", format(Sys.time(), "%Y%m%d%H%M%OS6"), perl = TRUE)
-  view_id <- sprintf("dv_%s_%06d", ts, sample.int(999999L, 1L))
+
+  if (is.null(view_id)) {
+    view_id <- dataview_new_id()
+  }
+
   state <- dataview_to_state(data)
   .sess_env$dataviews[[view_id]] <- state
   list(

sess/R/hooks.R

@@ -5,6 +5,10 @@
 #' @export
 register_hooks <- function(use_rstudioapi = TRUE, use_httpgd = TRUE) {
   # 1. Override View() to serve table data via paged RPC.
+  if (is.null(.sess_env$dataview_registry)) {
+    .sess_env$dataview_registry <- new.env(parent = emptyenv())
+  }
+
   show_dataview <- function(x, title = deparse(substitute(x))) {
     # make sure title is computed.
     force(title)
@@ -14,14 +18,27 @@ register_hooks <- function(use_rstudioapi = TRUE, use_httpgd = TRUE) {
     }
 
     if (is.data.frame(x) || is.matrix(x)) {
-      registration <- dataview_register(x)
+      title_key <- paste(as.character(title), collapse = "\n")
+      dataview_registry <- .sess_env$dataview_registry
+      has_view_id <- nzchar(title_key) &&
+        exists(title_key, envir = dataview_registry, inherits = FALSE)
+      view_id <- if (has_view_id) {
+        get(title_key, envir = dataview_registry, inherits = FALSE)
+      } else {
+        id <- dataview_new_id()
+        if (nzchar(title_key)) {
+          assign(title_key, id, envir = dataview_registry)
+        }
+        id
+      }
+
+      registration <- dataview_register(x, view_id = view_id)
 
       notify_client("dataview", list(
         title = title,
         source = "table",
         type = "json",
-        view_id = registration$view_id,
-        total_rows = registration$total_rows
+        view_id = registration$view_id
       ))
     } else if (is.list(x)) {
       file_path <- tempfile(tmpdir = .sess_env$tempdir, fileext = ".json")

sess/R/server.R

@@ -11,6 +11,9 @@ connect <- function(pipe_path = NULL, use_rstudioapi = TRUE, use_httpgd = TRUE)
   .sess_env$pending_responses <- list()
   .sess_env$read_buffer <- ""
   .sess_env$dataviews <- list()
+  if (is.null(.sess_env$dataview_registry)) {
+    .sess_env$dataview_registry <- new.env(parent = emptyenv())
+  }
 
   .sess_env$tempdir <- file.path(tempdir(), "sess")
   dir.create(.sess_env$tempdir, showWarnings = FALSE, recursive = TRUE)

src/session.ts

@@ -114,7 +114,8 @@ interface DataViewRequestMessage {
     filterModel?: Record<string, unknown>;
 }
 
-const dynamicDataViewPanels = new WeakSet<vscode.WebviewPanel>();
+const dynamicDataViewPanels = new Map<string, vscode.WebviewPanel>();
+let dynamicDataViewReloadRevision = 0;
 
 function escapeHtml(text: string): string {
     const map: Record<string, string> = {
@@ -127,13 +128,7 @@ function escapeHtml(text: string): string {
     return text.replace(/[&<>"']/g, c => map[c]);
 }
 
-function formatDataViewPanelTitle(baseTitle: string, totalRows: number): string {
-    return `${baseTitle} (rows: ${totalRows.toLocaleString()})`;
-}
-
 function attachDynamicDataViewBridge(panel: vscode.WebviewPanel, viewId: string, baseTitle: string): void {
-    dynamicDataViewPanels.add(panel);
-
     const postResponse = (requestId: number, ok: boolean, result?: unknown, error?: string) => {
         void panel.webview.postMessage({
             message: 'dataview/response',
@@ -159,9 +154,7 @@ function attachDynamicDataViewBridge(panel: vscode.WebviewPanel, viewId: string,
                 if (!result || typeof result.totalRows !== 'number') {
                     throw new Error('Invalid dataview_init response: missing or invalid totalRows');
                 }
-                if (Number.isFinite(result.totalRows)) {
-                    panel.title = formatDataViewPanelTitle(baseTitle, result.totalRows);
-                }
+                panel.title = baseTitle;
                 postResponse(msg.requestId, true, result);
                 return;
             }
@@ -180,9 +173,7 @@ function attachDynamicDataViewBridge(panel: vscode.WebviewPanel, viewId: string,
                 if (!result || typeof result.totalRows !== 'number') {
                     throw new Error('Invalid dataview_page response: missing or invalid totalRows');
                 }
-                if (Number.isFinite(result.totalRows)) {
-                    panel.title = formatDataViewPanelTitle(baseTitle, result.totalRows);
-                }
+                panel.title = baseTitle;
                 postResponse(msg.requestId, true, result);
                 return;
             }
@@ -192,8 +183,9 @@ function attachDynamicDataViewBridge(panel: vscode.WebviewPanel, viewId: string,
                     method: 'dataview_dispose',
                     params: { view_id: viewId },
                 });
-                // Remove from panels set to prevent duplicate disposal on panel close
-                dynamicDataViewPanels.delete(panel);
+                if (dynamicDataViewPanels.get(viewId) === panel) {
+                    dynamicDataViewPanels.delete(viewId);
+                }
                 postResponse(msg.requestId, true, true);
                 return;
             }
@@ -205,10 +197,10 @@ function attachDynamicDataViewBridge(panel: vscode.WebviewPanel, viewId: string,
     });
 
     panel.onDidDispose(() => {
-        if (!dynamicDataViewPanels.has(panel)) {
+        if (dynamicDataViewPanels.get(viewId) !== panel) {
             return;
         }
-        dynamicDataViewPanels.delete(panel);
+        dynamicDataViewPanels.delete(viewId);
         void sessionRequest({
             method: 'dataview_dispose',
             params: { view_id: viewId },
@@ -641,6 +633,17 @@ export async function showDataView(source: string, type: string, title: string,
     console.info(`[showDataView] source: ${source}, type: ${type}, title: ${title}, file: ${file}, viewer: ${viewer}, viewId: ${String(viewId ?? '')}`);
 
     if (source === 'table') {
+        if (viewId) {
+            const existing = dynamicDataViewPanels.get(viewId);
+            if (existing) {
+                existing.title = title;
+                existing.reveal(ViewColumn[viewer as keyof typeof ViewColumn], true);
+                const content = await getTableHtml(existing.webview, undefined, title);
+                existing.webview.html = `${content}\n<!-- dataview-reload:${++dynamicDataViewReloadRevision} -->`;
+                return;
+            }
+        }
+
         const panel = window.createWebviewPanel('dataview', title,
             {
                 preserveFocus: true,
@@ -652,12 +655,13 @@ export async function showDataView(source: string, type: string, title: string,
                 retainContextWhenHidden: true,
                 localResourceRoots: [Uri.file(resDir)],
             });
-        const content = await getTableHtml(panel.webview, file || undefined, title);
         panel.iconPath = new UriIcon('open-preview');
-        panel.webview.html = content;
         if (viewId) {
+            dynamicDataViewPanels.set(viewId, panel);
             attachDynamicDataViewBridge(panel, viewId, title);
         }
+        const content = await getTableHtml(panel.webview, file || undefined, title);
+        panel.webview.html = content;
     } else if (source === 'list') {
         const panel = window.createWebviewPanel('dataview', title,
             {