Merge branch 'main' into oleh/grn-4778-support-chart-blocks

Author: OlegWock

package-lock.json

@@ -2134,6 +2134,7 @@
         "ansi-to-html": "^0.6.7",
         "bootstrap": "^5.0.0",
         "bootstrap-less": "^3.3.8",
+        "clsx": "^2.1.1",
         "cross-fetch": "^3.1.5",
         "d3-format": "^3.1.0",
         "encoding": "^0.1.13",
@@ -2174,10 +2175,13 @@
         "strip-comments": "^2.0.1",
         "styled-components": "^5.2.1",
         "svg-to-pdfkit": "^0.1.8",
+        "tailwind-merge": "^3.3.1",
         "tcp-port-used": "^1.0.1",
         "tmp": "^0.2.4",
         "url-parse": "^1.5.10",
-        "vega-embed": "^7.1.0",
+        "vega": "^5.33.0",
+        "vega-embed": "^6.25.0",
+        "vega-lite": "^5.21.0",
         "vscode-debugprotocol": "^1.41.0",
         "vscode-languageclient": "8.0.2-next.5",
         "vscode-tas-client": "^0.1.84",

package.json

@@ -158,6 +158,13 @@ export type LocalizedMessages = {
     selectedImageListLabel: string;
     selectedImageLabel: string;
     dvDeprecationWarning: string;
+    dataframeRowsColumns: string;
+    dataframePerPage: string;
+    dataframePreviousPage: string;
+    dataframeNextPage: string;
+    dataframePageOf: string;
+    dataframeCopyTable: string;
+    dataframeExportTable: string;
 };
 // Map all messages to specific payloads
 export class IInteractiveWindowMapping {

src/messageTypes.ts

@@ -805,6 +805,13 @@ export namespace WebViews {
     export const dvDeprecationWarning = l10n.t(
         'The built-in data viewer will be deprecated and no longer usable starting with Visual Studio Code 1.92. Please <a href="command:workbench.extensions.search?%22@tag:jupyterVariableViewers%22">install other data viewing extensions</a> to continue inspecting data'
     );
+    export const dataframeRowsColumns = l10n.t('{0} rows, {1} columns');
+    export const dataframePerPage = l10n.t('/ page');
+    export const dataframePreviousPage = l10n.t('Previous page');
+    export const dataframeNextPage = l10n.t('Next page');
+    export const dataframePageOf = l10n.t('Page {0} of {1}');
+    export const dataframeCopyTable = l10n.t('Copy table');
+    export const dataframeExportTable = l10n.t('Export table');
 }
 
 export namespace Deprecated {

src/platform/common/utils/localize.ts

@@ -258,7 +258,14 @@ export abstract class WebviewHost<IMapping> implements IDisposable {
             deletePlot: localize.WebViews.deletePlot,
             selectedImageListLabel: localize.WebViews.selectedImageListLabel,
             selectedImageLabel: localize.WebViews.selectedImageLabel,
-            dvDeprecationWarning: localize.WebViews.dvDeprecationWarning
+            dvDeprecationWarning: localize.WebViews.dvDeprecationWarning,
+            dataframeRowsColumns: localize.WebViews.dataframeRowsColumns,
+            dataframePerPage: localize.WebViews.dataframePerPage,
+            dataframePreviousPage: localize.WebViews.dataframePreviousPage,
+            dataframeNextPage: localize.WebViews.dataframeNextPage,
+            dataframePageOf: localize.WebViews.dataframePageOf,
+            dataframeCopyTable: localize.WebViews.dataframeCopyTable,
+            dataframeExportTable: localize.WebViews.dataframeExportTable
         };
         this.postMessageInternal(SharedMessages.LocInit, JSON.stringify(locStrings)).catch(noop);
     }