decidim-core 0.27.10 → 0.28.0.rc4

data/app/packs/stylesheets/decidim/map.scss

@@ -1,3 +1,65 @@
-@import "stylesheets/decidim/plugins/leaflet";
-@import "stylesheets/decidim/plugins/MarkerCluster";
-@import "stylesheets/decidim/plugins/MarkerCluster.Default";
+/*
+  NOTE: Bad practice. These dependencies should not be loaded in this way (as static files),
+  but leaflet makes use of image files, which are being wrong resolved by webpack,
+  as currently is missing the "file-loader" in the webpack.config.js
+
+  See https://github.com/Leaflet/Leaflet/issues/4849 for further info
+*/
+@import "stylesheets/decidim/legacy/leaflet";
+@import "stylesheets/decidim/legacy/MarkerCluster";
+@import "stylesheets/decidim/legacy/MarkerCluster.Default";
+
+/* overwrite leaflet and card styles */
+.leaflet-popup-content-wrapper {
+  @apply bg-black w-fit rounded text-left text-white;
+
+  .card__list {
+    @apply border-tertiary focus:outline-none;
+
+    &-metadata {
+      @apply gap-1 md:gap-4 flex-wrap md:flex-nowrap;
+    }
+
+    &-metadata span:not([class]) {
+      @apply md:px-0 md:border-0;
+    }
+
+    &-metadata span:not([class]),
+    &-metadata svg,
+    &-title {
+      @apply font-sans text-white;
+    }
+
+    &-title {
+      @apply truncate;
+    }
+
+    &-content {
+      @apply w-full;
+    }
+
+    &:focus &-title {
+      @apply underline;
+    }
+  }
+}
+
+.leaflet-popup-tip {
+  @apply bg-black;
+}
+
+.leaflet-div-icon {
+  @apply text-secondary border-0 bg-transparent;
+}
+
+[data-decidim-map] {
+  @apply h-full bg-background z-0;
+}
+
+.map__skip {
+  @apply absolute z-10 top-1 left-1 -translate-y-full py-1 px-4 bg-primary rounded-br-lg text-white cursor-pointer transition focus:translate-y-0;
+
+  &-container {
+    @apply relative overflow-hidden focus-within:overflow-visible;
+  }
+}

data/app/permissions/decidim/permissions.rb

@@ -150,7 +150,7 @@ module Decidim
       user_group = context.fetch(:user_group)
 
       if permission_action.action == :leave
-        user_can_leave_group = Decidim::UserGroupMembership.where(user: user, user_group: user_group).any?
+        user_can_leave_group = Decidim::UserGroupMembership.where(user:, user_group:).any?
         return toggle_allow(user_can_leave_group)
       end
 
@@ -194,7 +194,7 @@ module Decidim
     end
 
     def not_already_active?(authorization)
-      Verifications::Authorizations.new(organization: user.organization, user: user, name: authorization.name).none?
+      Verifications::Authorizations.new(organization: user.organization, user:, name: authorization.name).none?
     end
 
     def user_manager_permissions

data/app/presenters/decidim/admin_log/area_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::Area`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/area_type_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::AreaType`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/attachment_collection_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::AttachmentCollection`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/attachment_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::Attachment`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/category_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::Category`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/component_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::Component`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/contextual_help_section_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::ContextualHelpSection`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/impersonation_log_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::ImpersonationLog`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/moderation_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::Moderation`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/newsletter_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::Newsletter`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/oauth_application_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::OAuthApplication`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/oauth_application_resource_presenter.rb

@@ -11,7 +11,7 @@ module Decidim
       #
       # Returns an HTML-safe String.
       def resource_path
-        @resource_path ||= h.decidim_system.oauth_application_path(resource)
+        @resource_path ||= h.decidim_admin.oauth_application_path(resource)
       end
     end
   end

data/app/presenters/decidim/admin_log/organization_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::Organization`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views
@@ -26,7 +26,7 @@ module Decidim
 
       def settings_attributes_mapping
         {
-          name: :i18n,
+          name: :string,
           default_locale: :locale,
           reference_prefix: :string,
           twitter_handler: :string,
@@ -67,7 +67,6 @@ module Decidim
           logo: :string,
           header_snippets: :string,
           favicon: :string,
-          official_img_header: :string,
           official_img_footer: :string,
           official_url: :string
         }

data/app/presenters/decidim/admin_log/participatory_space_private_user_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::ParticipatorySpacePrivateUserPresenter`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/scope_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::Scope`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/scope_type_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::ScopeType`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/static_page_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::StaticPage`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/user_group_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::UserGroup`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/user_moderation_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::UserModeration`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/admin_log/user_presenter.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class holds the logic to present a `Decidim::User`
     # for the `AdminLog` log.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views

data/app/presenters/decidim/area_presenter.rb

@@ -10,5 +10,11 @@ module Decidim
     def translated_name
       @translated_name ||= translated_attribute name
     end
+
+    def translated_name_with_type
+      translated_type_name = area_type.presence && AreaTypePresenter.new(area_type).translated_name
+
+      [translated_type_name, translated_name].compact_blank.join(" - ")
+    end
   end
 end

data/app/presenters/decidim/authorization_transfer_presenter.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Decorator for authorization transfer.
+  #
+  class AuthorizationTransferPresenter < SimpleDelegator
+    # Simplifies the informational hash returned by the `#information` for the
+    # display in the user interface. Returns a hash containing the record types
+    # (their class names as strings) as its keys and the translated amount of
+    # the records as its values.
+    #
+    # The record names are always in plural format for maximum language
+    # compatibility, as otherwise we would have to specify the translatable
+    # strings for all records in singular and plural formats.
+    #
+    # @example Format of the returned hash
+    #   {
+    #      "Decidim::Foo" => "Foos: 123",
+    #      "Decidim::Bar" => "Bars: 456"
+    #   }
+    #
+    # @return [Hash<String => String>] The translated resource counts with the
+    #   resource type as its keys and the translated text with the record count
+    #   as its values.
+    def translated_record_counts
+      resources = information.map do |type, info|
+        resource_class = info[:class]
+        name = resource_class.model_name
+
+        [type, "#{name.human(count: 2)}: #{info[:count]}"]
+      end
+
+      resources.sort_by { |v| v[1] }.to_h
+    end
+
+    # Returns an array of the translated record counts containing only the
+    # texts to be displayed for the user.
+    #
+    # @return [Array<String>] The translated records names with their coutns.
+    def translated_record_texts
+      translated_record_counts.values
+    end
+
+    # Generates a HTML list of the record counts with the translated.
+    #
+    # @return [String] An HTML formatted list of the record names with their
+    #   counts.
+    def records_list_html
+      items = translated_record_texts.map do |description|
+        "<li>#{CGI.escapeHTML(description)}</li>"
+      end
+
+      "<ul>#{items.join}</ul>".html_safe
+    end
+  end
+end

data/app/presenters/decidim/breadcrumb_root_menu_item_presenter.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A presenter to render menu items of breadcrumb root menu
+  class BreadcrumbRootMenuItemPresenter < MenuItemPresenter
+    include ::Shakapacker::Helper
+    include ::ActionView::Helpers::AssetUrlHelper
+    include Decidim::LayoutHelper
+
+    def render
+      content_tag :li, class: link_wrapper_classes do
+        output = [arrow_link(label, url, link_options)]
+        output.push(@view.send(:simple_menu, **@menu_item.submenu).render) if @menu_item.submenu
+
+        safe_join(output)
+      end
+    end
+
+    def arrow_link(text, url, args = {})
+      link_to url, class: args.with_indifferent_access[:class] do
+        "<span>#{text}</span> #{icon("arrow-right-line")}".html_safe
+      end
+    end
+  end
+end

data/app/presenters/decidim/breadcrumb_root_menu_presenter.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A presenter to render breadcrumb root menu
+  class BreadcrumbRootMenuPresenter < MenuPresenter
+    def render
+      render_menu
+    end
+
+    protected
+
+    def menu_items
+      items.map do |menu_item|
+        BreadcrumbRootMenuItemPresenter.new(menu_item, @view, @options).render
+      end
+    end
+  end
+end

data/app/presenters/decidim/footer_menu_presenter.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A presenter to render footer menu
+  class FooterMenuPresenter < MenuPresenter
+    def render
+      content_tag(:nav, role: "navigation", "aria-label" => @options[:label]) do
+        safe_join([content_tag(:h2, @options[:label], class: "h5 mb-4"), render_menu])
+      end
+    end
+  end
+end

data/app/presenters/decidim/hashtag_presenter.rb

@@ -27,7 +27,7 @@ module Decidim
     end
 
     def display_hashtag
-      link_to name, decidim.search_path(term: name), target: "_blank", class: "hashtag-mention", rel: "noopener"
+      link_to name, decidim.search_path(term: name), target: "_blank", class: "text-secondary underline", rel: "noopener", data: { "external-link": false }
     end
 
     def display_hashtag_name

data/app/presenters/decidim/log/base_presenter.rb

@@ -15,8 +15,8 @@ module Decidim
     # See `Decidim::ActionLog#render_log` for more info on the log types and
     # presenters.
     #
-    # Usage should be automatic and you shouldn't need to call this class
-    # directly, but here's an example:
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
     #
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views
@@ -91,10 +91,16 @@ module Decidim
       #
       # Returns an HTML-safe String.
       def present_dropdown
-        return h.content_tag(:div, "", class: "logs__log__actions") unless has_diff?
+        return h.content_tag(:div, "", class: "logs__log__actions") if present_diff.blank?
 
         h.content_tag(:div, class: "logs__log__actions") do
-          h.content_tag(:a, "", class: "logs__log__actions-dropdown", data: { toggle: h.dom_id(action_log) })
+          h.content_tag(
+            :a,
+            "",
+            class: "logs__log__actions-dropdown",
+            data: { controls: "panel-#{h.dom_id(action_log)}" },
+            aria: { label: I18n.t("decidim.admin.dashboard.show.dropdown") }
+          )
         end
       end
 
@@ -118,7 +124,7 @@ module Decidim
       # Returns an HTML-safe String.
       def present_content
         h.content_tag(:div, class: "logs__log__content") do
-          present_log_date + present_explanation + present_dropdown
+          present_dropdown + present_log_date + present_explanation
         end
       end
 
@@ -130,6 +136,7 @@ module Decidim
         @diff_presenter ||= Decidim::Log::DiffPresenter.new(
           changeset,
           view_helpers,
+          action_log,
           show_previous_value?: show_previous_value_in_diff?
         )
       end
@@ -150,7 +157,7 @@ module Decidim
       # Returns an HTML-safe String.
       def present_action_log
         classes = ["logs__log"] + action_log_extra_classes.to_a
-        h.content_tag(:li, id: h.dom_id(action_log), class: classes.join(" "), data: { toggler: ".logs__log--expanded" }) do
+        h.content_tag(:div, id: "accordion-#{h.dom_id(action_log)}", class: classes.join(" "), data: { component: "accordion" }) do
           h.concat(present_content)
           h.concat(present_diff)
         end

data/app/presenters/decidim/log/diff_presenter.rb

@@ -6,7 +6,7 @@ module Decidim
     # The data needed for this class to work should be sent by
     # `Decidim::Log::BasePresenter` or any of its children.
     #
-    # In order to be able to use your own class to present a diff, you'll need to
+    # In order to be able to use your own class to present a diff, you will need to
     # overwrite `BasePresenter#diff_presenter` to return your custom diff presenter.
     # The only requirement for custom renderers is that they should respond to `present`.
     class DiffPresenter
@@ -16,9 +16,10 @@ module Decidim
       # view_helpers - An object holding the view helpers at the render time.
       #   Most probably should come automatically from the views.
       # options - a Hash with options
-      def initialize(changeset, view_helpers, options = {})
+      def initialize(changeset, view_helpers, action_log, options = {})
         @changeset = changeset
         @view_helpers = view_helpers
+        @action_log = action_log
         @options = { show_previous_value?: true }.merge(options)
       end
 
@@ -31,7 +32,7 @@ module Decidim
 
       private
 
-      attr_reader :changeset, :view_helpers, :options
+      attr_reader :changeset, :view_helpers, :options, :action_log
       alias h view_helpers
 
       # Private: Presents the diff for this action. If the resource and the
@@ -41,7 +42,7 @@ module Decidim
       def present_diff
         return "".html_safe if changeset.blank?
 
-        h.content_tag(:div, class: "logs__log__diff") do
+        h.content_tag(:div, class: "logs__log__diff", id: "panel-#{h.dom_id(action_log)}") do
           changeset.each do |attribute|
             h.concat(present_new_value(attribute[:label], attribute[:new_value], attribute[:type]))
             h.concat(present_previous_value(attribute[:previous_value], attribute[:type])) if options[:show_previous_value?]
@@ -53,7 +54,7 @@ module Decidim
       #
       # value - the value for the given attribute
       # type - A symbol or String representing the type of the value.
-      #   If it's a String, it should be the name of the presenter that will
+      #   If it is a String, it should be the name of the presenter that will
       #   be in charge of presenting it.
       #
       # Returns an HTML-safe String.
@@ -69,7 +70,7 @@ module Decidim
       # label - the label name
       # value - the value for the given label
       # type - A symbol or String representing the type of the value.
-      #   If it's a String, it should be the name of the presenter that will
+      #   If it is a String, it should be the name of the presenter that will
       #   be in charge of presenting it.
       #
       # Returns an HTML-safe String.
@@ -84,7 +85,7 @@ module Decidim
       #
       # value - the value to be presented, no specific type.
       # type - A symbol or String representing the type of the value.
-      #   If it's a String, it should be the name of the presenter that will
+      #   If it is a String, it should be the name of the presenter that will
       #   be in charge of presenting it.
       #
       # Returns an HTML-safe String.
@@ -95,7 +96,7 @@ module Decidim
       # Private: Finds the presenter class for the given type.
       #
       # type - A symbol or String representing the type of the value.
-      #   If it's a String, it should be the name of the presenter that will
+      #   If it is a String, it should be the name of the presenter that will
       #   be in charge of presenting it.
       #
       # Returns a Class.

data/app/presenters/decidim/log/resource_presenter.rb

@@ -6,12 +6,10 @@ module Decidim
     # The data needed for this class to work should be sent by
     # `Decidim::Log::BasePresenter` or any of its children.
     #
-    # In order to be able to use your own class to present a resource, you'll need to
+    # In order to be able to use your own class to present a resource, you will need to
     # overwrite `BasePresenter#resource_presenter` to return your custom resource presenter.
     # The only requirement for custom renderers is that they should respond to `present`.
     class ResourcePresenter
-      include Decidim::SanitizeHelper
-
       # Public: Initializes the presenter.
       #
       # resource - An instance of a model that can be located by
@@ -67,11 +65,7 @@ module Decidim
       #
       # Returns an HTML-safe String.
       def present_resource_name
-        if resource.present? && resource.respond_to?(:presenter) && resource.presenter.respond_to?(:title)
-          resource.presenter.title(html_escape: true)
-        else
-          decidim_escape_translated(extra["title"]).html_safe
-        end
+        h.translated_attribute extra["title"]
       end
     end
   end

data/app/presenters/decidim/log/space_presenter.rb

@@ -6,7 +6,7 @@ module Decidim
     # activity log. The data needed for this class to work should be sent by
     # `Decidim::Log::BasePresenter` or any of its children.
     #
-    # In order to be able to use your own class to present a space, you'll need to
+    # In order to be able to use your own class to present a space, you will need to
     # overwrite `BasePresenter#space_presenter` to return your custom space presenter.
     # The only requirement for custom renderers is that they should respond to `present`.
     class SpacePresenter