decidim-core 0.24.0.rc1 → 0.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba53626a99146ce44d79185a60c063ee183c5ddf2e3c8a16ace87d59b8d5096a
-  data.tar.gz: db2b391dc61a51d6418b03b11672bc89c275b87b3b20325b95ce97eb9cbba386
+  metadata.gz: f3951a2b1d212641b4f8d6d237c46f04a51acdba30baaf937d051ddc1a5a657b
+  data.tar.gz: 91ede7442a9ba6ccc60328bcea6384962e93ebffa195efca31a0ba27aae35eac
 SHA512:
-  metadata.gz: 71cf88667385e031e66d0b5b2d82c2d487daa89987e66e256a87ecdbeab75fed3aa54a5ab1c6387d9efa7d97a4df9e86a4f83506fcb0e2c5180edc2837a3ee90
-  data.tar.gz: 9483f050bf203aee28dcb885ff797a384d73189ea71b167e621335d1f35fe379c2291cdc914849698582bdc10c9ec039ea3d4df03e99fa9b43ba7491e57a4c72
+  metadata.gz: dd77e400d4d79c85b294f128a401f9408e2b8acf964cba301cf88cb53ca4305683bebf735e3e66092a3f7a66c774f9be3db6244eae9367b90c54e6a51ddfb4d5
+  data.tar.gz: 9fb9dede7ce22aebcb6d83fd83e076d1926cbaceefecc033fce2ff19d4837a759abb82dc67caf5438435d1e868df77c1481d0e59d28952f0a4942dfe1a4f0675

data/app/assets/javascripts/decidim.js.es6

@@ -39,6 +39,7 @@
 // = require decidim/geocoding/attach_input
 // = require decidim/security/selfxss_warning
 // = require decidim/session_timeouter
+// = require decidim/gallery
 
 // = require_self
 // = require decidim/configuration

data/app/assets/javascripts/decidim/editor/linebreak_module.js.es6

@@ -10,6 +10,8 @@
   const Delta = Quill.import("delta");
   const Break = Quill.import("blots/break");
   const Embed = Quill.import("blots/embed");
+  const Scroll = Quill.import("blots/scroll");
+  const Parchment = Quill.import("parchment");
   const { HistoryOverride } = exports.Decidim.Editor
   Quill.register({"modules/history": HistoryOverride}, true)
   let icons = Quill.import("ui/icons");
@@ -31,6 +33,101 @@
   }
   Quill.register(SmartBreak);
 
+  // Override quill/blots/scroll.js
+  class ScrollOvderride extends Scroll {
+    optimize(mutations = [], context = {}) {
+      if (this.batch === true) {
+        return;
+      }
+
+      this.parchmentOptimize(mutations, context);
+
+      if (mutations.length > 0) {
+        // quill/core/emitter.js, Emitter.events.SCROLL_OPTIMIZE = "scroll-optimize"
+        this.emitter.emit("scroll-optimize", mutations, context);
+      }
+    }
+
+    // Override parchment/src/blot/scroll.ts
+    parchmentOptimize(mutations = [], context = {}) {
+      // super.optimize(context);
+      Reflect.apply(Parchment.Container.prototype.optimize, this, [context]);
+
+      // We must modify mutations directly, cannot make copy and then modify
+      // let records = [].slice.call(this.observer.takeRecords());
+      let records = [...this.observer.takeRecords()];
+      // Array.push currently seems to be implemented by a non-tail recursive function
+      // so we cannot just mutations.push.apply(mutations, this.observer.takeRecords());
+      while (records.length > 0) {
+        mutations.push(records.pop());
+      }
+      let mark = (blot, markParent) => {
+        if (!blot || blot === this) {
+          return;
+        }
+        if (!blot.domNode.parentNode) {
+          return;
+        }
+        if (blot.domNode.__blot && blot.domNode.__blot.mutations === null) {
+          blot.domNode.__blot.mutations = [];
+        }
+        if (markParent) {
+          mark(blot.parent);
+        }
+      };
+      let optimize = (blot) => {
+        // Post-order traversal
+        if (!blot.domNode.__blot) {
+          return;
+        }
+
+        if (blot instanceof Parchment.Container) {
+          blot.children.forEach(optimize);
+        }
+        blot.optimize(context);
+      };
+      let remaining = mutations;
+      for (let ind = 0; remaining.length > 0; ind += 1) {
+        // MAX_OPTIMIZE_ITERATIONS = 100
+        if (ind >= 100) {
+          throw new Error("[Parchment] Maximum optimize iterations reached");
+        }
+        remaining.forEach((mutation) => {
+          let blot = Parchment.find(mutation.target, true);
+          if (!blot) {
+            return;
+          }
+          if (blot.domNode === mutation.target) {
+            if (mutation.type === "childList") {
+              mark(Parchment.find(mutation.previousSibling, false));
+
+              mutation.addedNodes.forEach((node) => {
+                let child = Parchment.find(node, false);
+                mark(child, false);
+                if (child instanceof Parchment.Container) {
+                  child.children.forEach(function(grandChild) {
+                    mark(grandChild, false);
+                  });
+                }
+              });
+            } else if (mutation.type === "attributes") {
+              mark(blot.prev);
+            }
+          }
+          mark(blot);
+        });
+        this.children.forEach(optimize);
+        remaining = [...this.observer.takeRecords()];
+        records = remaining.slice();
+        while (records.length > 0) {
+          mutations.push(records.pop());
+        }
+      }
+    }
+  }
+  Quill.register("blots/scroll", ScrollOvderride, true);
+  Parchment.register(ScrollOvderride);
+
   const lineBreakButtonHandler = (quill) => {
     let range = quill.selection.getRange()[0];
     let currentLeaf = quill.getLeaf(range.index)[0];
@@ -72,6 +169,13 @@
       }
     });
 
+    quill.clipboard.addMatcher("BR", (node) => {
+      if (node && node.parentNode && node.parentNode.tagName && node.parentNode.tagName === "A") {
+        return new Delta().insert("\n");
+      }
+      return new Delta().insert({"break": ""});
+    });
+
     addEnterBindings(quill);
     backspaceBindingsRangeAny(quill);
     backspaceBindings(quill);

data/app/assets/javascripts/decidim/editor/modified_enter.js.es6

@@ -40,17 +40,28 @@
     const currentLeaf = quill.getLeaf(range.index)[0];
     const nextLeaf = quill.getLeaf(range.index + 1)[0];
     const previousChar = quill.getText(range.index - 1, 1);
+    const formats = quill.getFormat(range.index);
 
-    quill.insertEmbed(range.index, "break", true, "user");
-    quill.formatText(range.index + 1, "bold", true)
-    if (nextLeaf === null || (currentLeaf.parent !== nextLeaf.parent)) {
+    if ((currentLeaf && currentLeaf.next && currentLeaf.next.domNode &&
+      currentLeaf.next.domNode.tagName && currentLeaf.next.domNode.tagName === "A") ||
+      (nextLeaf && nextLeaf.parent && nextLeaf.parent.domNode && nextLeaf.parent.domNode.tagName &&
+        nextLeaf.parent.domNode.tagName === "A")) {
+      quill.insertEmbed(range.index, "break", true, "user");
+      quill.removeFormat(range.index, 1, Quill.sources.SILENT)
+    } else {
+      quill.insertEmbed(range.index, "break", true, "user");
+    }
+
+    if (nextLeaf === null) {
       quill.insertEmbed(range.index, "break", true, "user");
     } else if (context.offset === 1 && previousChar === "\n") {
       const delta = new Delta().retain(range.index).insert("\n");
       quill.updateContents(delta, Quill.sources.USER);
     }
 
-    quill.format(name, context.format[name], Quill.sources.USER);
+    Object.keys(formats).forEach((format) => {
+      quill.format(format, context.format[format], Quill.sources.USER);
+    });
     quill.setSelection(range.index + 1, Quill.sources.SILENT);
 
     const lineFormats = getLineFormats(context);
@@ -58,12 +69,6 @@
   };
 
   const addEnterBindings = (quill) => {
-    quill.clipboard.addMatcher("BR", () => {
-      let newDelta = new Delta();
-      newDelta.insert({"break": ""});
-      return newDelta;
-    });
-
     quill.keyboard.addBinding({
       key: 13,
       shiftKey: true

data/app/assets/javascripts/decidim/gallery.js.es6

@@ -0,0 +1,5 @@
+$(() => {
+  $(".gallery__container").on("closed.zf.callout", (event) => {
+    $(event.target).remove();
+  });
+});

data/app/assets/javascripts/decidim/map/controller/markers.js.es6

@@ -69,7 +69,19 @@
         this.markerClusters.addLayer(marker);
       });
 
-      this.map.fitBounds(bounds, { padding: [100, 100] });
+      // Make sure there is enough space in the map for the padding to be
+      // applied. Otherwise the map will automatically zoom out (test it on
+      // mobile). Make sure there is at least the same amount of width and
+      // height available on both sides + the padding (i.e. 4x padding in
+      // total).
+      const size = this.map.getSize();
+      if (size.y >= 400 && size.x >= 400) {
+        this.map.fitBounds(bounds, { padding: [100, 100] });
+      } else if (size.y >= 120 && size.x >= 120) {
+        this.map.fitBounds(bounds, { padding: [30, 30] });
+      } else {
+        this.map.fitBounds(bounds);
+      }
     }
 
     clearMarkers() {

data/app/cells/decidim/activity/show.erb

@@ -1,4 +1,4 @@
-<div class="card card--activity">
+<div class="card card--activity" id="<%= element_id %>">
   <div class="card__content">
     <div class="card__text">
       <div class="text-medium">

data/app/cells/decidim/activity_cell.rb

@@ -84,6 +84,12 @@ module Decidim
       model.user_lazy if resource.respond_to?(:user)
     end
 
+    delegate :action, to: :model
+
+    def element_id
+      "action-#{model.id}"
+    end
+
     private
 
     def published?

data/app/cells/decidim/address/details.erb

@@ -1,7 +1,7 @@
-<% if model.respond_to? :location %>
-  <strong><%= translated_attribute model.location %></strong><br>
+<% if has_location? %>
+  <strong><%= location %></strong><br>
 <% end %>
-<span><%= model.address %></span><br>
-<% if model.respond_to? :location_hints %>
-  <span><%= translated_attribute model.location_hints %></span>
+<span><%= address %></span><br>
+<% if has_location_hints? %>
+  <span><%= location_hints %></span>
 <% end %>

data/app/cells/decidim/address_cell.rb

@@ -5,11 +5,32 @@ module Decidim
   class AddressCell < Decidim::ViewModel
     include Cell::ViewModel::Partial
     include LayoutHelper
+    include Decidim::SanitizeHelper
 
     def details
       render
     end
 
+    def has_location?
+      model.respond_to?(:location)
+    end
+
+    def has_location_hints?
+      model.respond_to?(:location_hints)
+    end
+
+    def location_hints
+      decidim_sanitize(translated_attribute(model.location_hints))
+    end
+
+    def location
+      decidim_sanitize(translated_attribute(model.location))
+    end
+
+    def address
+      decidim_sanitize(translated_attribute(model.address))
+    end
+
     private
 
     def resource_icon

data/app/cells/decidim/announcement_cell.rb

@@ -2,20 +2,27 @@
 
 module Decidim
   # This cell renders an announcement
-  # the `model` is spected to be a Hash with two keys:
-  #  `announcement` is mandatory, its the message to show
-  #  `callout_class` is optional, the css class modifier
+  #
+  # The `model` is expected to be a Hash with two keys:
+  #   - `body` is mandatory, its the message to show
+  #   - `title` is mandatory, a title to show
   #
   # {
-  #   announcement: { ... },
-  #   callout_class: "warning"
+  #   title: "...", # mandatory
+  #   body: "..." # mandatory
   # }
   #
+  # It can also receive a single value to show as text. It can either be a String
+  # or a value accepted by the `translated_attribute` method.
+  #
+  # As options, the cell accepts a Hash with these keys:
+  #   - `callout_class`: The Css class to apply. Default to `"secondary"`
+  #
   class AnnouncementCell < Decidim::ViewModel
     include Decidim::SanitizeHelper
 
     def show
-      return unless announcement.presence
+      return if clean_body.blank? && clean_announcement.blank?
 
       render :show
     end
@@ -38,8 +45,16 @@ module Decidim
       clean(announcement[:title])
     end
 
+    def body
+      return announcement.presence unless announcement.is_a?(Hash)
+
+      announcement[:body].presence
+    end
+
     def clean_body
-      Array(announcement[:body]).map { |paragraph| tag.p(clean(paragraph)) }.join("")
+      return unless body
+
+      Array(body).map { |paragraph| tag.p(clean(paragraph)) }.join("")
     end
 
     def clean_announcement

data/app/cells/decidim/content_blocks/hero_cell.rb

@@ -22,12 +22,12 @@ module Decidim
       private
 
       # A MD5 hash of model attributes because is needed because
-      # the model doesn't respond to cache_version nor updated_at method
+      # the model doesn't respond to cache_key_with_version nor updated_at method
       def cache_hash
         hash = []
         hash << "decidim/content_blocks/hero"
         hash << Digest::MD5.hexdigest(model.attributes.to_s)
-        hash << current_organization.cache_version
+        hash << current_organization.cache_key_with_version
         hash << I18n.locale.to_s
 
         hash.join("/")

data/app/cells/decidim/content_blocks/last_activity_cell.rb

@@ -49,7 +49,7 @@ module Decidim
       def cache_hash
         hash = []
         hash << "decidim/content_blocks/last_activity"
-        hash << Digest::MD5.hexdigest(valid_activities.map(&:updated_at).to_s)
+        hash << Digest::MD5.hexdigest(valid_activities.map(&:cache_key_with_version).to_s)
         hash << I18n.locale.to_s
 
         hash.join("/")

data/app/commands/decidim/destroy_account.rb

@@ -30,6 +30,8 @@ module Decidim
     private
 
     def destroy_user_account!
+      @user.invalidate_all_sessions!
+
       @user.name = ""
       @user.nickname = ""
       @user.email = ""

data/app/controllers/concerns/decidim/devise_controllers.rb

@@ -30,6 +30,7 @@ module Decidim
       helper Decidim::LayoutHelper
       helper Decidim::MenuHelper
       helper Decidim::OmniauthHelper
+      helper Decidim::CacheHelper
 
       layout "layouts/decidim/application"
 

data/app/controllers/concerns/decidim/has_stored_path.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Shared behaviour for signed_in users that require the latest TOS accepted
+  module HasStoredPath
+    extend ActiveSupport::Concern
+
+    included do
+      # Saves the location before loading each page so we can return to the
+      # right page.
+      before_action :store_current_location
+    end
+
+    # Stores the url where the user will be redirected after login.
+    #
+    # Uses the `redirect_url` param or the current url if there's no param.
+    # In Devise controllers we only store the URL if it's from the params, we don't
+    # want to overwrite the stored URL for a Devise one.
+    def store_current_location
+      return if skip_store_location?
+
+      value = redirect_url || request.url
+      store_location_for(:user, value)
+    end
+
+    def skip_store_location?
+      # Skip if Devise already handles the redirection
+      return true if devise_controller? && redirect_url.blank?
+      # Skip for all non-HTML requests"
+      return true unless request.format.html?
+      # Skip if a signed in user requests the TOS page without having agreed to
+      # the TOS. Most of the times this is because of a redirect to the TOS
+      # page (in which case the desired location is somewhere else after the
+      # TOS is agreed).
+      return true if current_user && !current_user.tos_accepted? && request.path == URI(tos_path).path
+
+      false
+    end
+  end
+end

data/app/controllers/concerns/decidim/paginable.rb

@@ -18,7 +18,14 @@ module Decidim
       end
 
       def per_page
-        params[:per_page] || OPTIONS.first
+        if OPTIONS.include?(params[:per_page])
+          params[:per_page]
+        elsif params[:per_page]
+          sorted = OPTIONS.sort
+          params[:per_page].to_i.clamp(sorted.first, sorted.last)
+        else
+          OPTIONS.first
+        end
       end
 
       def page_offset