Switch ExperimentsParamsAndMetricsTree to string | ParamsAndMetrics…

…Item tree type (#700)

* move params and metrics tree to mixed type

* remove get param or metric methods where possible

* rework tree data type

* improve test

* improve test variable names

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/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) {