Add show setup commands (#3474)

* replace connect to Studio and open Studio settings commands

* add integration tests for split

Author: mattseddon

extension/package.json

@@ -421,6 +421,21 @@
         "command": "dvc.showExperimentsAndPlots",
         "category": "DVC"
       },
+      {
+        "title": "Connect to Studio",
+        "command": "dvc.showStudioConnect",
+        "category": "DVC"
+      },
+      {
+        "title": "Show Studio Settings",
+        "command": "dvc.showStudioSettings",
+        "category": "DVC"
+      },
+      {
+        "title": "Show Setup",
+        "command": "dvc.showSetup",
+        "category": "DVC"
+      },
       {
         "title": "Stop All Running Experiments",
         "command": "dvc.stopAllRunningExperiments",
@@ -841,6 +856,14 @@
           "command": "dvc.showExperimentsAndPlots",
           "when": "dvc.commands.available && dvc.project.available"
         },
+        {
+          "command": "dvc.showStudioConnect",
+          "when": "dvc.commands.available && dvc.project.available && !dvc.studio.connected"
+        },
+        {
+          "command": "dvc.showStudioSettings",
+          "when": "dvc.commands.available && dvc.project.available && dvc.studio.connected"
+        },
         {
           "command": "dvc.stopAllRunningExperiments",
           "when": "dvc.commands.available && dvc.project.available && dvc.experiment.running"
@@ -1398,12 +1421,12 @@
       },
       {
         "view": "dvc.views.studio",
-        "contents": "[$(plug) Connect](command:dvc.showStudioSetup)",
+        "contents": "[$(plug) Connect](command:dvc.showStudioConnect)",
         "when": "!dvc.studio.connected"
       },
       {
         "view": "dvc.views.studio",
-        "contents": "[$(settings-gear) Open Settings](command:dvc.showStudioSetup)",
+        "contents": "[$(settings-gear) Open Settings](command:dvc.showStudioSettings)",
         "when": "dvc.studio.connected"
       },
       {

extension/src/commands/external.ts

@@ -95,13 +95,14 @@ export enum RegisteredCommands {
 
   SETUP_SHOW = 'dvc.showSetup',
   SETUP_SHOW_EXPERIMENTS = 'dvc.showExperimentsSetup',
-  SETUP_SHOW_STUDIO = 'dvc.showStudioSetup',
   SELECT_FOCUSED_PROJECTS = 'dvc.selectFocusedProjects',
 
   ADD_STUDIO_ACCESS_TOKEN = 'dvc.addStudioAccessToken',
   UPDATE_STUDIO_ACCESS_TOKEN = 'dvc.updateStudioAccessToken',
   REMOVE_STUDIO_ACCESS_TOKEN = 'dvc.removeStudioAccessToken',
   EXPERIMENT_VIEW_SHARE_TO_STUDIO = 'dvc.views.experiments.shareExperimentToStudio',
+  SETUP_SHOW_STUDIO_CONNECT = 'dvc.showStudioConnect',
+  SETUP_SHOW_STUDIO_SETTINGS = 'dvc.showStudioSettings',
 
   RESET_STATE = 'dvc.resetState'
 }

extension/src/setup/register.ts

@@ -45,7 +45,14 @@ const registerSetupShowCommands = (
   )
 
   internalCommands.registerExternalCommand(
-    RegisteredCommands.SETUP_SHOW_STUDIO,
+    RegisteredCommands.SETUP_SHOW_STUDIO_CONNECT,
+    async () => {
+      await setup.showSetup(Section.STUDIO)
+    }
+  )
+
+  internalCommands.registerExternalCommand(
+    RegisteredCommands.SETUP_SHOW_STUDIO_SETTINGS,
     async () => {
       await setup.showSetup(Section.STUDIO)
     }

extension/src/telemetry/constants.ts

@@ -281,8 +281,9 @@ export interface IEventNamePropertyMapping {
 
   [EventName.SETUP_SHOW]: undefined
   [EventName.SETUP_SHOW_EXPERIMENTS]: undefined
-  [EventName.SETUP_SHOW_STUDIO]: undefined
   [EventName.SELECT_FOCUSED_PROJECTS]: undefined
+  [EventName.SETUP_SHOW_STUDIO_SETTINGS]: undefined
+  [EventName.SETUP_SHOW_STUDIO_CONNECT]: undefined
 
   [EventName.ADD_STUDIO_ACCESS_TOKEN]: undefined
   [EventName.UPDATE_STUDIO_ACCESS_TOKEN]: undefined

extension/src/test/suite/setup/index.test.ts

@@ -870,4 +870,20 @@ suite('Setup Test Suite', () => {
       expect(mockShow).to.be.calledWithMatch({ sectionCollapsed: undefined })
     })
   })
+
+  it('should open the webview with the Studio section focus for dvc.showStudioSettings and dvc.showStudioConnect', async () => {
+    const mockShowWebview = stub(Setup.prototype, 'showSetup').resolves(
+      undefined
+    )
+
+    await commands.executeCommand(RegisteredCommands.SETUP_SHOW_STUDIO_CONNECT)
+
+    expect(mockShowWebview).to.be.calledWithExactly(Section.STUDIO)
+
+    mockShowWebview.resetHistory()
+
+    await commands.executeCommand(RegisteredCommands.SETUP_SHOW_STUDIO_SETTINGS)
+
+    expect(mockShowWebview).to.be.calledWithExactly(Section.STUDIO)
+  })
 })