Skip to content

Commit d3a544b

Browse files
committed
fix selectedPackages and environment values to be pulled from package manager state when executing a command
1 parent 64995f2 commit d3a544b

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

packages/common/src/commands/registerPkgCommands.ts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,31 @@ import {
88

99
export function registerPkgCommands(
1010
commands: CommandRegistry,
11-
pkgModel: Conda.IPackageManager,
12-
selectedPackages: Conda.IPackage[],
13-
environment: string
11+
pkgModel: Conda.IPackageManager
1412
) {
1513
commands.addCommand('gator-lab:update-all-packages', {
1614
label: 'Update All Packages',
17-
execute: async () => {
18-
await updateAllPackages(pkgModel);
15+
execute: async args => {
16+
const environment = args['environment'] as string;
17+
await updateAllPackages(pkgModel, environment);
1918
}
2019
});
2120

2221
commands.addCommand('gator-lab:apply-package-changes', {
2322
label: 'Apply Package Changes',
24-
execute: async () => {
23+
execute: async args => {
24+
const selectedPackages = args[
25+
'selectedPackages'
26+
] as unknown as Conda.IPackage[];
27+
const environment = args['environment'] as string;
2528
await applyPackageChanges(pkgModel, selectedPackages, environment);
2629
}
2730
});
2831
commands.addCommand('gator-lab:refresh-available-packages', {
2932
label: 'Refresh Available Packages',
30-
execute: async () => {
31-
await refreshAvailablePkgs(pkgModel);
33+
execute: async args => {
34+
const environment = args['environment'] as string;
35+
await refreshAvailablePkgs(pkgModel, environment);
3236
}
3337
});
3438
}

packages/labextension/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ async function activateCondaEnv(
124124
});
125125

126126
registerEnvCommands(commands, model);
127-
registerPkgCommands(commands, model.getPackageManager(), [], '');
127+
registerPkgCommands(commands, model.getPackageManager());
128128

129129
if (launcher) {
130130
launcher.add({

packages/navigator/src/plugins/navigator/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
4141
content.title.icon = condaIcon;
4242
const widget = new MainAreaWidget({ content: content });
4343
registerEnvCommands(app.commands, model);
44-
registerPkgCommands(app.commands, model.getPackageManager(), [], '');
44+
registerPkgCommands(app.commands, model.getPackageManager());
4545
widget.title.closable = false;
4646
app.shell.add(widget, 'main');
4747
}

0 commit comments

Comments
 (0)