alchemy_cms 5.3.1 → 5.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d0f346b9e40e791697acdf21d5e1193c72023f8f2570b777683ba2e781b67c1
-  data.tar.gz: b0c6a7f6e466bd0b134f9a7fdc76cb88ec1a56d0ca068209fa6b004619ed3a8e
+  metadata.gz: 37f7ca98f0e6c0d8729e8ba6ef3fd432449dc5dba0b900ef72f9bd7494e406d5
+  data.tar.gz: 0d3871f0f550d07b09eda00cd5a26427d9c80303cc0f008aea496a7a3e9a6579
 SHA512:
-  metadata.gz: e10199dcdc4b12d01bfebef27d23b752d1dd95c393263dac664c2d5588677aca80113c8b99ca281aefa130592767cc01304ab635d09273c63f3cc575ab2a1313
-  data.tar.gz: eaf3f967e1cb5ac4644cddf31ffdfcf3e931107be5508091fe94f61ceb7c096bacc4e39a8203ab8ba1ddf820992abfdae795774f91ac4ff571fc7687f7efd0ba
+  metadata.gz: c91fb49f9939ad01bb30e88fe3042898d4cca8126e0d3ebc143f7a2232cf67cbbc176ca796c8b14f517683e975172ed8d7f92359989297cce30274bdb5bc981d
+  data.tar.gz: a3e8bcf872db1d3276dffb0e56baa01a125e24f4ede546359854032a45446d5abc44b7559ab8f76fb1da8b692572ed7608f51542bf5a70dafb8a1ecb75b9bce3

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 5.3.4 (2022-04-11)
+
+- Don't delete locals in render_element so they can be used by all elem… [#2284](https://github.com/AlchemyCMS/alchemy_cms/pull/2284) ([dbwinger](https://github.com/dbwinger))
+- Show site and language name on page select in Link dialog [#2280](https://github.com/AlchemyCMS/alchemy_cms/pull/2280) ([dbwinger](https://github.com/dbwinger))
+
+## 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))
+- Fix new Sitemap ([tvdeyen](https://github.com/tvdeyen))
+
 ## 5.3.1 (2022-03-11)
 
 - Allow all pages in API again ([tvdeyen](https://github.com/tvdeyen))

data/app/assets/javascripts/alchemy/alchemy.base.js.coffee

@@ -54,9 +54,12 @@ $.extend Alchemy,
         image.on 'load', ->
           spinner.stop()
           image.fadeIn 400
-        image.on 'error', ->
+        image.on 'error', (evt) ->
+          message = "Could not load #{this.src}"
           spinner.stop()
-          $parent.html('<span class="icon warn"/>')
+          console.error(message, evt)
+          $parent.html('<span class="icon fas fa-exclamation-triangle" title="' + message + '" />')
+          return
 
   # Removes the picture from essence picture thumbnail
   removePicture: (selector) ->

data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee

@@ -80,6 +80,8 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
               name: page.name
               url_path: page.url_path
               page_id: page.id
+              language: page.language
+              site: page.site
           more: meta.page * meta.per_page < meta.total_count
       initSelection: ($element, callback) =>
         urlname = $element.val()

data/app/assets/stylesheets/alchemy/archive.scss

@@ -33,6 +33,10 @@ div#image_assign_filter_and_image_sizing {
   background-color: $thumbnail-background-color;
   width: 100%;
   height: 120px;
+
+  &:hover {
+    text-decoration: none;
+  }
 }
 
 .picture_thumbnail {

data/app/helpers/alchemy/elements_helper.rb

@@ -142,8 +142,8 @@ module Alchemy
       render element, {
         element: element,
         counter: counter,
-        options: options,
-      }.merge(options.delete(:locals) || {})
+        options: options.except(:locals),
+      }.merge(options[:locals] || {})
     rescue ActionView::MissingTemplate => e
       warning(%(
         Element view partial not found for #{element.name}.\n

data/lib/alchemy/version.rb

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

data/package/src/node_tree.js

@@ -1,5 +1,5 @@
 import Sortable from "sortablejs"
-import ajax from "./utils/ajax"
+import { patch } from "./utils/ajax"
 import { on } from "./utils/events"
 
 function displayNodeFolders() {
@@ -23,7 +23,7 @@ function onFinishDragging(evt) {
     new_position: evt.newIndex
   }
 
-  ajax("PATCH", url, data)
+  patch(url, data)
     .then(() => {
       const message = Alchemy.t("Successfully moved menu item")
       Alchemy.growl(message)
@@ -41,7 +41,7 @@ function handleNodeFolders() {
     const url = Alchemy.routes.toggle_folded_api_node_path(nodeId)
     const list = menu_item.querySelector(".children")
 
-    ajax("PATCH", url)
+    patch(url)
       .then(() => {
         list.classList.toggle("folded")
         menu_item.dataset.folded =

data/package/src/page_sorter.js

@@ -1,4 +1,5 @@
 import Sortable from "sortablejs"
+import { patch } from "./utils/ajax"
 
 function onFinishDragging(evt) {
   const pageId = evt.item.dataset.pageId
@@ -8,16 +9,9 @@ function onFinishDragging(evt) {
     new_position: evt.newIndex
   }
 
-  fetch(url, {
-    method: "PATCH",
-    headers: {
-      "Content-Type": "application/json",
-      Accept: "application/json"
-    },
-    body: JSON.stringify(data)
-  })
+  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,6 +1,7 @@
 // The admin sitemap Alchemy class
 import PageSorter from "./page_sorter"
 import { on } from "./utils/events"
+import { get, patch } from "./utils/ajax"
 import { createSortables, displayPageFolders } from "./page_sorter"
 
 export default class Sitemap {
@@ -30,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()
       })
@@ -52,14 +53,9 @@ export default class Sitemap {
         pageFolder.innerHTML = ""
         spinner.spin(pageFolder)
 
-        fetch(Alchemy.routes.fold_admin_page_path(pageId), {
-          method: "PATCH",
-          headers: {
-            Accept: "application/json"
-          }
-        })
+        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

@@ -1,5 +1,5 @@
 import xhrMock from "xhr-mock"
-import ajax from "../ajax"
+import { get, patch, post } from "../ajax"
 
 const token = "s3cr3t"
 
@@ -8,116 +8,160 @@ beforeEach(() => {
   xhrMock.setup()
 })
 
-describe("ajax('get')", () => {
+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"}')
     })
-    await ajax("get", "/users")
+    await get("/users")
   })
 
   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"
       )
       return res.status(200).body('{"message":"Ok"}')
     })
-    await ajax("get", "/users")
+    await get("/users")
   })
 
   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"}')
     })
-    await ajax("get", "/users")
+    await get("/users")
   })
 
   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 ajax("get", "/users").then((res) => {
+    await get("/users").then((res) => {
       expect(res.data).toEqual({ email: "mail@example.com" })
     })
   })
 
   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)
-    await ajax("get", "/users").catch((e) => {
+    await get("/users").catch((e) => {
       expect(e.message).toMatch("Unexpected token")
     })
   })
 
   it("network errors get rejected", async () => {
-    xhrMock.get("/users", () => {
+    xhrMock.get("http://localhost/users", () => {
       return Promise.reject(new Error())
     })
     expect.assertions(1)
-    await ajax("get", "/users").catch((e) => {
+    await get("/users").catch((e) => {
       expect(e.message).toEqual("An error occurred during the transaction")
     })
   })
 
   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)
-    await ajax("get", "/users").catch((e) => {
+    await get("/users").catch((e) => {
       expect(e.error).toEqual("Unauthorized")
     })
   })
 
   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)
-    await ajax("get", "/users").catch((e) => {
+    await get("/users").catch((e) => {
       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.patch("http://localhost/users", (req, res) => {
+      expect(req.header("X-CSRF-TOKEN")).toEqual(token)
+      return res.status(200).body('{"message":"Ok"}')
+    })
+    await patch("/users")
+  })
+
+  it("sends Content-Type header", async () => {
+    xhrMock.patch("http://localhost/users", (req, res) => {
+      expect(req.header("Content-Type")).toEqual(
+        "application/json; charset=utf-8"
+      )
+      return res.status(200).body('{"message":"Ok"}')
+    })
+    await patch("/users")
+  })
+
+  it("sends Accept header", async () => {
+    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 JSON data", async () => {
+    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" })
+  })
 })
 
-describe("ajax('post')", () => {
+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"}')
     })
-    await ajax("post", "/users")
+    await post("/users")
   })
 
   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"
       )
       return res.status(200).body('{"message":"Ok"}')
     })
-    await ajax("post", "/users")
+    await post("/users")
   })
 
   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"}')
     })
-    await ajax("post", "/users")
+    await post("/users")
   })
 
   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"}')
     })
-    await ajax("post", "/users", { email: "mail@example.com" })
+    await post("/users", { email: "mail@example.com" })
   })
 })
 

data/package/src/utils/ajax.js

@@ -29,16 +29,33 @@ function getToken() {
   return metaTag.attributes.content.textContent
 }
 
-export default function ajax(method, url, data) {
+export function get(url, params) {
+  return ajax("GET", url, params)
+}
+
+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, path, data) {
   const xhr = new XMLHttpRequest()
   const promise = buildPromise(xhr)
+  const url = new URL(window.location.origin + path)
+
+  if (data && method.toLowerCase() === "get") {
+    url.search = new URLSearchParams(data).toString()
+  }
 
-  xhr.open(method, url)
+  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.1",
+  "version": "5.3.4",
   "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.1
+  version: 5.3.4
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-11 00:00:00.000000000 Z
+date: 2022-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers