Skip to content

Commit bb10bcc

Browse files
mattseddonmattseddon
authored
Fix view/title commands (#2439)
1 parent 998d3f3 commit bb10bcc

File tree

7 files changed

+38
-79
lines changed

7 files changed

+38
-79
lines changed

‎extension/package.json‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,46 +1054,16 @@
10541054
"group": "7_modification@2",
10551055
"when": "view == dvc.views.trackedExplorerTree && viewItem =~ /^.*Data$/ && !dvc.scm.command.running"
10561056
},
1057-
{
1058-
"command": "dvc.addExperimentsTableSort",
1059-
"group": "inline",
1060-
"when": "view == dvc.views.experimentsSortByTree && dvc.commands.available && viewItem == dvcRoot"
1061-
},
1062-
{
1063-
"command": "dvc.addStarredExperimentsTableSort",
1064-
"group": "inline",
1065-
"when": "view == dvc.views.experimentsSortByTree && dvc.commands.available && viewItem == dvcRoot"
1066-
},
10671057
{
10681058
"command": "dvc.views.experimentsSortByTree.removeSort",
10691059
"group": "inline",
10701060
"when": "view == dvc.views.experimentsSortByTree && dvc.commands.available && viewItem != dvcRoot"
10711061
},
1072-
{
1073-
"command": "dvc.views.experimentsSortByTree.removeAllSorts",
1074-
"group": "inline",
1075-
"when": "view == dvc.views.experimentsSortByTree && dvc.commands.available && viewItem == dvcRoot"
1076-
},
1077-
{
1078-
"command": "dvc.addExperimentsTableFilter",
1079-
"group": "inline",
1080-
"when": "view == dvc.views.experimentsFilterByTree && dvc.commands.available && viewItem == dvcRoot"
1081-
},
1082-
{
1083-
"command": "dvc.addStarredExperimentsTableFilter",
1084-
"group": "inline",
1085-
"when": "view == dvc.views.experimentsFilterByTree && dvc.commands.available && viewItem == dvcRoot"
1086-
},
10871062
{
10881063
"command": "dvc.views.experimentsFilterByTree.removeFilter",
10891064
"group": "inline",
10901065
"when": "view == dvc.views.experimentsFilterByTree && dvc.commands.available && viewItem != dvcRoot"
10911066
},
1092-
{
1093-
"command": "dvc.views.experimentsFilterByTree.removeAllFilters",
1094-
"group": "inline",
1095-
"when": "view == dvc.views.experimentsFilterByTree && dvc.commands.available && viewItem == dvcRoot"
1096-
},
10971067
{
10981068
"command": "dvc.views.experiments.applyExperiment",
10991069
"group": "inline@1",
@@ -1138,31 +1108,6 @@
11381108
"command": "dvc.views.experiments.queueExperiment",
11391109
"group": "2_modify@3",
11401110
"when": "view == dvc.views.experimentsTree && dvc.commands.available && viewItem =~ /^(workspace|branch|experiment|queued)$/ && !dvc.experiment.running"
1141-
},
1142-
{
1143-
"command": "dvc.views.experimentsTree.selectExperiments",
1144-
"group": "inline",
1145-
"when": "view == dvc.views.experimentsTree && dvc.commands.available && viewItem == dvcRoot"
1146-
},
1147-
{
1148-
"command": "dvc.views.experimentsTree.autoApplyFilters",
1149-
"group": "inline",
1150-
"when": "view == dvc.views.experimentsTree && dvc.commands.available && !dvc.experiments.filter.selected && viewItem == dvcRoot"
1151-
},
1152-
{
1153-
"command": "dvc.views.experimentsTree.disableAutoApplyFilters",
1154-
"group": "inline",
1155-
"when": "view == dvc.views.experimentsTree && dvc.commands.available && dvc.experiments.filter.selected && viewItem == dvcRoot"
1156-
},
1157-
{
1158-
"command": "dvc.views.plotsPathsTree.selectPlots",
1159-
"group": "inline",
1160-
"when": "view == dvc.views.plotsPathsTree && dvc.commands.available && viewItem == dvcRoot"
1161-
},
1162-
{
1163-
"command": "dvc.views.plotsPathsTree.refreshPlots",
1164-
"group": "inline",
1165-
"when": "view == dvc.views.plotsPathsTree && dvc.commands.available && viewItem == dvcRoot"
11661111
}
11671112
],
11681113
"view/title": [
@@ -1191,11 +1136,6 @@
11911136
"when": "view == dvc.views.experimentsColumnsTree",
11921137
"group": "navigation@2"
11931138
},
1194-
{
1195-
"command": "dvc.views.experimentsColumnsTree.selectColumns",
1196-
"group": "inline",
1197-
"when": "view == dvc.views.experimentsColumnsTree && dvc.commands.available && viewItem == dvcRoot"
1198-
},
11991139
{
12001140
"command": "dvc.runExperiment",
12011141
"when": "view == dvc.views.experimentsTree && !dvc.experiments.webviewActive && !dvc.experiment.running && !dvc.experiment.checkpoints",

‎extension/src/experiments/commands/register.ts‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
RegisteredCommands
1212
} from '../../commands/external'
1313
import { Title } from '../../vscode/title'
14+
import { Context, getDvcRootFromContext } from '../../vscode/context'
1415

1516
type ExperimentDetails = { dvcRoot: string; id: string }
1617

@@ -230,12 +231,13 @@ const registerExperimentQuickPickCommands = (
230231

231232
internalCommands.registerExternalCommand(
232233
RegisteredCommands.EXPERIMENT_FILTER_ADD,
233-
(dvcRoot?: string) => experiments.addFilter(dvcRoot)
234+
(context: Context) => experiments.addFilter(getDvcRootFromContext(context))
234235
)
235236

236237
internalCommands.registerExternalCommand(
237238
RegisteredCommands.EXPERIMENT_FILTER_ADD_STARRED,
238-
(dvcRoot?: string) => experiments.addStarredFilter(dvcRoot)
239+
(context: Context) =>
240+
experiments.addStarredFilter(getDvcRootFromContext(context))
239241
)
240242

241243
internalCommands.registerExternalCommand(
@@ -245,12 +247,13 @@ const registerExperimentQuickPickCommands = (
245247

246248
internalCommands.registerExternalCommand(
247249
RegisteredCommands.EXPERIMENT_SORT_ADD,
248-
(dvcRoot?: string) => experiments.addSort(dvcRoot)
250+
(context: Context) => experiments.addSort(getDvcRootFromContext(context))
249251
)
250252

251253
internalCommands.registerExternalCommand(
252254
RegisteredCommands.EXPERIMENT_SORT_ADD_STARRED,
253-
(dvcRoot?: string) => experiments.addStarredSort(dvcRoot)
255+
(context: Context) =>
256+
experiments.addStarredSort(getDvcRootFromContext(context))
254257
)
255258

256259
internalCommands.registerExternalCommand(
@@ -260,12 +263,14 @@ const registerExperimentQuickPickCommands = (
260263

261264
internalCommands.registerExternalCommand(
262265
RegisteredCommands.EXPERIMENT_SELECT,
263-
(dvcRoot?: string) => experiments.selectExperiments(dvcRoot)
266+
(context: Context) =>
267+
experiments.selectExperiments(getDvcRootFromContext(context))
264268
)
265269

266270
internalCommands.registerExternalCommand(
267271
RegisteredCommands.EXPERIMENT_COLUMNS_SELECT,
268-
(dvcRoot?: string) => experiments.selectColumns(dvcRoot)
272+
(context: Context) =>
273+
experiments.selectColumns(getDvcRootFromContext(context))
269274
)
270275
}
271276

@@ -295,8 +300,8 @@ const registerExperimentRunCommands = (
295300

296301
internalCommands.registerExternalCommand(
297302
RegisteredCommands.EXPERIMENT_SHOW,
298-
(context: { dvcRoot?: string } | undefined) =>
299-
experiments.showWebview(context?.dvcRoot)
303+
(context: Context) =>
304+
experiments.showWebview(getDvcRootFromContext(context))
300305
)
301306
}
302307

@@ -312,12 +317,14 @@ export const registerExperimentCommands = (
312317

313318
internalCommands.registerExternalCommand(
314319
RegisteredCommands.EXPERIMENT_AUTO_APPLY_FILTERS,
315-
(dvcRoot?: string) => experiments.autoApplyFilters(true, dvcRoot)
320+
(context: Context) =>
321+
experiments.autoApplyFilters(true, getDvcRootFromContext(context))
316322
)
317323

318324
internalCommands.registerExternalCommand(
319325
RegisteredCommands.EXPERIMENT_DISABLE_AUTO_APPLY_FILTERS,
320-
(dvcRoot?: string) => experiments.autoApplyFilters(false, dvcRoot)
326+
(context: Context) =>
327+
experiments.autoApplyFilters(false, getDvcRootFromContext(context))
321328
)
322329

323330
internalCommands.registerExternalCommand(

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,11 @@ export class ExperimentsTree
294294
)
295295
)
296296

297-
return `${selected} of ${total} (max ${MAX_SELECTED_EXPERIMENTS})`
297+
return (
298+
`${selected} of ${total} (max ${MAX_SELECTED_EXPERIMENTS}` +
299+
(dvcRoots.length > 1 ? ' per project' : '') +
300+
')'
301+
)
298302
}
299303

300304
private isRoot(element: string | ExperimentItem): element is string {

‎extension/src/experiments/webview/messages.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,6 @@ export class WebviewMessages {
282282
}
283283

284284
private showPlots() {
285-
return commands.executeCommand(RegisteredCommands.PLOTS_SHOW, {
286-
dvcRoot: this.dvcRoot
287-
})
285+
return commands.executeCommand(RegisteredCommands.PLOTS_SHOW, this.dvcRoot)
288286
}
289287
}

‎extension/src/plots/commands/register.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { RegisteredCommands } from '../../commands/external'
22
import { InternalCommands } from '../../commands/internal'
3+
import { Context, getDvcRootFromContext } from '../../vscode/context'
34
import { WorkspacePlots } from '../workspace'
45

56
export const registerPlotsCommands = (
@@ -8,17 +9,16 @@ export const registerPlotsCommands = (
89
) => {
910
internalCommands.registerExternalCommand(
1011
RegisteredCommands.PLOTS_SHOW,
11-
(context: { dvcRoot?: string } | undefined) =>
12-
plots.showWebview(context?.dvcRoot)
12+
(context: Context) => plots.showWebview(getDvcRootFromContext(context))
1313
)
1414

1515
internalCommands.registerExternalCommand(
1616
RegisteredCommands.PLOTS_SELECT,
17-
(dvcRoot?: string) => plots.selectPlots(dvcRoot)
17+
(context: Context) => plots.selectPlots(getDvcRootFromContext(context))
1818
)
1919

2020
internalCommands.registerExternalCommand(
2121
RegisteredCommands.PLOTS_REFRESH,
22-
(dvcRoot?: string) => plots.refresh(dvcRoot)
22+
(context: Context) => plots.refresh(getDvcRootFromContext(context))
2323
)
2424
}

‎extension/src/tree/index.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ export const createTreeView = <T>(
4343
})
4444

4545
export const getRootItem = (path: string): TreeItem => {
46-
const item = new TreeItem(Uri.file(path), TreeItemCollapsibleState.Expanded)
46+
const item = new TreeItem(
47+
Uri.file(path),
48+
TreeItemCollapsibleState.Expanded
49+
) as TreeItem
4750
item.id = path
4851
item.contextValue = 'dvcRoot'
4952
return item

‎extension/src/vscode/context.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,10 @@ import { commands } from 'vscode'
22

33
export const setContextValue = (key: string, value: unknown) =>
44
commands.executeCommand('setContext', key, value)
5+
6+
export type Context = string | Record<string, unknown> | undefined
7+
8+
export const getDvcRootFromContext = (context: Context): string | undefined => {
9+
const isDvcRoot = typeof context === 'string'
10+
return isDvcRoot ? context : undefined
11+
}

0 commit comments

Comments
 (0)