alchemy_cms 5.3.2 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2df8b8b8a114a3c838038e49ed3f464fdb45aca2706d7a691aa9674a6d0fceb
-  data.tar.gz: e94ecf5d831ada56e030d86f83e98e79dca35a9cd8638349aca7d3376ad20cd0
+  metadata.gz: 0f18c2fd116b7cecb0091d78a0e3d7bdad8a996e03b04c53e56e04a651a5d47b
+  data.tar.gz: 35f9e7ed5ef6c525348a5d885c50d448376ce03f2ce0955037ed3a05c4733ade
 SHA512:
-  metadata.gz: 24b96afb3447382b6d66cdf47be50ba012e83c86236fd9bd8b45a83b8685752c8820a938829920ba615c45217863966a7e46af07db027b04cff24ee9227879ae
-  data.tar.gz: e2206807c7a623254540441742d1017c40d75fabd8cc097793d040c55271f0c33a6feedee3994deb68d75dc3fddcf0f1b2a8ad98205ce254852f164877d5940a
+  metadata.gz: 23b529d54cdc27a766208ee9750e282349b184feec1cc21f398a01caccd970d2dc5a9bdd7f500f52fe165f306bf32052d8d48f2e892b83af92037d65fcec33c9
+  data.tar.gz: f733eee0bb31d47a489657d66c741fb983f1a363e017756f3be0ced53a589e3978e51f5240c8bdd3fa6d405a89bf8c89d6a7ff3b17d6de4631d638f7206dcb90

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 5.3.3 (2022-03-24)
+
+- fix admin sitemap feature specs ([tvdeyen](https://github.com/tvdeyen))
+- fix: Add support for ajax.get query params ([tvdeyen](https://github.com/tvdeyen))
+- fix(Sitemap): Use response data ([tvdeyen](https://github.com/tvdeyen))
+- Revert "Ajax: Send method override" ([tvdeyen](https://github.com/tvdeyen))
+
 ## 5.3.2 (2022-03-24)
 
 - ImageLoader: Add error handling ([tvdeyen](https://github.com/tvdeyen))

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "5.3.2"
+  VERSION = "5.3.3"
 
   def self.version
     VERSION

data/package/src/page_sorter.js

@@ -11,7 +11,7 @@ function onFinishDragging(evt) {
 
   patch(url, data)
     .then(async (response) => {
-      const pageData = await response.json()
+      const pageData = await response.data
       const pageEl = document.getElementById(`page_${pageId}`)
       const urlPathEl = pageEl.querySelector(".sitemap_url")
 

data/package/src/sitemap.js

@@ -1,7 +1,7 @@
 // The admin sitemap Alchemy class
 import PageSorter from "./page_sorter"
 import { on } from "./utils/events"
-import { patch } from "./utils/ajax"
+import { get, patch } from "./utils/ajax"
 import { createSortables, displayPageFolders } from "./page_sorter"
 
 export default class Sitemap {
@@ -31,9 +31,9 @@ export default class Sitemap {
     const spinTarget = this.sitemap_wrapper
     spinTarget.innerHTML = ""
     spinner.spin(spinTarget)
-    fetch(`${this.options.url}?id=${pageId}`)
+    get(this.options.url, { id: pageId })
       .then(async (response) => {
-        this.render(await response.json())
+        this.render(await response.data)
         this.handlePageFolders()
         spinner.stop()
       })
@@ -55,7 +55,7 @@ export default class Sitemap {
 
         patch(Alchemy.routes.fold_admin_page_path(pageId))
           .then(async (response) => {
-            this.reRender(pageId, await response.json())
+            this.reRender(pageId, await response.data)
             spinner.stop()
           })
           .catch(this.errorHandler)

data/package/src/utils/__tests__/ajax.spec.js

@@ -10,7 +10,7 @@ beforeEach(() => {
 
 describe("get", () => {
   it("sends X-CSRF-TOKEN header", async () => {
-    xhrMock.get("/users", (req, res) => {
+    xhrMock.get("http://localhost/users", (req, res) => {
       expect(req.header("X-CSRF-TOKEN")).toEqual(token)
       return res.status(200).body('{"message":"Ok"}')
     })
@@ -18,7 +18,7 @@ describe("get", () => {
   })
 
   it("sends Content-Type header", async () => {
-    xhrMock.get("/users", (req, res) => {
+    xhrMock.get("http://localhost/users", (req, res) => {
       expect(req.header("Content-Type")).toEqual(
         "application/json; charset=utf-8"
       )
@@ -28,7 +28,7 @@ describe("get", () => {
   })
 
   it("sends Accept header", async () => {
-    xhrMock.get("/users", (req, res) => {
+    xhrMock.get("http://localhost/users", (req, res) => {
       expect(req.header("Accept")).toEqual("application/json")
       return res.status(200).body('{"message":"Ok"}')
     })
@@ -36,7 +36,7 @@ describe("get", () => {
   })
 
   it("returns JSON", async () => {
-    xhrMock.get("/users", (_req, res) => {
+    xhrMock.get("http://localhost/users", (_req, res) => {
       return res.status(200).body('{"email":"mail@example.com"}')
     })
     await get("/users").then((res) => {
@@ -45,7 +45,7 @@ describe("get", () => {
   })
 
   it("JSON parse errors get rejected", async () => {
-    xhrMock.get("/users", (_req, res) => {
+    xhrMock.get("http://localhost/users", (_req, res) => {
       return res.status(200).body('email => "mail@example.com"')
     })
     expect.assertions(1)
@@ -55,7 +55,7 @@ describe("get", () => {
   })
 
   it("network errors get rejected", async () => {
-    xhrMock.get("/users", () => {
+    xhrMock.get("http://localhost/users", () => {
       return Promise.reject(new Error())
     })
     expect.assertions(1)
@@ -65,7 +65,7 @@ describe("get", () => {
   })
 
   it("server errors get rejected", async () => {
-    xhrMock.get("/users", (_req, res) => {
+    xhrMock.get("http://localhost/users", (_req, res) => {
       return res.status(401).body('{"error":"Unauthorized"}')
     })
     expect.assertions(1)
@@ -75,7 +75,7 @@ describe("get", () => {
   })
 
   it("server errors parsing errors get rejected", async () => {
-    xhrMock.get("/users", (_req, res) => {
+    xhrMock.get("http://localhost/users", (_req, res) => {
       return res.status(401).body("Unauthorized")
     })
     expect.assertions(1)
@@ -83,11 +83,19 @@ describe("get", () => {
       expect(e.message).toMatch("Unexpected token")
     })
   })
+
+  it("params get attached as query string", async () => {
+    xhrMock.get("http://localhost/users?name=foo", (_req, res) => {
+      return res.status(200).body(`{"name":"foo"}`)
+    })
+    const { data } = await get("/users", { name: "foo" })
+    expect(data.name).toEqual("foo")
+  })
 })
 
 describe("patch", () => {
   it("sends X-CSRF-TOKEN header", async () => {
-    xhrMock.post("/users", (req, res) => {
+    xhrMock.patch("http://localhost/users", (req, res) => {
       expect(req.header("X-CSRF-TOKEN")).toEqual(token)
       return res.status(200).body('{"message":"Ok"}')
     })
@@ -95,7 +103,7 @@ describe("patch", () => {
   })
 
   it("sends Content-Type header", async () => {
-    xhrMock.post("/users", (req, res) => {
+    xhrMock.patch("http://localhost/users", (req, res) => {
       expect(req.header("Content-Type")).toEqual(
         "application/json; charset=utf-8"
       )
@@ -105,26 +113,16 @@ describe("patch", () => {
   })
 
   it("sends Accept header", async () => {
-    xhrMock.post("/users", (req, res) => {
+    xhrMock.patch("http://localhost/users", (req, res) => {
       expect(req.header("Accept")).toEqual("application/json")
       return res.status(200).body('{"message":"Ok"}')
     })
     await patch("/users")
   })
 
-  it("sends method override data", async () => {
-    xhrMock.post("/users", (req, res) => {
-      expect(req.body()).toEqual('{"_method":"patch"}')
-      return res.status(200).body('{"message":"Ok"}')
-    })
-    await patch("/users")
-  })
-
   it("sends JSON data", async () => {
-    xhrMock.post("/users", (req, res) => {
-      expect(req.body()).toEqual(
-        '{"email":"mail@example.com","_method":"patch"}'
-      )
+    xhrMock.patch("http://localhost/users", (req, res) => {
+      expect(req.body()).toEqual('{"email":"mail@example.com"}')
       return res.status(200).body('{"message":"Ok"}')
     })
     await patch("/users", { email: "mail@example.com" })
@@ -133,7 +131,7 @@ describe("patch", () => {
 
 describe("post", () => {
   it("sends X-CSRF-TOKEN header", async () => {
-    xhrMock.post("/users", (req, res) => {
+    xhrMock.post("http://localhost/users", (req, res) => {
       expect(req.header("X-CSRF-TOKEN")).toEqual(token)
       return res.status(200).body('{"message":"Ok"}')
     })
@@ -141,7 +139,7 @@ describe("post", () => {
   })
 
   it("sends Content-Type header", async () => {
-    xhrMock.post("/users", (req, res) => {
+    xhrMock.post("http://localhost/users", (req, res) => {
       expect(req.header("Content-Type")).toEqual(
         "application/json; charset=utf-8"
       )
@@ -151,7 +149,7 @@ describe("post", () => {
   })
 
   it("sends Accept header", async () => {
-    xhrMock.post("/users", (req, res) => {
+    xhrMock.post("http://localhost/users", (req, res) => {
       expect(req.header("Accept")).toEqual("application/json")
       return res.status(200).body('{"message":"Ok"}')
     })
@@ -159,7 +157,7 @@ describe("post", () => {
   })
 
   it("sends JSON data", async () => {
-    xhrMock.post("/users", (req, res) => {
+    xhrMock.post("http://localhost/users", (req, res) => {
       expect(req.body()).toEqual('{"email":"mail@example.com"}')
       return res.status(200).body('{"message":"Ok"}')
     })

data/package/src/utils/ajax.js

@@ -33,24 +33,29 @@ export function get(url, params) {
   return ajax("GET", url, params)
 }
 
-export function patch(url, data = {}) {
-  return ajax("POST", url, { ...data, _method: "patch" })
+export function patch(url, data) {
+  return ajax("PATCH", url, data)
 }
 
 export function post(url, data) {
   return ajax("POST", url, data)
 }
 
-export default function ajax(method, url, data) {
+export default function ajax(method, path, data) {
   const xhr = new XMLHttpRequest()
   const promise = buildPromise(xhr)
+  const url = new URL(window.location.origin + path)
 
-  xhr.open(method, url)
+  if (data && method.toLowerCase() === "get") {
+    url.search = new URLSearchParams(data).toString()
+  }
+
+  xhr.open(method, url.toString())
   xhr.setRequestHeader("Content-type", "application/json; charset=utf-8")
   xhr.setRequestHeader("Accept", "application/json")
   xhr.setRequestHeader("X-CSRF-Token", getToken())
 
-  if (data) {
+  if (data && method.toLowerCase() !== "get") {
     xhr.send(JSON.stringify(data))
   } else {
     xhr.send()

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 5.3.3
 platform: ruby
 authors:
 - Thomas von Deyen