to fix dataview_table

Author: Fred-Wu

R/session/vsc.R

@@ -134,28 +134,14 @@ dataview_table <- function(data, start = 0, end = NULL, sortModel = NULL) {
     # ── SORT data before slicing ──
     if (!is.null(sortModel) && length(sortModel) > 0) {
 
-        sort <- sortModel[[1]]
-        col_f <- sort$colId
-        dir <- sort$sort
-        real <- field_map[[col_f]]
-
-        # only sort if it's one of your real data columns
-        if (!is.null(real) && real %in% .colnames[-1]) {
-
-            # attach rownames_ as a helper column
-            data[, "__rownames__" := rownames_]
-
-            # sort in place: order=1L for asc, -1L for desc
-            data.table::setorderv(
-                data,
-                cols  = real,
-                order = if (dir == "asc") 1L else -1L
-            )
+        cols <- vapply(sortModel, function(s) field_map[[s$colId]], FUN.VALUE = "")
+        ords <- vapply(sortModel, function(s) if (s$sort == "asc") 1L else -1L, FUN.VALUE = integer(1))
+        data[, "__rn__" := rownames_]
 
-            # pull the helper back out as rownames_
-            rownames_ <- data[["__rownames__"]]
-            data[, "__rownames__" := NULL]
-        }
+        data.table::setorderv(data, cols, order = ords)
+
+        rownames_ <- data[["__rn__"]]
+        data[, "__rn__" := NULL]
     }
 
     if (is.null(end)) end <- .nrow

src/session.ts

@@ -437,7 +437,7 @@ export async function showDataView(source: string, type: string, title: string,
                         start,
                         end,
                         rows: rows as object[],
-                        totalRows: totalRows,
+                        lastRow: (totalRows <= (end ?? totalRows) ? totalRows : -1),
                         requestId
                     });
                 } catch (error) {
@@ -600,6 +600,40 @@ export async function getTableHtml(webview: Webview, file: string): Promise<stri
         }
     };
     const data = ${String(content)};
+    const displayDataSource = {
+        rowCount: undefined,
+        getRows(params) {
+          const msg = {
+              command:   'fetchRows',
+              start:     params.startRow,
+              end:       params.endRow,
+              sortModel: params.sortModel,
+              requestId: Math.random().toString(36).substr(2, 9) // Generate unique requestId
+          };
+
+          const handler = event => {
+              const m = event.data;
+              if (m.command   === 'fetchedRows' && m.requestId === msg.requestId) {
+                console.log('Fetched rows:', m.rows);
+                params.successCallback(m.rows, m.lastRow);
+                window.removeEventListener('message', handler);
+              }
+            };
+          window.addEventListener('message', handler);
+          vscode.postMessage(msg);
+        }
+      };
+    const colDefs = data.columns.map(col => {
+      if (col.field === 'x1') {
+        return {
+          ...col,
+          sortable: false,    
+          filter:   false,    
+          suppressMenu: true, 
+        };
+      }
+      return col;
+    });
     const gridOptions = {
         defaultColDef: {
             sortable: true,
@@ -612,45 +646,23 @@ export async function getTableHtml(webview: Webview, file: string): Promise<stri
                 closeOnApply: true
             }
         },
-        columnDefs: data.columns,
-        rowSelection: 'multiple',
+        datasource: displayDataSource,
+        getRowId: params => params.data.x1,
+        columnDefs: colDefs,
+        rowSelection: { mode: "multiRow", headerCheckbox: false },
         pagination: ${pageSize > 0 ? 'true' : 'false'},
         paginationPageSize: ${pageSize},
         enableCellTextSelection: true,
         ensureDomOrder: true,
         tooltipShowDelay: 100,
         onFirstDataRendered: onFirstDataRendered,
         rowModelType: 'infinite',
-        getRowNodeId:  rowData => rowData.x1,
         cacheBlockSize: 100,
-        maxBlocksInCache: 0,
-        datasource: {
-            getRows: function(params) {
-                const msg = {
-                    command:   'fetchRows',
-                    start:     params.startRow,
-                    end:       params.endRow,
-                    sortModel: params.sortModel,
-                    requestId: Math.random().toString(36).substr(2, 9) // Generate unique requestId
-                };
-
-                const handler = event => {
-                    const m = event.data;
-                    if (
-                      m.command   === 'fetchedRows' &&
-                      m.requestId === msg.requestId
-                    ) {
-                      console.log('Fetched rows:', m.rows);
-                      params.successCallback(m.rows, m.totalRows);
-                      window.removeEventListener('message', handler);
-                    }
-                  };
-                  window.addEventListener('message', handler);
-                  vscode.postMessage(msg);
-
-                }
-              }
-            };
+        maxBlocksInCache: 10,
+        cacheOverflowSize: 2,
+        maxConcurrentDatasourceRequests: 2,
+        infiniteInitialRowCount: 1
+      };
     
     function onFirstDataRendered(params) {
         params.api.autoSizeAllColumns(false);