Merge branch 'main' into dinohamzic/grn-5031-loading-state-on-startup

Author: dinohamzic

package.json

@@ -99,6 +99,12 @@
                 "category": "Deepnote",
                 "icon": "$(plug)"
             },
+            {
+                "command": "deepnote.openInDeepnote",
+                "title": "Open in Deepnote",
+                "category": "Deepnote",
+                "icon": "$(globe)"
+            },
             {
                 "command": "deepnote.newProject",
                 "title": "New project",
@@ -129,6 +135,12 @@
                 "category": "Deepnote",
                 "icon": "$(graph)"
             },
+            {
+                "command": "deepnote.addChartBlock",
+                "title": "%deepnote.commands.addChartBlock.title%",
+                "category": "Deepnote",
+                "icon": "$(graph-line)"
+            },
             {
                 "command": "deepnote.addInputTextBlock",
                 "title": "%deepnote.commands.addInputTextBlock.title%",
@@ -728,9 +740,30 @@
             {
                 "id": "editor.interactiveWindow.context",
                 "label": "%jupyter.command.editor.interactiveWindow.context.label%"
+            },
+            {
+                "id": "deepnote.explorer.context",
+                "label": "Deepnote"
             }
         ],
         "menus": {
+            "view/title": [
+                {
+                    "command": "deepnote.newProject",
+                    "when": "view == deepnoteExplorer",
+                    "group": "navigation@1"
+                },
+                {
+                    "command": "deepnote.importNotebook",
+                    "when": "view == deepnoteExplorer",
+                    "group": "navigation@2"
+                },
+                {
+                    "command": "deepnote.refreshExplorer",
+                    "when": "view == deepnoteExplorer",
+                    "group": "navigation@3"
+                }
+            ],
             "editor/context": [
                 {
                     "submenu": "editor.interactiveWindow.context",
@@ -740,6 +773,11 @@
                     "when": "editorFocus && editorLangId == python && jupyter.hascodecells && !notebookEditorFocused && isWorkspaceTrusted",
                     "command": "jupyter.exportfileasnotebook",
                     "group": "Jupyter3@2"
+                },
+                {
+                    "when": "resourceExtname == .deepnote",
+                    "command": "deepnote.openInDeepnote",
+                    "group": "navigation"
                 }
             ],
             "editor.interactiveWindow.context": [
@@ -779,6 +817,14 @@
                     "when": "editorFocus && editorLangId == python && !notebookEditorFocused && isWorkspaceTrusted"
                 }
             ],
+            "deepnote.explorer.context": [
+                {
+                    "command": "deepnote.newProject"
+                },
+                {
+                    "command": "deepnote.importNotebook"
+                }
+            ],
             "editor/title": [
                 {
                     "command": "jupyter.restartkernel",
@@ -821,6 +867,51 @@
                     "group": "navigation@1",
                     "when": "notebookType == 'deepnote'"
                 },
+                {
+                    "command": "deepnote.addChartBlock",
+                    "group": "navigation@2",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addBigNumberChartBlock",
+                    "group": "navigation@3",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addInputTextBlock",
+                    "group": "navigation@4",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addInputTextareaBlock",
+                    "group": "navigation@5",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addInputSelectBlock",
+                    "group": "navigation@6",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addInputSliderBlock",
+                    "group": "navigation@7",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addInputCheckboxBlock",
+                    "group": "navigation@8",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addInputDateBlock",
+                    "group": "navigation@9",
+                    "when": "notebookType == 'deepnote'"
+                },
+                {
+                    "command": "deepnote.addInputDateRangeBlock",
+                    "group": "navigation@10",
+                    "when": "notebookType == 'deepnote'"
+                },
                 {
                     "command": "jupyter.restartkernel",
                     "group": "navigation/execute@5",
@@ -951,6 +1042,11 @@
                 }
             ],
             "explorer/context": [
+                {
+                    "submenu": "deepnote.explorer.context",
+                    "when": "isWorkspaceTrusted",
+                    "group": "navigation@10"
+                },
                 {
                     "when": "resourceLangId == python && !notebookEditorFocused && isWorkspaceTrusted",
                     "command": "jupyter.runFileInteractive",
@@ -1352,6 +1448,18 @@
             "type": "object",
             "title": "Deepnote",
             "properties": {
+                "deepnote.domain": {
+                    "type": "string",
+                    "default": "deepnote.com",
+                    "description": "Deepnote domain (e.g., 'deepnote.com' or 'ra-18838.deepnote-staging.com')",
+                    "scope": "application"
+                },
+                "deepnote.disableSSLVerification": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Disable SSL certificate verification (for development only)",
+                    "scope": "application"
+                },
                 "jupyter.experiments.enabled": {
                     "type": "boolean",
                     "default": true,

package.nls.json

@@ -255,7 +255,8 @@
     "deepnote.commands.importNotebook.title": "Import Notebook",
     "deepnote.commands.importJupyterNotebook.title": "Import Jupyter Notebook",
     "deepnote.commands.addSqlBlock.title": "Add SQL Block",
-    "deepnote.commands.addBigNumberChartBlock.title": "Add Big Number Chart Block",
+    "deepnote.commands.addBigNumberChartBlock.title": "Add Big Number Block",
+    "deepnote.commands.addChartBlock.title": "Add Chart Block",
     "deepnote.commands.addInputTextBlock.title": "Add Input Text Block",
     "deepnote.commands.addInputTextareaBlock.title": "Add Input Textarea Block",
     "deepnote.commands.addInputSelectBlock.title": "Add Input Select Block",

src/commands.ts

@@ -188,6 +188,7 @@ export interface ICommandNameArgumentTypeMapping {
     [DSCommands.ContinueEditSessionInCodespace]: [];
     [DSCommands.AddSqlBlock]: [];
     [DSCommands.AddBigNumberChartBlock]: [];
+    [DSCommands.AddChartBlock]: [];
     [DSCommands.AddInputTextBlock]: [];
     [DSCommands.AddInputTextareaBlock]: [];
     [DSCommands.AddInputSelectBlock]: [];
@@ -197,4 +198,5 @@ export interface ICommandNameArgumentTypeMapping {
     [DSCommands.AddInputDateRangeBlock]: [];
     [DSCommands.AddInputFileBlock]: [];
     [DSCommands.AddButtonBlock]: [];
+    [DSCommands.OpenInDeepnote]: [];
 }

src/messageTypes.ts

@@ -182,6 +182,7 @@ export type LocalizedMessages = {
     // Integration type labels
     integrationsPostgresTypeLabel: string;
     integrationsBigQueryTypeLabel: string;
+    integrationsSnowflakeTypeLabel: string;
     // PostgreSQL form strings
     integrationsPostgresNameLabel: string;
     integrationsPostgresNamePlaceholder: string;
@@ -204,9 +205,36 @@ export type LocalizedMessages = {
     integrationsBigQueryCredentialsLabel: string;
     integrationsBigQueryCredentialsPlaceholder: string;
     integrationsBigQueryCredentialsRequired: string;
+    // Snowflake form strings
+    integrationsSnowflakeNameLabel: string;
+    integrationsSnowflakeNamePlaceholder: string;
+    integrationsSnowflakeAccountLabel: string;
+    integrationsSnowflakeAccountPlaceholder: string;
+    integrationsSnowflakeAuthMethodLabel: string;
+    integrationsSnowflakeAuthMethodSubLabel: string;
+    integrationsSnowflakeAuthMethodUsernamePassword: string;
+    integrationsSnowflakeAuthMethodKeyPair: string;
+    integrationsSnowflakeUnsupportedAuthMethod: string;
+    integrationsSnowflakeUsernameLabel: string;
+    integrationsSnowflakePasswordLabel: string;
+    integrationsSnowflakePasswordPlaceholder: string;
+    integrationsSnowflakeServiceAccountUsernameLabel: string;
+    integrationsSnowflakeServiceAccountUsernameHelp: string;
+    integrationsSnowflakePrivateKeyLabel: string;
+    integrationsSnowflakePrivateKeyHelp: string;
+    integrationsSnowflakePrivateKeyPlaceholder: string;
+    integrationsSnowflakePrivateKeyPassphraseLabel: string;
+    integrationsSnowflakePrivateKeyPassphraseHelp: string;
+    integrationsSnowflakeDatabaseLabel: string;
+    integrationsSnowflakeDatabasePlaceholder: string;
+    integrationsSnowflakeRoleLabel: string;
+    integrationsSnowflakeRolePlaceholder: string;
+    integrationsSnowflakeWarehouseLabel: string;
+    integrationsSnowflakeWarehousePlaceholder: string;
     // Common form strings
     integrationsRequiredField: string;
     integrationsOptionalField: string;
+    integrationsUnnamedIntegration: string;
 };
 // Map all messages to specific payloads
 export class IInteractiveWindowMapping {

src/notebooks/deepnote/blocks.md

@@ -45,7 +45,7 @@ project:
           type: 'code'
           content: "df = pd.DataFrame({'a': [1, 2, 3]})\ndf"
           sortingKey: '001'
-          blockGroup: 'default-group'
+          blockGroup: 'uuid-v4'
           executionCount: 1
           metadata:
             table_state_spec: '{"pageSize": 25, "pageIndex": 0}'
@@ -150,7 +150,7 @@ Example of a cell after pocket conversion:
         __deepnotePocket: {
             type: 'code',
             sortingKey: '001',
-            blockGroup: 'default-group',
+            blockGroup: 'uuid-v4',
             executionCount: 1
         }
     },
@@ -472,7 +472,7 @@ blocks:
     type: 'big-number'
     content: ''
     sortingKey: '001'
-    blockGroup: 'default-group'
+    blockGroup: 'uuid-v4'
     metadata:
       deepnote_big_number_title: 'Customers'
       deepnote_big_number_value: 'customers'
@@ -517,7 +517,7 @@ When opened in VS Code, the block becomes a cell with JSON content showing the c
         __deepnotePocket: {
             type: 'big-number',
             sortingKey: '001',
-            blockGroup: 'default-group'
+            blockGroup: 'uuid-v4'
         }
     }
 }

src/notebooks/deepnote/deepnoteDataConverter.ts

@@ -27,6 +27,7 @@ import {
     ButtonBlockConverter
 } from './converters/inputConverters';
 import { CHART_BIG_NUMBER_MIME_TYPE } from '../../platform/deepnote/deepnoteConstants';
+import { generateUuid } from '../../platform/common/uuid';
 
 /**
  * Utility class for converting between Deepnote block structures and VS Code notebook cells.
@@ -168,7 +169,7 @@ export class DeepnoteDataConverter {
 
     private createFallbackBlock(cell: NotebookCellData, index: number): DeepnoteBlock {
         return {
-            blockGroup: 'default-group',
+            blockGroup: generateUuid(),
             id: generateBlockId(),
             sortingKey: generateSortingKey(index),
             type: cell.kind === NotebookCellKind.Code ? 'code' : 'markdown',

src/notebooks/deepnote/deepnoteExplorerView.ts

@@ -8,6 +8,7 @@ import { IDeepnoteNotebookManager } from '../types';
 import { DeepnoteTreeDataProvider } from './deepnoteTreeDataProvider';
 import { type DeepnoteTreeItem, DeepnoteTreeItemType, type DeepnoteTreeItemContext } from './deepnoteTreeItem';
 import { generateUuid } from '../../platform/common/uuid';
+import { DeepnoteBlock, DeepnoteFile } from '@deepnote/blocks';
 
 /**
  * Manages the Deepnote explorer tree view and related commands
@@ -213,10 +214,10 @@ export class DeepnoteExplorerView {
             const projectId = generateUuid();
             const notebookId = generateUuid();
 
-            const firstBlock = {
+            const firstBlock: DeepnoteBlock = {
                 blockGroup: generateUuid(),
                 content: '',
-                executionCount: null,
+                executionCount: 0,
                 id: generateUuid(),
                 metadata: {},
                 outputs: [],
@@ -225,9 +226,10 @@ export class DeepnoteExplorerView {
                 version: 1
             };
 
-            const projectData = {
-                version: 1.0,
+            const projectData: DeepnoteFile = {
+                version: '1.0.0',
                 metadata: {
+                    createdAt: new Date().toISOString(),
                     modifiedAt: new Date().toISOString()
                 },
                 project: {

src/notebooks/deepnote/deepnoteExplorerView.unit.test.ts

@@ -265,7 +265,9 @@ suite('DeepnoteExplorerView - Empty State Commands', () => {
             const yamlContent = Buffer.from(capturedContent!).toString('utf8');
             const projectData = yaml.load(yamlContent) as any;
 
-            expect(projectData.version).to.equal(1.0);
+            expect(projectData.version).to.equal('1.0.0');
+            expect(projectData.metadata.createdAt).to.exist;
+            expect(projectData.metadata.modifiedAt).to.exist;
             expect(projectData.project.id).to.equal(projectId);
             expect(projectData.project.name).to.equal(projectName);
             expect(projectData.project.notebooks).to.have.lengthOf(1);