Fix table stories and data types (#4041)

mattseddon · web-flow · commit 69c26dbc0e34 · 2023-06-07T06:27:35.000+10:00
diff --git a/extension/src/cli/dvc/contract.ts b/extension/src/cli/dvc/contract.ts
@@ -62,7 +62,6 @@ export const fileHasError = (file: FileDataOrError): file is DvcError =>
 
 export const DEFAULT_EXP_SHOW_OUTPUT = [
   {
-    branch: undefined,
     rev: EXPERIMENT_WORKSPACE_ID
   }
 ]
@@ -97,13 +96,11 @@ export type ExecutorState = {
 export type ExpWithError = {
   rev: string
   name?: string
-  branch: string | undefined
 } & DvcError
 
 type ExpWithData = {
   rev: string
   name?: string
-  branch: string | undefined
   data: ExpData
 }
 
diff --git a/extension/src/cli/dvc/reader.test.ts b/extension/src/cli/dvc/reader.test.ts
@@ -97,7 +97,6 @@ describe('CliReader', () => {
       const cliOutput = await dvcReader.expShow(cwd)
       expect(cliOutput).toStrictEqual([
         {
-          branch: undefined,
           error: { msg: unexpectedStderr, type: 'Caught error' },
           rev: EXPERIMENT_WORKSPACE_ID
         }
@@ -111,9 +110,7 @@ describe('CliReader', () => {
       )
 
       const cliOutput = await dvcReader.expShow(cwd)
-      expect(cliOutput).toStrictEqual([
-        { branch: undefined, rev: EXPERIMENT_WORKSPACE_ID }
-      ])
+      expect(cliOutput).toStrictEqual([{ rev: EXPERIMENT_WORKSPACE_ID }])
     })
   })
 
diff --git a/extension/src/experiments/columns/collect/index.test.ts b/extension/src/experiments/columns/collect/index.test.ts
@@ -733,7 +733,6 @@ describe('collectRelativeMetricsFiles', () => {
     expect(
       collectRelativeMetricsFiles([
         {
-          branch: 'main',
           rev: EXPERIMENT_WORKSPACE_ID,
           error: { msg: 'I broke', type: 'not important' }
         }
diff --git a/extension/src/experiments/model/collect.ts b/extension/src/experiments/model/collect.ts
@@ -157,7 +157,7 @@ const collectExpState = (
   expState: ExpState,
   commitData: { [sha: string]: CommitData }
 ): Experiment | undefined => {
-  const { rev, name, branch } = expState
+  const { rev, name } = expState
   const label =
     rev === EXPERIMENT_WORKSPACE_ID
       ? EXPERIMENT_WORKSPACE_ID
@@ -168,7 +168,6 @@ const collectExpState = (
   const description: string | undefined = formatCommitMessage(commit?.message)
 
   const experiment: Experiment = {
-    branch,
     commit,
     description,
     id,
@@ -342,7 +341,6 @@ export const collectExperiments = (
     hasCheckpoints: hasCheckpoints(expShow),
     runningExperiments: [],
     workspace: {
-      branch: undefined,
       id: EXPERIMENT_WORKSPACE_ID,
       label: EXPERIMENT_WORKSPACE_ID
     }
diff --git a/extension/src/experiments/model/index.ts b/extension/src/experiments/model/index.ts
@@ -374,7 +374,7 @@ export class ExperimentsModel extends ModelWithPersistence {
     }
 
     return [
-      this.addDetails(this.workspace),
+      { branch: undefined, ...this.addDetails(this.workspace) },
       ...this.rowOrder.map(({ branch, sha }) => {
         const commit = { ...commitsBySha[sha], branch }
         const experiments = this.getExperimentsByCommit(commit)
diff --git a/extension/src/experiments/webview/contract.ts b/extension/src/experiments/webview/contract.ts
@@ -46,7 +46,7 @@ export type Experiment = {
   starred?: boolean
   status?: ExperimentStatus
   timestamp?: string | null
-  branch?: string
+  branch?: string | undefined
 }
 
 export const isRunning = (status: ExperimentStatus | undefined): boolean =>
diff --git a/extension/src/test/fixtures/expShow/base/output.ts b/extension/src/test/fixtures/expShow/base/output.ts
@@ -14,7 +14,6 @@ export const ERROR_SHAS = [
 
 const data: ExpShowOutput = [
   {
-    branch: 'main',
     rev: EXPERIMENT_WORKSPACE_ID,
     data: {
       rev: EXPERIMENT_WORKSPACE_ID,
@@ -123,7 +122,6 @@ const data: ExpShowOutput = [
     }
   },
   {
-    branch: 'main',
     rev: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77',
     name: 'main',
     data: {
@@ -236,7 +234,6 @@ const data: ExpShowOutput = [
         name: 'exp-e7a67',
         revs: [
           {
-            branch: 'main',
             rev: '4fb124aebddb2adf1545030907687fa9a4c80e70',
             name: 'exp-e7a67',
             data: {
@@ -356,7 +353,6 @@ const data: ExpShowOutput = [
         name: 'test-branch',
         revs: [
           {
-            branch: 'main',
             rev: '42b8736b08170529903cd203a1f40382a4b4a8cd',
             name: 'test-branch',
             data: {
@@ -472,7 +468,6 @@ const data: ExpShowOutput = [
         name: 'exp-83425',
         revs: [
           {
-            branch: 'main',
             rev: EXPERIMENT_WORKSPACE_ID,
             name: 'exp-83425',
             data: {
@@ -591,7 +586,6 @@ const data: ExpShowOutput = [
       {
         revs: [
           {
-            branch: 'main',
             rev: ERROR_SHAS[0],
             error: {
               type: 'YAMLFileCorruptedError',
@@ -605,7 +599,6 @@ const data: ExpShowOutput = [
         name: 'exp-f13bca',
         revs: [
           {
-            branch: 'main',
             rev: ERROR_SHAS[1],
             name: 'exp-f13bca',
             data: {
@@ -718,7 +711,6 @@ const data: ExpShowOutput = [
       {
         revs: [
           {
-            branch: 'main',
             rev: '90aea7f2482117a55dfcadcdb901aaa6610fbbc9',
             data: {
               rev: '90aea7f2482117a55dfcadcdb901aaa6610fbbc9',
@@ -833,7 +825,6 @@ const data: ExpShowOutput = [
       {
         revs: [
           {
-            branch: 'main',
             rev: ERROR_SHAS[2],
             data: {
               rev: ERROR_SHAS[2],
@@ -916,7 +907,6 @@ const data: ExpShowOutput = [
     ]
   },
   {
-    branch: 'main',
     rev: 'fe2919bb4394b30494bea905c253e10077b9a1bd',
     data: {
       rev: 'fe2919bb4394b30494bea905c253e10077b9a1bd',
@@ -1025,7 +1015,6 @@ const data: ExpShowOutput = [
     }
   },
   {
-    branch: 'main',
     rev: '7df876cb5147800cd3e489d563bc6dcd67188621',
     data: {
       rev: '7df876cb5147800cd3e489d563bc6dcd67188621',
diff --git a/extension/src/test/fixtures/expShow/base/rows.ts b/extension/src/test/fixtures/expShow/base/rows.ts
@@ -17,7 +17,7 @@ const colorsList = copyOriginalColors()
 
 const rowsFixture: Commit[] = [
   {
-    branch: 'main',
+    branch: undefined,
     commit: undefined,
     description: undefined,
     deps: {
diff --git a/extension/src/test/fixtures/expShow/dataTypes/output.ts b/extension/src/test/fixtures/expShow/dataTypes/output.ts
@@ -5,7 +5,6 @@ import {
 
 const data: ExpShowOutput = [
   {
-    branch: 'main',
     data: {
       deps: null,
       meta: { has_checkpoints: false },
@@ -31,7 +30,6 @@ const data: ExpShowOutput = [
     rev: EXPERIMENT_WORKSPACE_ID
   },
   {
-    branch: 'main',
     data: {
       deps: null,
       meta: { has_checkpoints: false },
diff --git a/extension/src/test/fixtures/expShow/dataTypes/rows.ts b/extension/src/test/fixtures/expShow/dataTypes/rows.ts
@@ -3,7 +3,7 @@ import { Commit } from '../../../../experiments/webview/contract'
 
 const data: Commit[] = [
   {
-    branch: 'main',
+    branch: undefined,
     displayColor: undefined,
     id: EXPERIMENT_WORKSPACE_ID,
     label: EXPERIMENT_WORKSPACE_ID,
diff --git a/extension/src/test/fixtures/expShow/deeplyNested/output.ts b/extension/src/test/fixtures/expShow/deeplyNested/output.ts
@@ -5,7 +5,6 @@ import {
 
 const data: ExpShowOutput = [
   {
-    branch: 'main',
     rev: EXPERIMENT_WORKSPACE_ID,
     data: {
       deps: null,
@@ -38,7 +37,6 @@ const data: ExpShowOutput = [
     }
   },
   {
-    branch: 'main',
     rev: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77',
     data: {
       deps: null,
diff --git a/extension/src/test/fixtures/expShow/deeplyNested/rows.ts b/extension/src/test/fixtures/expShow/deeplyNested/rows.ts
@@ -2,7 +2,7 @@ import { EXPERIMENT_WORKSPACE_ID } from '../../../../cli/dvc/contract'
 
 export const data = [
   {
-    branch: 'main',
+    branch: undefined,
     id: EXPERIMENT_WORKSPACE_ID,
     label: EXPERIMENT_WORKSPACE_ID,
     params: {
diff --git a/extension/src/test/fixtures/expShow/survival/output.ts b/extension/src/test/fixtures/expShow/survival/output.ts
@@ -7,7 +7,6 @@ import { join } from '../../../util/path'
 // https://dagshub.com/kingabzpro/kaggle-titanic-dvc
 const data: ExpShowOutput = [
   {
-    branch: 'main',
     rev: EXPERIMENT_WORKSPACE_ID,
     data: {
       rev: EXPERIMENT_WORKSPACE_ID,
@@ -312,7 +311,6 @@ const data: ExpShowOutput = [
     }
   },
   {
-    branch: 'main',
     rev: '3d5adcb974bb2c85917a5d61a489b933adaa2b7f',
     data: {
       meta: { has_checkpoints: false },
@@ -618,7 +616,6 @@ const data: ExpShowOutput = [
     name: 'main'
   },
   {
-    branch: 'main',
     rev: 'a49e03966a1f9f1299ec222ebc4bed8625d2c54d',
     data: {
       rev: 'a49e03966a1f9f1299ec222ebc4bed8625d2c54d',
@@ -923,7 +920,6 @@ const data: ExpShowOutput = [
     }
   },
   {
-    branch: 'main',
     rev: '4f7b50c3d171a11b6cfcd04416a16fc80b61018d',
     data: {
       rev: '4f7b50c3d171a11b6cfcd04416a16fc80b61018d',
diff --git a/extension/src/test/fixtures/expShow/survival/rows.ts b/extension/src/test/fixtures/expShow/survival/rows.ts
@@ -4,7 +4,7 @@ import { EXPERIMENT_WORKSPACE_ID } from '../../../../cli/dvc/contract'
 
 const data: Commit[] = [
   {
-    branch: 'main',
+    branch: undefined,
     id: EXPERIMENT_WORKSPACE_ID,
     label: EXPERIMENT_WORKSPACE_ID,
     metrics: {
diff --git a/extension/src/test/fixtures/expShow/uncommittedDeps/output.ts b/extension/src/test/fixtures/expShow/uncommittedDeps/output.ts
@@ -5,7 +5,6 @@ import {
 
 const data: ExpShowOutput = [
   {
-    branch: 'main',
     rev: EXPERIMENT_WORKSPACE_ID,
     data: {
       meta: { has_checkpoints: false },
@@ -64,7 +63,6 @@ const data: ExpShowOutput = [
     }
   },
   {
-    branch: 'main',
     rev: '852d4fbd10638ceca4de50ee68d6125b2915f23b',
     data: {
       deps: null,
diff --git a/extension/src/test/util/experiments.ts b/extension/src/test/util/experiments.ts
@@ -25,7 +25,6 @@ const generateTestExpState = (
   data: Partial<ExpData> = {},
   name?: string
 ): ExpState => ({
-  branch: 'main',
   data: generateTestExpData({ ...data, rev }),
   name,
   rev
diff --git a/webview/src/stories/Table.stories.tsx b/webview/src/stories/Table.stories.tsx
diff --git a/webview/src/stories/util.ts b/webview/src/stories/util.ts

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ export const fileHasError = (file: FileDataOrError): file is DvcError =>`
`62`	`62`
`63`	`63`	`export const DEFAULT_EXP_SHOW_OUTPUT = [`
`64`	`64`	`{`
`65`		`- branch: undefined,`
`66`	`65`	`rev: EXPERIMENT_WORKSPACE_ID`
`67`	`66`	`}`
`68`	`67`	`]`
`@@ -97,13 +96,11 @@ export type ExecutorState = {`
`97`	`96`	`export type ExpWithError = {`
`98`	`97`	`rev: string`
`99`	`98`	`name?: string`
`100`		`- branch: string \| undefined`
`101`	`99`	`} & DvcError`
`102`	`100`
`103`	`101`	`type ExpWithData = {`
`104`	`102`	`rev: string`
`105`	`103`	`name?: string`
`106`		`- branch: string \| undefined`
`107`	`104`	`data: ExpData`
`108`	`105`	`}`
`109`	`106`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,6 @@ describe('CliReader', () => {`
`97`	`97`	`const cliOutput = await dvcReader.expShow(cwd)`
`98`	`98`	`expect(cliOutput).toStrictEqual([`
`99`	`99`	`{`
`100`		`- branch: undefined,`
`101`	`100`	`error: { msg: unexpectedStderr, type: 'Caught error' },`
`102`	`101`	`rev: EXPERIMENT_WORKSPACE_ID`
`103`	`102`	`}`
`@@ -111,9 +110,7 @@ describe('CliReader', () => {`
`111`	`110`	`)`
`112`	`111`
`113`	`112`	`const cliOutput = await dvcReader.expShow(cwd)`
`114`		`- expect(cliOutput).toStrictEqual([`
`115`		`- { branch: undefined, rev: EXPERIMENT_WORKSPACE_ID }`
`116`		`- ])`
	`113`	`+ expect(cliOutput).toStrictEqual([{ rev: EXPERIMENT_WORKSPACE_ID }])`
`117`	`114`	`})`
`118`	`115`	`})`
`119`	`116`
Original file line number	Diff line number	Diff line change
`@@ -733,7 +733,6 @@ describe('collectRelativeMetricsFiles', () => {`
`733`	`733`	`expect(`
`734`	`734`	`collectRelativeMetricsFiles([`
`735`	`735`	`{`
`736`		`- branch: 'main',`
`737`	`736`	`rev: EXPERIMENT_WORKSPACE_ID,`
`738`	`737`	`error: { msg: 'I broke', type: 'not important' }`
`739`	`738`	`}`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ export class ExperimentsModel extends ModelWithPersistence {`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`return [`
`377`		`- this.addDetails(this.workspace),`
	`377`	`+ { branch: undefined, ...this.addDetails(this.workspace) },`
`378`	`378`	`...this.rowOrder.map(({ branch, sha }) => {`
`379`	`379`	`const commit = { ...commitsBySha[sha], branch }`
`380`	`380`	`const experiments = this.getExperimentsByCommit(commit)`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export type Experiment = {`
`46`	`46`	`starred?: boolean`
`47`	`47`	`status?: ExperimentStatus`
`48`	`48`	`timestamp?: string \| null`
`49`		`- branch?: string`
	`49`	`+ branch?: string \| undefined`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`export const isRunning = (status: ExperimentStatus \| undefined): boolean =>`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ export const ERROR_SHAS = [`
`14`	`14`
`15`	`15`	`const data: ExpShowOutput = [`
`16`	`16`	`{`
`17`		`- branch: 'main',`
`18`	`17`	`rev: EXPERIMENT_WORKSPACE_ID,`
`19`	`18`	`data: {`
`20`	`19`	`rev: EXPERIMENT_WORKSPACE_ID,`
`@@ -123,7 +122,6 @@ const data: ExpShowOutput = [`
`123`	`122`	`}`
`124`	`123`	`},`
`125`	`124`	`{`
`126`		`- branch: 'main',`
`127`	`125`	`rev: '53c3851f46955fa3e2b8f6e1c52999acc8c9ea77',`
`128`	`126`	`name: 'main',`
`129`	`127`	`data: {`
`@@ -236,7 +234,6 @@ const data: ExpShowOutput = [`
`236`	`234`	`name: 'exp-e7a67',`
`237`	`235`	`revs: [`
`238`	`236`	`{`
`239`		`- branch: 'main',`
`240`	`237`	`rev: '4fb124aebddb2adf1545030907687fa9a4c80e70',`
`241`	`238`	`name: 'exp-e7a67',`
`242`	`239`	`data: {`
`@@ -356,7 +353,6 @@ const data: ExpShowOutput = [`
`356`	`353`	`name: 'test-branch',`
`357`	`354`	`revs: [`
`358`	`355`	`{`
`359`		`- branch: 'main',`
`360`	`356`	`rev: '42b8736b08170529903cd203a1f40382a4b4a8cd',`
`361`	`357`	`name: 'test-branch',`
`362`	`358`	`data: {`
`@@ -472,7 +468,6 @@ const data: ExpShowOutput = [`
`472`	`468`	`name: 'exp-83425',`
`473`	`469`	`revs: [`
`474`	`470`	`{`
`475`		`- branch: 'main',`
`476`	`471`	`rev: EXPERIMENT_WORKSPACE_ID,`
`477`	`472`	`name: 'exp-83425',`
`478`	`473`	`data: {`
`@@ -591,7 +586,6 @@ const data: ExpShowOutput = [`
`591`	`586`	`{`
`592`	`587`	`revs: [`
`593`	`588`	`{`
`594`		`- branch: 'main',`
`595`	`589`	`rev: ERROR_SHAS[0],`
`596`	`590`	`error: {`
`597`	`591`	`type: 'YAMLFileCorruptedError',`
`@@ -605,7 +599,6 @@ const data: ExpShowOutput = [`
`605`	`599`	`name: 'exp-f13bca',`
`606`	`600`	`revs: [`
`607`	`601`	`{`
`608`		`- branch: 'main',`
`609`	`602`	`rev: ERROR_SHAS[1],`
`610`	`603`	`name: 'exp-f13bca',`
`611`	`604`	`data: {`
`@@ -718,7 +711,6 @@ const data: ExpShowOutput = [`
`718`	`711`	`{`
`719`	`712`	`revs: [`
`720`	`713`	`{`
`721`		`- branch: 'main',`
`722`	`714`	`rev: '90aea7f2482117a55dfcadcdb901aaa6610fbbc9',`
`723`	`715`	`data: {`
`724`	`716`	`rev: '90aea7f2482117a55dfcadcdb901aaa6610fbbc9',`
`@@ -833,7 +825,6 @@ const data: ExpShowOutput = [`
`833`	`825`	`{`
`834`	`826`	`revs: [`
`835`	`827`	`{`
`836`		`- branch: 'main',`
`837`	`828`	`rev: ERROR_SHAS[2],`
`838`	`829`	`data: {`
`839`	`830`	`rev: ERROR_SHAS[2],`
`@@ -916,7 +907,6 @@ const data: ExpShowOutput = [`
`916`	`907`	`]`
`917`	`908`	`},`
`918`	`909`	`{`
`919`		`- branch: 'main',`
`920`	`910`	`rev: 'fe2919bb4394b30494bea905c253e10077b9a1bd',`
`921`	`911`	`data: {`
`922`	`912`	`rev: 'fe2919bb4394b30494bea905c253e10077b9a1bd',`
`@@ -1025,7 +1015,6 @@ const data: ExpShowOutput = [`
`1025`	`1015`	`}`
`1026`	`1016`	`},`
`1027`	`1017`	`{`
`1028`		`- branch: 'main',`
`1029`	`1018`	`rev: '7df876cb5147800cd3e489d563bc6dcd67188621',`
`1030`	`1019`	`data: {`
`1031`	`1020`	`rev: '7df876cb5147800cd3e489d563bc6dcd67188621',`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ const colorsList = copyOriginalColors()`
`17`	`17`
`18`	`18`	`const rowsFixture: Commit[] = [`
`19`	`19`	`{`
`20`		`- branch: 'main',`
	`20`	`+ branch: undefined,`
`21`	`21`	`commit: undefined,`
`22`	`22`	`description: undefined,`
`23`	`23`	`deps: {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ import {`
`5`	`5`
`6`	`6`	`const data: ExpShowOutput = [`
`7`	`7`	`{`
`8`		`- branch: 'main',`
`9`	`8`	`data: {`
`10`	`9`	`deps: null,`
`11`	`10`	`meta: { has_checkpoints: false },`
`@@ -31,7 +30,6 @@ const data: ExpShowOutput = [`
`31`	`30`	`rev: EXPERIMENT_WORKSPACE_ID`
`32`	`31`	`},`
`33`	`32`	`{`
`34`		`- branch: 'main',`
`35`	`33`	`data: {`
`36`	`34`	`deps: null,`
`37`	`35`	`meta: { has_checkpoints: false },`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { Commit } from '../../../../experiments/webview/contract'`
`3`	`3`
`4`	`4`	`const data: Commit[] = [`
`5`	`5`	`{`
`6`		`- branch: 'main',`
	`6`	`+ branch: undefined,`
`7`	`7`	`displayColor: undefined,`
`8`	`8`	`id: EXPERIMENT_WORKSPACE_ID,`
`9`	`9`	`label: EXPERIMENT_WORKSPACE_ID,`