fix: use downloadUrl, cleanup, testing

addon/adapters/file.js

@@ -2,7 +2,6 @@ import ApplicationAdapter from "./application";
 
 export default class FileAdapter extends ApplicationAdapter {
   ajaxOptions(url, type, options) {
-    console.log(url, type, options);
     const ajaxOptions = super.ajaxOptions(url, type, options);
 
     if (type === "PUT") {
@@ -14,7 +13,6 @@ export default class FileAdapter extends ApplicationAdapter {
     if (type === "PUT" || type === "POST") {
       // Remove content type for updating and creating records so the content
       // type will be defined by the passed form data
-      console.log("removing content-type header from", ajaxOptions.headers);
       delete ajaxOptions.headers["content-type"];
     }
 

addon/models/document.js

@@ -26,6 +26,6 @@ export default class DocumentModel extends LocalizedModel {
     const thumbnail = this.files.filter(
       (file) => file.variant === "thumbnail",
     )[0];
-    return thumbnail && thumbnail.content;
+    return thumbnail && thumbnail.downloadUrl;
   }
 }

addon/models/file.js

@@ -3,6 +3,7 @@ import Model, { attr, belongsTo, hasMany } from "@ember-data/model";
 export default class FileModel extends Model {
   @attr variant;
   @attr name;
+  @attr downloadUrl;
   @attr metainfo;
   @attr content;
   @attr checksum;

addon/serializers/file.js

@@ -20,7 +20,7 @@ export default class TemplateSerializer extends JSONSerializer {
 
     formData.append("name", name);
     formData.append("variant", variant);
-    formData.append("document", snapshot.belongsTo("document").id);
+    formData.append("document", snapshot.belongsTo("document")?.id);
 
     if (content instanceof File) {
       formData.append("content", content);

addon/services/documents.js

@@ -1,7 +1,6 @@
 import { action } from "@ember/object";
 import Service, { inject as service } from "@ember/service";
 import { tracked } from "@glimmer/tracking";
-import fetch from "fetch";
 
 export default class DocumentsService extends Service {
   @service store;
@@ -90,19 +89,9 @@ export default class DocumentsService extends Service {
       document,
       createdByGroup: this.config.activeGroup,
       modifiedByGroup: this.config.activeGroup,
+      content: file,
     });
-
     await fileModel.save();
-
-    const response = await fetch(fileModel.uploadUrl, {
-      method: "PUT",
-      body: file,
-      headers: { "content-type": "application/octet-stream" },
-    });
-
-    if (!response.ok) {
-      throw new Error(response.statusText, response.status);
-    }
   }
 
   /**

tests/acceptance/documents-test.js

@@ -178,9 +178,10 @@ module("Acceptance | documents", function (hooks) {
     assert.dom("[data-test-file]").doesNotExist();
 
     this.assertRequest("POST", "/api/v1/files", (request) => {
-      const { attributes } = JSON.parse(request.requestBody).data;
-      assert.strictEqual(attributes.name, "test-file.txt");
-      assert.strictEqual(attributes.variant, "original");
+      const name = request.requestBody.get("name");
+      const variant = request.requestBody.get("variant");
+      assert.strictEqual(name, "test-file.txt");
+      assert.strictEqual(variant, "original");
     });
     await triggerEvent("[data-test-replace]", "change", {
       files: [new File(["Ember Rules!"], "test-file.txt")],

tests/dummy/mirage/config.js

@@ -25,11 +25,11 @@ export default function makeServer(config) {
 
       this.get("/marks");
 
-      this.post("/files", function (schema) {
-        const attrs = this.normalizedRequestAttrs();
+      this.post("/files", function (schema, request) {
+        const attrs = Object.fromEntries(request.requestBody.entries());
         return schema.files.create({
           ...attrs,
-          uploadUrl: "/api/v1/file-upload",
+          document: schema.documents.find(attrs.document),
         });
       });
 

tests/unit/serializers/file-test.js

@@ -13,10 +13,17 @@ module("Unit | Serializer | file", function (hooks) {
 
   test("it serializes records", function (assert) {
     const store = this.owner.lookup("service:store");
-    const record = store.createRecord("file", {});
+    const file = {
+      name: "foo",
+      variant: "original",
+    };
+    const record = store.createRecord("file", file);
 
     const serializedRecord = record.serialize();
 
-    assert.ok(serializedRecord);
+    assert.deepEqual(Object.fromEntries(serializedRecord.entries()), {
+      ...file,
+      document: "undefined",
+    });
   });
 });