Logging couldn't work, this fixes.

When I changed undo I failed to take into account logging.

Author: gbishop

src/components/logger.js

@@ -83,7 +83,7 @@ export class Logger extends TreeBase {
       second: "numeric",
     });
     record = { DateTime, ...record };
-    db.write("log", record);
+    db.writeLog(record);
   }
 
   init() {
@@ -140,8 +140,8 @@ export class Logger extends TreeBase {
 }
 TreeBase.register(Logger, "Logger");
 
-export async function SaveLogs() {
-  let toSave = await db.readAll("log");
+export async function SaveLog() {
+  let toSave = await db.readLog();
   if (toSave.length > 0) {
     await saveContent("log", toSave, "xlsx");
   } else {
@@ -150,6 +150,6 @@ export async function SaveLogs() {
   }
 }
 
-export async function ClearLogs() {
-  await db.clear("log");
+export async function ClearLog() {
+  await db.clearLog();
 }

src/components/toolbar.js

@@ -16,7 +16,7 @@ import { DB } from "app/db";
 import { Designer } from "./designer";
 import { readSheetFromBlob, saveContent } from "./content";
 import { Data } from "app/data";
-import { SaveLogs, ClearLogs } from "./logger";
+import { SaveLog, ClearLog } from "./logger";
 import { friendlyName, wikiName } from "./names";
 
 import { workerUpdateButton } from "components/serviceWorker";
@@ -341,14 +341,14 @@ function getFileMenuItems(bar) {
       title: "Save any logs as spreadsheets",
       divider: "Logs",
       callback: async () => {
-        SaveLogs();
+        SaveLog();
       },
     }),
     new MenuItem({
       label: "Clear logs",
       title: "Clear any stored logs",
       callback: async () => {
-        ClearLogs();
+        ClearLog();
       },
     }),
     new MenuItem({

src/db.js

@@ -5,34 +5,43 @@ import Globals from "./globals";
 
 export class DB {
   constructor() {
-    this.dbPromise = openDB("os-dpi", 5, {
+    this.dbPromise = openDB("os-dpi", 6, {
       async upgrade(db, oldVersion, _newVersion, transaction) {
-        let store5 = db.createObjectStore("store5", {
-          keyPath: ["name", "type"],
-        });
-        store5.createIndex("by-name", "name");
-        if (oldVersion == 4) {
-          // copy data from old store to new
-          const store4 = transaction.objectStore("store");
-          for await (const cursor of store4) {
-            const record4 = cursor.value;
-            store5.put(record4);
-          }
-          db.deleteObjectStore("store");
-          // add an etag index to url store
-          transaction.objectStore("url").createIndex("by-etag", "etag");
-        } else if (oldVersion < 4) {
-          db.createObjectStore("media");
-          let savedStore = db.createObjectStore("saved", {
-            keyPath: "name",
+        if (oldVersion < 6) {
+          let logStore = db.createObjectStore("logstore", {
+            keyPath: "id",
+            autoIncrement: true,
           });
-          savedStore.createIndex("by-etag", "etag");
-          // track etags for urls
-          const urlStore = db.createObjectStore("url", {
-            keyPath: "url",
+          logStore.createIndex("by-name", "name");
+        }
+        if (oldVersion < 5) {
+          let store5 = db.createObjectStore("store5", {
+            keyPath: ["name", "type"],
           });
-          // add an etag index to the url store
-          urlStore.createIndex("by-etag", "etag");
+          store5.createIndex("by-name", "name");
+          if (oldVersion == 4) {
+            // copy data from old store to new
+            const store4 = transaction.objectStore("store");
+            for await (const cursor of store4) {
+              const record4 = cursor.value;
+              store5.put(record4);
+            }
+            db.deleteObjectStore("store");
+            // add an etag index to url store
+            transaction.objectStore("url").createIndex("by-etag", "etag");
+          } else if (oldVersion < 4) {
+            db.createObjectStore("media");
+            let savedStore = db.createObjectStore("saved", {
+              keyPath: "name",
+            });
+            savedStore.createIndex("by-etag", "etag");
+            // track etags for urls
+            const urlStore = db.createObjectStore("url", {
+              keyPath: "url",
+            });
+            // add an etag index to the url store
+            urlStore.createIndex("by-etag", "etag");
+          }
         }
       },
       blocked(currentVersion, blockedVersion, event) {
@@ -162,16 +171,23 @@ export class DB {
   }
 
   /**
-   * Read all records of the given type
+   * Read log records
    *
-   * @param {string} type
    * @returns {Promise<Object[]>}
    */
-  async readAll(type) {
-    return [this.read(type)];
+  async readLog() {
+    const db = await this.dbPromise;
+    const index = db.transaction("logstore", "readonly").store.index("by-name");
+    const key = this.designName;
+    const result = [];
+    for await (const cursor of index.iterate(key)) {
+      const data = cursor.value.data;
+      result.push(data);
+    }
+    return result;
   }
 
-  /** Add a new record
+  /** Write a design record
    * @param {string} type
    * @param {Object} data
    */
@@ -189,6 +205,16 @@ export class DB {
     this.notify({ action: "update", name: this.designName });
   }
 
+  /** Write a log record
+   * @param {Object} data
+   */
+  async writeLog(data) {
+    const db = await this.dbPromise;
+    const tx = db.transaction(["logstore"], "readwrite");
+    tx.objectStore("logstore").put({ name: this.designName, data });
+    await tx.done;
+  }
+
   /**
    * delete records of this type
    *
@@ -200,19 +226,19 @@ export class DB {
     return db.delete("store5", [this.designName, type]);
   }
 
-  /** Undo by deleting the most recent record
-   * @param {string} type
+  /**
+   * delete log records
+   *
+   * @returns {Promise<void>}
    */
-  async undo(type) {
-    if (type == "content") return;
+  async clearLog() {
     const db = await this.dbPromise;
-    const index = db
-      .transaction("store5", "readwrite")
-      .store.index("by-name-type");
-    const cursor = await index.openCursor([this.designName, type], "prev");
-    if (cursor) await cursor.delete();
-    await db.delete("saved", this.designName);
-    this.notify({ action: "update", name: this.designName });
+    const tx = db.transaction("logstore", "readwrite");
+    const index = tx.store.index("by-name");
+    for await (const cursor of index.iterate(this.designName)) {
+      cursor.delete();
+    }
+    await tx.done;
   }
 
   /** Read a design from a local file