Merge branch 'master' of https://github.com/iterative/vscode-dvc into…

… update-checkout-action

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2020-2021 Iterative, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

extension/package.json

@@ -112,11 +112,6 @@
         "category": "DVC",
         "icon": "$(trash)"
       },
-      {
-        "title": "%command.deselectDefaultProject%",
-        "command": "dvc.deselectDefaultProject",
-        "category": "DVC"
-      },
       {
         "title": "%command.experimentGarbageCollect%",
         "command": "dvc.experimentGarbageCollect",
@@ -237,11 +232,6 @@
         "category": "DVC",
         "icon": "$(notebook-revert)"
       },
-      {
-        "title": "%command.selectDefaultProject%",
-        "command": "dvc.selectDefaultProject",
-        "category": "DVC"
-      },
       {
         "title": "%command.selectForCompare%",
         "command": "dvc.selectForCompare",
@@ -299,12 +289,6 @@
     "configuration": {
       "title": "DVC",
       "properties": {
-        "dvc.defaultProject": {
-          "title": "%config.defaultProject.title%",
-          "description": "%config.defaultProject.description%",
-          "type": "string",
-          "default": null
-        },
         "dvc.dvcPath": {
           "title": "%config.dvcPath.title%",
           "description": "%config.dvcPath.description%",

extension/package.nls.json

@@ -14,7 +14,6 @@
   "command.copyFilePath": "Copy Path",
   "command.copyRelativeFilePath": "Copy Relative Path",
   "command.deleteTarget": "Delete",
-  "command.deselectDefaultProject": "Deselect Default Project",
   "command.experimentGarbageCollect": "Garbage Collect Experiments",
   "command.findInFolder": "Find in Folder...",
   "command.getStarted": "Get Started",
@@ -32,11 +31,10 @@
   "command.removeExperimentsTableSorts": "Remove Sort(s) From Experiments Table",
   "command.removeTarget": "Remove",
   "command.renameTarget": "Rename",
+  "command.resetWorkspace": "Reset the Workspace",
   "command.runExperiment": "Run Experiment",
   "command.runQueuedExperiments": "Run All Queued Experiments",
   "command.runResetExperiment": "Run and Reset Experiment",
-  "command.resetWorkspace": "Reset the Workspace",
-  "command.selectDefaultProject": "Select Default Project",
   "command.selectForCompare": "Select for Compare",
   "command.setupWorkspace": "Setup The Workspace",
   "command.showCommands": "Show Commands",
@@ -46,8 +44,6 @@
   "command.views.experimentsFilterByTree.removeFilter": "Remove Filter From Experiments Table",
   "command.views.experimentsSortByTree.removeAllSorts": "Remove All Sorts From Experiments Table",
   "command.views.experimentsSortByTree.removeSort": "Remove Sort From Experiments Table",
-  "config.defaultProject.description": "When enabled all generic commands will be run against this project.",
-  "config.defaultProject.title": "DVC Default Project",
   "config.dvcPath.description": "Call DVC from this path. Follows Python extension when blank.",
   "config.dvcPath.title": "DVC CLI Path",
   "config.noOpenUnsupported.description": "Do not attempt to open dvc tracked files that are not supported by the text editor.",

extension/src/commands/external.ts

@@ -35,9 +35,7 @@ export enum RegisteredCommands {
   EXPERIMENT_SORTS_REMOVE_ALL = 'dvc.views.experimentsSortByTree.removeAllSorts',
   STOP_EXPERIMENT = 'dvc.stopRunningExperiment',
 
-  EXTENSION_DESELECT_DEFAULT_PROJECT = 'dvc.deselectDefaultProject',
   EXTENSION_GET_STARTED = 'dvc.getStarted',
-  EXTENSION_SELECT_DEFAULT_PROJECT = 'dvc.selectDefaultProject',
   EXTENSION_SETUP_WORKSPACE = 'dvc.setupWorkspace',
   EXTENSION_SHOW_COMMANDS = 'dvc.showCommands',
 

extension/src/commands/internal.test.ts

@@ -3,9 +3,7 @@ import { ICli } from '../cli'
 import { Config } from '../config'
 import { OutputChannel } from '../vscode/outputChannel'
 
-const mockedConfig = {
-  getDefaultProject: jest.fn()
-} as unknown as Config
+const mockedConfig = {} as Config
 
 const mockedOutputChannel = {
   show: jest.fn()
@@ -33,7 +31,7 @@ describe('InternalCommands', () => {
     it('should throw an error if we try to re-register an existing command', () => {
       expect(() =>
         internalCommands.registerCommand(
-          AvailableCommands.GET_DEFAULT_OR_PICK_PROJECT,
+          AvailableCommands.GET_ONLY_OR_PICK_PROJECT,
           jest.fn()
         )
       ).toThrow()

extension/src/commands/internal.ts

@@ -16,7 +16,7 @@ type Command = (...args: Args) => unknown | Promise<unknown>
 
 export const AvailableCommands = Object.assign(
   {
-    GET_DEFAULT_OR_PICK_PROJECT: 'getDefaultOrPickProject',
+    GET_ONLY_OR_PICK_PROJECT: 'getOnlyOrPickProject',
     GET_THEME: 'getTheme'
   } as const,
   CliExecutorCommands,
@@ -40,15 +40,15 @@ export class InternalCommands {
     this.outputChannel = outputChannel
 
     this.registerCommand(
-      AvailableCommands.GET_DEFAULT_OR_PICK_PROJECT,
+      AvailableCommands.GET_ONLY_OR_PICK_PROJECT,
       (...dvcRoots: string[]) => {
         if (dvcRoots.length === 1) {
           return dvcRoots[0]
         }
 
-        return (
-          config.getDefaultProject() ||
-          quickPickOne(dvcRoots, 'Select which project to run command against')
+        return quickPickOne(
+          dvcRoots,
+          'Select which project to run command against'
         )
       }
     )

extension/src/config.ts

@@ -14,9 +14,7 @@ import {
   getOnDidChangePythonExecutionDetails,
   getPythonBinPath
 } from './extensions/python'
-import { QuickPickItemWithValue, quickPickValue } from './vscode/quickPick'
-import { getConfigValue, setConfigValue } from './vscode/config'
-import { definedAndNonEmpty } from './util/array'
+import { getConfigValue } from './vscode/config'
 
 export class Config {
   @observable
@@ -34,14 +32,11 @@ export class Config {
 
   private readonly executionDetailsChanged: EventEmitter<void>
 
-  private dvcRoots: string[] = []
-
   private readonly deferred = new Deferred()
   private readonly initialized = this.deferred.promise
 
   private dvcPathOption = 'dvc.dvcPath'
   private pythonPathOption = 'dvc.pythonPath'
-  private defaultProjectOption = 'dvc.defaultProject'
 
   constructor() {
     makeObservable(this)
@@ -64,10 +59,6 @@ export class Config {
     this.onDidConfigurationChange()
   }
 
-  public setDvcRoots(dvcRoots: string[]): void {
-    this.dvcRoots = dvcRoots
-  }
-
   public isReady() {
     return this.initialized
   }
@@ -83,20 +74,6 @@ export class Config {
     return getConfigValue(this.dvcPathOption)
   }
 
-  public getDefaultProject(): string {
-    return getConfigValue(this.defaultProjectOption)
-  }
-
-  public deselectDefaultProject = (): Thenable<void> =>
-    this.setDefaultProject(undefined)
-
-  public selectDefaultProject = async (): Promise<void> => {
-    const dvcRoot = await this.pickDefaultProject()
-    if (dvcRoot) {
-      this.setDefaultProject(dvcRoot)
-    }
-  }
-
   public isPythonExtensionUsed() {
     return !getConfigValue(this.pythonPathOption) && !!this.pythonBinPath
   }
@@ -149,44 +126,4 @@ export class Config {
       this.executionDetailsChanged.fire()
     }
   }
-
-  private getDefaultProjectOptions(
-    dvcRoots: string[]
-  ): QuickPickItemWithValue[] {
-    return [
-      {
-        description: 'Choose project each time a command is run',
-        label: 'Always prompt',
-        picked: true,
-        value: 'remove-default'
-      },
-      ...dvcRoots.map(dvcRoot => ({
-        description: dvcRoot,
-        label: 'Project',
-        value: dvcRoot
-      }))
-    ]
-  }
-
-  private async pickDefaultProject(): Promise<string | undefined> {
-    if (definedAndNonEmpty(this.dvcRoots)) {
-      const selected = await quickPickValue(
-        this.getDefaultProjectOptions(this.dvcRoots),
-        {
-          placeHolder: 'Select a default project to run all commands against'
-        }
-      )
-
-      if (selected === 'remove-default') {
-        this.deselectDefaultProject()
-        return
-      }
-
-      return selected
-    }
-  }
-
-  private setDefaultProject(path?: string): Thenable<void> {
-    return setConfigValue(this.defaultProjectOption, path)
-  }
 }