Data viewer update

Fred Wu · Fred Wu · commit 5d1760398d11 · 2025-04-24T13:01:02.000+10:00
diff --git a/R/session/vsc.R b/R/session/vsc.R
@@ -456,6 +456,9 @@ if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
 
 show_view <- !identical(getOption("vsc.view", "Two"), FALSE)
 if (show_view) {
+    # Create registry to track dataview UUIDs by title
+    dataview_registry <- new.env(parent = emptyenv())
+
     get_column_def <- function(name, field, value) {
         filter <- TRUE
         tooltip <- sprintf(
@@ -535,10 +538,24 @@ if (show_view) {
             return(.data)
         }
 
+        # Generate a dataview_uuid (separate from the LiveShare uuid)
+        dataview_uuid <- NULL
         if (missing(title)) {
             sub <- substitute(x)
             title <- deparse(sub, nlines = 1)
         }
+
+        # Generate a unique ID for this dataview based on the title
+        title_key <- title
+        if (exists(title_key, envir = dataview_registry, inherits = FALSE)) {
+            dataview_uuid <- get(title_key, envir = dataview_registry, inherits = FALSE)
+            logger("Reusing existing dataview UUID for title:", title, "UUID:", dataview_uuid)
+        } else {
+            dataview_uuid <- paste0("dataview-", format(Sys.time(), "%Y%m%d%H%M%S"), "-", sample(1000:9999, 1))
+            assign(title_key, dataview_uuid, envir = dataview_registry)
+            logger("Created new dataview UUID for title:", title, "UUID:", dataview_uuid)
+        }
+
         if (inherits(x, "ArrowTabular")) {
             x <- as_truncated_data(x)
             x <- as.data.frame(x)
@@ -602,21 +619,21 @@ if (show_view) {
             file <- tempfile(tmpdir = tempdir, fileext = ".json")
             jsonlite::write_json(data, file, na = "string", null = "null", auto_unbox = TRUE, force = TRUE)
             request("dataview", source = "table", type = "json",
-                title = title, file = file, viewer = viewer, uuid = uuid
+                title = title, file = file, viewer = viewer, uuid = uuid, dataview_uuid = dataview_uuid
             )
         } else if (is.list(x)) {
             tryCatch({
                 file <- tempfile(tmpdir = tempdir, fileext = ".json")
                 jsonlite::write_json(x, file, na = "string", null = "null", auto_unbox = TRUE, force = TRUE)
                 request("dataview", source = "list", type = "json",
-                    title = title, file = file, viewer = viewer, uuid = uuid
+                    title = title, file = file, viewer = viewer, uuid = uuid, dataview_uuid = dataview_uuid
                 )
             }, error = function(e) {
                 file <- file.path(tempdir, paste0(make.names(title), ".txt"))
                 text <- utils::capture.output(print(x))
                 writeLines(text, file)
                 request("dataview", source = "object", type = "txt",
-                    title = title, file = file, viewer = viewer, uuid = uuid
+                    title = title, file = file, viewer = viewer, uuid = uuid, dataview_uuid = dataview_uuid
                 )
             })
         } else {
@@ -628,7 +645,7 @@ if (show_view) {
             }
             writeLines(code, file)
             request("dataview", source = "object", type = "R",
-                title = title, file = file, viewer = viewer, uuid = uuid
+                title = title, file = file, viewer = viewer, uuid = uuid, dataview_uuid = dataview_uuid
             )
         }
     }
diff --git a/package.json b/package.json
@@ -31,7 +31,8 @@
   "activationEvents": [
     "workspaceContains:**/*.{rproj,Rproj,r,R,rd,Rd,rmd,Rmd}",
     "onCommand:r.runSelectionInActiveTerm",
-    "onWebviewPanel:rhelp"
+    "onWebviewPanel:rhelp",
+    "onWebviewPanel:rdataviewer"
   ],
   "main": "./dist/extension",
   "contributes": {
@@ -1872,6 +1873,11 @@
           },
           "additionalProperties": false
         },
+        "r.dataViewer.reuseWindow": {
+          "type": "boolean",
+          "default": true,
+          "markdownDescription": "Reuse the existing data viewer window when `View()` is called multiple times. When enabled, only one data viewer window will be shown and refreshed with new data."
+        },
         "r.rtermSendDelay": {
           "type": "integer",
           "default": 8,
diff --git a/src/liveShare/shareSession.ts b/src/liveShare/shareSession.ts
@@ -36,6 +36,7 @@ export interface IRequest {
     url?: string;
     requestPath?: string;
     uuid?: number;
+    dataview_uuid?: string;  // Add this property
     tempdir?: string;
     version?: string;
     info?: {
@@ -149,7 +150,7 @@ export async function updateGuestRequest(file: string, force: boolean = false):
                 if (request.source && request.type && request.title && request.file
                     && request.viewer !== undefined) {
                     await showDataView(request.source,
-                        request.type, request.title, request.file, request.viewer);
+                        request.type, request.title, request.file, request.viewer, request.dataview_uuid);
                 }
                 break;
             }
diff --git a/src/session.ts b/src/session.ts
@@ -67,6 +67,9 @@ let activeBrowserPanel: WebviewPanel | undefined;
 let activeBrowserUri: Uri | undefined;
 let activeBrowserExternalUri: Uri | undefined;
 
+// Add a map to track dataview panels by UUID
+const dataviewPanels = new Map<string, WebviewPanel>();
+
 export function deploySessionWatcher(extensionPath: string): void {
     console.info(`[deploySessionWatcher] extensionPath: ${extensionPath}`);
     resDir = path.join(extensionPath, 'dist', 'resources');
@@ -334,15 +337,59 @@ export async function showWebView(file: string, title: string, viewer: string |
     console.info('[showWebView] Done');
 }
 
-export async function showDataView(source: string, type: string, title: string, file: string, viewer: string): Promise<void> {
-    console.info(`[showDataView] source: ${source}, type: ${type}, title: ${title}, file: ${file}, viewer: ${viewer}`);
+export async function showDataView(source: string, type: string, title: string, file: string, viewer: string, dataview_uuid?: string): Promise<void> {
+    console.info(`[showDataView] source: ${source}, type: ${type}, title: ${title}, file: ${file}, viewer: ${viewer}, dataview_uuid: ${dataview_uuid}`);
 
     if (isGuestSession) {
         resDir = guestResDir;
     }
 
+ // Check if we have an existing panel with this UUID
+    let panel: WebviewPanel | undefined;
+    if (dataview_uuid && dataviewPanels.has(dataview_uuid)) {
+        panel = dataviewPanels.get(dataview_uuid);
+        // Panel might have been closed, check if it's still valid
+        if (panel) {
+            try {
+                panel.title = title; // Update title
+                panel.reveal(ViewColumn[viewer as keyof typeof ViewColumn]);
+
+                if (source === 'table') {
+                    // Update existing panel content
+                    const content = await getTableHtml(panel.webview, file);
+                    panel.webview.html = content;
+                } else if (source === 'list') {
+                    const content = await getListHtml(panel.webview, file);
+                    panel.webview.html = content;
+                } else {
+                    // For other types, we'll still reopen, but use the existing panel
+                    if (isGuestSession) {
+                        const fileContent = await rGuestService?.requestFileContent(file, 'utf8');
+                        if (fileContent) {
+                            await openVirtualDoc(file, fileContent, true, true, ViewColumn[viewer as keyof typeof ViewColumn]);
+                        }
+                    } else {
+                        await commands.executeCommand('vscode.open', Uri.file(file), {
+                            preserveFocus: true,
+                            preview: true,
+                            viewColumn: ViewColumn[viewer as keyof typeof ViewColumn],
+                        });
+                    }
+                }
+                console.info('[showDataView] Updated existing panel');
+                return;
+            } catch (e) {
+                console.log(`Panel was disposed, creating new one: ${e}`);
+                // Panel was disposed, remove from registry
+                dataviewPanels.delete(dataview_uuid);
+                panel = undefined;
+            }
+        }
+    }
+
+    // Create a new panel if needed
     if (source === 'table') {
-        const panel = window.createWebviewPanel('dataview', title,
+      panel = window.createWebviewPanel('dataview', title,
             {
                 preserveFocus: true,
                 viewColumn: ViewColumn[viewer as keyof typeof ViewColumn],
@@ -356,8 +403,16 @@ export async function showDataView(source: string, type: string, title: string,
         const content = await getTableHtml(panel.webview, file);
         panel.iconPath = new UriIcon('open-preview');
         panel.webview.html = content;
+        
+        // Register panel if we have a UUID
+        if (dataview_uuid) {
+            dataviewPanels.set(dataview_uuid, panel);
+            panel.onDidDispose(() => {
+                dataviewPanels.delete(dataview_uuid!);
+            });
+        }
     } else if (source === 'list') {
-        const panel = window.createWebviewPanel('dataview', title,
+      panel = window.createWebviewPanel('dataview', title,
             {
                 preserveFocus: true,
                 viewColumn: ViewColumn[viewer as keyof typeof ViewColumn],
@@ -371,6 +426,14 @@ export async function showDataView(source: string, type: string, title: string,
         const content = await getListHtml(panel.webview, file);
         panel.iconPath = new UriIcon('open-preview');
         panel.webview.html = content;
+        
+        // Register panel if we have a UUID
+        if (dataview_uuid) {
+            dataviewPanels.set(dataview_uuid, panel);
+            panel.onDidDispose(() => {
+                dataviewPanels.delete(dataview_uuid!);
+            });
+        }
     } else {
         if (isGuestSession) {
             const fileContent = await rGuestService?.requestFileContent(file, 'utf8');
@@ -738,7 +801,8 @@ export async function writeSuccessResponse(responseSessionDir: string): Promise<
 
 type ISessionRequest = {
     plot_url?: string,
-    server?: SessionServer
+    server?: SessionServer,
+    dataview_uuid?: string  // Add this property to match the R code
 } & IRequest;
 
 async function updateRequest(sessionStatusBarItem: StatusBarItem) {
@@ -753,7 +817,7 @@ async function updateRequest(sessionStatusBarItem: StatusBarItem) {
         console.info(`[updateRequest] request: ${requestContent}`);
         const request = JSON.parse(requestContent) as ISessionRequest;
         if (request.wd && isFromWorkspace(request.wd)) {
-            if (request.uuid === null || request.uuid === undefined || request.uuid === UUID) {
+            if (request.uuid === null || request.uuid === undefined || String(request.uuid) === String(UUID)) {
                 switch (request.command) {
                     case 'help': {
                         if (globalRHelp && request.requestPath) {
@@ -818,8 +882,9 @@ async function updateRequest(sessionStatusBarItem: StatusBarItem) {
                     }
                     case 'dataview': {
                         if (request.source && request.type && request.file && request.title && request.viewer !== undefined) {
+                          // Use dataview_uuid for panel tracking, preserve uuid for LiveShare
                             await showDataView(request.source,
-                                request.type, request.title, request.file, request.viewer);
+                                request.type, request.title, request.file, request.viewer, request.dataview_uuid);
                         }
                         break;
                     }
