decidim-core 0.26.0.rc2 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '008fc01a452a6ce6800305e9cd20ebaf12adade8db7b13aa2f62d5d11bf07eb0'
-  data.tar.gz: 9acc5acf5b9e95057be4731b089fb383e45f2ac90065d978e7f23f8a97dac4e6
+  metadata.gz: 18193603bd469c0ea5937875b577f4cc5439727b2ad1759e60ea725d029e18f1
+  data.tar.gz: 91c95bec2cdc7af5ad17a5d5ccd165817516fbaf0ed46051c198d3b8b5b1321b
 SHA512:
-  metadata.gz: 5edc8e0a59cf89167962340fe5fca99b5ddd5257f1dd936b0e8a9c8e3f620f8cdd8596b1d831c2886750d94764dd009453fa117c347ba00020ceb6eefa8f911f
-  data.tar.gz: 7538bffa5a162c3e4777fc9317f529854e664540dcf77da130c6a08362afa37bff8a84d78b29ae78b04cf2f370b6c582da21a8fdeebdbf447cf360cf82419f63
+  metadata.gz: 71b39ec5cae4751ab21048ef686cd6b3704e8d5469d9ba608fcf163944ebf83fc100d1a47c59d4eae4b4c01af4d5074918113a8cf533151e954eb97defa14bf9
+  data.tar.gz: 72011b7df988f022988d64892177f9f4b28338019152d0a2ce46f489696256acdcd095d0da83346e41d70cdeb72c72ef7e21c0e701b50a1d4b35a6de8c51840d

data/app/cells/decidim/activity_cell.rb

@@ -95,6 +95,9 @@ module Decidim
       hash << I18n.locale.to_s
       hash << model.class.name.underscore
       hash << model.cache_key_with_version
+      if (author_cell = author)
+        hash.push(Digest::MD5.hexdigest(author_cell.send(:cache_hash)))
+      end
 
       hash.join(Decidim.cache_key_separator)
     end

data/app/cells/decidim/author_cell.rb

@@ -66,6 +66,7 @@ module Decidim
 
       hash.push(I18n.locale)
       hash.push(model.cache_key_with_version) if model.respond_to?(:cache_key_with_version)
+      hash.push(from_context.cache_key_with_version) if from_context.respond_to?(:cache_key_with_version)
       hash.push(current_user.try(:id))
       hash.push(current_user.present?)
       hash.push(commentable?)

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

@@ -9,7 +9,7 @@
       <div class="card__text">
         <div class="card__text--paragraph">
           <%= render :badge if has_badge? %>
-          <%= description %>
+          <%= Decidim::ContentProcessor.render(description, "div") %>
         </div>
       </div>
 

data/app/cells/decidim/card_m_cell.rb

@@ -19,7 +19,7 @@ module Decidim
     private
 
     def resource_path
-      resource_locator(model).path(filter_link_params)
+      resource_locator(model).path
     end
 
     def resource_image_path

data/app/cells/decidim/diff/diff_mode_dropdown.erb

@@ -4,21 +4,26 @@
       <%= t("versions.dropdown.choose_diff_view_mode") %>
     </span>
 
-    <ul class="dropdown menu" data-dropdown-menu>
-      <li class="is-dropdown-submenu-parent">
-        <a id="diff-view-selected">
+    <ul class="dropdown menu" data-dropdown-menu
+      data-autoclose="false"
+      data-disable-hover="true"
+      data-click-open="true"
+      data-close-on-click="true"
+      role="menubar">
+      <li class="is-dropdown-submenu-parent" role="presentation">
+        <a href="#diffmode-chooser-menu" id="diff-view-selected" aria-controls="diffmode-chooser-menu" aria-haspopup="true" aria-label="<%= t("versions.dropdown.choose_diff_view_mode_menu") %>" role="menuitem">
           <%= t("versions.dropdown.option_unified") %>
         </a>
 
-        <ul class="menu">
-          <li>
-            <%= link_to "#diff-view-unified", class: "diff-view-mode", id:"diff-view-unified" do %>
+        <ul class="menu is-dropdown-submenu" id="diffmode-chooser-menu" role="menu" aria-labelledby="diff-view-selected">
+          <li role="presentation">
+            <%= link_to "#diff-view-unified", class: "diff-view-mode", id:"diff-view-unified", role: "menuitem" do %>
               <%= t("versions.dropdown.option_unified") %>
             <% end %>
           </li>
 
-          <li>
-            <%= link_to "#diff-view-split", class: "diff-view-mode", id:"diff-view-split" do %>
+          <li role="presentation">
+            <%= link_to "#diff-view-split", class: "diff-view-mode", id:"diff-view-split", role: "menuitem" do %>
               <%= t("versions.dropdown.option_split") %>
             <% end %>
           </li>

data/app/cells/decidim/diff/diff_mode_html.erb

@@ -5,21 +5,26 @@
         <%= t("versions.dropdown.choose_diff_view_html") %>
       </span>
 
-      <ul class="dropdown menu" data-dropdown-menu>
-        <li class="is-dropdown-submenu-parent">
-          <a id="diff-view-selected">
+      <ul class="dropdown menu" data-dropdown-menu
+        data-autoclose="false"
+        data-disable-hover="true"
+        data-click-open="true"
+        data-close-on-click="true"
+        role="menubar">
+        <li class="is-dropdown-submenu-parent" role="presentation">
+          <a href="#htmlmode-chooser-menu" id="diff-view-html-selected" aria-controls="htmlmode-chooser-menu" aria-haspopup="true" aria-label="<%= t("versions.dropdown.choose_diff_view_mode_menu") %>" role="menuitem">
             <%= t("versions.dropdown.option_unescaped") %>
           </a>
 
-          <ul class="menu">
-            <li>
-              <%= link_to "#unescaped-html", class: "diff-view-html", id:"unescaped-html" do %>
+          <ul class="menu is-dropdown-submenu" id="htmlmode-chooser-menu" role="menu" aria-labelledby="diff-view-html-selected">
+            <li role="presentation">
+              <%= link_to "#diff-view-unescaped-html", class: "diff-view-html", id: "diff-view-unescaped-html", role: "menuitem" do %>
                 <%= t("versions.dropdown.option_unescaped") %>
               <% end %>
             </li>
 
-            <li>
-              <%= link_to "#escaped-html", class: "diff-view-html", id:"escaped-html" do %>
+            <li role="presentation">
+              <%= link_to "#diff-view-escaped-html", class: "diff-view-html", id: "diff-view-escaped-html", role: "menuitem" do %>
                 <%= t("versions.dropdown.option_escaped") %>
               <% end %>
             </li>

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

@@ -1,6 +1,8 @@
 <%= render :diff_mode_dropdown %>
 <%= render :diff_mode_html %>
 
-<% diff_data.each do |data| %>
-  <%= attribute(data) %>
-<% end %>
+<div aria-live="polite">
+  <% diff_data.each do |data| %>
+    <%= attribute(data) %>
+  <% end %>
+</div>

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

@@ -1,7 +1,7 @@
 <div id="list-of-endorsements" class="section">
   <div class="row">
     <div class="columns large-12">
-      <h4 class="section-heading"><%= t("decidim.proposals.proposals.show.endorsements_list") %></h4>
+      <h3 class="section-heading"><%= t("decidim.proposals.proposals.show.endorsements_list") %></h3>
     </div>
     <div class="columns large-12">
       <%= cell(

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

@@ -3,7 +3,7 @@
 </div>
 
 <div id="<%= modal_name %>" class="reveal fingerprint-dialog" data-reveal aria-labelledby="modalTitle" aria-hidden="true" role="dialog">
-  <h2 id="modalTitle"><%= t "decidim.fingerprint.title" %></h2>
+  <h2 id="modalTitle" class="reveal__title"><%= t "decidim.fingerprint.title" %></h2>
   <p><%= t "decidim.fingerprint.explanation" %></p>
   <p>
     <strong><%= t "decidim.fingerprint.value" %>:</strong>

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

@@ -1,4 +1,4 @@
-<div class="empty-notifications callout secondary <%= "hide" if followers.any? %>">
+<div class="callout secondary <%= "hide" if followers.any? %>">
   <p><%= t("decidim.followers.no_followers") %></p>
 </div>
 <div class="row small-up-1 medium-up-2 card-grid">

data/app/cells/decidim/followers_cell.rb

@@ -12,7 +12,7 @@ module Decidim
     end
 
     def followers
-      @followers ||= model.followers.page(params[:page]).per(20)
+      @followers ||= model.followers.not_blocked.page(params[:page]).per(20)
     end
   end
 end

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

@@ -1,6 +1,6 @@
 <% if public_followings.any? %>
   <% if non_public_followings? %>
-    <div class="empty-notifications callout secondary">
+    <div class="callout secondary">
       <p><%= t("decidim.following.non_public_followings") %></p>
     </div>
   <% end %>
@@ -12,7 +12,7 @@
   </div>
   <%= decidim_paginate public_followings %>
 <% else %>
-  <div class="empty-notifications callout secondary">
+  <div class="callout secondary">
     <p><%= t("decidim.following.no_followings") %></p>
   </div>
 <% end %>

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

@@ -1,5 +1,5 @@
 <%= cell "decidim/user_group_pending_invitations_list", model %>
-<div class="empty-notifications callout secondary <%= "hide" if user_groups.any? %>">
+<div class="callout secondary <%= "hide" if user_groups.any? %>">
   <p><%= t("decidim.groups.no_user_groups") %></p>
 </div>
 <div class="row small-up-1 medium-up-2 card-grid">

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

@@ -1,4 +1,4 @@
-<div class="empty-notifications callout secondary <%= "hide" if memberships.any? %>">
+<div class="callout secondary <%= "hide" if memberships.any? %>">
   <p><%= t("decidim.members.no_members") %></p>
 </div>
 <div class="row small-up-1 medium-up-2 card-grid">

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

@@ -13,7 +13,7 @@
         <span class="text-small"><%= notification.event_class.constantize.model_name.human %></span>
         <br>
         <span>
-          <%= notification.event_class_instance.notification_title %>
+          <%= notification_title %>
         </span>
         <% if notification.display_resource_text? %>
           <p>

data/app/cells/decidim/notification_cell.rb

@@ -11,6 +11,12 @@ module Decidim
       render :show
     end
 
+    def notification_title
+      notification.event_class_instance.notification_title
+    rescue StandardError
+      I18n.t("decidim.notifications.show.missing_event")
+    end
+
     private
 
     def notification

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

@@ -23,7 +23,7 @@
       <small><%= decidim_html_escape(profile_user.about.to_s) %></small>
     </div>
     <% if profile_user.personal_url.present? %>
-      <%= link_to html_truncate(profile_user.personal_url.gsub(%r{https?\:\/\/}, ""), length: 30), profile_user.personal_url %>
+      <%= link_to html_truncate(profile_user.personal_url.gsub(%r{https?\:\/\/}, ""), length: 30), profile_user.personal_url, rel: "nofollow noopener noreferrer ugc" %>
     <% end %>
   </div>
   <% if profile_user.badge.present? %>

data/app/cells/decidim/user_conversation/messages.erb

@@ -1,6 +1,6 @@
 <div class="conversation-chat<%= " conversation-chat--offset" if sender_is_user?(sender) %>">
   <%= link_to sender.personal_url do %>
-    <%= image_tag sender.attached_uploader(:avatar).url(host: current_organization.host), alt: t("decidim.author.avatar", name: decidim_sanitize(sender.name)) %>
+    <%= image_tag avatar_url_for(sender), alt: t("decidim.author.avatar", name: decidim_sanitize(sender.name)) %>
   <% end %>
   <div>
     <% messages.each do |message| %>

data/app/cells/decidim/user_conversation_cell.rb

@@ -37,6 +37,10 @@ module Decidim
       user.id == sender.id
     end
 
+    def avatar_url_for(sender)
+      present(sender).avatar_url
+    end
+
     def conversation_avatar
       if interlocutors.count == 1
         present(interlocutors.first).avatar_url

data/app/cells/decidim/user_conversations/add_conversation_users.erb

@@ -2,7 +2,7 @@
   <div class="wrapper wrapper--inner">
     <div class="row">
       <div class="large-12">
-        <h2 id="modalTitle"> <%= t "decidim.user_conversations.index.modal_title" %> </h2>
+        <h2 id="modalTitle" class="reveal__title"><%= t "decidim.user_conversations.index.modal_title" %></h2>
       </div>
     </div>
     <div class="row">

data/app/cells/decidim/version_cell.rb

@@ -77,7 +77,7 @@ module Decidim
     end
 
     def resource_path
-      resource_locator(versioned_resource).path(filter_link_params)
+      resource_locator(versioned_resource).path
     end
   end
 end

data/app/cells/decidim/versions_list_cell.rb

@@ -13,7 +13,7 @@ module Decidim
     end
 
     def resource_path
-      resource_locator(versioned_resource).path(filter_link_params)
+      resource_locator(versioned_resource).path
     end
 
     def i18n_changes_title

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

@@ -2,9 +2,9 @@
   <div class="card--list__text">
     <div>
       <%= link_to version_path do %>
-        <h6 class="card--list__heading heading6">
+        <h4 class="card--list__heading heading6">
           <%= i18n_version_index %>
-        </h6>
+        </h4>
       <% end %>
       <div class="author-data">
         <%= render_resource_editor(version) %>

data/app/commands/decidim/messaging/reply_to_conversation.rb

@@ -20,7 +20,10 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) if form.invalid?
+        if form.invalid?
+          message.valid?
+          return broadcast(:invalid, message.errors.full_messages)
+        end
 
         if message.save
           notify_interlocutors

data/app/commands/decidim/unendorse_resource.rb

@@ -28,10 +28,11 @@ module Decidim
     private
 
     def destroy_resource_endorsement
-      query = @resource.endorsements.where(
-        author: @current_user,
-        decidim_user_group_id: @current_group&.id
-      )
+      query = if @current_group.present?
+                @resource.endorsements.where(decidim_user_group_id: @current_group&.id)
+              else
+                @resource.endorsements.where(author: @current_user)
+              end
       query.destroy_all
     end
   end

data/app/commands/decidim/update_user_interests.rb

@@ -29,7 +29,11 @@ module Decidim
     end
 
     def selected_scopes_ids
-      @form.scopes.select(&:checked).map(&:id)
+      @form.scopes.map do |scope|
+        next unless scope.checked?
+
+        scope.id.to_i
+      end.compact
     end
   end
 end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # We don't want to reset timeout timer on routes where we make requests automatically
+  # (e.g. asking time before timeout or fetching comments).
+  module SkipTimeoutable
+    extend ActiveSupport::Concern
+
+    private
+
+    def skip_timeout
+      request.env["devise.skip_timeoutable"] = true
+    end
+  end
+end

data/app/controllers/decidim/application_controller.rb

@@ -33,6 +33,7 @@ module Decidim
     helper Decidim::ViewHooksHelper
     helper Decidim::CardHelper
     helper Decidim::SanitizeHelper
+    helper Decidim::TwitterSearchHelper
 
     register_permissions(::Decidim::ApplicationController,
                          ::Decidim::Admin::Permissions,

data/app/controllers/decidim/components/base_controller.rb

@@ -24,7 +24,6 @@ module Decidim
       helper Decidim::AttachmentsHelper
       helper Decidim::SanitizeHelper
       helper Decidim::PadHelper
-      helper Decidim::FilterParamsHelper
 
       helper_method :current_component,
                     :current_participatory_space,

data/app/controllers/decidim/timeouts_controller.rb

@@ -5,6 +5,8 @@ require "active_support/concern"
 module Decidim
   # Tells/Extends time before inactivity warning or automatic logout.
   class TimeoutsController < Decidim::ApplicationController
+    include Decidim::SkipTimeoutable
+
     # Skip these methods because they can call Devise's store_location_for, which can save timeouts path to session.
     skip_before_action :store_current_location
 
@@ -23,11 +25,5 @@ module Decidim
         format.js
       end
     end
-
-    private
-
-    def skip_timeout
-      request.env["devise.skip_timeoutable"] = true
-    end
   end
 end

data/app/events/decidim/amendable/amendment_base_event.rb

@@ -6,7 +6,7 @@ module Decidim::Amendable
                     :emendation_path, :emendation_author_nickname, :emendation_author_path
 
     def amendable_title
-      @amendable_title ||= amendable_resource.title
+      @amendable_title ||= translated_attribute(amendable_resource.title)
     end
 
     def amendable_type

data/app/forms/decidim/messaging/message_form.rb

@@ -8,7 +8,7 @@ module Decidim
 
       attribute :body, Decidim::Attributes::CleanString
 
-      validates :body, presence: true
+      validates :body, presence: true, length: { maximum: Decidim.config.maximum_conversation_message_length }
     end
   end
 end

data/app/forms/decidim/user_interest_scope_form.rb

@@ -6,7 +6,7 @@ module Decidim
   class UserInterestScopeForm < Form
     mimic :scope
 
-    attribute :name, String
+    attribute :name, JsonbAttributes
     attribute :checked, Boolean
     attribute :children, Array[UserInterestScopeForm]
 

data/app/helpers/decidim/application_helper.rb

@@ -119,5 +119,9 @@ module Decidim
         [base_url, "/", process.active_step.cta_path].join("")
       end
     end
+
+    def prevent_timeout_seconds
+      0
+    end
   end
 end

data/app/helpers/decidim/endorsable_helper.rb

@@ -76,12 +76,13 @@ module Decidim
     #   user       - The user that is endorsing at the end (mandatory).
     #   user_group - The user_group on behalf of which the endorsement is being done (optional).
     def render_endorsement_identity(resource, user, user_group = nil)
-      presenter = if user_group
-                    Decidim::UserGroupPresenter.new(user_group)
-                  else
-                    Decidim::UserPresenter.new(user)
-                  end
-      selected = resource.endorsed_by?(user, user_group)
+      if user_group
+        presenter = Decidim::UserGroupPresenter.new(user_group)
+        selected = resource.endorsed_by?(user, user_group)
+      else
+        presenter = Decidim::UserPresenter.new(user)
+        selected = resource.endorsed_by?(user)
+      end
       http_method = selected ? :delete : :post
       render partial: "decidim/endorsements/identity", locals:
       { identity: presenter, selected: selected,

data/app/helpers/decidim/meta_tags_helper.rb

@@ -16,7 +16,30 @@ module Decidim
       add_decidim_meta_description(tags[:description])
       add_decidim_meta_url(tags[:url])
       add_decidim_meta_twitter_handler(tags[:twitter_handler])
-      add_decidim_meta_image_url(tags[:image_url])
+      add_decidim_meta_image_url(add_base_url_to(tags[:image_url]))
+    end
+
+    # Public: Add base url to path if path doesn't include host.
+    # path - A String containing path (e.g. "/proposals/1" )
+    # Returns a String of URL including base URL and path, or path if it's blank.
+    def add_base_url_to(path)
+      return path if path.blank?
+      return path if URI.parse(path).host.present?
+
+      "#{resolve_base_url}#{path}"
+    end
+
+    # Public: Resolve base url (example: https://www.decidim.org) without url params
+    # Returns a String of base URL
+    def resolve_base_url
+      return request.base_url if respond_to?(:request) && request&.base_url.present?
+
+      uri = URI.parse(decidim.root_url(host: current_organization.host))
+      if uri.port.blank? || [80, 443].include?(uri.port)
+        "#{uri.scheme}://#{uri.host}"
+      else
+        "#{uri.scheme}://#{uri.host}:#{uri.port}"
+      end
     end
 
     # Public: Accumulates the given `title` so that they can be chained. Since Rails views

data/app/helpers/decidim/sanitize_helper.rb

@@ -94,11 +94,17 @@ module Decidim
       end
     end
 
+    # This method is currently being used only for Proposal and Meeting,
+    # It aims to load the presenter class, and perform some basic sanitization on the content
+    # This method should be used along side simple_format.
+    # @param resource [Object] Resource object
+    # @param method [Symbol] Method name
+    #
+    # @return ActiveSupport::SafeBuffer
     def render_sanitized_content(resource, method)
       content = present(resource).send(method, links: true, strip_tags: !safe_content?)
-      content = simple_format(content, {}, sanitize: false)
 
-      return content unless safe_content?
+      return decidim_sanitize(content, {}) unless safe_content?
 
       decidim_sanitize_editor(content)
     end

data/app/helpers/decidim/twitter_search_helper.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module TwitterSearchHelper
+    # Builds the URL for Twitter's hashtag search.
+    #
+    # @param hashtag [String] The hasthag to search
+    #
+    # @return [String]
+    def twitter_hashtag_url(hashtag)
+      format("https://twitter.com/hashtag/%{hashtag}?src=hash", hashtag: hashtag)
+    end
+  end
+end

data/app/models/decidim/action_log.rb

@@ -135,6 +135,7 @@ module Decidim
     def visible_for?(user)
       return false if resource_lazy.blank?
       return false if participatory_space_lazy.blank?
+      return false if resource_lazy.respond_to?(:deleted?) && resource_lazy.deleted?
       return false if resource_lazy.respond_to?(:hidden?) && resource_lazy.hidden?
       return false if resource_lazy.respond_to?(:can_participate?) && !resource_lazy.can_participate?(user)
 

data/app/models/decidim/moderation.rb

@@ -12,6 +12,9 @@ module Decidim
 
     delegate :component, :organization, to: :reportable
 
+    scope :hidden, -> { where.not(hidden_at: nil) }
+    scope :not_hidden, -> { where(hidden_at: nil) }
+
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::ModerationPresenter
     end

data/app/models/decidim/user.rb

@@ -50,9 +50,6 @@ module Decidim
 
     validate :all_roles_are_valid
 
-    has_one_attached :avatar
-    validates_upload :avatar, uploader: Decidim::AvatarUploader
-
     has_one_attached :data_portability_file
 
     scope :not_deleted, -> { where(deleted_at: nil) }

data/app/models/decidim/user_base_entity.rb

@@ -55,6 +55,7 @@ module Decidim
       scope = scope.public_spaces if klass.try(:participatory_space?)
       scope = scope.includes(:component) if klass.try(:has_component?)
       scope = scope.filter(&:visible?) if klass.method_defined?(:visible?)
+      scope = scope.reject(&:blocked) if klass == Decidim::UserBaseEntity
       scope
     end
   end

data/app/models/decidim/user_group.rb

@@ -26,9 +26,6 @@ module Decidim
     validate :correct_state
     validate :unique_document_number, if: :has_document_number?
 
-    has_one_attached :avatar
-    validates_upload :avatar, uploader: Decidim::AvatarUploader
-
     devise :confirmable, :decidim_validatable, confirmation_keys: [:decidim_organization_id, :email]
 
     scope :verified, -> { where.not("extended_data->>'verified_at' IS ?", nil) }

data/app/packs/entrypoints/decidim_core.js

@@ -13,6 +13,7 @@ window.morphdom = morphdom
 import "src/decidim/vendor/foundation-datepicker"
 import "src/decidim/foundation_datepicker_locales"
 import "src/decidim/vendor/modernizr"
+import "src/decidim/vendor/social-share-button"
 import "social-share-button"
 
 import "src/decidim/input_tags"
@@ -33,6 +34,7 @@ import "src/decidim/dropdowns_menus"
 import "src/decidim/append_redirect_url_to_modals"
 import "src/decidim/form_attachments"
 import "src/decidim/form_validator"
+import "src/decidim/form_remote"
 import "src/decidim/ajax_modals"
 import "src/decidim/conferences"
 import "src/decidim/tooltip_keep_on_hover"
@@ -55,6 +57,7 @@ import "src/decidim/start_conversation_dialog"
 import "src/decidim/notifications"
 import "src/decidim/identity_selector_dialog"
 import "src/decidim/gallery"
+import "src/decidim/back_to_list"
 
 // CSS
 import "entrypoints/decidim_core.scss"