From 99736f235b755fac549c048a326f6f5fa812438d Mon Sep 17 00:00:00 2001 From: Ian Huff Date: Thu, 6 Feb 2020 15:31:04 -0800 Subject: [PATCH 1/2] fix kernel and server labels when not connected (#9965) --- news/2 Fixes/9933.md | 1 + package.nls.json | 1 + src/client/common/utils/localize.ts | 1 + .../interactive-common/kernelSelection.tsx | 27 ++++++++++++++----- .../interactive-common/redux/store.ts | 4 +-- 5 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 news/2 Fixes/9933.md diff --git a/news/2 Fixes/9933.md b/news/2 Fixes/9933.md new file mode 100644 index 000000000000..371d3ed72c85 --- /dev/null +++ b/news/2 Fixes/9933.md @@ -0,0 +1 @@ +Correct the server and kernel text for when not connected to a server. \ No newline at end of file diff --git a/package.nls.json b/package.nls.json index 8eb3ccb1584b..a70fc4d71a7d 100644 --- a/package.nls.json +++ b/package.nls.json @@ -307,6 +307,7 @@ "DataScience.noRowsInDataViewer": "No rows match current filter", "DataScience.jupyterServer": "Jupyter Server", "DataScience.noKernel": "No Kernel", + "DataScience.serverNotStarted": "Not Started", "DataScience.localJupyterServer": "local", "DataScience.pandasTooOldForViewingFormat": "Python package 'pandas' is version {0}. Version 0.20 or greater is required for viewing data.", "DataScience.pandasRequiredForViewing": "Python package 'pandas' is required for viewing data.", diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts index 427551a6bd55..56d85b0211bc 100644 --- a/src/client/common/utils/localize.ts +++ b/src/client/common/utils/localize.ts @@ -336,6 +336,7 @@ export namespace DataScience { export const noRowsInDataViewer = localize('DataScience.noRowsInDataViewer', 'No rows match current filter'); export const jupyterServer = localize('DataScience.jupyterServer', 'Jupyter Server'); export const noKernel = localize('DataScience.noKernel', 'No Kernel'); + export const serverNotStarted = localize('DataScience.serverNotStarted', 'Not Started'); export const selectKernel = localize('DataScience.selectKernel', 'Select a Kernel'); export const selectDifferentKernel = localize('DataScience.selectDifferentKernel', 'Select a different Kernel'); export const selectDifferentJupyterInterpreter = localize('DataScience.selectDifferentJupyterInterpreter', 'Select a different Interpreter'); diff --git a/src/datascience-ui/interactive-common/kernelSelection.tsx b/src/datascience-ui/interactive-common/kernelSelection.tsx index 374cbd6bc34f..066ca42c8b29 100644 --- a/src/datascience-ui/interactive-common/kernelSelection.tsx +++ b/src/datascience-ui/interactive-common/kernelSelection.tsx @@ -41,9 +41,7 @@ export class KernelSelection extends React.Component { const displayNameTextWidth: React.CSSProperties = { maxWidth: this.getMaxWidth(displayNameTextSize) }; - const kernelSelectionClass = this.isKernelSelectionAllowed - ? 'kernel-status-section kernel-status-section-hoverable kernel-status-status' - : 'kernel-status-section kernel-status-status'; + return (
@@ -53,19 +51,34 @@ export class KernelSelection extends React.Component {
-
- {this.props.kernel.displayName}: {this.props.kernel.jupyterServerStatus} -
+ {this.renderKernelStatus(displayNameTextWidth)}
); } + + private renderKernelStatus(displayNameTextWidth: React.CSSProperties) { + if (this.isKernelSelectionAllowed) { + return ( +
+ {this.props.kernel.displayName}: {this.props.kernel.jupyterServerStatus} +
+ ); + } else { + return ( +
+ {getLocString('DataScience.noKernel', 'No Kernel')} +
+ ); + } + } + private selectKernel() { if (this.isKernelSelectionAllowed) { this.props.selectKernel(); } } private getIcon(): ImageName { - return this.props.kernel.localizedUri === getLocString('DataScience.noKernel', 'No Kernel') ? ImageName.JupyterServerDisconnected : ImageName.JupyterServerConnected; + return this.props.kernel.jupyterServerStatus === ServerStatus.NotStarted ? ImageName.JupyterServerDisconnected : ImageName.JupyterServerConnected; } private getMaxWidth(charLenght: number): string { diff --git a/src/datascience-ui/interactive-common/redux/store.ts b/src/datascience-ui/interactive-common/redux/store.ts index 4e35c159d567..70737eea68db 100644 --- a/src/datascience-ui/interactive-common/redux/store.ts +++ b/src/datascience-ui/interactive-common/redux/store.ts @@ -46,8 +46,8 @@ function generateDefaultState(skipDefault: boolean, testMode: boolean, baseTheme monacoReady: testMode, // When testing, monaco starts out ready loaded: false, kernel: { - displayName: 'Python', - localizedUri: getLocString('DataScience.noKernel', 'No Kernel'), + displayName: getLocString('DataScience.noKernel', 'No Kernel'), + localizedUri: getLocString('DataScience.serverNotStarted', 'Not Started'), jupyterServerStatus: ServerStatus.NotStarted }, settings: testMode ? getDefaultSettings() : undefined, // When testing, we don't send (or wait) for the real settings. From 2e1d2ac793fb74545ff807f433cb734896355b1c Mon Sep 17 00:00:00 2001 From: Ian Huff Date: Thu, 6 Feb 2020 15:43:33 -0800 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 3 ++- news/2 Fixes/9933.md | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 news/2 Fixes/9933.md diff --git a/CHANGELOG.md b/CHANGELOG.md index c7888ea74c9b..0ac937fbe82e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,7 +46,8 @@ ([#9701](https://github.com/Microsoft/vscode-python/issues/9701)) ### Fixes - +1. Correct the server and kernel text for when not connected to a server. + ([#9933](https://github.com/Microsoft/vscode-python/issues/9933)) 1. Make sure to clear variable list on restart kernel. ([#9740](https://github.com/Microsoft/vscode-python/issues/9740)) 1. Use the autoStart server when available. diff --git a/news/2 Fixes/9933.md b/news/2 Fixes/9933.md deleted file mode 100644 index 371d3ed72c85..000000000000 --- a/news/2 Fixes/9933.md +++ /dev/null @@ -1 +0,0 @@ -Correct the server and kernel text for when not connected to a server. \ No newline at end of file