alchemy_cms 6.0.0.pre.rc3 → 6.0.0.pre.rc6

data/package/src/page_publication_fields.js

@@ -0,0 +1,27 @@
+// Handles the page publication date fields
+export default function () {
+  document.addEventListener("DialogReady.Alchemy", function (evt) {
+    const dialog = evt.detail.body
+    const public_on_field = dialog.querySelector("#page_public_on")
+    const public_until_field = dialog.querySelector("#page_public_until")
+    const publication_date_fields = dialog.querySelector(
+      ".page-publication-date-fields"
+    )
+
+    dialog
+      .querySelector("#page_public")
+      .addEventListener("click", function (evt) {
+        const checkbox = evt.target
+        const now = new Date()
+
+        if (checkbox.checked) {
+          publication_date_fields.classList.remove("hidden")
+          public_on_field._flatpickr.setDate(now)
+        } else {
+          publication_date_fields.classList.add("hidden")
+          public_on_field.value = ""
+        }
+        public_until_field.value = ""
+      })
+  })
+}

data/package/src/sitemap.js

@@ -0,0 +1,133 @@
+// The admin sitemap Alchemy class
+
+export default class Sitemap {
+  // Storing some objects.
+  constructor(options) {
+    const list_template_regexp = new RegExp("/" + options.page_root_id, "g")
+    const list_template_html = document
+      .getElementById("sitemap-list")
+      .innerHTML.replace(list_template_regexp, "/{{id}}")
+    this.search_field = document.querySelector(".search_input_field")
+    this.filter_field_clear = document.querySelector(".search_field_clear")
+    this.filter_field_clear.removeAttribute("href")
+    this.display = document.getElementById("page_filter_result")
+    this.sitemap_wrapper = document.getElementById("sitemap-wrapper")
+    this.template = Handlebars.compile(
+      document.getElementById("sitemap-template").innerHTML
+    )
+    this.list_template = Handlebars.compile(list_template_html)
+    this.items = null
+    this.options = options
+    Handlebars.registerPartial("list", list_template_html)
+    this.load(options.page_root_id)
+  }
+
+  // Loads the sitemap
+  load(pageId) {
+    const spinner = this.options.spinner || new Alchemy.Spinner("medium")
+    const spinTarget = this.sitemap_wrapper
+    spinTarget.innerHTML = ""
+    spinner.spin(spinTarget)
+    this.fetch(
+      `${this.options.url}?id=${pageId}&full=${this.options.full}`
+    ).then(async (response) => {
+      this.render(await response.json())
+      spinner.stop()
+    })
+  }
+
+  // Reload the sitemap for a specific branch
+  reload(pageId) {
+    const spinner = new Alchemy.Spinner("small")
+    const spinTarget = document.getElementById(`fold_button_${pageId}`)
+    spinTarget.querySelector(".far").remove()
+    spinner.spin(spinTarget)
+    this.fetch(`${this.options.url}?id=${pageId}`).then(async (response) => {
+      this.render(await response.json(), pageId)
+      spinner.stop()
+    })
+  }
+
+  fetch(url) {
+    return fetch(url).catch((error) => console.warn(`Request failed: ${error}`))
+  }
+
+  // Renders the sitemap
+  render(data, foldingId) {
+    let renderTarget, renderTemplate
+
+    if (foldingId) {
+      renderTarget = document.getElementById(`page_${foldingId}`)
+      renderTemplate = this.list_template
+      renderTarget.outerHTML = renderTemplate({ children: data.pages })
+    } else {
+      renderTarget = this.sitemap_wrapper
+      renderTemplate = this.template
+      renderTarget.innerHTML = renderTemplate({ children: data.pages })
+    }
+    this.items = document
+      .getElementById("sitemap")
+      .querySelectorAll(".sitemap_page")
+    this.sitemap_wrapper = document.getElementById("sitemap-wrapper")
+    this._observe()
+
+    if (this.options.ready) {
+      this.options.ready()
+    }
+  }
+
+  // Filters the sitemap
+  filter(term) {
+    const results = []
+
+    this.items.forEach(function (item) {
+      if (
+        term !== "" &&
+        item.getAttribute("name").toLowerCase().indexOf(term) !== -1
+      ) {
+        item.classList.add("highlight")
+        item.classList.remove("no-match")
+        results.push(item)
+      } else {
+        item.classList.add("no-match")
+        item.classList.remove("highlight")
+      }
+    })
+    this.filter_field_clear.style.display = "inline-block"
+    const { length } = results
+
+    if (length === 1) {
+      this.display.style.display = "block"
+      this.display.innerText = `1 ${Alchemy.t("page_found")}`
+      results[0].scrollIntoView({ behavior: "smooth", block: "center" })
+    } else if (length > 1) {
+      this.display.style.display = "block"
+      this.display.innerText = `${length} ${Alchemy.t("pages_found")}`
+    } else {
+      this.items.forEach((item) =>
+        item.classList.remove("no-match", "highlight")
+      )
+      this.display.style.display = "none"
+      window.scrollTo({
+        top: 0,
+        left: 0,
+        behavior: "smooth"
+      })
+      this.filter_field_clear.style.display = "none"
+    }
+  }
+
+  // Adds onkey up observer to search field
+  _observe() {
+    this.search_field.addEventListener("keyup", (evt) => {
+      const term = evt.target.value
+      this.filter(term.toLowerCase())
+    })
+    this.search_field.addEventListener("focus", () => key.setScope("search"))
+    this.filter_field_clear.addEventListener("click", () => {
+      this.search_field.value = ""
+      this.filter("")
+      return false
+    })
+  }
+}

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.0-rc3",
+  "version": "6.0.0-rc6",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [
@@ -24,6 +24,7 @@
   },
   "homepage": "https://github.com/AlchemyCMS/alchemy_cms#readme",
   "dependencies": {
+    "flatpickr": "^4.6.9",
     "lodash-es": "^4.17.21",
     "sortablejs": "^1.10.2"
   },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.rc3
+  version: 6.0.0.pre.rc6
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-24 00:00:00.000000000 Z
+date: 2022-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -408,9 +408,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -418,9 +418,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -757,7 +757,6 @@ files:
 - app/assets/javascripts/alchemy/alchemy.buttons.js.coffee
 - app/assets/javascripts/alchemy/alchemy.char_counter.js.coffee
 - app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee
-- app/assets/javascripts/alchemy/alchemy.datepicker.js.coffee
 - app/assets/javascripts/alchemy/alchemy.dialog.js.coffee
 - app/assets/javascripts/alchemy/alchemy.dirty.js.coffee
 - app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee
@@ -776,7 +775,6 @@ files:
 - app/assets/javascripts/alchemy/alchemy.page_sorter.js
 - app/assets/javascripts/alchemy/alchemy.preview.js.coffee
 - app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee
-- app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee
 - app/assets/javascripts/alchemy/alchemy.spinner.js
 - app/assets/javascripts/alchemy/alchemy.string_extension.js.coffee
 - app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee
@@ -1008,6 +1006,7 @@ files:
 - app/serializers/alchemy/picture_serializer.rb
 - app/services/alchemy/delete_elements.rb
 - app/services/alchemy/duplicate_element.rb
+- app/services/alchemy/tag_validations.rb
 - app/views/alchemy/_edit_mode.html.erb
 - app/views/alchemy/_menubar.html.erb
 - app/views/alchemy/_preview_mode_code.html.erb
@@ -1308,6 +1307,7 @@ files:
 - lib/alchemy/element_definition.rb
 - lib/alchemy/elements_finder.rb
 - lib/alchemy/engine.rb
+- lib/alchemy/error_tracking.rb
 - lib/alchemy/errors.rb
 - lib/alchemy/essence.rb
 - lib/alchemy/filetypes.rb
@@ -1424,12 +1424,15 @@ files:
 - package.json
 - package/admin.js
 - package/src/__tests__/i18n.spec.js
+- package/src/datepicker.js
 - package/src/file_editors.js
 - package/src/i18n.js
 - package/src/image_cropper.js
 - package/src/image_loader.js
 - package/src/node_tree.js
+- package/src/page_publication_fields.js
 - package/src/picture_editors.js
+- package/src/sitemap.js
 - package/src/translations.js
 - package/src/utils/__tests__/ajax.spec.js
 - package/src/utils/__tests__/events.spec.js

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

@@ -1,29 +0,0 @@
-window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
-
-$.extend Alchemy,
-
-  Datepicker: (scope) ->
-    $datepicker_inputs = $('input[data-datepicker-type]', scope)
-
-    # Initializes the datepickers on the text inputs and sets the proper type
-    # to enable browsers default datepicker if the current OS is iOS.
-    if Alchemy.isiOS
-      $datepicker_inputs.prop "type", ->
-        return $(this).data('datepicker-type')
-    else
-      $datepicker_inputs.each ->
-        type = $(this).data('datepicker-type')
-        options =
-          # alchemy_i18n supports `zh_CN` etc., but flatpickr only has two-letter codes (`zh`)
-          locale: Alchemy.locale.slice(0, 2)
-          altInput: true
-          altFormat: Alchemy.t("formats.#{type}")
-          altInputClass: ""
-          enableTime: /time/.test(type)
-          noCalendar: type == "time"
-          time_24hr: Alchemy.t("formats.time_24hr")
-          onValueUpdate: (_selectedDates, _dateStr, instance) ->
-            Alchemy.setElementDirty $(instance.element).closest(".element-editor")
-        $(this).flatpickr(options)
-
-    return

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

@@ -1,119 +0,0 @@
-window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
-
-# The admin sitemap Alchemy module
-Alchemy.Sitemap =
-
-  # Storing some objects.
-  init: (options) ->
-    @search_field = $(".search_input_field")
-    @filter_field_clear = $('.search_field_clear')
-    @display = $('#page_filter_result')
-    @sitemap_wrapper = $('#sitemap-wrapper p.loading')
-    @template = Handlebars.compile($('#sitemap-template').html())
-    list_template_regexp = new RegExp '\/' + options.page_root_id, 'g'
-    list_template_html = $('#sitemap-list').html().replace(list_template_regexp, '/{{id}}')
-    @list_template = Handlebars.compile(list_template_html)
-    @items = null
-    @options = options
-    @watchPagePublicationState()
-    true
-
-    Handlebars.registerPartial('list', list_template_html)
-
-    @fetch()
-
-  # Fetches the sitemap from JSON
-  fetch: (foldingId) ->
-    self = Alchemy.Sitemap
-
-    if foldingId
-      spinner = new Alchemy.Spinner('small')
-      spinTarget = $('#fold_button_' + foldingId)
-      renderTarget = $('#page_' + foldingId)
-      renderTemplate = @list_template
-      pageId = foldingId
-    else
-      spinner = @options.spinner || new Alchemy.Spinner('medium')
-      spinTarget = @sitemap_wrapper
-      renderTarget = @sitemap_wrapper
-      renderTemplate = @template
-      pageId = @options.page_root_id
-
-    spinner.spin(spinTarget[0])
-
-    request = $.ajax url: @options.url, data:
-      id: pageId
-      full: @options.full
-
-    request.done (data) ->
-      # This will also remove the spinner
-      renderTarget.replaceWith(renderTemplate({children: data.pages}))
-      self.items = $(".sitemap_page", '#sitemap')
-      self._observe()
-
-      if self.options.ready
-        self.options.ready()
-
-    request.fail (jqXHR, status) ->
-      console.warn("Request failed: " + status)
-
-  # Filters the sitemap
-  filter: (term) ->
-    results = []
-    self = Alchemy.Sitemap
-    self.items.map ->
-      item = $(this)
-      if term != '' && item.attr('name').toLowerCase().indexOf(term) != -1
-        item.addClass('highlight')
-        item.removeClass('no-match')
-        results.push item
-      else
-        item.addClass('no-match')
-        item.removeClass('highlight')
-    self.filter_field_clear.show()
-    length = results.length
-    if length == 1
-      self.display.show().text("1 #{Alchemy.t('page_found')}")
-      $.scrollTo(results[0], {duration: 400, offset: -80})
-    else if length > 1
-      self.display.show().text("#{length} #{Alchemy.t('pages_found')}")
-    else
-      self.items.removeClass('no-match highlight')
-      self.display.hide()
-      $.scrollTo('0', 400)
-      self.filter_field_clear.hide()
-
-  # Adds onkey up observer to search field
-  _observe: ->
-    filter = @filter
-    @search_field.on 'keyup', ->
-      term = $(this).val()
-      filter(term.toLowerCase())
-    @search_field.on 'focus', ->
-      key.setScope('search')
-    @filter_field_clear.click =>
-      @search_field.val('')
-      filter('')
-      false
-
-  # Handles the page publication date fields
-  watchPagePublicationState: ->
-    $(document).on 'DialogReady.Alchemy', (e, $dialog) ->
-      $public_on_field = $('#page_public_on', $dialog)
-      $public_until_field = $('#page_public_until', $dialog)
-      $publication_date_fields = $('.page-publication-date-fields', $dialog)
-
-      $('#page_public', $dialog).click ->
-        $checkbox = $(this)
-        format = $checkbox.data('date-format')
-        now = new Date()
-        if $checkbox.is(':checked')
-          $publication_date_fields.removeClass('hidden')
-          $public_on_field[0]._flatpickr.setDate(now)
-        else
-          $publication_date_fields.addClass('hidden')
-          $public_on_field.val('')
-        $public_until_field.val('')
-        true
-
-    return