Add createTreeView wrapper

extension/src/experiments/index.ts

@@ -83,10 +83,6 @@ export class Experiments {
     return Object.keys(this.experiments)
   }
 
-  public getParamOrMetric(dvcRoot: string, path: string) {
-    return this.getRepository(dvcRoot).getParamOrMetric(path)
-  }
-
   public getChildParamsOrMetrics(dvcRoot: string, path: string) {
     return this.getRepository(dvcRoot).getChildParamsOrMetrics(path)
   }

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

@@ -6,12 +6,12 @@ import {
   TreeDataProvider,
   TreeItem,
   TreeItemCollapsibleState,
-  Uri,
-  window
+  Uri
 } from 'vscode'
 import { getFilterId } from '.'
 import { Experiments } from '../..'
 import { definedAndNonEmpty, flatten } from '../../../util/array'
+import { createTreeView } from '../../../vscode/tree'
 
 type FilterItem = {
   description: string
@@ -33,14 +33,7 @@ export class ExperimentsFilterByTree
     this.onDidChangeTreeData = experiments.experimentsChanged.event
 
     this.dispose.track(
-      window.createTreeView<string | FilterItem>(
-        'dvc.views.experimentsFilterByTree',
-        {
-          canSelectMany: true,
-          showCollapseAll: true,
-          treeDataProvider: this
-        }
-      )
+      createTreeView<FilterItem>('dvc.views.experimentsFilterByTree', this)
     )
 
     this.experiments = experiments

extension/src/experiments/paramsAndMetrics/model.ts

@@ -45,25 +45,20 @@ export class ParamsAndMetricsModel {
     return this.data.filter(paramOrMetric => !paramOrMetric.hasChildren)
   }
 
-  public getParamOrMetric(path: string) {
-    const paramOrMetric = this.data?.find(
-      paramOrMetric => paramOrMetric.path === path
-    )
-    if (paramOrMetric) {
-      return {
-        ...paramOrMetric,
-        descendantStatuses: this.getDescendantsStatuses(paramOrMetric.path),
-        status: this.status[paramOrMetric.path]
-      }
-    }
-  }
-
   public getChildren(path: string) {
-    return this.data?.filter(paramOrMetric =>
-      path
-        ? paramOrMetric.parentPath === path
-        : ['metrics', 'params'].includes(paramOrMetric.parentPath)
-    )
+    return this.data
+      ?.filter(paramOrMetric =>
+        path
+          ? paramOrMetric.parentPath === path
+          : ['metrics', 'params'].includes(paramOrMetric.parentPath)
+      )
+      .map(paramOrMetric => {
+        return {
+          ...paramOrMetric,
+          descendantStatuses: this.getDescendantsStatuses(paramOrMetric.path),
+          status: this.status[paramOrMetric.path]
+        }
+      })
   }
 
   public toggleStatus(path: string) {
@@ -90,6 +85,10 @@ export class ParamsAndMetricsModel {
     })
   }
 
+  private getParamOrMetric(path: string) {
+    return this.data?.find(paramOrMetric => paramOrMetric.path === path)
+  }
+
   private setAreParentsSelected(path: string) {
     const changed = this.getParamOrMetric(path)
     if (!changed) {