Fix ts errors (#73)

* Cleaned up unused code.

* linting

* Fixed ts errors, simplified code, eslint.

* Removed unused imports

* Added a note to explain ts cast

* Fixed lint warnings

Author: 3coins

src/docprovider/filebrowser.ts

@@ -130,8 +130,7 @@ export const ynotebook: JupyterFrontEndPlugin<void> = {
               'experimentalEnableDocumentWideUndoRedo'
             ).composite as boolean;
 
-            // @ts-ignore
-            disableDocumentWideUndoRedo = !enableDocWideUndo ?? true;
+            disableDocumentWideUndoRedo = !(enableDocWideUndo ?? false);
           };
 
           updateSettings(settings);

src/executionindicator.tsx

@@ -4,17 +4,14 @@ import React from 'react';
 
 import { ISessionContext } from '@jupyterlab/apputils';
 import { ITranslator, nullTranslator } from '@jupyterlab/translation';
-import {
-  VDomRenderer
-} from '@jupyterlab/ui-components';
+import { VDomRenderer } from '@jupyterlab/ui-components';
 
-import { 
-  Notebook, 
-  ExecutionIndicatorComponent, 
-  ExecutionIndicator as E,
+import {
+  Notebook,
+  ExecutionIndicatorComponent,
+  ExecutionIndicator as E
 } from '@jupyterlab/notebook';
 
-
 /**
  * A VDomRenderer widget for displaying the execution status.
  */
@@ -61,36 +58,38 @@ export class AwarenessExecutionIndicator extends VDomRenderer<AwarenessExecution
 }
 
 export namespace AwarenessExecutionIndicator {
-
   export class Model extends E.Model {
-
     /**
      * A weak map to hold execution status of multiple notebooks.
      */
-  
-    attachNotebook(data: { content?: Notebook; context?: ISessionContext; } | null): void {
-      let nb = data?.content;
+
+    // (this as any) casts are required to avoid
+    // ts errors when accessing private methods
+    attachNotebook(
+      data: { content?: Notebook; context?: ISessionContext } | null
+    ): void {
+      const nb = data?.content;
       if (!nb) {
         return;
       }
-      (this as any)._currentNotebook = nb;  
+      (this as any)._currentNotebook = nb;
       (this as any)._notebookExecutionProgress.set(nb, {
         executionStatus: 'idle',
         kernelStatus: 'idle',
         totalTime: 0,
         interval: 0,
         timeout: 0,
         scheduledCell: new Set<string>(),
-        scheduledCellNumber: 0, 
+        scheduledCellNumber: 0,
         needReset: true
       });
       const state = (this as any)._notebookExecutionProgress.get(nb);
-  
+
       const contextStatusChanged = (ctx: ISessionContext) => {
         if (state) {
-          let awarenessStates = nb?.model?.sharedModel.awareness.getStates();
+          const awarenessStates = nb?.model?.sharedModel.awareness.getStates();
           if (awarenessStates) {
-            for (let [_, clientState] of awarenessStates) {
+            for (const [, clientState] of awarenessStates) {
               if ('kernel' in clientState) {
                 state.kernelStatus = clientState['kernel']['execution_state'];
                 this.stateChanged.emit(void 0);
@@ -100,11 +99,9 @@ export namespace AwarenessExecutionIndicator {
           }
         }
       };
-      
+
       nb?.model?.sharedModel.awareness.on('change', contextStatusChanged);
       super.attachNotebook(data);
     }
   }
 }
-
-

src/index.ts

@@ -9,8 +9,6 @@ import { Title, Widget } from '@lumino/widgets';
 import {
   INotebookTracker,
   NotebookPanel,
-  // Notebook,
-  // ExecutionIndicator,
   INotebookModel
 } from '@jupyterlab/notebook';
 import { IStatusBar } from '@jupyterlab/statusbar';
@@ -24,16 +22,12 @@ import {
   SessionContextDialogs
 } from '@jupyterlab/apputils';
 import { KeyboardEvent } from 'react';
-import {
-  IToolbarWidgetRegistry,
-} from '@jupyterlab/apputils';
-import { 
-  AwarenessExecutionIndicator
- } from './executionindicator';
+import { IToolbarWidgetRegistry } from '@jupyterlab/apputils';
+import { AwarenessExecutionIndicator } from './executionindicator';
 
 import { IEditorServices } from '@jupyterlab/codeeditor';
 import { requestAPI } from './handler';
-import { YNotebookContentFactory } from './notebook';
+import { RtcNotebookContentFactory } from './notebook';
 
 import { rtcContentProvider, yfile, ynotebook, logger } from './docprovider';
 
@@ -43,12 +37,10 @@ import * as Y from 'yjs';
 import { Awareness } from 'y-protocols/awareness';
 import { IAwareness } from '@jupyter/ydoc';
 
-import {
-  AwarenessKernelStatus
-} from './kernelstatus';
 import { ServerConnection } from '@jupyterlab/services';
 import { WebSocketAwarenessProvider } from './docprovider/awareness';
 import { URLExt } from '@jupyterlab/coreutils';
+import { AwarenessKernelStatus } from './kernelstatus';
 /**
  * Initialization data for the @jupyter/rtc-core extension.
  */
@@ -98,7 +90,6 @@ export const rtcGlobalAwarenessPlugin: JupyterFrontEndPlugin<IAwareness> = {
   requires: [IStateDB],
   provides: IGlobalAwareness,
   activate: (app: JupyterFrontEnd, state: StateDB): IAwareness => {
-    // @ts-ignore
     const { user } = app.serviceManager;
 
     const ydoc = new Y.Doc();
@@ -132,20 +123,18 @@ export const rtcGlobalAwarenessPlugin: JupyterFrontEndPlugin<IAwareness> = {
   }
 };
 
-class AwarenessExecutionIndicatorIcon implements DocumentRegistry.IWidgetExtension<
-NotebookPanel,
-INotebookModel
-> {
-  createNew(panel: NotebookPanel): IDisposable { 
-    let item = new AwarenessExecutionIndicator()
-    let nb = panel.content;
-    item.model.attachNotebook({content: nb})
+class AwarenessExecutionIndicatorIcon
+  implements DocumentRegistry.IWidgetExtension<NotebookPanel, INotebookModel>
+{
+  createNew(panel: NotebookPanel): IDisposable {
+    const item = new AwarenessExecutionIndicator();
+    const nb = panel.content;
+    item.model.attachNotebook({ content: nb });
     panel.toolbar.insertAfter('kernelName', 'awarenessExecutionProgress', item);
-    return item
+    return item;
   }
 }
 
-
 /**
  * A plugin that provides a execution indicator item to the status bar.
  */
@@ -162,17 +151,18 @@ export const executionIndicator: JupyterFrontEndPlugin<void> = {
     translator: ITranslator,
     statusBar: IStatusBar | null,
     settingRegistry: ISettingRegistry | null,
-    toolbarRegistry: IToolbarWidgetRegistry, 
+    toolbarRegistry: IToolbarWidgetRegistry
   ) => {
-    console.log("JupyterLab extension activated: Awareness Execution Indicator")
+    console.log(
+      'JupyterLab extension activated: Awareness Execution Indicator'
+    );
     app.docRegistry.addWidgetExtension(
-      "Notebook", 
+      'Notebook',
       new AwarenessExecutionIndicatorIcon()
-    )
+    );
   }
 };
 
-
 /**
  * A plugin that provides a kernel status item to the status bar.
  */
@@ -190,7 +180,9 @@ export const kernelStatus: JupyterFrontEndPlugin<IKernelStatusModel> = {
     translator_: ITranslator | null,
     labShell: ILabShell | null
   ): IKernelStatusModel => {
-    console.log("JupyterLab extension activated: Awareness Kernel Status Indicator")
+    console.log(
+      'JupyterLab extension activated: Awareness Kernel Status Indicator'
+    );
     const translator = translator_ ?? nullTranslator;
     const sessionDialogs =
       sessionDialogs_ ?? new SessionContextDialogs({ translator });
@@ -249,7 +241,7 @@ export const kernelStatus: JupyterFrontEndPlugin<IKernelStatusModel> = {
       if (oldValue) {
         oldValue.title.changed.disconnect(onTitleChanged);
       }
-    
+
       item.model.attachDocument(newValue);
       item.model.sessionContext =
         [...providers]
@@ -284,7 +276,6 @@ export const kernelStatus: JupyterFrontEndPlugin<IKernelStatusModel> = {
   }
 };
 
-
 /**
  * The notebook cell factory provider.
  */
@@ -296,7 +287,7 @@ const factory: JupyterFrontEndPlugin<NotebookPanel.IContentFactory> = {
   autoStart: true,
   activate: (app: JupyterFrontEnd, editorServices: IEditorServices) => {
     const editorFactory = editorServices.factoryService.newInlineEditor;
-    return new YNotebookContentFactory({ editorFactory });
+    return new RtcNotebookContentFactory({ editorFactory });
   }
 };
 
@@ -313,4 +304,3 @@ const plugins: JupyterFrontEndPlugin<unknown>[] = [
 ];
 
 export default plugins;
-

src/kernelstatus.tsx

@@ -2,17 +2,12 @@
 // Distributed under the terms of the Modified BSD License.
 
 import { TextItem } from '@jupyterlab/statusbar';
-import {
-  ITranslator,
-  nullTranslator,
-} from '@jupyterlab/translation';
+import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import { VDomRenderer } from '@jupyterlab/ui-components';
 import React, { KeyboardEvent } from 'react';
 import { ISessionContext } from '@jupyterlab/apputils';
 import { Widget } from '@lumino/widgets';
-import { 
-  KernelStatus as K
-} from '@jupyterlab/apputils';
+import { KernelStatus as K } from '@jupyterlab/apputils';
 import { NotebookPanel } from '@jupyterlab/notebook';
 import { Session } from '@jupyterlab/services';
 
@@ -81,12 +76,11 @@ namespace KernelStatusComponent {
   }
 }
 
-
 export class AwarenessKernelStatus extends VDomRenderer<AwarenessKernelStatus.Model> {
   /**
    * Construct the kernel status widget.
    */
-  constructor(opts:K.IOptions, translator?: ITranslator) {
+  constructor(opts: K.IOptions, translator?: ITranslator) {
     super(new AwarenessKernelStatus.Model(translator));
     this.translator = translator || nullTranslator;
     this._handleClick = opts.onClick;
@@ -119,23 +113,22 @@ export class AwarenessKernelStatus extends VDomRenderer<AwarenessKernelStatus.Mo
   private _handleKeyDown: (event: KeyboardEvent<HTMLImageElement>) => void;
 }
 
-
 export namespace AwarenessKernelStatus {
-
   export class Model extends K.Model {
-
-    attachDocument(widget: Widget | null) { 
+    attachDocument(widget: Widget | null) {
       if (!widget) {
-        return
+        return;
       }
-      let panel = (widget as NotebookPanel);
+      const panel = widget as NotebookPanel;
       const stateChanged = () => {
         if (this) {
-          let awarenessStates = panel?.model?.sharedModel.awareness.getStates();
+          const awarenessStates =
+            panel?.model?.sharedModel.awareness.getStates();
           if (awarenessStates) {
-            for (let [_, clientState] of awarenessStates) {
+            for (const [, clientState] of awarenessStates) {
               if ('kernel' in clientState) {
-                (this as any)._kernelStatus = clientState['kernel']['execution_state'];
+                (this as any)._kernelStatus =
+                  clientState['kernel']['execution_state'];
                 (this as any).stateChanged.emit(void 0);
                 return;
               }
@@ -150,9 +143,13 @@ export namespace AwarenessKernelStatus {
       const oldState = (this as any)._getAllState();
       (this as any)._sessionContext = sessionContext;
       (this as any)._kernelName =
-        sessionContext?.kernelDisplayName ?? (this as any)._trans.__('No Kernel');
-      (this as any)._triggerChange(oldState, (this as any)._getAllState()); 
-      sessionContext?.kernelChanged.connect(this._onKernelDisplayNameChanged, this);
+        sessionContext?.kernelDisplayName ??
+        (this as any)._trans.__('No Kernel');
+      (this as any)._triggerChange(oldState, (this as any)._getAllState());
+      sessionContext?.kernelChanged.connect(
+        this._onKernelDisplayNameChanged,
+        this
+      );
     }
     /**
      * React to changes in the kernel.
@@ -167,7 +164,5 @@ export namespace AwarenessKernelStatus {
       (this as any)._kernelName = _sessionContext.kernelDisplayName;
       (this as any)._triggerChange(oldState, (this as any)._getAllState());
     }
-
   }
-
-}
+}