feat: load blocks from url providers

sanchezcarlosjr · Nov 21, 2023 · f124fe6 · f124fe6
1 parent e92cd44
commit f124fe6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/src/app/notebook/assistant/assistant.component.html b/src/app/notebook/assistant/assistant.component.html
@@ -1,2 +1,2 @@
-<img (click)="toggleChatbot()"  class="chatbot-toggle" ngSrc="../../../assets/avatar.png" alt="avatar.png" height="512" width="512">
+<img (click)="toggleChatbot()"  priority class="chatbot-toggle" ngSrc="../../../assets/avatar.png" alt="avatar.png" height="512" width="512">
 <gradio-app *ngIf="showChatbot" info="false" class="chatbot" src="https://evatutor.sanchezcarlosjr.com/"></gradio-app>
diff --git a/src/app/notebook/notebook.component.html b/src/app/notebook/notebook.component.html
@@ -9,7 +9,6 @@
     </button>
     <button mat-menu-item  (click)="openRecent()" >Open recent</button>
     <button mat-menu-item (click)="saveInUrl()">Save in URL</button>
-    <button mat-menu-item (click)="removeUrlProviders()">Delete c and u parameter</button>
     <button mat-menu-item (click)="shareNotebook()">Share notebook</button>
   </mat-menu>
   <button mat-button [matMenuTriggerFor]="runtimeMenu">Runtime</button>

diff --git a/src/app/notebook/notebook.component.ts b/src/app/notebook/notebook.component.ts
@@ -262,10 +262,7 @@ export class NotebookComponent implements OnInit {
     this.titleService.setTitle(name);
   }
 
-  removeUrlProviders() {
-    url.remove("c");
-    url.remove("u");
-  }
+
 
   shareNotebook() {
     this.dialog.open(ShareDialogComponent);

diff --git a/src/app/notebook/shell/DatabaseManager.ts b/src/app/notebook/shell/DatabaseManager.ts
@@ -249,12 +249,14 @@ export class DatabaseManager {
   async registerUrlProviders() {
     if (url.has("c")) {
       return this.readBlocksFromURL().then(blocks => {
+        url.remove('c');
         return blocks;
       });
     }
     if (url.has("u")) {
-      return fetch(url.read("u")).then(response => response.json()).then(blocks => {
-        return blocks;
+      return fetch(url.read("u")).then(response => response.json()).then(notebook => {
+        url.remove('u');
+        return notebook?.blocks || notebook;
       });
     }
     return [];

diff --git a/src/app/notebook/shell/shell.ts b/src/app/notebook/shell/shell.ts
@@ -307,7 +307,7 @@ export class Shell {
       const blockCollection = await this.databaseManager.start();
       const documents = await firstValueFrom(blockCollection);
       let blocks: BlockDocument[] = await this.processDocuments(documents);
-      if (blocks.length === 0 && !url.has("ps") && !url.has("u")) {
+      if (blocks.length === 0 && !url.has("ps")  && !url.has("u")) {
         blocks.push(this.databaseManager.generateDefaultBlock());
         this.databaseManager.upsert(blocks[0]);
       }
@@ -339,10 +339,10 @@ export class Shell {
   private async renderEditor(blocks: BlockDocument[], isMode2: boolean) {
     if (url.has("ps") && blocks.length <= 1 && blocks[0]?.data?.text === "")
       return;
-    await this.editor.render({ version: '2.27.0', blocks });
+    await this.editor.render({ version: '2.29.0-rc.6', blocks });
     const newBlocks: OutputBlockData[] = await this.databaseManager.registerUrlProviders();
     if (newBlocks.length > 0) {
-      await this.editor.render({ version: '2.27.0', blocks: newBlocks });
+      await this.editor.render({ version: '2.29.0-rc.6', blocks: newBlocks });
       if (isMode2) {
         window.dispatchEvent(new CustomEvent('shell.RunAll'));
       } else {