increase time out for large data, POSIXlt/POSIXct date time column support

Author: Fred Wu

R/session/vsc.R

@@ -82,7 +82,9 @@ get_column_def <- function(name, field, value) {
         if (is.null(attr(value, "class"))) {
             filter <- "agNumberColumnFilter"
         }
-    } else if (inherits(value, "Date")) {
+    } else if (inherits(value, "Date")
+               || inherits(value, "POSIXlt")
+               || inherits(value, "POSIXct")) {
         type <- "dateColumn"
         filter <- "agDateColumnFilter"
     } else if (is.logical(value)) {
@@ -181,7 +183,9 @@ dataview_table <- local({
                     if (!is.null(fd$type) && !is.null(fd$filter)) {
                         op  <- fd$type
                         raw <- if (fd$filterType == "date") fd$dateFrom else fd$filter
-                        lit <- if (inherits(dt1[[col_name]], "Date")) {
+                        lit <- if (inherits(dt1[[col_name]], "Date")
+                                   || inherits(dt1[[col_name]], "POSIXlt")
+                                   || inherits(dt1[[col_name]], "POSIXct")) {
                             sprintf('as.Date("%s")', raw)
                         } else if (is.numeric(dt1[[col_name]])) {
                             as.numeric(raw)
@@ -205,7 +209,10 @@ dataview_table <- local({
                             blank                = sprintf('is.na(%s) | %s == ""', col_name, col_name),
                             notBlank             = sprintf('!is.na(%s) & %s != ""', col_name, col_name),
                             inRange = {
-                                hi <- if (inherits(dt1[[col_name]], "Date") && !is.null(fd$dateTo)) {
+                                hi <- if ((inherits(dt1[[col_name]], "Date")
+                                           || inherits(dt1[[col_name]], "POSIXlt")
+                                           || inherits(dt1[[col_name]], "POSIXct"))
+                                          && !is.null(fd$dateTo)) {
                                     sprintf('as.Date("%s")', fd$dateTo)
                                 } else {
                                     as.numeric(fd$filterTo)

src/session.ts

@@ -428,7 +428,7 @@ export async function showDataView(source: string, type: string, title: string,
 
                     // Set a timeout for the entire operation
                     const timeoutPromise = new Promise((_, reject) => {
-                        setTimeout(() => reject(new Error('Operation timed out')), 60000); // 60 second timeout
+                        setTimeout(() => reject(new Error('Operation timed out')), 120000); // 120 second timeout
                     });
 
                     const requestPromise = sessionRequest(server, {
@@ -635,8 +635,6 @@ export async function getTableHtml(webview: Webview, file: string): Promise<stri
     const displayDataSource = {
         rowCount: undefined,
         getRows(params) {
-        console.log("Getting rows:", params.startRow, "to", params.endRow, 
-                    "Sort:", JSON.stringify(params.sortModel));
 
         const msg = {
             command:     'fetchRows',
@@ -650,7 +648,6 @@ export async function getTableHtml(webview: Webview, file: string): Promise<stri
         const handler = event => {
             const m = event.data;
             if (m.command   === 'fetchedRows' && m.requestId === msg.requestId) {
-              console.log('Received rows:', m.rows.length, 'First few row IDs:', m.rows.slice(0, 3).map(r => r.x1));
               
               displayDataSource._TotalRows = m.totalRows;
               displayDataSource._TotalUnfiltered = m.totalUnfiltered;
@@ -662,7 +659,6 @@ export async function getTableHtml(webview: Webview, file: string): Promise<stri
               if (totalRows <= params.endRow) {
                 lastRow = totalRows;
               }
-              console.log('Success callback with lastRow:', lastRow, 'totalRows:', totalRows);
               params.successCallback(m.rows, lastRow);
               window.removeEventListener('message', handler);
             }