Support strings for kernel activity dates (#14335)

microsoft · Sep 18, 2023 · e3cbadc · e3cbadc
1 parent a7a1fab
commit e3cbadc
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/src/kernels/helpers.ts b/src/kernels/helpers.ts
@@ -375,8 +375,18 @@ export function getRemoteKernelSessionInformation(
     defaultValue: string = ''
 ): string {
     if (kernelConnection?.kind === 'connectToLiveRemoteKernel') {
+        let date: Date | undefined;
+        if (typeof kernelConnection.kernelModel.lastActivityTime === 'string') {
+            try {
+                date = new Date(kernelConnection.kernelModel.lastActivityTime);
+            } catch (ex) {
+                traceVerbose(`Error parsing date ${ex}`);
+            }
+        } else {
+            date = kernelConnection.kernelModel.lastActivityTime;
+        }
         return DataScience.jupyterSelectLiveRemoteKernelDescription(
-            kernelConnection.kernelModel.lastActivityTime,
+            date,
             kernelConnection.kernelModel.numberOfConnections
         );
     }

diff --git a/src/kernels/jupyter/types.ts b/src/kernels/jupyter/types.ts
@@ -80,7 +80,7 @@ export interface IJupyterKernel {
      */
     id?: string;
     name: string;
-    lastActivityTime: Date;
+    lastActivityTime: Date | string;
     numberOfConnections: number;
 }
 

diff --git a/src/platform/common/utils/localize.ts b/src/platform/common/utils/localize.ts
@@ -361,7 +361,16 @@ export namespace DataScience {
     export const jupyterSelectURIMustBeHttpOrHttps = l10n.t(
         'Invalid protocol in URL specified, only HTTP or HTTPS are supported.'
     );
-    export const jupyterSelectLiveRemoteKernelDescription = (time: Date, numberOfConnections: number) => {
+    export const jupyterSelectLiveRemoteKernelDescription = (time: Date | undefined, numberOfConnections: number) => {
+        if (!time) {
+            if (numberOfConnections === 0) {
+                return '';
+            }
+            if (numberOfConnections === 1) {
+                return l10n.t('1 connection');
+            }
+            return l10n.t('{1} connections', numberOfConnections.toString());
+        }
         if (numberOfConnections === 0) {
             return l10n.t('Last activity {0}', fromNow(time, true, false, false));
         }

diff --git a/src/test/mocks/vsc/index.ts b/src/test/mocks/vsc/index.ts
@@ -289,7 +289,6 @@ export namespace vscMock {
         public static readonly SourceFixAll: CodeActionKind = new CodeActionKind('source.fix.all');
         public static readonly RefactorMove: CodeActionKind = new CodeActionKind('refactor.move');
         static readonly Notebook: CodeActionKind;
-
         private constructor(private _value: string) {}
 
         public append(parts: string): CodeActionKind {