Looking for a new feature branch for exporting!

src/app/notebook/export/export.component.ts

@@ -22,11 +22,11 @@ export class ExportComponent {
   }
 
   async exportNotebook() {
-    console.log(await this.manager.exportNotebook(url.read("p")));
+    console.log(await this.manager.exportNotebook(url.read("p"), url.read("t")));
   }
 
   async destroy() {
-    this.manager.destroy();
+    await this.manager.destroy();
   }
 
 }

src/app/notebook/open/open.component.ts

@@ -1,6 +1,8 @@
 import {Component} from "@angular/core";
 import {MatDialog} from "@angular/material/dialog";
 import {DatabaseManager} from "../shell/DatabaseManager";
+import * as url from "../shell/url";
+import { BlockDocument } from "../shell/DatabaseManager";
 
 @Component({
   selector: 'app-opener',
@@ -23,9 +25,20 @@ export class OpenComponent {
   async importNotebook(event: Event) {
     const input = event.target as HTMLInputElement;
     if (input.files && input.files.length > 0) {
-      const blocks = JSON.parse(await input.files[0].text()).blocks;
-      await this.manager.bulkInsertBlocks(blocks);
+      const currentBlocks = (await this.manager.exportNotebook(url.read("p"), url.read("t"))).blocks;
+      let currentMaxndex = currentBlocks.reduce((max, _, index) => Math.max(max, index), 0);
+      let newBlocks = JSON.parse(await input.files[0].text()).blocks;
+      newBlocks = newBlocks.map((block: BlockDocument) => {
+        if (block && block.index !== undefined) {
+          block.index = currentMaxndex;
+          currentMaxndex += 1;
+        }
+        return block;
+      }).filter((block: BlockDocument | undefined) => block !== undefined).forEach;
+      const item = await this.manager.bulkInsertBlocks(newBlocks, url.read("p"), url.read("t"));
+      if (item) {
+        window.location.href = `${location.origin}?t=${item.topic ?? ""}&p=${item.peer ?? ""}`;
+      }
     }
   }
-
 }

src/app/notebook/shell/DatabaseManager.ts

@@ -298,15 +298,21 @@ export class DatabaseManager {
     );
   }
 
-  bulkInsertBlocks(blocks: BlockDocument[]) {
-    blocks.forEach((block: BlockDocument, index: number) => {
-      block.index = index;
-      block.createdBy = this._uuid;
-      block.lastEditedBy = this._uuid;
-      block.topic = this.topic;
+  bulkInsertBlocks(blocks: BlockDocument[], peer: string | undefined = undefined, topic: string | undefined = undefined) {
+    if ((peer && !topic) || (!peer && topic)) {
+      return;
+    } else if (!peer && !topic) {
+      peer = this._uuid;
+      topic = this.topic;
+    }
+    blocks.forEach((block: BlockDocument) => {
+      block.createdBy = peer;
+      block.lastEditedBy = peer;
+      block.topic = topic;
     });
-    // @ts-ignore
-    return this._database?.blocks.bulkInsert(blocks);
+    const db = this._database as any;
+    db.blocks.bulkInsert(blocks);
+    return {"peer": peer, "topic": topic}
   }
 
   decodeHtmlEntities(html: string) {
@@ -351,11 +357,11 @@ export class DatabaseManager {
     return this._database?.exportJSON();
   }
 
-  async exportNotebook(peer: string) {
+  async exportNotebook(peer: string, topic: string) {
     const data = await this._database?.exportJSON();
     let toExport: Array<BlockDocument> = [];
     data?.collections[1].docs.forEach((element) => {
-      if (element.createdBy === peer) {
+      if (element.createdBy === peer && element.topic === topic) {
         toExport.push(element)
       }
     })
@@ -411,13 +417,14 @@ export class DatabaseManager {
   }
 
   async insert(name: string, outputData: OutputData) {
-    // @ts-ignore
-    return (await this._database[name].insertCRDT({
-      ifMatch: {
-        $set: outputData
-      },
-    }))._data;
-    // @ts-ignore
+    const db = this._database as any;
+    if (this._database && db[name]) {
+      return await db[name].insertCRDT({
+        ifMatch: {
+          $set: outputData
+        },
+      })._data;
+    }
   }
 
   async destroy() {

src/app/notebook/shell/editorJS.ts

@@ -15,8 +15,7 @@ export class EditorJS {
   public static version: "2.26.5";
   public readonly blocks = new Blocks(this.environment);
 
-  constructor(private environment: Environment) {
-  }
+  constructor(private environment: Environment) {}
 
   get isReady(): Promise<boolean> {
     return new Promise((resolve) => resolve(true));