decidim-core 0.30.3 → 0.31.0.rc2

data/app/forms/decidim/amendable/form.rb

@@ -46,7 +46,7 @@ module Decidim
 
       # Validates the emendation using the amendable form.
       def amendable_form_must_be_valid
-        parse_hashtaggable_params
+        parse_content_params
         original_form.validate unless defined?(@original_form) # Preserves previously added errors.
 
         amendable_form.validate unless defined?(@amendable_form) # Preserves previously added errors.
@@ -72,13 +72,13 @@ module Decidim
         end
       end
 
-      # Parses :title and :body attribute values with HashtagParser.
-      def parse_hashtaggable_params
+      # Parses :title and :body attribute values with BlobParser.
+      def parse_content_params
         emendation_params.each do |key, value|
           next unless [:title, :body].include?(key)
 
           clean_value = translated_attribute(value)
-          emendation_params[key] = Decidim::ContentParsers::HashtagParser.new(clean_value, form_context).rewrite
+          emendation_params[key] = Decidim::ContentParsers::BlobParser.new(clean_value, form_context).rewrite
         end
       end
 

data/app/forms/decidim/ephemeral_user_form.rb

@@ -10,6 +10,7 @@ module Decidim
     attribute :nickname
     attribute :organization
     attribute :verified, Boolean, default: false
+    attribute :onboarding_data, Hash, default: {}
 
     def name
       super || I18n.t("decidim.ephemeral_user", locale:)

data/app/forms/decidim/notifications_settings_form.rb

@@ -46,7 +46,7 @@ module Decidim
     end
 
     def meet_push_notifications_requirements?
-      Rails.application.secrets.dig(:vapid, :enabled) || false
+      Decidim.vapid_public_key.present?
     end
   end
 end

data/app/forms/decidim/omniauth_registration_form.rb

@@ -22,7 +22,7 @@ module Decidim
     validates :uid, presence: true
 
     def self.create_signature(provider, uid)
-      Digest::MD5.hexdigest("#{provider}-#{uid}-#{Rails.application.secret_key_base}")
+      Digest::SHA256.hexdigest("#{provider}-#{uid}-#{Rails.application.secret_key_base}")
     end
 
     def normalized_nickname

data/app/forms/decidim/upload_validation_form.rb

@@ -79,7 +79,7 @@ module Decidim
     class AttachmentContextProxy
       attr_reader :organization, :attachment_context
 
-      delegate :id, :_read_attribute, to: :organization
+      delegate :id, :_read_attribute, :read_attribute, to: :organization
 
       def initialize(organization, attachment_context)
         @organization = organization
@@ -90,6 +90,14 @@ module Decidim
         :id
       end
 
+      def self.composite_primary_key?
+        false
+      end
+
+      def self.has_query_constraints?
+        false
+      end
+
       def self.polymorphic_name
         "Decidim::Organization"
       end

data/app/helpers/decidim/amendments_helper.rb

@@ -83,7 +83,6 @@ module Decidim
 
     def amendments_form_field_for(attribute, form, original_resource)
       options = {
-        class: "js-hashtags",
         label: amendments_form_fields_label(attribute),
         value: amendments_form_fields_value(original_resource, attribute)
       }
@@ -92,7 +91,7 @@ module Decidim
       when :title
         form.text_field(:title, options)
       when :body
-        text_editor_for(form, :body, options.merge(hashtaggable: true))
+        text_editor_for(form, :body, options)
       end
     end
 

data/app/helpers/decidim/animations_helper.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AnimationsHelper
+    def success_animation
+      content_tag(:div, class: "success-image") do
+        content_tag(:svg, class: "animation-success__checkmark", xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 52 52") do
+          concat tag(:circle, class: "animation-success__checkmark__circle", cx: "26", cy: "26", r: "25", fill: "none")
+          concat tag(:path, class: "animation-success__checkmark__check", fill: "none", d: "M14.1 27.2l7.1 7.2 16.7-16.8")
+        end
+      end
+    end
+  end
+end

data/app/helpers/decidim/decidim_form_helper.rb

@@ -11,11 +11,7 @@ module Decidim
     #
     # Returns a String.
     def decidim_form_for(record, options = {}, &)
-      options[:data] ||= {}
-      options[:data].update(:abide => true, "live-validate" => true, "validate-on-blur" => true)
-
-      options[:html] ||= {}
-      options[:html].update(novalidate: true) unless options[:html].has_key?(:novalidate)
+      options = parse_html_options(options)
 
       # Generally called by form_for but we need the :url option generated
       # already before that.
@@ -56,7 +52,7 @@ module Decidim
         template += label_tag(name, options[:label]) if options[:label] != false
         template += hidden_field_tag(name, value, options)
         template += content_tag(:div, nil, class: "editor-container", data: {
-                                  toolbar: options[:toolbar]
+                                  toolbar: options[:toolbar], controller: "editor"
                                 }, style: "height: #{options[:lines]}rem")
         template.html_safe
       end
@@ -191,5 +187,20 @@ module Decidim
 
       organization.area_types
     end
+
+    private
+
+    def parse_html_options(options)
+      options[:data] ||= {}
+      options[:data].update(live_validate: true, validate_on_blur: true)
+      options[:data].update(controller: "") unless options[:data].has_key?(:controller)
+      options[:data][:controller] += " form-validator"
+      options[:data][:controller].strip!
+
+      options[:html] ||= {}
+      options[:html].update(novalidate: true) unless options[:html].has_key?(:novalidate)
+
+      options
+    end
   end
 end

data/app/helpers/decidim/layout_helper.rb

@@ -63,7 +63,7 @@ module Decidim
       if name == "wechat-line"
         html_properties = html_properties.merge({ "aria-label" => I18n.t("decidim.author.comments.other") }).except("aria-hidden")
       elsif name == "heart-line"
-        html_properties = html_properties.merge({ "aria-label" => I18n.t("decidim.author.endorsements.other") }).except("aria-hidden")
+        html_properties = html_properties.merge({ "aria-label" => I18n.t("decidim.author.likes.other") }).except("aria-hidden")
       end
 
       href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg")
@@ -122,20 +122,6 @@ module Decidim
       classes.compact
     end
 
-    def extended_navigation_bar(items, max_items: 5)
-      return unless items.any?
-
-      extra_items = items.slice((max_items + 1)..-1) || []
-      active_item = items.find { |item| item[:active] }
-
-      controller.view_context.render partial: "decidim/shared/extended_navigation_bar", locals: {
-        items:,
-        extra_items:,
-        active_item:,
-        max_items:
-      }
-    end
-
     def current_user_unread_data
       return {} if current_user.blank?
 

data/app/helpers/decidim/likeable_helper.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A Helper for views with likeable resources.
+  module LikeableHelper
+    # Public: Checks if like are enabled in this step.
+    #
+    # Returns true if enabled, false otherwise.
+    def likes_enabled?
+      current_settings.likes_enabled
+    end
+
+    # Public: Checks if likes are blocked in this step.
+    #
+    # Returns true if blocked, false otherwise.
+    def likes_blocked?
+      current_settings.likes_blocked
+    end
+
+    # Public: Checks if the current user is allowed to like in this step.
+    #
+    # Returns true if the current user can like, false otherwise.
+    def current_user_can_like?
+      current_user && likes_enabled? && !likes_blocked?
+    end
+
+    # Public: Checks if the card for likes should be rendered.
+    #
+    # Returns true if the likes card should be rendered, false otherwise.
+    def show_likes_card?
+      likes_enabled?
+    end
+
+    # produces the path that should be POST to create a like
+    def path_to_create_like(resource)
+      likes_path(resource_id: resource.to_gid.to_param,
+                 authenticity_token: form_authenticity_token)
+    end
+
+    # Produces the path that should be DELETE to destroy a like.
+    def path_to_destroy_like(resource)
+      like_path(resource.to_gid.to_param,
+                authenticity_token: form_authenticity_token)
+    end
+  end
+end

data/app/helpers/decidim/messaging/conversation_helper.rb

@@ -116,7 +116,7 @@ module Decidim
       end
 
       #
-      # Links to the conversation between the current user and another users group
+      # Links to the conversation between the current user and another users
       #
       def current_or_new_conversation_path_with_multiple(users, opts = {})
         return decidim_routes.new_user_session_path unless user_signed_in?

data/app/helpers/decidim/omniauth_helper.rb

@@ -20,7 +20,7 @@ module Decidim
       name = "#{name}-fill"
 
       if provider_info
-        icon_path = provider_info[:icon_path] || Rails.application.secrets.omniauth[provider][:icon_path].presence
+        icon_path = provider_info[:icon_path] || Decidim.omniauth_providers[provider][:icon_path].presence
         return external_icon(icon_path) if icon_path.present?
 
         name = provider_info[:icon] if provider_info[:icon]

data/app/helpers/decidim/qr_code_helper.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module QrCodeHelper
+    include Decidim::ShortLinkHelper
+
+    def resource_url
+      @resource_url ||= (resource_name ? short_url(route_name: resource_name, params: local_params) : decidim_meta_url)
+    end
+
+    def qr_code
+      @qr_code ||= RQRCode::QRCode.new(resource_url.to_s)
+    end
+
+    def local_params
+      return processed_params.merge(budget_id: resource.decidim_budgets_budget_id) if project?
+
+      processed_params
+    end
+
+    def resource_name
+      return "budget_project" if project?
+
+      resource.class.name.demodulize.underscore
+    end
+
+    def qr_code_image
+      Base64.encode64(qr_code.as_png(size: 500).to_s).gsub("\n", "")
+    end
+
+    private
+
+    def project?
+      Decidim.module_installed?(:budgets) && resource.is_a?(Decidim::Budgets::Project)
+    end
+  end
+end

data/app/helpers/decidim/rich_text_editor_helper.rb

@@ -15,7 +15,6 @@ module Decidim
         options[:context] ||= "participant"
         form.editor attribute, options
       else
-        options.delete(:hashtaggable)
         options[:rows] ||= 10
         form.text_area attribute, options
       end

data/app/helpers/decidim/sanitize_helper.rb

@@ -112,12 +112,12 @@ module Decidim
       add_line_feeds_to_paragraphs(add_line_feeds_to_list_items(text))
     end
 
-    def content_handle_locale(body, all_locales, extras, links, strip_tags)
+    def content_handle_locale(body, all_locales, links, strip_tags)
       handle_locales(body, all_locales) do |content|
         content = strip_tags(sanitize_text(content)) if strip_tags
 
-        renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
-        content = renderer.render(links:, extras:).html_safe
+        renderer = Decidim::ContentRenderers::BlobRenderer.new(content)
+        content = renderer.render.html_safe
 
         content = Decidim::ContentRenderers::LinkRenderer.new(content).render if links
         content
@@ -131,8 +131,8 @@ module Decidim
     # @param method [Symbol] Method name
     #
     # @return ActiveSupport::SafeBuffer
-    def render_sanitized_content(resource, method)
-      content = present(resource).send(method, links: true, strip_tags: !try(:safe_content?))
+    def render_sanitized_content(resource, method, presenter_class: nil)
+      content = present(resource, presenter_class:).send(method, links: true, strip_tags: !try(:safe_content?))
 
       return decidim_sanitize(content, {}) unless try(:safe_content?)
       return decidim_sanitize_editor_admin(content, {}) if try(:safe_content_admin?)

data/app/helpers/decidim/social_share_button_helper.rb

@@ -6,9 +6,7 @@ module Decidim
     def social_share_button_tag(title, args)
       return unless enabled_services.length.positive?
 
-      content_tag :div, class: "share-modal__list", data: { social_share: "" } do
-        render_social_share_buttons(enabled_services, title, args)
-      end
+      render_social_share_buttons(enabled_services, title, args)
     end
 
     def render_social_share_buttons(services, title, args)
@@ -21,18 +19,21 @@ module Decidim
       uri = service.formatted_share_uri(title, args)
       return unless uri
 
+      data = service.optional_args.reverse_merge(
+        "site" => service.name.downcase,
+        "external-link" => "text-only",
+        "external-domain-link" => false
+      )
+
       link_to(
         uri,
         rel: "nofollow noopener noreferrer",
         target: "_blank",
-        data: {
-          "site" => service.name.downcase,
-          "external-link" => "text-only",
-          "external-domain-link" => false
-        },
+        data:,
         title: t("decidim.shared.share_modal.share_to", service: service.name)
       ) do
-        render_social_share_icon(service) + content_tag(:span, service.name)
+        content_tag(:span, render_social_share_icon(service), class: "icon") +
+          content_tag(:span, service.name, class: "text")
       end
     end
 
@@ -40,7 +41,7 @@ module Decidim
       if service.icon.include? ".svg"
         image_tag service.icon_path, options.merge(alt: t("decidim.shared.share_modal.share_to", service: service.name))
       else
-        icon(service.icon, options.merge(ignore_missing: true, style: "color: #{service.icon_color};"))
+        icon(service.icon, options.merge(ignore_missing: true))
       end
     end
 

data/app/jobs/decidim/delete_inactive_participants_job.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A job to delete inactive participants and notify them
+  class DeleteInactiveParticipantsJob < ApplicationJob
+    queue_as :delete_inactive_participants
+
+    def perform(organization)
+      clear_notifications_for_active_users(organization)
+      send_first_warning_notifications(organization.users.first_warning_inactive_users)
+      send_last_warning_notifications(organization.users.last_warning_inactive_users)
+      remove_inactive_users(organization.users.removable_users)
+    end
+
+    private
+
+    def enqueue_jobs(users, action, *args)
+      users.find_each do |user|
+        ProcessInactiveParticipantJob.perform_later(user.id, action, *args)
+      end
+    end
+
+    def clear_notifications_for_active_users(organization)
+      enqueue_jobs(organization.users.not_deleted
+                               .with_inactivity_notification
+                               .active_after_notification, :clear_notification)
+    end
+
+    def send_first_warning_notifications(users)
+      enqueue_jobs(users, :send_warning, "first", Decidim.delete_inactive_users_first_warning_days_before)
+    end
+
+    def send_last_warning_notifications(users)
+      enqueue_jobs(users, :send_warning, "second", Decidim.delete_inactive_users_last_warning_days_before)
+    end
+
+    def remove_inactive_users(users)
+      enqueue_jobs(users, :remove)
+    end
+  end
+end

data/app/jobs/decidim/process_inactive_participant_job.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A job to process a single inactive participant
+  class ProcessInactiveParticipantJob < ApplicationJob
+    queue_as :delete_inactive_participants
+
+    def perform(user_id, action, *)
+      user = Decidim::User.find_by(id: user_id)
+      return unless user
+
+      case action.to_sym
+      when :clear_notification
+        user.extended_data.delete("inactivity_notification")
+        user.save!
+      when :send_warning
+        process_send_warning(user, *)
+      when :remove
+        process_remove_user(user)
+      end
+    end
+
+    private
+
+    def process_send_warning(user, type, days)
+      user.extended_data.deep_merge!(
+        "inactivity_notification" => { "notification_type" => type, "sent_at" => Time.current }
+      )
+      user.update!(extended_data: user.extended_data)
+      ParticipantsAccountMailer.inactivity_notification(user, days).deliver_later
+    end
+
+    def process_remove_user(user)
+      email = user.email
+      name = user.name
+      locale = user.locale
+      organization = user.organization
+
+      ParticipantsAccountMailer.removal_notification(email, name, locale, organization).deliver_later
+
+      Decidim::DestroyAccount.call(
+        Decidim::DeleteAccountForm.from_params(
+          delete_reason: I18n.t("decidim.account.destroy.inactive_account_removal_reason", inactivity_period: Decidim.delete_inactive_users_after_days)
+        ).with_context(current_user: user)
+      )
+    end
+  end
+end

data/app/mailers/decidim/participants_account_mailer.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A mailer to notify users about their account status
+  class ParticipantsAccountMailer < Decidim::ApplicationMailer
+    # Notify user about inactivity and potential account removal
+    def inactivity_notification(user, days)
+      with_user(user) do
+        @user = user
+        @organization = user.organization
+        @days_before_deletion = days
+
+        subject = I18n.t(
+          "decidim.participants_account_mailer.inactivity_notification.subject",
+          organization_name: organization_name(@organization)
+        )
+
+        mail(to: user.email, subject:)
+      end
+    end
+
+    # Notify user about account removal due to inactivity
+    def removal_notification(email, name, locale, organization)
+      @email = email
+      @user_name = name
+      @organization = organization
+
+      I18n.with_locale(locale) do
+        subject = I18n.t(
+          "decidim.participants_account_mailer.removal_notification.subject",
+          organization_name: organization_name(@organization)
+        )
+
+        mail(to: email, subject:)
+      end
+    end
+  end
+end

data/app/mailers/decidim/user_group_mailer.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  class UserGroupMailer < ApplicationMailer
+    # This is a mailer that aids migration from the old user_groups to the new user group system
+    # This should be used only in the scope of the migration process
+    # @deprecated This mailer will be removed in decidim v0.32.0
+    def notify_deprecation_to_owner(group)
+      with_user(group) do
+        @group_name = group.name
+        @group_email = group.email
+        @organization = group.organization
+
+        subject = I18n.t("notify_deprecation_to_owner.subject", scope: "decidim.user_group_mailer")
+        mail(to: group.email, subject:)
+      end
+    end
+
+    # This is a mailer that aids migration from the old user_groups to the new user group system
+    # This should be used only in the scope of the migration process
+    # @deprecated This mailer will be removed in decidim v0.32.0
+    def notify_deprecation_to_member(user, group_name, group_email)
+      with_user(user) do
+        @user = user
+        @group_name = group_name
+        @group_email = group_email
+        @organization = user.organization
+
+        subject = I18n.t("notify_deprecation_to_member.subject", scope: "decidim.user_group_mailer")
+        mail(to: user.email, subject:)
+      end
+    end
+
+    # This is a mailer that aids migration from the old user_groups to the new user group system
+    # This should be used only in the scope of the migration process
+    # @deprecated This mailer will be removed in decidim v0.32.0
+    def notify_user_group_patched(group, user, password)
+      with_user(user) do
+        @group = group
+        @user = user
+        @password = password
+        @organization = user.organization
+
+        subject = I18n.t("notify_user_group_patched.subject", scope: "decidim.user_group_mailer")
+        mail(to: user.email, subject:)
+      end
+    end
+  end
+end

data/app/models/decidim/action_log.rb

@@ -12,9 +12,7 @@ module Decidim
                foreign_key: :decidim_organization_id,
                class_name: "Decidim::Organization"
 
-    belongs_to :user,
-               foreign_key: :decidim_user_id,
-               class_name: "Decidim::User"
+    belongs_to :user, class_name: "Decidim::UserBaseEntity"
 
     belongs_to :component,
                foreign_key: :decidim_component_id,
@@ -200,7 +198,7 @@ module Decidim
     # Lazy loads the `user` association through BatchLoader, can be used
     # as a regular object.
     def user_lazy(cache: true)
-      self.class.lazy_relation(decidim_user_id, "Decidim::User", cache)
+      self.class.lazy_relation(user_id, user_type, cache)
     end
 
     # Lazy loads the `participatory_space` association through BatchLoader, can be used
@@ -247,7 +245,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([:moderation, :root_commentable, :user_group])
+                  scope.where(id: relation_ids).includes([:moderation, :root_commentable])
                 else
                   scope
                 end

data/app/models/decidim/amendment.rb

@@ -10,7 +10,7 @@ module Decidim
 
     validates :state, presence: true, inclusion: { in: STATES.keys.map(&:to_s) }
 
-    enum state: STATES, _default: "draft"
+    enum :state, STATES, default: "draft"
 
     # Reports the mapped resource type for authorization transfers.
     #

data/app/models/decidim/attachment_collection.rb

@@ -11,6 +11,8 @@ module Decidim
     belongs_to :collection_for, polymorphic: true
     has_many :attachments, class_name: "Decidim::Attachment", dependent: :nullify
 
+    delegate :organization, to: :collection_for
+
     default_scope { order(arel_table[:weight].asc) }
 
     def unused?

data/app/models/decidim/authorization_transfer.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Rails/HelperInstanceVariable
 module Decidim
   # An authorization transfer object is created when the user authorizes
   # themselves with the same unique ID as some other user had used in the past.

data/app/models/decidim/coauthorship.rb

@@ -9,7 +9,7 @@ module Decidim
     after_commit :author_is_follower, on: [:create]
 
     def identity
-      user_group || author
+      author
     end
 
     # Reports the mapped resource type for authorization transfers.

data/app/models/decidim/component.rb

@@ -77,7 +77,10 @@ module Decidim
 
     # 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
+      @primary_stat ||= begin
+        data = manifest.stats.filter(primary: true).with_context([self]).map { |name, value| [name, value] }.first&.first&.[](:data)
+        data.respond_to?(:first) ? data.first : data
+      end
     end
 
     # Public: Returns the component's name as resource title

data/app/models/decidim/{endorsement.rb → like.rb}

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 module Decidim
-  # A resource can have an endorsement for each user or group the author/endorser belongs to.
-  class Endorsement < ApplicationRecord
+  # A resource can have a like for each user.
+  class Like < ApplicationRecord
     include Decidim::Authorable
 
     belongs_to :resource,
                polymorphic: true,
                counter_cache: true
 
-    validates :resource_id, uniqueness: { scope: [:resource_type, :author, :user_group] }
+    validates :resource_id, uniqueness: { scope: [:resource_type, :author] }
     validate :author_and_resource_same_organization
 
-    scope :for_listing, -> { order(:decidim_user_group_id, :created_at) }
+    scope :for_listing, -> { order(:decidim_author_type, :decidim_author_id, :created_at) }
 
     private