Update collection of files which trigger exp show updates (#4564)

Author: mattseddon

extension/src/experiments/data/collect.test.ts

@@ -6,9 +6,13 @@ import { generateTestExpShowOutput } from '../../test/util/experiments'
 
 describe('collectFiles', () => {
   it('should collect all of the available files from the test fixture', () => {
-    expect(collectFiles(expShowFixture, [])).toStrictEqual([
-      'params.yaml',
+    const files = collectFiles(expShowFixture, [])
+    files.sort()
+
+    expect(files).toStrictEqual([
+      'metrics.json',
       join('nested', 'params.yaml'),
+      'params.yaml',
       'summary.json'
     ])
   })
@@ -80,9 +84,12 @@ describe('collectFiles', () => {
       }
     })
 
+    const files = collectFiles(workspaceOnly, ['dvclive.json'])
+    files.sort()
+
     expect(collectFiles(workspaceOnly, ['dvclive.json'])).toStrictEqual([
-      'params.yaml',
-      'dvclive.json'
+      'dvclive.json',
+      'params.yaml'
     ])
   })
 })

extension/src/experiments/data/collect.ts

@@ -1,7 +1,29 @@
-import { ExpShowOutput } from '../../cli/dvc/contract'
-import { uniqueValues } from '../../util/array'
+import { ExpData, ExpShowOutput, MetricsOrParams } from '../../cli/dvc/contract'
 import { getExpData } from '../columns/collect'
 
+const collectFilesFromKeys = (
+  acc: Set<string>,
+  metricsOrParams: MetricsOrParams | null | undefined
+): void => {
+  for (const file of Object.keys(metricsOrParams || {})) {
+    if (!file) {
+      continue
+    }
+    acc.add(file)
+  }
+}
+
+const collectFilesFromExperiment = (
+  acc: Set<string>,
+  data: ExpData | undefined
+) => {
+  if (!data) {
+    return
+  }
+  collectFilesFromKeys(acc, data.params)
+  collectFilesFromKeys(acc, data.metrics)
+}
+
 export const collectFiles = (
   output: ExpShowOutput,
   existingFiles: string[]
@@ -10,17 +32,25 @@ export const collectFiles = (
     return existingFiles
   }
 
-  const [workspace] = output
+  const acc = new Set(existingFiles)
 
-  const data = getExpData(workspace)
+  for (const commit of output) {
+    const data = getExpData(commit)
+    collectFilesFromExperiment(acc, data)
+
+    const { experiments } = commit
+
+    if (!experiments?.length) {
+      continue
+    }
+
+    for (const { revs } of experiments) {
+      const [experiment] = revs
+      collectFilesFromExperiment(acc, getExpData(experiment))
+    }
+  }
 
-  return uniqueValues([
-    ...Object.keys({
-      ...data?.params,
-      ...data?.metrics
-    }).filter(Boolean),
-    ...existingFiles
-  ])
+  return [...acc]
 }
 
 const isCurrentBranch = (branch: string) => branch.indexOf('*') === 0