Remove garbage collect experiments (#4104)

Author: mattseddon

extension/package.json

@@ -200,11 +200,6 @@
         "category": "DVC",
         "icon": "$(discard)"
       },
-      {
-        "title": "Garbage Collect Experiments",
-        "command": "dvc.experimentGarbageCollect",
-        "category": "DVC"
-      },
       {
         "title": "Find in Folder...",
         "command": "dvc.findInFolder",
@@ -740,10 +735,6 @@
           "command": "dvc.deleteTarget",
           "when": "false"
         },
-        {
-          "command": "dvc.experimentGarbageCollect",
-          "when": "dvc.commands.available && dvc.project.available && !dvc.experiment.running.workspace"
-        },
         {
           "command": "dvc.findInFolder",
           "when": "false"

extension/src/cli/dvc/constants.ts

@@ -94,22 +94,14 @@ export enum ExperimentFlag {
   REV = '--rev'
 }
 
-export enum GcPreserveFlag {
-  ALL_BRANCHES = '--all-branches',
-  ALL_TAGS = '--all-tags',
-  ALL_COMMITS = '--all-commits',
-  QUEUED = '--queued',
-  WORKSPACE = '--workspace'
-}
-
 export enum ConfigKey {
   STUDIO_TOKEN = 'studio.token',
   STUDIO_OFFLINE = 'studio.offline'
 }
 
 type Target = string
 
-type Flags = Flag | ExperimentFlag | GcPreserveFlag
+type Flags = Flag | ExperimentFlag
 
 export type Args = (
   | Command

extension/src/cli/dvc/executor.test.ts

@@ -1,7 +1,7 @@
 import { join } from 'path'
 import { EventEmitter } from 'vscode'
 import { Disposable, Disposer } from '@hediet/std/disposable'
-import { Flag, GcPreserveFlag, UNEXPECTED_ERROR_CODE } from './constants'
+import { Flag, UNEXPECTED_ERROR_CODE } from './constants'
 import { DvcExecutor } from './executor'
 import { CliResult, CliStarted } from '..'
 import { createProcess } from '../../process/execution'
@@ -278,31 +278,6 @@ describe('CliExecutor', () => {
     })
   })
 
-  describe('expGarbageCollect', () => {
-    it('should call createProcess with the correct parameters to garbage collect experiments', async () => {
-      const cwd = __dirname
-      const stdout =
-        'WARNING: This will remove all experiments except those derived from the workspace of the current repo. ' +
-        'Run queued experiments will be preserved. Run queued experiments will be removed.\n' +
-        "Removed 45 experiments. To remove unused cache files use 'dvc gc'. "
-      mockedCreateProcess.mockReturnValueOnce(getMockedProcess(stdout))
-
-      const output = await dvcExecutor.expGarbageCollect(
-        cwd,
-        GcPreserveFlag.WORKSPACE,
-        GcPreserveFlag.QUEUED
-      )
-      expect(output).toStrictEqual(stdout)
-
-      expect(mockedCreateProcess).toHaveBeenCalledWith({
-        args: ['exp', 'gc', '-f', '--workspace', '--queued'],
-        cwd,
-        env: mockedEnv,
-        executable: 'dvc'
-      })
-    })
-  })
-
   describe('expPush', () => {
     it('should call createProcess with the correct parameters to push an existing experiment to the remote', async () => {
       const cwd = __dirname

extension/src/cli/dvc/executor.ts

@@ -5,7 +5,6 @@ import {
   ExperimentFlag,
   ExperimentSubCommand,
   Flag,
-  GcPreserveFlag,
   QueueSubCommand
 } from './constants'
 import { typeCheckCommands } from '..'
@@ -18,7 +17,6 @@ export const autoRegisteredCommands = {
   COMMIT: 'commit',
   EXP_APPLY: 'expApply',
   EXP_BRANCH: 'expBranch',
-  EXP_GARBAGE_COLLECT: 'expGarbageCollect',
   EXP_PUSH: 'expPush',
   EXP_QUEUE: 'expRunQueue',
   EXP_REMOVE: 'expRemove',
@@ -71,15 +69,6 @@ export class DvcExecutor extends DvcCli {
     )
   }
 
-  public expGarbageCollect(cwd: string, ...preserveFlags: GcPreserveFlag[]) {
-    return this.executeExperimentProcess(
-      cwd,
-      ExperimentSubCommand.GARBAGE_COLLECT,
-      Flag.FORCE,
-      ...preserveFlags
-    )
-  }
-
   public expPush(cwd: string, ...ids: string[]) {
     return this.executeExperimentProcess(
       cwd,

extension/src/experiments/commands/register.ts

@@ -1,5 +1,4 @@
 import { getBranchExperimentCommand, getPushExperimentCommand } from '.'
-import { pickGarbageCollectionFlags } from '../quickPick'
 import { WorkspaceExperiments } from '../workspace'
 import { AvailableCommands, InternalCommands } from '../../commands/internal'
 import {
@@ -147,15 +146,6 @@ const registerExperimentQuickPickCommands = (
   internalCommands: InternalCommands,
   setup: Setup
 ): void => {
-  internalCommands.registerExternalCliCommand(
-    RegisteredCliCommands.EXPERIMENT_GARBAGE_COLLECT,
-    () =>
-      experiments.getCwdAndQuickPickThenRun(
-        AvailableCommands.EXP_GARBAGE_COLLECT,
-        pickGarbageCollectionFlags
-      )
-  )
-
   internalCommands.registerExternalCommand(
     RegisteredCommands.EXPERIMENT_FILTER_ADD,
     (context: Context) => experiments.addFilter(getDvcRootFromContext(context))

extension/src/experiments/quickPick.test.ts

@@ -104,26 +104,26 @@ export const deleteAllExistingExperiments = async () => {
   const workbench = await browser.getWorkbench()
 
   const deleteNonWorkspaceExperiments = await workbench.executeCommand(
-    'DVC: Garbage Collect Experiments'
+    'DVC: Remove Experiment(s)'
   )
-  await browser.waitUntil(() =>
-    deleteNonWorkspaceExperiments.elem.isDisplayed()
-  )
-  await browser.keys('Enter')
 
-  const deleteAllNonTagExperiments = await workbench.executeCommand(
-    'DVC: Garbage Collect Experiments'
-  )
+  try {
+    await browser.waitUntil(() =>
+      deleteNonWorkspaceExperiments.elem.isDisplayed()
+    )
 
-  await browser.waitUntil(() => deleteAllNonTagExperiments.elem.isDisplayed())
+    await browser
+      .action('key')
+      .down(Key.Shift)
+      .down(Key.Tab)
+      .up(Key.Tab)
+      .up(Key.Shift)
+      .perform()
 
-  const tagOption = 'tags'
-  await browser.keys([...tagOption, 'ArrowDown', 'Space', 'ArrowUp'])
-  for (let i = 0; i < tagOption.length; i++) {
-    await browser.keys('Backspace')
-  }
-  await browser.keys(['w', 'o', 'ArrowDown', 'Space'])
-  return browser.keys('Enter')
+    await browser.keys('Space')
+
+    return browser.keys('Enter')
+  } catch {}
 }
 
 export const runModifiedExperiment = async () => {