Remove auto apply filters to experiment selection for plots (#3315)

Author: mattseddon

README.md

@@ -155,7 +155,6 @@ These are the VS Code [settings] available for the Extension:
 | `dvc.doNotShowWalkthroughAfterInstall` | Do not prompt to show the Get Started page after installing. Useful for pre-configured development environments                                          |
 | `dvc.doNotRecommendRedHatExtension`    | Do not prompt to install the Red Hat YAML extension, which helps with DVC YAML schema validation (`dvc.yaml` and `.dvc` files).                          |
 | `dvc.doNotShowCliUnavailable`          | Do not warn when the workspace contains a DVC project but the DVC binary is unavailable.                                                                 |
-| `dvc.doNotShowUnableToFilter`          | Do not warn before disabling auto-apply filters when these would result in too many experiments being selected.                                          |
 
 > **Note** that the `Setup The Workspace` command helps you set up the basic
 > ones at the [Workspace level] (saved to `.vscode/setting.json`).

extension/package.json

@@ -532,18 +532,6 @@
         "category": "DVC",
         "icon": "$(list-filter)"
       },
-      {
-        "title": "%command.views.experimentsTree.autoApplyFilters%",
-        "command": "dvc.views.experimentsTree.autoApplyFilters",
-        "category": "DVC",
-        "icon": "$(filter)"
-      },
-      {
-        "title": "%command.views.experimentsTree.disableAutoApplyFilters%",
-        "command": "dvc.views.experimentsTree.disableAutoApplyFilters",
-        "category": "DVC",
-        "icon": "$(close)"
-      },
       {
         "title": "%command.views.plotsPathsTree.selectPlots%",
         "command": "dvc.views.plotsPathsTree.selectPlots",
@@ -588,12 +576,6 @@
           "type": "boolean",
           "default": null
         },
-        "dvc.doNotShowUnableToFilter": {
-          "title": "%config.doNotShowUnableToFilter.title%",
-          "description": "%config.doNotShowUnableToFilter.description%",
-          "type": "boolean",
-          "default": null
-        },
         "dvc.dvcPath": {
           "title": "%config.dvcPath.title%",
           "description": "%config.dvcPath.description%",
@@ -919,14 +901,6 @@
           "command": "dvc.views.experimentsSortByTree.removeSort",
           "when": "false"
         },
-        {
-          "command": "dvc.views.experimentsTree.autoApplyFilters",
-          "when": "dvc.commands.available && dvc.project.available && !dvc.experiments.filter.selected"
-        },
-        {
-          "command": "dvc.views.experimentsTree.disableAutoApplyFilters",
-          "when": "dvc.commands.available && dvc.project.available && dvc.experiments.filter.selected"
-        },
         {
           "command": "dvc.views.experimentsTree.selectExperiments",
           "when": "dvc.commands.available && dvc.project.available"

extension/package.nls.json

@@ -66,8 +66,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",
-  "command.views.experimentsTree.autoApplyFilters": "Auto Apply Filters To Experiment Selection",
-  "command.views.experimentsTree.disableAutoApplyFilters": "Disable Auto Apply Filters To Experiment Selection",
   "command.views.experiments.applyExperiment": "Apply to Workspace",
   "command.views.experiments.branchExperiment": "Create new Branch",
   "command.views.experiments.queueExperiment": "Modify Param(s) and Queue",

extension/src/commands/external.ts

@@ -49,9 +49,7 @@ export enum RegisteredCliCommands {
 }
 
 export enum RegisteredCommands {
-  EXPERIMENT_AUTO_APPLY_FILTERS = 'dvc.views.experimentsTree.autoApplyFilters',
   EXPERIMENT_COLUMNS_SELECT = 'dvc.views.experimentsColumnsTree.selectColumns',
-  EXPERIMENT_DISABLE_AUTO_APPLY_FILTERS = 'dvc.views.experimentsTree.disableAutoApplyFilters',
   EXPERIMENT_FILTER_ADD = 'dvc.addExperimentsTableFilter',
   EXPERIMENT_FILTER_ADD_STARRED = 'dvc.addStarredExperimentsTableFilter',
   EXPERIMENT_FILTER_REMOVE = 'dvc.views.experimentsFilterByTree.removeFilter',

extension/src/experiments/commands/register.ts

@@ -340,18 +340,6 @@ export const registerExperimentCommands = (
   registerExperimentQuickPickCommands(experiments, internalCommands)
   registerExperimentRunCommands(experiments, internalCommands, setup)
 
-  internalCommands.registerExternalCommand(
-    RegisteredCommands.EXPERIMENT_AUTO_APPLY_FILTERS,
-    (context: Context) =>
-      experiments.autoApplyFilters(true, getDvcRootFromContext(context))
-  )
-
-  internalCommands.registerExternalCommand(
-    RegisteredCommands.EXPERIMENT_DISABLE_AUTO_APPLY_FILTERS,
-    (context: Context) =>
-      experiments.autoApplyFilters(false, getDvcRootFromContext(context))
-  )
-
   internalCommands.registerExternalCommand(
     RegisteredCommands.EXPERIMENT_TOGGLE,
     ({ dvcRoot, id }: ExperimentDetails) =>

extension/src/experiments/index.ts

@@ -21,14 +21,13 @@ import {
   pickFiltersToRemove
 } from './model/filterBy/quickPick'
 import { Color } from './model/status/colors'
-import { tooManySelected, UNSELECTED } from './model/status'
+import { UNSELECTED } from './model/status'
 import { starredSort } from './model/sortBy/constants'
 import { pickSortsToRemove, pickSortToAdd } from './model/sortBy/quickPick'
 import { ColumnsModel } from './columns/model'
 import { CheckpointsModel } from './checkpoints/model'
 import { ExperimentsData } from './data'
-import { askToDisableAutoApplyFilters } from './toast'
-import { Experiment, ColumnType, TableData, isQueued } from './webview/contract'
+import { Experiment, ColumnType, TableData } from './webview/contract'
 import { WebviewMessages } from './webview/messages'
 import { DecorationProvider } from './model/decorationProvider'
 import { starredFilter } from './model/filterBy/constants'
@@ -38,7 +37,6 @@ import { ExperimentsOutput, EXPERIMENT_WORKSPACE_ID } from '../cli/dvc/contract'
 import { ViewKey } from '../webview/constants'
 import { BaseRepository } from '../webview/repository'
 import { FileSystemData } from '../fileSystem/data'
-import { Response } from '../vscode/response'
 import { Title } from '../vscode/title'
 import { createTypedAccumulator } from '../util/object'
 import { pickPaths } from '../path/selection/quickPick'
@@ -305,12 +303,7 @@ export class Experiments extends BaseRepository<TableData> {
     return this.notifyChanged()
   }
 
-  public async removeFilter(id: string) {
-    const response = await this.checkAutoApplyFilters(id)
-    if (response === Response.CANCEL) {
-      return
-    }
-
+  public removeFilter(id: string) {
     if (this.experiments.removeFilter(id)) {
       return this.notifyChanged()
     }
@@ -323,11 +316,6 @@ export class Experiments extends BaseRepository<TableData> {
       return
     }
 
-    const response = await this.checkAutoApplyFilters(...filterIdsToRemove)
-    if (response === Response.CANCEL) {
-      return
-    }
-
     this.experiments.removeFilters(filterIdsToRemove)
     return this.notifyChanged()
   }
@@ -356,7 +344,6 @@ export class Experiments extends BaseRepository<TableData> {
       return
     }
 
-    this.experiments.setSelectionMode(false)
     this.experiments.setSelected(selected)
     return this.notifyChanged()
   }
@@ -373,22 +360,6 @@ export class Experiments extends BaseRepository<TableData> {
     return this.notifyChanged()
   }
 
-  public async autoApplyFilters(useFilters: boolean) {
-    this.experiments.setSelectionMode(useFilters)
-
-    if (useFilters) {
-      const filteredExperiments = this.experiments
-        .getUnfilteredExperiments()
-        .filter(exp => !isQueued(exp.status))
-      if (tooManySelected(filteredExperiments)) {
-        await this.warnAndDoNotAutoApply(filteredExperiments)
-      } else {
-        this.experiments.setSelected(filteredExperiments)
-      }
-      return this.notifyChanged()
-    }
-  }
-
   public pickExperiment() {
     return pickExperiment(
       this.experiments.getExperiments(),
@@ -593,34 +564,6 @@ export class Experiments extends BaseRepository<TableData> {
     return webviewMessages
   }
 
-  private async checkAutoApplyFilters(...filterIdsToRemove: string[]) {
-    if (this.experiments.canAutoApplyFilters(...filterIdsToRemove)) {
-      return
-    }
-
-    const response = await askToDisableAutoApplyFilters(
-      'Auto apply filters to experiment selection is currently active. Too many experiments would be selected by removing the selected filter(s), how would you like to proceed?',
-      Response.TURN_OFF
-    )
-    if (response !== Response.CANCEL) {
-      void this.autoApplyFilters(false)
-    }
-    return response
-  }
-
-  private async warnAndDoNotAutoApply(filteredExperiments: Experiment[]) {
-    this.experiments.setSelectionMode(false)
-
-    const response = await askToDisableAutoApplyFilters(
-      'Too many experiments would be selected by applying the current filter(s), how would you like to proceed?',
-      Response.SELECT_MOST_RECENT
-    )
-
-    if (response === Response.SELECT_MOST_RECENT) {
-      this.experiments.setSelected(filteredExperiments)
-    }
-  }
-
   private async getExperimentId(overrideId?: string) {
     if (overrideId) {
       return overrideId

extension/src/experiments/model/filterBy/tree.ts

@@ -128,10 +128,9 @@ export class ExperimentsFilterByTree
       return
     }
 
-    void this.experiments.getRepository(element).autoApplyFilters(false)
     const filters = await this.getChildren(element)
     for (const filter of filters) {
-      void this.removeFilter(filter as FilterItem)
+      this.removeFilter(filter as FilterItem)
     }
   }