decidim-core 0.30.1 → 0.31.0.rc1

data/app/controllers/decidim/qr_controller.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "rqrcode"
+
+module Decidim
+  class QrController < Decidim::ApplicationController
+    include Decidim::OrganizationHelper
+    include Decidim::QrCodeHelper
+
+    helper_method :resource, :qr_code, :qr_code_image
+    before_action :validate_resource
+    before_action :validate_component
+    before_action :validate_participatory_space
+
+    layout false
+
+    def show
+      respond_to do |format|
+        format.html
+        format.png { send_data(qr_code.as_png(size: 500), filename: "qr-#{organization_name}-#{parametrized_title}.png") }
+      end
+    end
+
+    # needs to be public so that short link works
+    def current_component = resource.try(:component)
+
+    # needs to be public so that short link works
+    def current_participatory_space
+      return resource if resource.is_a?(Decidim::Participable)
+
+      resource.try(:participatory_space)
+    end
+
+    private
+
+    def validate_resource
+      raise ActiveRecord::RecordNotFound if resource.blank?
+      raise ActiveRecord::RecordNotFound if resource.respond_to?(:hidden?) && resource.hidden?
+      raise ActiveRecord::RecordNotFound if resource.is_a?(Decidim::Publicable) && !resource.published?
+    end
+
+    def validate_component
+      return unless resource.respond_to?(:component) && resource.component.present?
+
+      raise ActiveRecord::RecordNotFound unless resource.component.published?
+    end
+
+    def validate_participatory_space
+      raise ActiveRecord::RecordNotFound if resource.respond_to?(:participatory_space) && !resource.participatory_space.published?
+    end
+
+    def processed_params
+      return {} if resource.is_a?(Decidim::Participable)
+
+      {
+        participatory_process_slug: current_participatory_space.slug,
+        component_id: current_component&.id&.to_s,
+        id: resource.id.to_s
+      }.with_indifferent_access
+    end
+
+    def resource
+      @resource ||= GlobalID::Locator.locate_signed(params[:resource])
+    end
+
+    def parametrized_title
+      [
+        resource.presenter.title(html_escape: true).parameterize,
+        resource.id
+      ].join("-")
+    end
+  end
+end

data/app/controllers/decidim/resource_autocomplete_controller.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ResourceAutocompleteController < Decidim::ApplicationController
+    def index
+      respond_to do |format|
+        format.json do
+          if term.blank?
+            render json: [{ title: t("decidim.resource_autocomplete.help"), help: true }]
+          else
+            render json: serialized_results
+          end
+        end
+      end
+    end
+
+    private
+
+    def allowed_resource_types
+      %w(Decidim::Proposals::Proposal)
+    end
+
+    def serialized_results
+      search_results.map do |result|
+        {
+          gid: result.resource_global_id,
+          title: result.content_a
+        }
+      end
+    end
+
+    def search_results
+      Decidim::SearchableResource
+        .where(
+          resource_type: allowed_resource_types,
+          organization: current_organization,
+          decidim_participatory_space: current_participatory_space,
+          locale: I18n.locale
+        )
+        .autocomplete_search(term)
+        .limit(10)
+    end
+
+    def term
+      params[:term]
+    end
+
+    def participatory_space_gid
+      params[:participatory_space_gid]
+    end
+
+    def current_participatory_space
+      @current_participatory_space ||= GlobalID::Locator.locate(participatory_space_gid)
+    end
+  end
+end

data/app/controllers/decidim/user_activities_controller.rb

@@ -4,7 +4,6 @@ module Decidim
   # The controller to show all the last activities in a Decidim Organization.
   class UserActivitiesController < Decidim::ApplicationController
     include Paginable
-    include UserGroups
     include FilterResource
     include Flaggable
     include HasProfileBreadcrumb

data/app/events/decidim/resource_liked_event.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ResourceLikedEvent < Decidim::Events::SimpleEvent
+    i18n_attributes :liker_nickname, :liker_name, :liker_path, :nickname, :resource_type
+
+    delegate :nickname, :name, to: :liker, prefix: true
+
+    def nickname
+      liker_nickname
+    end
+
+    def liker_path
+      liker.profile_path
+    end
+
+    def resource_text
+      return resource.body if resource.respond_to? :body
+      return resource.description if resource.respond_to? :description
+    end
+
+    def resource_type
+      resource.class.model_name.human
+    end
+
+    private
+
+    def liker
+      @liker ||= Decidim::UserPresenter.new(liker_user)
+    end
+
+    def liker_user
+      @liker_user ||= Decidim::User.find_by(id: extra[:liker_id])
+    end
+  end
+end

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

@@ -7,7 +7,6 @@ module Decidim
       mimic :amendment
 
       attribute :amendable_gid, String
-      attribute :user_group_id, Integer
       attribute :emendation_params, Hash
 
       validates :amendable_gid, presence: true

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

@@ -7,7 +7,6 @@ module Decidim
       mimic :amendment
 
       attribute :id, Integer
-      attribute :user_group_id, Integer
       attribute :emendation_params, Hash
 
       validates :id, presence: true

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

@@ -61,8 +61,9 @@ module Decidim
     # Checks if the user can accept and reject the emendation
     def allowed_to_accept_and_reject?(emendation)
       return unless emendation.amendment.evaluating?
+      return current_user.admin? if emendation.amendable.respond_to?(:official?) && emendation.amendable.official?
 
-      emendation.amendable.created_by?(current_user) || current_user.admin?
+      emendation.amendable.created_by?(current_user)
     end
 
     # Checks if the user can promote the emendation
@@ -82,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)
       }
@@ -91,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/filters_helper.rb

@@ -32,6 +32,31 @@ module Decidim
       end
     end
 
+    def filter_search_label(label, id)
+      I18n.t("decidim.searches.filters.resource", label:, collection: filter_for_resource(id))
+    end
+
+    def filter_for_resource(skip_to_id)
+      case skip_to_id
+      when "proposals"
+        I18n.t("decidim/proposals/proposal.other", scope: "activerecord.models")
+      when "meetings"
+        I18n.t("decidim/meetings/meeting.other", scope: "activerecord.models")
+      when "debates"
+        I18n.t("decidim/debates/debate.other", scope: "activerecord.models")
+      when "sortitions"
+        I18n.t("decidim/sortitions/sortition.other", scope: "activerecord.models")
+      when "surveys"
+        I18n.t("decidim/surveys/survey.other", scope: "activerecord.models")
+      when "projects"
+        I18n.t("decidim/budgets/project.other", scope: "activerecord.models")
+      when "initiatives"
+        I18n.t("decidim/initiative.other", scope: "activerecord.models")
+      else
+        ""
+      end
+    end
+
     private
 
     # Creates a unique namespace for a filter form to prevent duplicate IDs in

data/app/helpers/decidim/layout_helper.rb

@@ -60,6 +60,12 @@ module Decidim
       html_properties = options.with_indifferent_access.transform_keys(&:dasherize).slice("width", "height", "aria-label", "role", "aria-hidden", "class", "style")
       html_properties = default_html_properties.merge(html_properties)
 
+      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.likes.other") }).except("aria-hidden")
+      end
+
       href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg")
 
       content_tag :svg, html_properties do
@@ -116,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