From 64e78d03a117fffeb18e18154d9028a2532285a5 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Fri, 1 Sep 2023 10:52:15 +0200
Subject: wallet-core: implement and test stored backups

---
 packages/idb-bridge/src/SqliteBackend.ts | 27 +++++++++++++++++++++++++--
 packages/idb-bridge/src/bridge-idb.ts    |  7 ++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

(limited to 'packages/idb-bridge/src')

diff --git a/packages/idb-bridge/src/SqliteBackend.ts b/packages/idb-bridge/src/SqliteBackend.ts
index c40281861..a25ec0045 100644
--- a/packages/idb-bridge/src/SqliteBackend.ts
+++ b/packages/idb-bridge/src/SqliteBackend.ts
@@ -1882,7 +1882,7 @@ export class SqliteBackend implements Backend {
     }
   }
 
-  clearObjectStore(
+  async clearObjectStore(
     btx: DatabaseTransaction,
     objectStoreName: string,
   ): Promise<void> {
@@ -1906,7 +1906,21 @@ export class SqliteBackend implements Backend {
       );
     }
 
-    throw new Error("Method not implemented.");
+    this._prep(sqlClearObjectStore).run({
+      object_store_id: scopeInfo.objectStoreId,
+    });
+
+    for (const index of scopeInfo.indexMap.values()) {
+      let stmt: Sqlite3Statement;
+      if (index.unique) {
+        stmt = this._prep(sqlClearUniqueIndexData);
+      } else {
+        stmt = this._prep(sqlClearIndexData);
+      }
+      stmt.run({
+        index_id: index.indexId,
+      });
+    }
   }
 }
 
@@ -1963,6 +1977,15 @@ CREATE TABLE IF NOT EXISTS unique_index_data
 );
 `;
 
+const sqlClearObjectStore = `
+DELETE FROM object_data WHERE object_store_id=$object_store_id`;
+
+const sqlClearIndexData = `
+DELETE FROM index_data WHERE index_id=$index_id`;
+
+const sqlClearUniqueIndexData = `
+DELETE FROM unique_index_data WHERE index_id=$index_id`;
+
 const sqlListDatabases = `
 SELECT name, version FROM databases;
 `;
diff --git a/packages/idb-bridge/src/bridge-idb.ts b/packages/idb-bridge/src/bridge-idb.ts
index 8cecba534..f3749c77c 100644
--- a/packages/idb-bridge/src/bridge-idb.ts
+++ b/packages/idb-bridge/src/bridge-idb.ts
@@ -735,7 +735,9 @@ export class BridgeIDBDatabase extends FakeEventTarget implements IDBDatabase {
     }
 
     if (this._closePending) {
-      throw new InvalidStateError();
+      throw new InvalidStateError(
+        `tried to start transaction on ${this._name}, but a close is pending`,
+      );
     }
 
     if (!Array.isArray(storeNames)) {
@@ -930,6 +932,9 @@ export class BridgeIDBFactory {
         // http://www.w3.org/TR/2015/REC-IndexedDB-20150108/#dfn-steps-for-running-a-versionchange-transaction
 
         for (const otherConn of this.connections) {
+          if (otherConn._name != db._name) {
+            continue;
+          }
           if (otherConn._closePending) {
             continue;
           }
-- 
cgit v1.2.3


From 6c3cfa9be7a332c2cc8490f25ebd6c73c8244842 Mon Sep 17 00:00:00 2001
From: Sebastian <sebasjm@gmail.com>
Date: Fri, 8 Sep 2023 18:45:13 -0300
Subject: codespell fix

---
 build-system/taler-build-scripts                                      | 2 +-
 packages/idb-bridge/src/backend-interface.ts                          | 2 +-
 packages/merchant-backoffice-ui/src/InstanceRoutes.tsx                | 4 ++--
 .../merchant-backoffice-ui/src/components/product/ProductForm.tsx     | 2 +-
 .../merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'packages/idb-bridge/src')

diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index 23538677f..001f5dd08 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit 23538677f6c6be2a62f38dc6137ecdd1c76b7b15
+Subproject commit 001f5dd081fc8729ff8def90c4a1c3f93eb8689a
diff --git a/packages/idb-bridge/src/backend-interface.ts b/packages/idb-bridge/src/backend-interface.ts
index 3255261e2..690f92f54 100644
--- a/packages/idb-bridge/src/backend-interface.ts
+++ b/packages/idb-bridge/src/backend-interface.ts
@@ -144,7 +144,7 @@ export interface IndexMeta {
   unique: boolean;
 }
 
-// FIXME: Instead of refering to an object store by name,
+// FIXME: Instead of referring to an object store by name,
 // maybe refer to it via some internal, numeric ID?
 // This would simplify renaming.
 export interface Backend {
diff --git a/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx b/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx
index 4a4b3fee4..ee8db9a9f 100644
--- a/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx
+++ b/packages/merchant-backoffice-ui/src/InstanceRoutes.tsx
@@ -118,7 +118,7 @@ export enum InstancePaths {
   validators_update = "/validators/:vid/update",
   validators_new = "/validators/new",
 
-  settings = "/inteface",
+  settings = "/interface",
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -252,7 +252,7 @@ export function InstanceRoutes({
         instance={id}
         admin={admin}
         onShowSettings={() => {
-          route("/inteface")
+          route(InstancePaths.settings)
         }}
         path={path}
         onLogout={clearTokenAndGoToRoot}
diff --git a/packages/merchant-backoffice-ui/src/components/product/ProductForm.tsx b/packages/merchant-backoffice-ui/src/components/product/ProductForm.tsx
index 4cd90aa45..726a94f5e 100644
--- a/packages/merchant-backoffice-ui/src/components/product/ProductForm.tsx
+++ b/packages/merchant-backoffice-ui/src/components/product/ProductForm.tsx
@@ -148,7 +148,7 @@ export function ProductForm({ onSubscribe, initial, alreadyExist }: Props) {
           name="minimum_age"
           label={i18n.str`Age restricted`}
           tooltip={i18n.str`is this product restricted for customer below certain age?`}
-          help={i18n.str`can be overriden by the order configuration`}
+          help={i18n.str`can be overridden by the order configuration`}
         />
         <Input<Entity>
           name="unit"
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx
index 6ab2a2df6..984880752 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx
@@ -83,7 +83,7 @@ export function DetailPage({ instanceId, currentToken: oldToken, onBack, onNewTo
               <div class="level-left">
                 <div class="level-item">
                   <span class="is-size-4">
-                    Instace id: <b>{instanceId}</b>
+                    Instance id: <b>{instanceId}</b>
                   </span>
                 </div>
               </div>
-- 
cgit v1.2.3