fix(errors): rollback changes after backend returns an error

projectcaluma · Dec 11, 2023 · 4a8d17e · 4a8d17e
1 parent c77343e
commit 4a8d17e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/addon/components/document-delete-button.js b/addon/components/document-delete-button.js
@@ -38,7 +38,10 @@ export default class DocumentDeleteButtonComponent extends Component {
           : [this.args.docsToDelete]; // if the supplied argument is not an array we make it one
 
         for (const doc of docs) {
-          yield doc.destroyRecord();
+          yield doc.destroyRecord().catch((error) => {
+            doc.rollbackAttributes();
+            throw error;
+          });
           this.documents.deselectDocument(doc);
         }
       }
@@ -47,13 +50,13 @@ export default class DocumentDeleteButtonComponent extends Component {
         this.args.onConfirm(this.args.docsToDelete);
       }
 
-      this.hideDialog();
-
       this.notification.success(
         this.intl.t("alexandria.success.delete-document"),
       );
     } catch (error) {
       new ErrorHandler(this, error).notify("alexandria.errors.delete-document");
+    } finally {
+      this.hideDialog();
     }
   }
 }
diff --git a/addon/components/single-document-details.js b/addon/components/single-document-details.js
@@ -71,6 +71,7 @@ export default class SingleDocumentDetailsComponent extends DocumentCard {
       this.resetState();
       this.notification.success(this.intl.t("alexandria.success.update"));
     } catch (error) {
+      this.args.document.rollbackAttributes();
       new ErrorHandler(this, error).notify("alexandria.errors.update");
     }
   }

diff --git a/addon/services/tags.js b/addon/services/tags.js
@@ -34,6 +34,8 @@ export default class TagsService extends Service {
    */
   @action async add(document, tagInput) {
     let tag = tagInput;
+    const tags = [...(await document.tags)];
+
     try {
       if (typeof tagInput === "string") {
         const tagId = dasherize(tagInput.trim());
@@ -56,15 +58,14 @@ export default class TagsService extends Service {
         }
       }
 
-      const tags = await document.tags;
-
       if (tags.find((t) => t.id === tag.id)) {
         return tag;
       }
 
-      tags.push(tag);
+      document.tags = [...tags, tag];
       await document.save();
     } catch (error) {
+      document.tags = tags;
       new ErrorHandler(this, error).notify("alexandria.errors.update");
     }
 
@@ -84,11 +85,14 @@ export default class TagsService extends Service {
       tag = this.store.peekRecord("tag", tag);
     }
 
-    document.tags = (await document.tags).filter((t) => t !== tag);
+    const tags = [...(await document.tags)];
+
+    document.tags = tags.filter((t) => t !== tag);
 
     try {
       await document.save();
     } catch (error) {
+      document.tags = tags;
       new ErrorHandler(this, error).notify("alexandria.errors.update");
     }
 

diff --git a/tests/integration/components/document-card-test.js b/tests/integration/components/document-card-test.js
@@ -4,7 +4,7 @@ import { setupRenderingTest } from "dummy/tests/helpers";
 import { hbs } from "ember-cli-htmlbars";
 import fileSaver from "file-saver";
 import { module, test } from "qunit";
-import sinon from "sinon";
+import { stub, fake } from "sinon";
 
 const mockDocumentsService = class DocumentsService extends Service {
   deselectDocument() {
@@ -36,8 +36,7 @@ module("Integration | Component | document-card", function (hooks) {
   });
 
   test("download file", async function (assert) {
-    // eslint-disable-next-line import/no-named-as-default-member
-    const fileSaverStub = sinon.stub(fileSaver, "saveAs");
+    const fileSaverStub = stub(fileSaver, "saveAs");
 
     const downloadUrl = "http://earh.planet";
     const title = "test1.txt";
@@ -63,21 +62,18 @@ module("Integration | Component | document-card", function (hooks) {
   });
 
   test("delete file", async function (assert) {
+    const destroy = fake();
     this.document = {
       id: 1,
       marks: [],
-      // eslint-disable-next-line import/no-named-as-default-member
-      destroyRecord: sinon.fake(),
+      destroyRecord: async () => destroy(),
     };
     await render(hbs`<DocumentCard @document={{this.document}}/>`);
 
     await click("[data-test-context-menu-trigger]");
     await click("[data-test-delete]");
     await click("[data-test-delete-confirm]");
-    assert.ok(
-      this.document.destroyRecord.calledOnce,
-      "destroyRecord was called once",
-    );
+    assert.ok(destroy.calledOnce, "destroyRecord was called once");
   });
 
   test("thumbnail", async function (assert) {

diff --git a/tests/integration/components/single-document-details-test.js b/tests/integration/components/single-document-details-test.js
@@ -64,10 +64,11 @@ module("Integration | Component | single-document-details", function (hooks) {
   });
 
   test("delete document", async function (assert) {
+    const destroy = sinon.fake();
     this.selectedDocument = {
       id: 1,
       title: "Test",
-      destroyRecord: sinon.fake(),
+      destroyRecord: async () => destroy(),
     };
     await render(
       hbs`<SingleDocumentDetails @document={{this.selectedDocument}}/>`,
@@ -76,10 +77,7 @@ module("Integration | Component | single-document-details", function (hooks) {
     await click("[data-test-delete]");
     await click("[data-test-delete-confirm]");
 
-    assert.ok(
-      this.selectedDocument.destroyRecord.calledOnce,
-      "destroyRecord was called once",
-    );
+    assert.ok(destroy.calledOnce, "destroyRecord was called once");
   });
 
   test("edit document title", async function (assert) {