popup: fix creating new collection from popup, regression from switch…

… to async storage options
webrecorder · Jan 19, 2023 · 89559f0 · 89559f0
1 parent 6da562c
commit 89559f0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/ext/bg.js b/src/ext/bg.js
@@ -73,14 +73,14 @@ function popupHandler(port) {
       toggleBehaviors(tabId);
       break;
 
-    case "newColl":
-      collLoader.initNewColl({title: message.title}).then(async (newColl) => {
-        defaultCollId = newColl.name;
-        await setLocalOption("defaultCollId", defaultCollId);
-        port.postMessage(await listAllMsg(collLoader));
-      });
+    case "newColl": {
+      const { name } = await collLoader.initNewColl({title: message.title});
+      defaultCollId = name;
+      port.postMessage(await listAllMsg(collLoader, {defaultCollId}));
+      await setLocalOption("defaultCollId", defaultCollId);
       break;
     }
+    }
   });
 
   port.onDisconnect.addListener(() => {

diff --git a/src/popup.js b/src/popup.js
@@ -623,15 +623,15 @@ class RecPopup extends LitElement
     event.preventDefault();
   }
 
-  async onNewColl() {
-    await removeLocalOption(`${this.tabId}-collId`);
+  onNewColl() {
+    const title = this.renderRoot.querySelector("#new-name").value;
 
     this.sendMessage({
       tabId: this.tabId,
       type: "newColl",
-      title: this.renderRoot.querySelector("#new-name").value
+      title
     });
-
+    removeLocalOption(`${this.tabId}-collId`);
     this.collDrop = "";
   }
 }

diff --git a/src/utils.js b/src/utils.js
@@ -31,7 +31,7 @@ export async function ensureDefaultColl(collLoader)
 }
 
 // ===========================================================================
-export async function listAllMsg(collLoader) {
+export async function listAllMsg(collLoader, {defaultCollId = null} = {}) {
   let colls = await ensureDefaultColl(collLoader);
 
   colls = colls.map(x => getCollData(x));
@@ -49,7 +49,7 @@ export async function listAllMsg(collLoader) {
   });
 
   const msg = {type: "collections"};
-  msg.collId = await getLocalOption("defaultCollId");
+  msg.collId = defaultCollId || await getLocalOption("defaultCollId");
   msg.collections = colls.map(coll => ({
     id: coll.id,
     title: coll.title || coll.filename