Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update kernel picker titles #12156

Merged
merged 2 commits into from
Nov 24, 2022
Merged

Update kernel picker titles #12156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d411f3
Update kernel picker titles
DonJayamanne Nov 24, 2022
ba985ca
fic tests
DonJayamanne Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions package.nls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,6 +1139,9 @@
"DataScience.remoteKernelFinderDisplayName": "Current Remote",
"DataScience.kernelPickerSelectSourceTitle": "Select Another Jupyter Kernel...",
"DataScience.kernelPickerSelectKernelTitle": "Select Kernel",
"DataScience.kernelPickerSelectLocalKernelSpecTitle": "Select a Local Kernel Spec",
"DataScience.kernelPickerSelectPythonEnvironmentTitle": "Select a Local Python Environment",
"DataScience.kernelPickerSelectKernelFromRemoteTitle": "Select a Kernel from {0}",
"DataScience.UserJupyterServerUrlProviderDisplayName": "Existing Jupyter Server",
"DataScience.UserJupyterServerUrlProviderDetail": "Connect to an existing Jupyter Server",
"DataScience.UserJupyterServerUrlAlreadyExistError": "A Jupyter Server with the same URL already exists."
Expand Down
23 changes: 17 additions & 6 deletions src/notebooks/controllers/kernelSource/quicPickKernelItemProvider.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ suite('Quick Pick Kernel Item Provider', () => {
when(finder.displayName).thenReturn('Remote Server');
break;
}
when(finder.displayName).thenReturn();
when(finder.displayName).thenReturn('x');
when(finder.kernels).thenReturn([]);
when(finder.refresh()).thenResolve();
when(finder.status).thenReturn('idle');
Expand All @@ -71,17 +71,28 @@ suite('Quick Pick Kernel Item Provider', () => {
test('Verify title and status', async () => {
createProvider();

assert.strictEqual(provider.kind, provider.kind);
assert.strictEqual(provider.kind, kind);
assert.strictEqual(provider.status, 'idle');
assert.deepEqual(provider.kernels, []);
assert.isUndefined(provider.recommended);

await clock.runAllAsync();

assert.strictEqual(
provider.title,
`${DataScience.kernelPickerSelectKernelTitle()} from ${instance(finder).displayName}`
);
let expectedTitle = '';
switch (kind) {
case ContributedKernelFinderKind.LocalKernelSpec:
expectedTitle = DataScience.kernelPickerSelectLocalKernelSpecTitle();
break;
case ContributedKernelFinderKind.LocalPythonEnvironment:
expectedTitle = DataScience.kernelPickerSelectPythonEnvironmentTitle();
break;
default:
expectedTitle = DataScience.kernelPickerSelectKernelFromRemoteTitle().format(
instance(finder).displayName
);
break;
}
assert.strictEqual(provider.title, expectedTitle);
});
test('Verify status change and kernels listing', async () => {
when(finder.status).thenReturn('discovering');
Expand Down
13 changes: 11 additions & 2 deletions src/notebooks/controllers/kernelSource/quickPickKernelItemProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,17 @@ export class QuickPickKernelItemProvider {
if (this.refreshInvoked) {
finder.refresh().catch((ex) => traceError(`Failed to refresh finder for ${this.title}`, ex));
}

this.title = `${DataScience.kernelPickerSelectKernelTitle()} from ${finder.displayName}`;
switch (finder.kind) {
case ContributedKernelFinderKind.LocalKernelSpec:
this.title = DataScience.kernelPickerSelectLocalKernelSpecTitle();
break;
case ContributedKernelFinderKind.LocalPythonEnvironment:
this.title = DataScience.kernelPickerSelectPythonEnvironmentTitle();
break;
default:
this.title = DataScience.kernelPickerSelectKernelFromRemoteTitle().format(finder.displayName);
break;
}
finder.onDidChangeKernels(
() => {
this.kernels.length = 0;
Expand Down
6 changes: 6 additions & 0 deletions src/platform/common/utils/localize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,6 +1443,12 @@ export namespace DataScience {
localize('DataScience.kernelPickerSelectSourceTitle', 'Select Another Jupyter Kernel...');
export const kernelPickerSelectKernelTitle = () =>
localize('DataScience.kernelPickerSelectKernelTitle', 'Select Kernel');
export const kernelPickerSelectLocalKernelSpecTitle = () =>
localize('DataScience.kernelPickerSelectLocalKernelSpecTitle', 'Select a Local Kernel Spec');
export const kernelPickerSelectPythonEnvironmentTitle = () =>
localize('DataScience.kernelPickerSelectPythonEnvironmentTitle', 'Select a Local Python Environment');
export const kernelPickerSelectKernelFromRemoteTitle = () =>
localize('DataScience.kernelPickerSelectKernelFromRemoteTitle', 'Select a Kernel from {0}');
}

export namespace Deprecated {
Expand Down