decidim-core 0.28.5 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30504edbc5451f226b04213804ae8b02392132d8f66f9d5ebe9ea58ad264031e
-  data.tar.gz: 0ff217364122ef3812f7aa950e4908364126ceca46f135d0d5dc049b1ee19537
+  metadata.gz: b9d7e02680508906160916e60c9df702cacea39927e796c1a5e8c7b25a598e98
+  data.tar.gz: acaa0d17b9911bff8465bcc41e7617b239d3cba7db74a96d166247edd71c0952
 SHA512:
-  metadata.gz: 897aec8c06d1dd2110a5bd880e07061cab5e12495b707ed175afa81468c5ac162cf3d7a6643879eab83a82a9ca76232ff82dcb0d9b29ccf277d328fec6539a35
-  data.tar.gz: 88e9607861160a270e3604733a323fc2b1d359779c335ff8ccce97c9e587062c9c916d07682ad0ddda2b50abe2f718d3ce4baeb5bf77cbf3aab77ea231160014
+  metadata.gz: 9a7d5cb4b7dd42ed7950df79a9fc55da0f00f3eca5732eb496828d8295ca47c0b3cfd60ecb7821d2496a256a4c5df452faacffbae4a84bb1824d52d8b51c2206
+  data.tar.gz: 1ae409446d015bba3a91cb9bf7da8b91777730e98345166f16993e9b9ae72d4137af5135a82f4b817c5193854fbd75188918b4800b44b10cee552b7bfab625df

data/README.md

@@ -28,7 +28,7 @@ User authentication is set up with [`Devise`](https://github.com/plataformatec/d
 
 Core implements an Amendment feature that can be activated in the components. As of now, it is only implemented in the proposal component.
 
-This feature makes it possible for anyone to edit the text of an amendable resource and create a child resource as an amendment. This child resource may receive support and the author of the amendable resource may accept or reject the amendment (or child proposal). In case of rejection, the author of the rejected emendation may raise the child resource to an independent resource.
+This feature makes it possible for anyone to edit the text of an amendable resource and create a child resource as an amendment. This child resource may receive votes and the author of the amendable resource may accept or reject the amendment (or child proposal). In case of rejection, the author of the rejected emendation may raise the child resource to an independent resource.
 
 ### Key artifacts for Amendments
 

data/app/cells/decidim/activities_cell.rb

@@ -5,7 +5,6 @@ module Decidim
   # each one.
   class ActivitiesCell < Decidim::ViewModel
     include Decidim::CardHelper
-    include Decidim::IconHelper
     include Decidim::Core::Engine.routes.url_helpers
 
     # Since we are rendering each activity separatedly we need to trigger

data/app/cells/decidim/activity_cell.rb

@@ -7,10 +7,6 @@ module Decidim
   # tweak the necessary methods (usually `title` is enough).
   class ActivityCell < Decidim::ViewModel
     include Cell::ViewModel::Partial
-    include Decidim::IconHelper
-    include Decidim::ApplicationHelper
-    include Decidim::SanitizeHelper
-    include ActionView::Helpers::DateHelper
 
     def show
       return unless renderable?
@@ -27,6 +23,8 @@ module Decidim
 
     # The resource linked to the activity.
     def resource
+      return if model.blank?
+
       model.resource_lazy
     end
 
@@ -75,7 +73,7 @@ module Decidim
 
     # The text to show as the link to the resource.
     def resource_link_text
-      decidim_html_escape(translated_attribute(resource.title))
+      decidim_escape_translated(resource.title)
     end
 
     def created_at
@@ -107,6 +105,9 @@ module Decidim
       hash << I18n.locale.to_s
       hash << model.class.name.underscore
       hash << model.cache_key_with_version if model.respond_to?(: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
@@ -154,7 +155,7 @@ module Decidim
 
     def participatory_space_link
       link_to(
-        decidim_html_escape(translated_attribute(participatory_space.title)),
+        decidim_escape_translated(participatory_space.title),
         resource_locator(participatory_space).path
       )
     end

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

@@ -5,8 +5,8 @@
       <div class="address">
         <div class="address__location"><%= t(model.type_of_meeting, scope: "decidim.meetings.meetings.filters.type_values") %></div>
         <% if display_online_meeting_url? %>
-          <a href="<%= online_meeting_url %>" target="_blank" rel="noopener noreferrer" class="address__hints underline break-all">
-            <%= online_meeting_url %>
+          <a href="<%= model.online_meeting_url %>" target="_blank" rel="noopener noreferrer" class="address__hints underline break-all">
+            <%= model.online_meeting_url %>
           <% end %>
           </a>
       </div>

data/app/cells/decidim/address_cell.rb

@@ -4,8 +4,6 @@ module Decidim
   # This cell renders the address of a meeting.
   class AddressCell < Decidim::ViewModel
     include Cell::ViewModel::Partial
-    include LayoutHelper
-    include Decidim::SanitizeHelper
 
     def show
       return render :online if options[:online]
@@ -22,15 +20,15 @@ module Decidim
     end
 
     def location_hints
-      decidim_sanitize(translated_attribute(model.location_hints))
+      decidim_sanitize_translated(model.location_hints)
     end
 
     def location
-      decidim_sanitize(translated_attribute(model.location))
+      decidim_sanitize_translated(model.location)
     end
 
     def address
-      decidim_sanitize(translated_attribute(model.address))
+      decidim_sanitize_translated(model.address)
     end
 
     def display_start_and_end_time?
@@ -45,10 +43,6 @@ module Decidim
       HTML
     end
 
-    def online_meeting_url
-      URI::Parser.new.escape(model.online_meeting_url)
-    end
-
     def display_online_meeting_url?
       return true unless model.respond_to?(:online?)
       return true unless model.respond_to?(:iframe_access_level_allowed_for_user?)

data/app/cells/decidim/amendable/amend_button_card_cell.rb

@@ -4,8 +4,6 @@ module Decidim
   module Amendable
     # This cell renders the button to amend the given resource.
     class AmendButtonCardCell < Decidim::ViewModel
-      delegate :current_user, to: :controller, prefix: false
-
       def model_name
         model.model_name.human
       end

data/app/cells/decidim/amendable/amendments_cell.rb

@@ -3,9 +3,7 @@
 module Decidim::Amendable
   # This cell renders the list of amendments of a resource.
   class AmendmentsCell < Decidim::ViewModel
-    include Decidim::ApplicationHelper
     include Decidim::CardHelper
-    include Decidim::IconHelper
 
     delegate :amendable?, :visible_emendations_for, to: :model
 

data/app/cells/decidim/amendable/announcement_cell.rb

@@ -3,10 +3,8 @@
 module Decidim::Amendable
   # This cell renders the callout with information about the state of the emendation
   class AnnouncementCell < Decidim::ViewModel
-    include Decidim::ApplicationHelper
-
     def show
-      cell "decidim/announcement", announcement, callout_class: state_classes
+      cell "decidim/announcement", announcement, callout_class:, callout_styles:
     end
 
     private
@@ -50,17 +48,15 @@ module Decidim::Amendable
       model.amendment.updated_at
     end
 
-    def state_classes
-      case model.state
-      when "accepted"
-        "success"
-      when "rejected", "withdrawn"
-        "alert"
-      when "evaluating"
-        "warning"
-      else
-        "muted"
-      end
+    def callout_class
+      return "muted" if model.state.blank?
+      return "alert" if model.withdrawn?
+    end
+
+    def callout_styles
+      return if model.state.blank? || model.withdrawn?
+
+      model.proposal_state&.css_style
     end
   end
 end

data/app/cells/decidim/amendable/emendation_actions_cell.rb

@@ -3,8 +3,6 @@
 module Decidim::Amendable
   # This cell renders the action buttons for coauthors to amend the given resource.
   class EmendationActionsCell < Decidim::ViewModel
-    include Decidim::LayoutHelper
-
     delegate :amendment, to: :model
 
     def current_component

data/app/cells/decidim/amendable/promote_button_card_cell.rb

@@ -4,8 +4,6 @@ module Decidim
   module Amendable
     # This cell renders the button to amend the given resource.
     class PromoteButtonCardCell < Decidim::ViewModel
-      delegate :current_user, to: :controller, prefix: false
-
       def emendation
         @emendation ||= model
       end

data/app/cells/decidim/amendable/wizard_step_form_cell.rb

@@ -14,14 +14,10 @@ module Decidim
       # Returns the current step as Integer.
       def current_step
         @current_step ||= case params[:action].to_sym
-                          when :new, :create
+                          when :new, :create, :edit_draft, :update_draft, :destroy_draft
                             1
-                          when :compare_draft
-                            2
-                          when :edit_draft, :update_draft, :destroy_draft
-                            3
                           when :preview_draft, :publish_draft
-                            4
+                            2
                           end
       end
 
@@ -47,12 +43,10 @@ module Decidim
         {
           view:,
           current_step:,
-          total_steps: 4,
+          total_steps: 2,
           steps: {
             "1": i18n_step(1),
-            "2": i18n_step(2),
-            "3": i18n_step(3),
-            "4": i18n_step(4)
+            "2": i18n_step(2)
           }
         }
       end
@@ -68,7 +62,6 @@ module Decidim
       def wizard_header_options
         {
           wizard_header_title:,
-          wizard_header_similar_resources_count: options[:similar_resources_count],
           wizard_header_help_text:
         }
       end
@@ -86,9 +79,7 @@ module Decidim
         case current_step
         when 1
           Decidim::ResourceLocatorPresenter.new(amendable).path
-        when 3
-          Decidim::Core::Engine.routes.url_helpers.compare_draft_amend_path(amendment)
-        when 4
+        when 2
           Decidim::Core::Engine.routes.url_helpers.edit_draft_amend_path(amendment)
         end
       end
@@ -99,11 +90,7 @@ module Decidim
               when 1
                 :new
               when 2
-                :compare_draft
-              when 3
-                :edit_draft
-              when 4
-                :preview_draft
+                :publish_draft
               end
 
         t("decidim.amendments.#{key}.title")

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

@@ -1,4 +1,4 @@
-<%= content_tag :div, id: options[:id], class: "flash flex-col #{css_class}", data: { announcement: "" }.compact, hidden: options[:hidden] do %>
+<%= content_tag :div, id: options[:id], class: "flash flex-col #{css_class}", style: css_styles, data: { announcement: "" }.compact, hidden: options[:hidden] do %>
   <% if has_title? %>
     <div class="flash__title">
       <%= clean_title %>

data/app/cells/decidim/announcement_cell.rb

@@ -19,8 +19,6 @@ module Decidim
   #   - `callout_class`: The Css class to apply
   #
   class AnnouncementCell < Decidim::ViewModel
-    include Decidim::SanitizeHelper
-
     def show
       return if blank_content?
 
@@ -41,6 +39,12 @@ module Decidim
       has_title? ? clean_body : clean_announcement
     end
 
+    def css_styles
+      return unless options[:callout_styles]
+
+      options[:callout_styles]
+    end
+
     def css_class
       return unless options[:callout_class]
 

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

@@ -0,0 +1,3 @@
+<div class="row column">
+  <%= form.upload :file, button_class: "button button__sm button__transparent-secondary" %>
+</div>

data/app/cells/decidim/attachments_file_tab_cell.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  class AttachmentsFileTabCell < Decidim::ViewModel
+    alias form model
+
+    def show
+      render :show
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+<div class="row column">
+  <%= form.text_field :link, aria: { label: :url }, type: :text %>
+
+  <div class="upload-modal__text">
+    <span class="sr-only"><%= explanation %></span>
+    <ul>
+      <% help_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/app/cells/decidim/attachments_link_tab_cell.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  class AttachmentsLinkTabCell < Decidim::ViewModel
+    alias form model
+
+    def show
+      render :show
+    end
+
+    private
+
+    def explanation
+      I18n.t("decidim.forms.attachment_link.explanation")
+    end
+
+    def help_messages
+      I18n.t("decidim.forms.attachment_link.help_messages")
+    end
+  end
+end

data/app/cells/decidim/author/flag.erb

@@ -1,6 +1,6 @@
-<button type="button" class="link-alt" data-open="<%= current_user.present? ? "flagModal" : "loginModal" %>" title="<%= t("report", scope: "decidim.shared.flag_modal" ) %>" aria-controls="<%= current_user.present? ? "flagModal" : "loginModal" %>" aria-haspopup="true" tabindex="0">
+<button type="button" data-open="<%= current_user.present? ? "flagModal" : "loginModal" %>" title="<%= t("report", scope: "decidim.shared.flag_modal" ) %>" aria-controls="<%= current_user.present? ? "flagModal" : "loginModal" %>" aria-haspopup="true" tabindex="0">
   <%= icon "flag", aria_hidden: true, class: "icon--small", role: "img", "aria-hidden": true %>
-  <span class="show-for-sr">
+  <span>
     <%= t("report", scope: "decidim.shared.flag_modal" ) %>
   </span>
 </button>

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

@@ -1,7 +1,6 @@
-<%# If the options hash has the demo key it means we are in the decidim-design engine, so it is not a real-world scenario with actual users %>
-<% tooltip = options.has_key?(:demo) ? { tooltip: render(:profile_minicard).html_safe } : nil %>
-<%= content_tag(:span, class: :author, data: ) do %>
-  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}", data: tooltip do %>
+<% data = has_tooltip? ? { tooltip: render(:profile_minicard).html_safe } : nil %>
+<span class="author" data-author>
+  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}", data: do %>
     <% if layout == :compact %>
       <%= render :avatar %>
 
@@ -25,4 +24,4 @@
       <%= render action %>
     <% end %>
   <% end %>
-<% end %>
+</span>

data/app/cells/decidim/author_cell.rb

@@ -5,9 +5,7 @@ module Decidim
   # below resource titles to indicate its authorship & such, and is intended
   # for resources that have a single author.
   class AuthorCell < Decidim::ViewModel
-    include LayoutHelper
     include CellsHelper
-    include Decidim::SanitizeHelper
     include ::Devise::Controllers::Helpers
     include ::Devise::Controllers::UrlHelpers
     include Messaging::ConversationHelper
@@ -49,26 +47,8 @@ module Decidim
       @context_actions_options ||= options[:context_actions].map(&:to_sym)
     end
 
-    def profile_minicard
-      render
-    end
-
     private
 
-    # If the options hash has the demo key it means we are in the decidim-design engine,
-    # so it is not a real-world scenario with actual users
-    def data
-      @data ||= begin
-        internal_data = { author: true }
-        if has_tooltip? && !options.has_key?(:demo)
-          internal_data["remote_tooltip"] = true
-          internal_data["tooltip-url"] = decidim.profile_tooltip_path(raw_model.nickname)
-        end
-
-        internal_data
-      end
-    end
-
     def layout
       @layout ||= LAYOUTS.include?(options[:layout]) ? options[:layout] : :default
     end
@@ -180,13 +160,5 @@ module Decidim
     def resource_name
       @resource_name ||= from_context.class.name.demodulize.underscore
     end
-
-    def has_tooltip?
-      return false if model.deleted?
-      return false if model.respond_to?(:blocked?) && model.blocked?
-      return true if options.has_key?(:tooltip)
-
-      model.has_tooltip?
-    end
   end
 end

data/app/cells/decidim/authorization_modal_cell.rb

@@ -2,9 +2,6 @@
 
 module Decidim
   class AuthorizationModalCell < Decidim::ViewModel
-    include LayoutHelper
-    include Decidim::MetaTagsHelper
-
     delegate :authorize_action_path, to: :controller
 
     alias authorizations model

data/app/cells/decidim/badge_cell.rb

@@ -2,11 +2,7 @@
 
 module Decidim
   class BadgeCell < Decidim::ViewModel
-    include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
-    include Decidim::IconHelper
-
-    delegate :current_user, to: :controller
 
     def small
       render "small"

data/app/cells/decidim/badges_cell.rb

@@ -2,8 +2,6 @@
 
 module Decidim
   class BadgesCell < Decidim::ViewModel
-    include Decidim::ApplicationHelper
-    include Decidim::LayoutHelper
     include Decidim::Core::Engine.routes.url_helpers
 
     def available_badges

data/app/cells/decidim/button_cell.rb

@@ -3,9 +3,6 @@
 module Decidim
   # This cell renders a generic button.
   class ButtonCell < Decidim::ViewModel
-    include LayoutHelper
-    include IconHelper
-    include Decidim::SanitizeHelper
     include Decidim::ResourceHelper
 
     DEFAULT_ATTRIBUTES = {

data/app/cells/decidim/card_cell.rb

@@ -3,12 +3,8 @@
 module Decidim
   # This cell renders the card of the given instance of a Component
   # delegated to the components' cell if specified in the manifest
-  # otherwise a primary cell wil be shown.
+  # otherwise a primary cell will be shown.
   class CardCell < Decidim::ViewModel
-    include Decidim::ApplicationHelper
-    include Decidim::IconHelper
-    include ActionView::Helpers::NumberHelper
-
     ICONS_MAPPING = {
       published_at: "calendar-line",
       votings_count: "check-double-line",

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

@@ -1,7 +1,7 @@
 <%= link_to resource_path, class: classes[:default], id: resource_id do %>
   <div class="<%= classes[:img] %>">
     <% if has_image? %>
-      <%= image_tag resource_image_url, alt: alt_title %>
+      <%= image_tag resource_image_path, alt: alt_title %>
     <% else %>
       <%= external_icon "media/images/placeholder-card-g.svg", class: "card__placeholder-g" %>
     <% end %>

data/app/cells/decidim/card_g_cell.rb

@@ -52,15 +52,12 @@ module Decidim
       @id_base_name ||= resource.class.name.gsub(/\ADecidim::/, "").underscore.split("/").join("__")
     end
 
-    def resource_image_url
-      # Backwards compatibility.
-      return resource_image_path if respond_to?(:resource_image_path)
-
+    def resource_image_path
       nil
     end
 
     def has_image?
-      resource_image_url.present?
+      resource_image_path.present?
     end
 
     def show_description?
@@ -76,11 +73,11 @@ module Decidim
     end
 
     def title
-      decidim_html_escape(translated_attribute(resource.title))
+      decidim_escape_translated(resource.title)
     end
 
     def alt_title
-      [t("decidim.application.photo.alt"), decidim_html_escape(translated_attribute(resource.title))].join(": ")
+      [t("decidim.application.photo.alt"), decidim_escape_translated(resource.title)].join(": ")
     end
 
     def title_tag

data/app/cells/decidim/card_l/image.erb

@@ -1,6 +1,6 @@
 <div class="card__list-image">
-  <% if has_image? %>
-    <%= image_tag resource_image_url, class: "w-full h-full object-cover" %>
+  <% if resource_image_path.present? %>
+    <%= image_tag resource_image_path, class: "w-full h-full object-cover" %>
   <% else %>
     <div class="w-full h-full relative">
       <div class="w-full h-full bg-primary opacity-10 absolute top-0 left-0 z-10">

data/app/cells/decidim/card_l/space.erb

@@ -1 +1 @@
-<span class="muted"><%= searchable_resource_human_name(model.participatory_space.class, count: 1) %>:</span>&nbsp;<%= link_to translated_attribute(participatory_space.title), Decidim::ResourceLocatorPresenter.new(participatory_space).path %>
+<span><%= searchable_resource_human_name(model.participatory_space.class, count: 1) %>:</span>&nbsp;<%= link_to translated_attribute(participatory_space.title), Decidim::ResourceLocatorPresenter.new(participatory_space).path %>

data/app/cells/decidim/card_l_cell.rb

@@ -5,9 +5,7 @@ module Decidim
   # so other cells only have to customize a few methods or overwrite views.
   class CardLCell < Decidim::ViewModel
     include Cell::ViewModel::Partial
-    include Decidim::ApplicationHelper
     include Decidim::TooltipHelper
-    include Decidim::SanitizeHelper
     include Decidim::CardHelper
     include Decidim::LayoutHelper
     include Decidim::SearchesHelper
@@ -68,15 +66,12 @@ module Decidim
       "#{class_base_name}__#{class_name}"
     end
 
-    def resource_image_url
-      # Backwards compatibility.
-      return resource_image_path if respond_to?(:resource_image_path)
-
+    def resource_image_path
       nil
     end
 
     def has_image?
-      resource_image_url.present?
+      resource_image_path.present?
     end
 
     def has_link_to_resource?
@@ -107,7 +102,7 @@ module Decidim
     end
 
     def title
-      decidim_html_escape(translated_attribute(resource.title))
+      decidim_escape_translated(resource.title)
     end
 
     def title_tag

data/app/cells/decidim/card_metadata_cell.rb

@@ -4,11 +4,7 @@ module Decidim
   # This cell is used to display metadata inside a list card
   # so other cells only have to customize a few methods or overwrite views.
   class CardMetadataCell < Decidim::ViewModel
-    include Decidim::IconHelper
-    include Decidim::ApplicationHelper
-    include Decidim::SanitizeHelper
     include Decidim::DateRangeHelper
-    include ActionView::Helpers::DateHelper
     include Cell::ViewModel::Partial
     include Decidim::ViewHooksHelper
 
@@ -33,7 +29,7 @@ module Decidim
       return unless show_space?
 
       {
-        text: decidim_html_escape(translated_attribute(participatory_space.title)),
+        text: decidim_escape_translated(participatory_space.title),
         icon: resource_type_icon_key(participatory_space.class),
         url: Decidim::ResourceLocatorPresenter.new(participatory_space).path
       }

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

@@ -1,12 +1,10 @@
-<%= content_tag :div, id: dom_id(resource), class: "card__search" do %>
+<%= link_to resource_path, class: "card__search", id: dom_id(resource) do %>
   <%= content_tag title_tag, class: "h4 card__search-title" do %>
-    <%= link_to resource_path, class: "card__search" do %>
-      <%= title %>
-    <% end %>
+    <%= title %>
   <% end %>
   <% if metadata_cell.present? %>
     <div class="card__search-metadata">
-     <%= cell metadata_cell, resource, links: false %>
+      <%= cell metadata_cell, resource, links: false %>
     </div>
   <% end %>
 <% end %>

data/app/cells/decidim/card_s_cell.rb

@@ -4,9 +4,6 @@ module Decidim
   # This cell is used a base for all Search cards. It holds the basic layout
   # so other cells only have to customize a few methods or overwrite views.
   class CardSCell < Decidim::ViewModel
-    include Decidim::ApplicationHelper
-    include Decidim::SanitizeHelper
-
     alias resource model
 
     def show
@@ -24,7 +21,7 @@ module Decidim
     end
 
     def title
-      decidim_html_escape(translated_attribute(resource.title))
+      decidim_escape_translated(resource.title)
     end
 
     def title_tag

data/app/cells/decidim/coauthorships_cell.rb

@@ -7,8 +7,6 @@ module Decidim
   #
   #    cell("decidim/coauthorships", @proposal)
   class CoauthorshipsCell < Decidim::ViewModel
-    include Decidim::ApplicationHelper
-
     def show
       if authorable?
         cell "decidim/author", presenter_for_author(model), has_actions: has_actions?, from: model