decidim-core 0.21.0 → 0.22.0

data/app/helpers/decidim/participatory_space_helpers.rb

@@ -36,7 +36,7 @@ module Decidim
     end
 
     def participatory_space_wrapper(&block)
-      content_tag :main, class: "wrapper" do
+      content_tag :div, class: "wrapper" do
         concat(participatory_space_floating_help)
         concat(capture(&block))
       end

data/app/helpers/decidim/resource_versions_helper.rb

@@ -3,6 +3,8 @@
 module Decidim
   # Helper to print resource versions.
   module ResourceVersionsHelper
+    include ResourceHelper
+
     # Displays the localized version for the given resource.
     #
     # resource - the Resource that has the version to display.
@@ -11,19 +13,34 @@ module Decidim
     #
     # Returns a String.
     def resource_version(resource, options = {})
-      return unless resource.respond_to?(:amendable?) && resource.amendable?
+      return unless resource.respond_to?(:versions) && resource.versions.present?
 
-      html = %(<strong class="text-uppercase">#{localized_version("version", resource.versions_count)}</strong> #{localized_version("of_versions", resource.versions_count)})
+      html = []
+      html << resource_version_number(resource.versions_count)
+      html << " "
+      html << resource_version_of(resource.versions_count)
+      html << " "
+      html << link_to_other_resource_versions(options[:versions_path]) if options[:versions_path]
 
-      html += %( #{link_to(localized_version("see_other_versions"), options[:versions_path])}) if options[:versions_path]
+      content_tag(:div, safe_join(html), class: "tech-info #{options[:class]}")
+    end
 
-      "<div class='tech-info #{options[:class]}'>#{html}</div>".html_safe
+    def resource_version_number(count, css_class = "")
+      content_tag(:strong, t("version", scope: "decidim.versions.resource_version", number: count), class: css_class)
     end
 
-    private
+    def resource_version_of(count)
+      t("of_versions", scope: "decidim.versions.resource_version", number: count)
+    end
 
-    def localized_version(string, count = nil)
-      I18n.t(string, scope: "decidim.proposals.collaborative_drafts.show", number: count)
+    def link_to_other_resource_versions(versions_path)
+      link_to(
+        t(
+          "see_other_versions",
+          scope: "decidim.versions.resource_version"
+        ),
+        versions_path
+      )
     end
   end
 end

data/app/helpers/decidim/rich_text_editor_helper.rb

@@ -14,6 +14,7 @@ module Decidim
         options[:lines] ||= 25
         form.editor attribute, options
       else
+        options.delete(:hashtaggable)
         options[:rows] ||= 10
         form.text_area attribute, options
       end

data/app/helpers/decidim/sanitize_helper.rb

@@ -14,12 +14,20 @@ module Decidim
     # html - A string representing user-inputted HTML.
     #
     # Returns an HTML-safe String.
-    def decidim_sanitize(html)
-      sanitize(html, scrubber: Decidim::UserInputScrubber.new)
+    def decidim_sanitize(html, options = {})
+      if options[:strip_tags]
+        strip_tags sanitize(html, scrubber: Decidim::UserInputScrubber.new)
+      else
+        sanitize(html, scrubber: Decidim::UserInputScrubber.new)
+      end
     end
 
     def decidim_html_escape(text)
       ERB::Util.unwrapped_html_escape(text.to_str)
     end
+
+    def decidim_url_escape(text)
+      decidim_html_escape(text).sub(/^javascript:/, "")
+    end
   end
 end

data/app/helpers/decidim/tooltip_helper.rb

@@ -5,7 +5,7 @@ module Decidim
   # on the layout.
   module TooltipHelper
     def with_tooltip(title, &block)
-      content_tag(:span, data: { tooltip: true, disable_hover: false, click_open: false },
+      content_tag(:span, data: { tooltip: true, disable_hover: false, keep_on_hover: true, click_open: false },
                          title: title, &block)
     end
   end

data/app/helpers/decidim/traceability_helper.rb

@@ -11,10 +11,7 @@ module Decidim
     #
     # Returns an HTML-safe String representing the HTML to render the author.
     def render_resource_last_editor(resource)
-      render partial: "decidim/shared/version_author",
-             locals: {
-               author: Decidim.traceability.last_editor(resource)
-             }
+      cell "decidim/version_author", Decidim.traceability.last_editor(resource)
     end
 
     # Renders the avatar and author name of the author of the given version.
@@ -23,10 +20,7 @@ module Decidim
     #
     # Returns an HTML-safe String representing the HTML to render the author.
     def render_resource_editor(version)
-      render partial: "decidim/shared/version_author",
-             locals: {
-               author: Decidim.traceability.version_editor(version)
-             }
+      cell "decidim/version_author", Decidim.traceability.version_editor(version)
     end
   end
 end

data/app/helpers/decidim/user_profile_helper.rb

@@ -17,7 +17,7 @@ module Decidim
       active = is_active_link?(link, (options[:aria_link_type] || :inclusive))
 
       content_tag(:li, class: "tabs-title#{active ? " is-active" : nil}") do
-        aria_selected_link_to(text, link, options)
+        link_to(text, link, options)
       end
     end
   end

data/app/helpers/decidim/widget_urls_helper.rb

@@ -2,10 +2,12 @@
 
 module Decidim
   module WidgetUrlsHelper
-    def embed_modal_for(url)
+    def embed_modal_for(url, options = {})
+      extra_locals = options[:locals] || {}
+
       js_embed_code = String.new(content_tag(:script, "", src: url))
       embed_code = String.new(content_tag(:noscript, content_tag(:iframe, "", src: url.gsub(".js", ".html"), frameborder: 0, scrolling: "vertical")))
-      render partial: "decidim/shared/embed_modal", locals: { js_embed_code: js_embed_code, embed_code: embed_code }
+      render partial: "decidim/shared/embed_modal", locals: { js_embed_code: js_embed_code, embed_code: embed_code }.merge(extra_locals)
     end
   end
 end

data/app/jobs/decidim/event_publisher_job.rb

@@ -9,7 +9,7 @@ module Decidim
     def perform(event_name, data)
       @resource = data[:resource]
 
-      return unless notifiable?
+      return unless data[:force_send] || notifiable?
 
       EmailNotificationGeneratorJob.perform_later(
         event_name,

data/app/mailers/concerns/decidim/multitenant_asset_host.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # A module to be included in the mailers that allows
+  # to define the assets host based on an organization host
+  module MultitenantAssetHost
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :set_asset_host
+
+      # set_asset_host allows to redefine the host asset if not specified in application configuration
+      # We use a lambda because this code is executed when the application is started
+      # and does not allow us to modify it afterwards.
+      # Leave action_mailer asset_host empty to use it.
+      def set_asset_host
+        return if Rails.application.config.action_mailer.asset_host.present?
+
+        self.asset_host = ->(_mail) { "#{protocol}://#{@organization.host}" }
+      end
+
+      private
+
+      def protocol
+        return "https" if Decidim.force_ssl
+
+        "http"
+      end
+    end
+  end
+end

data/app/mailers/decidim/application_mailer.rb

@@ -5,6 +5,7 @@ module Decidim
   # mailers.
   class ApplicationMailer < ActionMailer::Base
     include LocalisedMailer
+    include MultitenantAssetHost
     after_action :set_smtp
 
     default from: Decidim.config.mailer_sender

data/app/mailers/decidim/messaging/conversation_mailer.rb

@@ -15,6 +15,28 @@ module Decidim
         )
       end
 
+      def new_group_conversation(originator, manager, conversation, group)
+        notification_mail(
+          from: originator,
+          to: manager,
+          conversation: conversation,
+          message: conversation.messages.first.body,
+          action: "new_group_conversation",
+          third_party: group
+        )
+      end
+
+      def comanagers_new_conversation(group, user, conversation, manager)
+        notification_mail(
+          from: group,
+          to: user,
+          conversation: conversation,
+          message: conversation.messages.first.body,
+          action: "comanagers_new_conversation",
+          third_party: manager
+        )
+      end
+
       def new_message(sender, user, conversation, message)
         notification_mail(
           from: sender,
@@ -25,26 +47,53 @@ module Decidim
         )
       end
 
+      def new_group_message(sender, user, conversation, message, group)
+        notification_mail(
+          from: sender,
+          to: user,
+          conversation: conversation,
+          message: message.body,
+          action: "new_group_message",
+          third_party: group
+        )
+      end
+
+      def comanagers_new_message(sender, user, conversation, message, manager)
+        notification_mail(
+          from: sender,
+          to: user,
+          conversation: conversation,
+          message: message.body,
+          action: "comanagers_new_message",
+          third_party: manager
+        )
+      end
+
       private
 
-      def notification_mail(from:, to:, conversation:, action:, message: nil)
+      # rubocop:disable Metrics/ParameterLists
+      def notification_mail(from:, to:, conversation:, action:, message: nil, third_party: nil)
         with_user(to) do
           @organization = to.organization
           @conversation = conversation
-          @sender = from.name
-          @recipient = to.name
+          @sender = from
+          @recipient = to
+          @third_party = third_party
           @message = message
           @host = @organization.host
 
           subject = I18n.t(
             "conversation_mailer.#{action}.subject",
             scope: "decidim.messaging",
-            sender: @sender
+            sender: @sender.name,
+            manager: @third_party&.name,
+            group: @third_party&.name
           )
 
           mail(to: to.email, subject: subject)
         end
       end
+      # rubocop:enable Metrics/ParameterLists
     end
   end
 end

data/app/mailers/decidim/newsletter_mailer.rb

@@ -5,8 +5,12 @@ module Decidim
     helper Decidim::SanitizeHelper
     include Decidim::NewslettersHelper
 
+    layout "decidim/newsletter_base"
+
     add_template_helper Decidim::TranslationsHelper
 
+    helper_method :cell
+
     def newsletter(user, newsletter)
       return if user.email.blank?
 
@@ -18,14 +22,28 @@ module Decidim
       @encrypted_token = Decidim::NewsletterEncryptor.sent_at_encrypted(@user.id, @newsletter.sent_at)
 
       with_user(user) do
-        subject = @newsletter.subject[I18n.locale.to_s].presence || @newsletter.subject[@organization.default_locale]
-        body = @newsletter.body[I18n.locale.to_s].presence || @newsletter.body[@organization.default_locale]
+        uninterpolated_subject =
+          @newsletter.subject[I18n.locale.to_s].presence || @newsletter.subject[@organization.default_locale]
 
-        @subject = parse_interpolations(subject, user, @newsletter.id)
-        @body = parse_interpolations(body, user, @newsletter.id)
+        @subject = parse_interpolations(uninterpolated_subject, user, @newsletter.id)
 
         mail(to: "#{user.name} <#{user.email}>", subject: @subject)
       end
     end
+
+    private
+
+    def cell
+      @cell ||= ::Decidim::ViewModel.cell(
+        @newsletter.template.cell,
+        @newsletter.template,
+        organization: @organization,
+        newsletter: @newsletter,
+        recipient_user: @user,
+        context: {
+          controller: self
+        }
+      )
+    end
   end
 end

data/app/middleware/decidim/strip_x_forwarded_host.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  class StripXForwardedHost
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      env["HTTP_X_FORWARDED_HOST"] = nil unless Decidim.follow_http_x_forwarded_host
+      @app.call(env)
+    end
+  end
+end

data/app/models/decidim/action_log.rb

@@ -118,7 +118,7 @@ module Decidim
                 elsif klass.reflect_on_association(:organization)
                   scope.where(id: relation_ids).includes(:organization)
                 elsif klass_name == "Decidim::Comments::Comment"
-                  scope.where(id: relation_ids).includes(:commentable)
+                  scope.where(id: relation_ids).includes([:moderation, :root_commentable, :user_group])
                 else
                   scope
                 end

data/app/models/decidim/amendment.rb

@@ -28,23 +28,5 @@ module Decidim
 
       emendation.linked_promoted_resource.present?
     end
-
-    # VisibilityStepSetting::options can be expanded via config setting.
-    #
-    # For new options, add the missing locales in `decidim-core/config/locales/en.yml` and
-    # change the logic of the filtering methods in the Amendable concern to fit your needs:
-    # - Decidim::Amendable::only_visible_emendations_for(user, component)
-    # - Decidim::Amendable::amendables_and_visible_emendations_for(user, component)
-    # - Decidim::Amendable#visible_emendations_for(user)
-    #
-    # Returns an Array of Arrays of translation, value:
-    # i.e. [["All amendments are visible", "all"], ...]
-    class VisibilityStepSetting
-      def self.options
-        Decidim.config.amendments_visibility_options.map do |option|
-          [I18n.t(option, scope: "decidim.amendments.visibility_options"), option]
-        end
-      end
-    end
   end
 end

data/app/models/decidim/authorization.rb

@@ -11,6 +11,7 @@ module Decidim
   # depending on the response it allows the creation of the authorization or
   # not.
   class Authorization < ApplicationRecord
+    include Decidim::Traceable
     mount_uploader :verification_attachment, Decidim::Verifications::AttachmentUploader
 
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -46,6 +47,20 @@ module Decidim
       !granted_at.nil?
     end
 
+    # Returns true if the authorization is renewable by the participant
+    def renewable?
+      return unless workflow_manifest
+
+      workflow_manifest.renewable && renewable_at < Time.current
+    end
+
+    # Returns a String, the cell to be used to render the metadata
+    def metadata_cell
+      return unless workflow_manifest
+
+      workflow_manifest.metadata_cell
+    end
+
     # Calculates at when this authorization will expire, if it needs to.
     #
     # Returns nil if the authorization does not expire.
@@ -70,5 +85,14 @@ module Decidim
     def workflow_manifest
       @workflow_manifest ||= Decidim::Verifications.find_workflow_manifest(name)
     end
+
+    # Calculates when this authorization can be reseted, if desired.
+    #
+    # **time_between_renewals** is defined in `workflow_manifest.time_between_renewals`
+    # defaults to 1 day
+    # Returns an ActiveSupport::TimeWithZone.
+    def renewable_at
+      (granted_at || created_at) + workflow_manifest.time_between_renewals
+    end
   end
 end

data/app/models/decidim/component.rb

@@ -60,6 +60,13 @@ module Decidim
       }
     end
 
+    # Public: The Form Class for this component.
+    #
+    # Returns a ComponentForm.
+    def form_class
+      manifest.component_form_class
+    end
+
     # Public: Returns the value of the registered primary stat.
     def primary_stat
       @primary_stat ||= manifest.stats.filter(primary: true).with_context([self]).map { |name, value| [name, value] }.first&.last