fix: sql editor compatible libro

Author: NewByVector

packages/secretnote/src/modules/scql-editor/cell/view.tsx

@@ -76,7 +76,7 @@ export class SQLCellView extends LibroExecutableCellView {
     this.viewManager = viewManager;
     this.commandRegistry = commandRegistry;
 
-    this.outputs = options.cell?.outputs as IOutput[];
+    this.outputs = (options.cell?.outputs || []) as IOutput[];
     this.className = this.className + ' sql-editor-container';
 
     this.viewManager
@@ -103,8 +103,17 @@ export class SQLCellView extends LibroExecutableCellView {
     await this.createEditor();
   };
 
+  override toJSON() {
+    const meta = super.toJSON();
+    return {
+      ...meta,
+      outputs: this.outputArea?.toJSON() ?? this.outputs,
+    };
+  }
+
   createEditor() {
     const option: CodeEditorViewOptions = {
+      uuid: this.options.uuid,
       factory: (editorOption) => new SQLEditor(editorOption),
       model: this.cellModel,
       config: {
@@ -116,10 +125,8 @@ export class SQLCellView extends LibroExecutableCellView {
       .getOrCreateView<CodeEditorView, CodeEditorViewOptions>(CodeEditorView, option)
       .then(async (editorView) => {
         this.editorView = editorView;
-
-        await editorView.editorReady;
+        await editorView.editor.editorReady;
         this.handleCommand();
-
         return;
       })
       .catch(() => {

packages/secretnote/src/modules/scql-editor/editor/editor.ts

@@ -8,6 +8,7 @@ import type {
   IPosition,
   ICoordinate,
   SearchMatch,
+  EditorState,
 } from '@difizen/libro-jupyter';
 import {
   Disposable,
@@ -44,6 +45,7 @@ export class SQLEditor implements IEditor {
 
   monacoEditor?: MonacoEditorType;
   host: HTMLElement;
+  editorState?: EditorState<EditorState>;
 
   get uuid(): string {
     return this._uuid;
@@ -220,6 +222,16 @@ export class SQLEditor implements IEditor {
     };
   }
 
+  getState(): EditorState<EditorState> {
+    const cursorPosition = this.getCursorPosition();
+    const selections = this.getSelections();
+    return {
+      ...this.editorState!,
+      cursorPosition,
+      selections,
+    };
+  }
+
   protected updateEditorSize() {
     const contentHeight = this.monacoEditor?.getContentHeight() ?? 20;
     this.host.style.height = `${contentHeight + 30}px`;

packages/secretnote/src/modules/scql-project/notification-view.tsx

@@ -26,10 +26,10 @@ import { ProjectService, Respond } from './service';
 export const InvitationNotificationComponent = () => {
   const instance = useInject<InvitationNotificationView>(ViewInstance);
   const pending = instance.service.invitationList.filter(
-    (item) => item.accepted === Respond.Pending,
+    (item) => item.status === Respond.UNDECIDED,
   );
   const archived = instance.service.invitationList.filter(
-    (item) => item.accepted !== Respond.Pending,
+    (item) => item.status !== Respond.UNDECIDED,
   );
 
   const handleInvitation = async (id: string, accepted: boolean) => {
@@ -102,10 +102,10 @@ export const InvitationNotificationComponent = () => {
                   <span
                     className="action"
                     style={{
-                      color: item.accepted === Respond.Accepted ? 'green' : 'orange',
+                      color: item.status === Respond.ACCEPTED ? 'green' : 'orange',
                     }}
                   >
-                    {Respond[item.accepted]}
+                    {Respond[item.status]}
                   </span>
                 </li>
               ))}

packages/secretnote/src/modules/scql-project/service.ts

@@ -11,16 +11,18 @@ export interface Project {
 }
 
 export interface Invitation {
-  accepted: number;
   id: string;
   inviter: string;
+  invitee: string;
   project: string;
+  status: Respond;
 }
 
 export enum Respond {
-  Pending = 0,
-  Accepted = 1,
-  Declined = -1,
+  UNDECIDED = 'UNDECIDED',
+  ACCEPTED = 'ACCEPTED',
+  DECLINED = 'DECLINED',
+  INVALID = 'INVALID',
 }
 
 export interface PlatformInfo {
@@ -91,9 +93,10 @@ export class ProjectService {
     });
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     this.invitationList = invitationList.map((item: any) => ({
-      accepted: item.accepted,
+      status: item.status,
       id: item.invitation_id,
       inviter: item.inviter,
+      invitee: item.invitee,
       project: item.project.name || item.project.project_id,
     }));
     return invitationList;