Move Connect to Studio into Setup webview (#3452)

* move Connect to Studio into Setup webview * reduce duplication and refactor
iterative · Mar 14, 2023 · 5302a56 · 5302a56
1 parent 40e7d96
commit 5302a56
Show file tree

Hide file tree

Showing 47 changed files with 976 additions and 1,055 deletions.
diff --git a/extension/package.json b/extension/package.json
@@ -399,16 +399,6 @@
         "command": "dvc.showCommands",
         "category": "DVC"
       },
-      {
-        "title": "Connect to Studio",
-        "command": "dvc.showConnect",
-        "category": "DVC"
-      },
-      {
-        "title": "Open Studio Settings",
-        "command": "dvc.showStudioSettings",
-        "category": "DVC"
-      },
       {
         "title": "Show Experiments",
         "command": "dvc.showExperiments",
@@ -819,14 +809,6 @@
           "command": "dvc.stopQueuedExperiments",
           "when": "dvc.commands.available && dvc.project.available"
         },
-        {
-          "command": "dvc.showConnect",
-          "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.selectForCompare",
           "when": "false"
@@ -1416,12 +1398,12 @@
       },
       {
         "view": "dvc.views.studio",
-        "contents": "[$(plug) Connect](command:dvc.showConnect)",
+        "contents": "[$(plug) Connect](command:dvc.showSetup)",
         "when": "!dvc.studio.connected"
       },
       {
         "view": "dvc.views.studio",
-        "contents": "[$(settings-gear) Open Settings](command:dvc.showConnect)",
+        "contents": "[$(settings-gear) Open Settings](command:dvc.showSetup)",
         "when": "dvc.studio.connected"
       },
       {

diff --git a/extension/src/commands/external.ts b/extension/src/commands/external.ts
@@ -96,8 +96,6 @@ export enum RegisteredCommands {
   SETUP_SHOW = 'dvc.showSetup',
   SELECT_FOCUSED_PROJECTS = 'dvc.selectFocusedProjects',
 
-  CONNECT_SHOW = 'dvc.showConnect',
-  OPEN_STUDIO_SETTINGS = 'dvc.showStudioSettings',
   ADD_STUDIO_ACCESS_TOKEN = 'dvc.addStudioAccessToken',
   UPDATE_STUDIO_ACCESS_TOKEN = 'dvc.updateStudioAccessToken',
   REMOVE_STUDIO_ACCESS_TOKEN = 'dvc.removeStudioAccessToken',

diff --git a/extension/src/connect/index.ts b/extension/src/connect/index.ts
diff --git a/extension/src/connect/register.ts b/extension/src/connect/register.ts
diff --git a/extension/src/connect/webview/contract.ts b/extension/src/connect/webview/contract.ts
diff --git a/extension/src/experiments/commands/index.ts b/extension/src/experiments/commands/index.ts
@@ -2,7 +2,7 @@ import { Progress, commands } from 'vscode'
 import { AvailableCommands, InternalCommands } from '../../commands/internal'
 import { Toast } from '../../vscode/toast'
 import { WorkspaceExperiments } from '../workspace'
-import { Connect } from '../../connect'
+import { Setup } from '../../setup'
 import { RegisteredCommands } from '../../commands/external'
 
 export const getBranchExperimentCommand =
@@ -108,11 +108,11 @@ export const getShareExperimentAsCommitCommand =
   }
 
 export const getShareExperimentToStudioCommand =
-  (internalCommands: InternalCommands, connect: Connect) =>
+  (internalCommands: InternalCommands, setup: Setup) =>
   ({ dvcRoot, id }: { dvcRoot: string; id: string }) => {
-    const studioAccessToken = connect.getStudioAccessToken()
+    const studioAccessToken = setup.getStudioAccessToken()
     if (!studioAccessToken) {
-      return commands.executeCommand(RegisteredCommands.CONNECT_SHOW)
+      return commands.executeCommand(RegisteredCommands.SETUP_SHOW)
     }
 
     return internalCommands.executeCommand(

diff --git a/extension/src/experiments/commands/register.ts b/extension/src/experiments/commands/register.ts
@@ -15,7 +15,6 @@ import { Title } from '../../vscode/title'
 import { Context, getDvcRootFromContext } from '../../vscode/context'
 import { Setup } from '../../setup'
 import { showSetupOrExecuteCommand } from '../../commands/util'
-import { Connect } from '../../connect'
 
 type ExperimentDetails = { dvcRoot: string; id: string }
 
@@ -331,8 +330,7 @@ const registerExperimentRunCommands = (
 export const registerExperimentCommands = (
   experiments: WorkspaceExperiments,
   internalCommands: InternalCommands,
-  setup: Setup,
-  connect: Connect
+  setup: Setup
 ) => {
   registerExperimentCwdCommands(experiments, internalCommands)
   registerExperimentNameCommands(experiments, internalCommands)
@@ -348,7 +346,7 @@ export const registerExperimentCommands = (
 
   internalCommands.registerExternalCommand(
     RegisteredCommands.EXPERIMENT_VIEW_SHARE_TO_STUDIO,
-    getShareExperimentToStudioCommand(internalCommands, connect)
+    getShareExperimentToStudioCommand(internalCommands, setup)
   )
 
   internalCommands.registerExternalCliCommand(

diff --git a/extension/src/extension.ts b/extension/src/extension.ts
@@ -9,8 +9,6 @@ import { DvcExecutor } from './cli/dvc/executor'
 import { DvcRunner } from './cli/dvc/runner'
 import { DvcReader } from './cli/dvc/reader'
 import { Config } from './config'
-import { Connect } from './connect'
-import { registerConnectCommands } from './connect/register'
 import { Context } from './context'
 import { WorkspaceExperiments } from './experiments/workspace'
 import { registerExperimentCommands } from './experiments/commands/register'
@@ -65,7 +63,6 @@ export class Extension extends Disposable {
 
   private readonly resourceLocator: ResourceLocator
   private readonly repositories: WorkspaceRepositories
-  private readonly connect: Connect
   private readonly experiments: WorkspaceExperiments
   private readonly plots: WorkspacePlots
   private readonly setup: Setup
@@ -94,14 +91,10 @@ export class Extension extends Disposable {
 
     const config = this.dispose.track(new Config())
 
-    this.connect = this.dispose.track(
-      new Connect(context, this.resourceLocator.dvcIcon)
-    )
-
     this.gitExecutor = this.dispose.track(new GitExecutor())
     this.gitReader = this.dispose.track(new GitReader())
 
-    const getStudioLiveShareToken = () => this.connect.getStudioLiveShareToken()
+    const getStudioLiveShareToken = () => this.setup.getStudioLiveShareToken()
 
     this.dvcExecutor = this.dispose.track(
       new DvcExecutor(config, getStudioLiveShareToken, cwd =>
@@ -189,6 +182,7 @@ export class Extension extends Disposable {
 
     this.setup = this.dispose.track(
       new Setup(
+        context,
         config,
         this.internalCommands,
         this.experiments,
@@ -207,14 +201,11 @@ export class Extension extends Disposable {
       )
     )
 
-    registerConnectCommands(this.connect, this.internalCommands)
-
     registerPatchCommand(this.internalCommands)
     registerExperimentCommands(
       this.experiments,
       this.internalCommands,
-      this.setup,
-      this.connect
+      this.setup
     )
     registerPlotsCommands(this.plots, this.internalCommands, this.setup)
     registerSetupCommands(this.setup, this.internalCommands)

diff --git a/extension/src/patch.ts b/extension/src/patch.ts
@@ -104,7 +104,7 @@ const showUnauthorized = async () => {
     UserResponse.SHOW
   )
   if (response === UserResponse.SHOW) {
-    return commands.executeCommand(RegisteredCommands.CONNECT_SHOW)
+    return commands.executeCommand(RegisteredCommands.SETUP_SHOW)
   }
 }