Cleanup redundant commands and fix errors when resetting bundle variables (#1292)

## Changes
<!-- Summary of your changes that are easy to understand -->

## Tests
<!-- How is this tested? -->

---------

Co-authored-by: Ilia Babanov <ilia.babanov@databricks.com>

Author: kartikgupta-db

packages/databricks-vscode/package.json

@@ -60,7 +60,7 @@
                 "command": "databricks.connection.configureLogin",
                 "icon": "$(gear)",
                 "title": "Sign in to Databricks workspace",
-                "enablement": "databricks.context.activated",
+                "enablement": "databricks.context.activated && databricks.context.bundle.deploymentState == idle",
                 "category": "Databricks"
             },
             {
@@ -143,6 +143,7 @@
             {
                 "command": "databricks.autocomplete.configure",
                 "title": "Configure autocomplete for Databricks globals",
+                "enablement": "databricks.context.activated",
                 "category": "Databricks"
             },
             {
@@ -234,7 +235,6 @@
                 "command": "databricks.bundle.initNewProject",
                 "icon": "$(new-folder)",
                 "title": "Initialize new project",
-                "enablement": "databricks.context.activated",
                 "category": "Databricks"
             },
             {
@@ -368,7 +368,7 @@
                 },
                 {
                     "id": "dabsVariableView",
-                    "name": "Bundle Variables View",
+                    "name": "Bundle Variables",
                     "visibility": "visible",
                     "when": "databricks.context.bundle.isTargetSet"
                 },
@@ -400,11 +400,6 @@
                 "contents": "[Create a new Databricks Project](command:databricks.bundle.initNewProject)",
                 "when": "workspaceFolderCount > 0 && databricks.context.initialized"
             },
-            {
-                "view": "configurationView",
-                "contents": "To learn more about how to use Databricks with VS Code [read our docs](https://docs.databricks.com/dev-tools/vscode-ext.html) or [Quickstart guide](command:databricks.quickstart.open)",
-                "when": "databricks.context.initialized"
-            },
             {
                 "view": "configurationView",
                 "contents": "Initializing...",
@@ -414,6 +409,10 @@
                 "view": "configurationView",
                 "contents": "This folder is empty.\n[Create a new Databricks Project](command:databricks.bundle.initNewProject)",
                 "when": "workspaceFolderCount == 0"
+            },
+            {
+                "view": "configurationView",
+                "contents": "To learn more about how to use Databricks with VS Code [read our docs](https://docs.databricks.com/dev-tools/vscode-ext.html) or [Quickstart guide](command:databricks.quickstart.open)"
             }
         ],
         "menus": {
@@ -575,7 +574,7 @@
                 {
                     "submenu": "databricks.run",
                     "group": "navigation@0",
-                    "when": "databricks.context.isActiveFileInActiveWorkspace && resourceLangId =~ /^(python|scala|r|sql)$/ || databricks.context.isActiveFileInActiveWorkspace && resourceExtname == .ipynb"
+                    "when": "databricks.context.isActiveFileInActiveWorkspace && databricks.context.showRunAsWorkflow || databricks.context.isActiveFileInActiveWorkspace && resourceExtname == .ipynb"
                 }
             ],
             "databricks.run": [
@@ -586,7 +585,7 @@
                 },
                 {
                     "command": "databricks.run.runEditorContentsAsWorkflow",
-                    "when": "resourceLangId == python || resourceLangId == scala || resourceLangId == r || resourceLangId == sql || resourceExtname == .ipynb",
+                    "when": "resourceLangId == python || resourceExtname == .ipynb || databricks.context.showRunAsWorkflow",
                     "group": "1_remote@2"
                 },
                 {
@@ -607,7 +606,7 @@
                 },
                 {
                     "command": "databricks.run.runEditorContentsAsWorkflow",
-                    "when": "resourceLangId == python || resourceExtname == .ipynb"
+                    "when": "resourceLangId == python || resourceExtname == .ipynb || databricks.context.showRunAsWorkflow"
                 },
                 {
                     "command": "databricks.wsfs.createFolder",
@@ -641,7 +640,7 @@
             "explorer/context": [
                 {
                     "submenu": "databricks.run",
-                    "when": "resourceLangId == python || resourceExtname == .ipynb"
+                    "when": "resourceLangId == python || resourceExtname == .ipynb || databricks.context.showRunAsWorkflow"
                 }
             ]
         },

packages/databricks-vscode/src/bundle/models/BundleVariableModel.ts

@@ -137,11 +137,9 @@ export class BundleVariableModel extends BaseModelWithStateCache<BundleVariableM
                     .filter((v) => v[1] !== undefined)
             );
         } catch (e: any) {
-            if (e.code !== "ENOENT") {
-                throw e;
-            }
             NamedLogger.getOrCreate(Loggers.Extension).debug(
-                "No bundle variable overrides found."
+                "No bundle variable overrides found.",
+                e
             );
             return {};
         }
@@ -252,7 +250,7 @@ export class BundleVariableModel extends BaseModelWithStateCache<BundleVariableM
         try {
             await workspace.fs.delete(this.bundleVariableFilePath);
         } catch (e: any) {
-            if (e.code !== "ENOENT") {
+            if (e.code !== "ENOENT" && e.code !== "FileNotFound") {
                 throw e;
             }
         }

packages/databricks-vscode/src/extension.ts

@@ -75,6 +75,7 @@ import {EnvironmentCommands} from "./language/EnvironmentCommands";
 import {WorkspaceFolderManager} from "./vscode-objs/WorkspaceFolderManager";
 import {SyncCommands} from "./sync/SyncCommands";
 import {CodeSynchronizer} from "./sync";
+import {LocalUri} from "./sync/SyncDestination";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const packageJson = require("../package.json");
@@ -151,7 +152,30 @@ export async function activate(
     }
 
     const cli = new CliWrapper(context, loggerManager, cliLogFilePath);
-    context.extensionPath;
+
+    // Loggers
+    context.subscriptions.push(
+        telemetry.registerCommand(
+            "databricks.logs.openFolder",
+            loggerManager.openLogFolder,
+            loggerManager
+        ),
+        telemetry.registerCommand(
+            "databricks.bundle.showLogs",
+            () => loggerManager.showOutputChannel("Databricks Bundle Logs"),
+            loggerManager
+        )
+    );
+
+    // Quickstart
+    const quickstartCommands = new QuickstartCommands(context);
+    context.subscriptions.push(
+        telemetry.registerCommand(
+            "databricks.quickstart.open",
+            quickstartCommands.openQuickstartCommand(),
+            quickstartCommands
+        )
+    );
 
     if (
         workspace.workspaceFolders === undefined ||
@@ -250,19 +274,6 @@ export async function activate(
 
     cli.setPythonExtension(pythonExtensionWrapper);
 
-    context.subscriptions.push(
-        telemetry.registerCommand(
-            "databricks.logs.openFolder",
-            loggerManager.openLogFolder,
-            loggerManager
-        ),
-        telemetry.registerCommand(
-            "databricks.bundle.showLogs",
-            () => loggerManager.showOutputChannel("Databricks Bundle Logs"),
-            loggerManager
-        )
-    );
-
     // manage contexts for experimental features
     function updateFeatureContexts() {
         customWhenContext.updateShowClusterView();
@@ -807,6 +818,20 @@ export async function activate(
             runCommands.runEditorContentsAsWorkflowCommand(),
             runCommands
         ),
+        window.onDidChangeActiveTextEditor(async (e) => {
+            const uri = e?.document.uri;
+
+            if (
+                uri &&
+                uri.scheme === "file" &&
+                ((await FileUtils.isNotebook(new LocalUri(uri))) ||
+                    uri.fsPath.endsWith(".py"))
+            ) {
+                customWhenContext.setShowRunAsWorkflow(true);
+            } else {
+                customWhenContext.setShowRunAsWorkflow(false);
+            }
+        }),
         debug.registerDebugAdapterDescriptorFactory("databricks", debugFactory),
         debugFactory,
         debug.registerDebugAdapterDescriptorFactory(
@@ -816,16 +841,6 @@ export async function activate(
         debugWorkflowFactory
     );
 
-    // Quickstart
-    const quickstartCommands = new QuickstartCommands(context);
-    context.subscriptions.push(
-        telemetry.registerCommand(
-            "databricks.quickstart.open",
-            quickstartCommands.openQuickstartCommand(),
-            quickstartCommands
-        )
-    );
-
     showQuickStartOnFirstUse(context).catch((e) => {
         logging.NamedLogger.getOrCreate("Extension").error(
             "Quick Start error",

packages/databricks-vscode/src/test/e2e/bundle_variables.e2e.ts

@@ -102,7 +102,7 @@ describe("Bundle Variables", async function () {
     }
 
     it("should find bundle variable explorer and load default variables", async function () {
-        const section = (await getViewSection("BUNDLE VARIABLES VIEW")) as
+        const section = (await getViewSection("BUNDLE VARIABLES")) as
             | CustomTreeSection
             | undefined;
         assert(section);
@@ -131,7 +131,7 @@ describe("Bundle Variables", async function () {
         );
         await editor.save();
 
-        const section = (await getViewSection("BUNDLE VARIABLES VIEW")) as
+        const section = (await getViewSection("BUNDLE VARIABLES")) as
             | CustomTreeSection
             | undefined;
         assert(section);
@@ -154,7 +154,7 @@ describe("Bundle Variables", async function () {
     });
 
     it("should revert overrides", async function () {
-        const section = (await getViewSection("BUNDLE VARIABLES VIEW")) as
+        const section = (await getViewSection("BUNDLE VARIABLES")) as
             | CustomTreeSection
             | undefined;
         assert(section);
@@ -189,7 +189,7 @@ describe("Bundle Variables", async function () {
 
         await writeRootBundleConfig(schemaDef, vscodeWorkspaceRoot);
 
-        const section = (await getViewSection("BUNDLE VARIABLES VIEW")) as
+        const section = (await getViewSection("BUNDLE VARIABLES")) as
             | CustomTreeSection
             | undefined;
         assert(section);

packages/databricks-vscode/src/test/e2e/utils/commonUtils.ts

@@ -15,7 +15,7 @@ const ViewSectionTypes = [
     "CONFIGURATION",
     "WORKSPACE EXPLORER",
     "BUNDLE RESOURCE EXPLORER",
-    "BUNDLE VARIABLES VIEW",
+    "BUNDLE VARIABLES",
 ] as const;
 export type ViewSectionType = (typeof ViewSectionTypes)[number];
 

packages/databricks-vscode/src/vscode-objs/CustomWhenContext.ts

@@ -94,4 +94,12 @@ export class CustomWhenContext {
             value
         );
     }
+
+    setShowRunAsWorkflow(value: boolean) {
+        commands.executeCommand(
+            "setContext",
+            "databricks.context.showRunAsWorkflow",
+            value
+        );
+    }
 }