decidim-core 0.30.2 → 0.31.0.rc1

data/app/cells/decidim/share_text_widget_cell.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "rqrcode"
+
+module Decidim
+  class ShareTextWidgetCell < Decidim::ViewModel
+    include Decidim::SocialShareButtonHelper
+
+    alias resource model
+
+    def show
+      render
+    end
+
+    def title
+      t(:share_text, scope: "decidim.budgets.order.status", space_name:, component_url:)
+    end
+
+    def space_name
+      translated_attribute(resource.participatory_space.title)
+    end
+
+    def component_url
+      Decidim::ResourceLocatorPresenter.new(resource).url
+    end
+  end
+end

data/app/cells/decidim/share_widget/modal.erb

@@ -1,18 +1,29 @@
 <%= decidim_modal id: "socialShare", class: "share-modal" do %>
   <div data-dialog-container>
-    <%= icon "share-line" %>
-    <h2 id="dialog-title-socialShare" tabindex="-1" data-dialog-title><%= t("share", scope: "decidim.shared.share_modal") %></h2>
+    <h2 tabindex="-1" data-dialog-title><%= t("share", scope: "decidim.shared.share_modal") %></h2>
+
     <div>
-      <%= social_share_button_tag(decidim_page_title,
-                                  url: decidim_meta_url,
-                                  image: decidim_meta_image_url,
-                                  desc: decidim_html_escape(decidim_meta_description || ""),
-                                  via: decidim_meta_twitter_handler) %>
 
+      <div class="share-modal__list" data-social-share>
+        <%= social_share_button_tag(decidim_page_title,
+                                    url: resource_url,
+                                    image: decidim_meta_image_url,
+                                    desc: decidim_html_escape(decidim_meta_description || ""),
+                                    via: decidim_meta_twitter_handler) %>
+
+        <%= render_social_share_button(Decidim.social_share_services_registry.find("QR"), decidim_page_title,
+                                       url: resource_url,
+                                       image: decidim_meta_image_url,
+                                       desc: decidim_html_escape(decidim_meta_description || ""),
+                                       via: decidim_meta_twitter_handler) %>
+      </div>
+
+      <p><%= t("copy_share_link_cta", scope: "decidim.shared.share_modal") %></p>
       <div class="share-modal__input">
-        <input id="urlShareLink" type="text" title="<%= t("share_link" , scope: "decidim.shared.share_modal") %>" value="<%= resource_name ? short_url(route_name: resource_name, params:) : decidim_meta_url %>" readonly>
+        <input id="urlShareLink" type="text" title="<%= t("share_link" , scope: "decidim.shared.share_modal") %>" value="<%= resource_url %>" readonly>
         <button type="button"
                 class="button button__sm button__text-secondary"
+                data-controller="clipboard-copy"
                 data-clipboard-copy="#urlShareLink"
                 data-clipboard-copy-label="<%= t("copy_share_link_copied", scope: "decidim.shared.share_modal") %>"
                 data-clipboard-copy-message="<%= t("copy_share_link_message", scope: "decidim.shared.share_modal") %>"

data/app/cells/decidim/share_widget/qr_code_modal.erb

@@ -0,0 +1,26 @@
+<%= decidim_modal id: "QRCodeDialog", class: "qr-modal" do %>
+  <div data-dialog-container>
+    <div data-dialog-title>
+      <%= icon "qr-code-line" %>
+      <h2 tabindex="-1"><%= t("decidim.share_widget.qr_code") %></h2>
+    </div>
+    <div class="content">
+      <div>
+        <% if current_organization.logo.attached? %>
+          <%= image_tag current_organization.attached_uploader(:logo).variant_url(:medium), alt: t("logo", scope: "decidim.accessibility", organization: current_organization_name) %>
+        <% end %>
+        <h2><%= title %></h2>
+      </div>
+      <div>
+        <img alt="<%= t("decidim.share_widget.qr_code") %>" src="data:;base64,<%= qr_code_image %>">
+      </div>
+    </div>
+
+  </div>
+  <div data-dialog-actions>
+    <%= link_to t("decidim.share_widget.print"), decidim.qr_path(resource: model.to_sgid.to_s),
+                class: "button button__sm lg:button__lg button__transparent-secondary" %>
+    <%= link_to t("decidim.share_widget.download"), decidim.qr_path(resource: model.to_sgid.to_s, format: :png),
+                class: "button button__sm lg:button__lg button__secondary" %>
+  </div>
+<% end %>

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

@@ -1,2 +1,3 @@
 <%= cell("decidim/share_button", model) %>
 <%= render :modal %>
+<%= render :qr_code_modal %>

data/app/cells/decidim/share_widget_cell.rb

@@ -1,20 +1,24 @@
 # frozen_string_literal: true
 
+require "rqrcode"
+
 module Decidim
   class ShareWidgetCell < Decidim::ViewModel
-    include Decidim::ShortLinkHelper
+    include Decidim::QrCodeHelper
     include Decidim::SocialShareButtonHelper
 
+    alias resource model
+
     def show
       render
     end
 
-    private
-
-    def resource_name
-      return "budget_project" if model.is_a?(Decidim::Budgets::Project)
+    def processed_params
+      params.permit(:participatory_process_slug, :component_id, :id).to_h
+    end
 
-      model.class.name.demodulize.underscore
+    def title
+      model.presenter.title(html_escape: true)
     end
   end
 end

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

@@ -1,8 +1,26 @@
 <div class="statistic <%= stat_dom_class %>" data-statistic>
-  <span class="statistic__title" title="<%= stat_title %>">
-    <%= stat_title %>
-  </span>
-  <span class="statistic__number">
+  <div class="statistic__header">
+    <div class="statistic__metric">
+      <div class="statistic__title" title="<%= stat_title %>">
+        <%= stat_title %>
+      </div>
+      <div class="statistic__tooltip">
+        <%= information_tooltip %>
+      </div>
+    </div>
+    <div class="statistic__icon">
+      <%= stat_icon %>
+    </div>
+  </div>
+  <% if second_stat_number %>
+    <div class="statistic__second-number">
+      <%= stat_sub_title %>
+      <span class="font-semibold"><%= second_stat_number %></span>
+    </div>
+  <% else %>
+    <p class="h-[21px]"></p>
+  <% end %>
+  <div class="statistic__number">
     <%= stat_number %>
-  </span>
+  </div>
 </div>

data/app/cells/decidim/statistic_cell.rb

@@ -6,15 +6,40 @@ module Decidim
     private
 
     def stat_number
-      number_with_delimiter(model[:stat_number])
+      number_with_delimiter(model[:data][0])
+    end
+
+    def second_stat_number
+      number_with_delimiter(model[:data][1]) if model[:data].size > 1
     end
 
     def stat_dom_class
-      model[:stat_title]
+      model[:name]
     end
 
     def stat_title
-      t(model[:stat_title], scope: "decidim.statistics")
+      t(model[:name], scope: "decidim.statistics")
+    end
+
+    def stat_sub_title
+      return if model[:sub_title].blank?
+
+      t(model[:sub_title], scope: "decidim.statistics")
+    end
+
+    def information_tooltip
+      return if model[:tooltip_key].blank?
+
+      tooltip_key = model[:tooltip_key].to_s
+      with_tooltip(t(tooltip_key, scope: "decidim.statistics"), class: "top") do
+        icon("information-line")
+      end
+    end
+
+    def stat_icon
+      return if model[:icon_name].blank?
+
+      icon(model[:icon_name].to_sym)
     end
   end
 end

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

@@ -1,5 +1,5 @@
 <% if tabs.length > 0 %>
-  <div class="layout-main__section" data-component="accordion" data-multiselectable="false" data-collapsible="false">
+  <div class="layout-main__section" data-controller="accordion" data-multiselectable="false" data-collapsible="false">
     <ul class="tab-x-container tabs-<%= tabs.length %>">
       <% tabs.each_with_index do |tab, i| %>
         <li>

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

@@ -3,7 +3,7 @@
     <div class="profile__user-avatar">
       <%= image_tag avatar, alt: t("decidim.author.avatar", name: decidim_sanitize(name)) %>
     </div>
-    <%= render :badge if show_badge? %>
+    <%= render :badge if officialized? %>
   </div>
   <div class="space-y-1">
     <div class="profile__user-name">

data/app/cells/decidim/user_profile_cell.rb

@@ -9,25 +9,17 @@ module Decidim
     delegate :officialized?, to: :presented_resource
     delegate :badge, to: :presented_resource
 
-    def user
-      group_membership? ? model.user : model
-    end
+    alias user model
 
     def avatar
       present(user).avatar_url
     end
 
     def role
-      return model.role if group_membership?
       return "admin" if user.admin?
     end
 
-    def show_badge?
-      user_group? ? badge.present? : officialized?
-    end
-
     def resource_path
-      # Exposes the same method, both Decidim::User and Decidim::UserGroup
       user.try(:profile_url) || decidim.profile_path(user.nickname)
     end
 

data/app/cells/decidim/version_author_cell.rb

@@ -2,13 +2,6 @@
 
 module Decidim
   class VersionAuthorCell < AuthorCell
-    def has_tooltip?
-      return super unless from_context.is_a?(PaperTrail::Version)
-      return if author.is_a?(String)
-
-      super
-    end
-
     def display_name
       return super unless from_context.is_a?(PaperTrail::Version)
       return author if author.is_a?(String) && author.present?

data/app/commands/decidim/amendable/accept.rb

@@ -14,7 +14,6 @@ module Decidim
         @amendable = form.amendable
         @emendation = form.emendation
         @amender = form.emendation.creator_author
-        @user_group = form.emendation.creator.user_group
       end
 
       # Executes the command. Broadcasts these events:
@@ -62,8 +61,7 @@ module Decidim
           @amendable.save!
           @amendable
         end
-
-        @amendable.add_coauthor(@amender, user_group: @user_group) if @amendable.is_a?(Decidim::Coauthorable)
+        @amendable.add_coauthor(@amender) if @amendable.is_a?(Decidim::Coauthorable)
       end
 
       def notify_emendation_state_change!

data/app/commands/decidim/amendable/create_draft.rb

@@ -12,7 +12,6 @@ module Decidim
       def initialize(form)
         @form = form
         @amendable = form.amendable
-        @user_group = Decidim::UserGroup.find_by(id: form.user_group_id)
       end
 
       # Executes the command. Broadcasts these events:
@@ -34,7 +33,7 @@ module Decidim
 
       private
 
-      attr_reader :form, :amendable, :user_group
+      attr_reader :form, :amendable
 
       # Prevent PaperTrail from creating an additional version
       # in the amendment multi-step creation process (step 1: create)
@@ -54,7 +53,7 @@ module Decidim
             emendation.body = { I18n.locale => form.emendation_params.with_indifferent_access[:body] }
             emendation.component = amendable.component
             emendation.taxonomies = amendable.taxonomies if amendable.respond_to?(:taxonomies)
-            emendation.add_author(current_user, user_group)
+            emendation.add_author(current_user)
             emendation.save!
             emendation
           end

data/app/commands/decidim/amendable/update_draft.rb

@@ -14,7 +14,6 @@ module Decidim
         @amendment = form.amendment
         @amender = form.amender
         @emendation = form.emendation
-        @user_group = Decidim::UserGroup.find_by(id: form.user_group_id)
       end
 
       # Executes the command. Broadcasts these events:
@@ -36,7 +35,7 @@ module Decidim
 
       private
 
-      attr_reader :form, :amendment, :amender, :emendation, :user_group
+      attr_reader :form, :amendment, :amender, :emendation
 
       # Prevent PaperTrail from creating an additional version
       # in the amendment multi-step creation process (step 3: complete)
@@ -48,7 +47,7 @@ module Decidim
           emendation.assign_attributes(form.emendation_params)
           emendation.title = { I18n.locale => form.emendation_params.with_indifferent_access[:title] }
           emendation.body = { I18n.locale => form.emendation_params.with_indifferent_access[:body] }
-          emendation.add_author(current_user, user_group)
+          emendation.add_author(current_user)
           emendation.save!
         end
       end

data/app/commands/decidim/create_ephemeral_user.rb

@@ -41,12 +41,18 @@ module Decidim
         locale: form.locale,
         tos_agreement: true,
         managed: true,
-        extended_data: { ephemeral: true, verified: form.verified }
+        extended_data: { ephemeral: true, verified: form.verified }.merge(onboarding_data)
       )
     end
 
     def confirm_user
       @user.confirm
     end
+
+    def onboarding_data
+      return {} if form.onboarding_data.blank?
+
+      { OnboardingManager::DATA_KEY => form.onboarding_data.stringify_keys.transform_keys(&:underscore) }
+    end
   end
 end

data/app/commands/decidim/create_omniauth_registration.rb

@@ -21,11 +21,12 @@ module Decidim
       verify_oauth_signature!
 
       begin
-        if existing_identity
-          user = existing_identity.user
-          verify_user_confirmed(user)
+        if (@identity = existing_identity)
+          @user = existing_identity.user
+          verify_user_confirmed(@user)
 
-          return broadcast(:ok, user)
+          trigger_omniauth_event("decidim.user.omniauth_login")
+          return broadcast(:ok, @user)
         end
         return broadcast(:invalid) if form.invalid?
 
@@ -33,7 +34,7 @@ module Decidim
           create_or_find_user
           @identity = create_identity
         end
-        trigger_omniauth_registration
+        trigger_omniauth_event
 
         broadcast(:ok, @user)
       rescue NeedTosAcceptance
@@ -128,9 +129,9 @@ module Decidim
       form.oauth_signature == signature
     end
 
-    def trigger_omniauth_registration
+    def trigger_omniauth_event(event_name = "decidim.user.omniauth_registration")
       ActiveSupport::Notifications.publish(
-        "decidim.user.omniauth_registration",
+        event_name,
         user_id: @user.id,
         identity_id: @identity.id,
         provider: form.provider,

data/app/commands/decidim/create_report.rb

@@ -69,7 +69,15 @@ module Decidim
     end
 
     def hideable?
-      hidden_by_admin? || (!@reportable.hidden? && moderation.report_count >= Decidim.max_reports_before_hiding)
+      hidden_by_admin? || hidden_by_spam_engine? || hidden_by_report_count?
+    end
+
+    def hidden_by_report_count?
+      !@reportable.hidden? && moderation.report_count >= Decidim.max_reports_before_hiding
+    end
+
+    def hidden_by_spam_engine?
+      form.hide == true && form.context[:marked_as_spam] == true
     end
 
     def send_hide_notification_to_moderators

data/app/commands/decidim/destroy_account.rb

@@ -18,7 +18,6 @@ module Decidim
       Decidim::User.transaction do
         destroy_user_account!
         destroy_user_identities
-        destroy_user_group_memberships
         destroy_follows
         destroy_participatory_space_private_user
         delegate_destroy_to_participatory_spaces
@@ -52,10 +51,6 @@ module Decidim
       current_user.identities.destroy_all
     end
 
-    def destroy_user_group_memberships
-      Decidim::UserGroupMembership.where(user: current_user).destroy_all
-    end
-
     def destroy_follows
       Decidim::Follow.where(followable: current_user).destroy_all
       Decidim::Follow.where(user: current_user).destroy_all

data/app/commands/decidim/like_resource.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A command with all the business logic related with a user liking a resource.
+  # This is a user creates and like.
+  class LikeResource < Decidim::Command
+    # Public: Initializes the command.
+    #
+    # resource     - An instance of Decidim::Likeable.
+    # current_user - The current user.
+    def initialize(resource, current_user)
+      @resource = resource
+      @current_user = current_user
+    end
+
+    # Executes the command. Broadcasts these events:
+    #
+    # - :ok when everything is valid, together with the resource vote.
+    # - :invalid if the form was not valid and we could not proceed.
+    #
+    # Returns nothing.
+    def call
+      like = build_resource_like
+      if like.save
+        notify_liker_followers
+        broadcast(:ok, like)
+      else
+        broadcast(:invalid)
+      end
+    rescue ActiveRecord::RecordNotUnique
+      broadcast(:invalid)
+    end
+
+    private
+
+    def build_resource_like
+      @resource.likes.build(author: @current_user)
+    end
+
+    def notify_liker_followers
+      Decidim::EventsManager.publish(
+        event: "decidim.events.resource_liked",
+        event_class: Decidim::ResourceLikedEvent,
+        resource: @resource,
+        followers: @current_user.followers,
+        extra: {
+          liker_id: @current_user.id
+        }
+      )
+    end
+  end
+end

data/app/commands/decidim/messaging/reply_to_conversation.rb

@@ -27,7 +27,6 @@ module Decidim
 
         if message.save
           notify_interlocutors
-          notify_comanagers if sender.is_a?(UserGroup)
 
           broadcast(:ok, message)
         else
@@ -49,28 +48,10 @@ module Decidim
         @already_notified = [form.context.current_user]
 
         conversation.interlocutors(sender).each do |recipient|
-          if recipient.is_a?(UserGroup)
-            recipient.managers.each do |manager|
-              notify(manager) do
-                ConversationMailer.new_group_message(sender, manager, conversation, message, recipient).deliver_later
-              end
-              Decidim::PushNotificationMessageSender.new.new_group_message(sender, manager, conversation, message, recipient).deliver
-            end
-          else
-            notify(recipient) do
-              ConversationMailer.new_message(sender, recipient, conversation, message).deliver_later
-            end
-            Decidim::PushNotificationMessageSender.new.new_message(sender, recipient, conversation, message).deliver
-          end
-        end
-      end
-
-      def notify_comanagers
-        sender.managers.each do |recipient|
           notify(recipient) do
-            ConversationMailer.comanagers_new_message(sender, recipient, conversation, message, form.context.current_user).deliver_later
+            ConversationMailer.new_message(sender, recipient, conversation, message).deliver_later
           end
-          Decidim::PushNotificationMessageSender.new.comanagers_new_message(sender, recipient, conversation, message, form.context.current_user).deliver
+          Decidim::PushNotificationMessageSender.new.new_message(sender, recipient, conversation, message).deliver
         end
       end
 

data/app/commands/decidim/messaging/start_conversation.rb

@@ -22,7 +22,6 @@ module Decidim
 
         if conversation.save
           notify_interlocutors
-          notify_comanagers if originator.is_a?(UserGroup)
 
           broadcast(:ok, conversation)
         else
@@ -49,28 +48,10 @@ module Decidim
         @already_notified = [form.context.current_user]
 
         conversation.interlocutors(originator).each do |recipient|
-          if recipient.is_a?(UserGroup)
-            recipient.managers.each do |manager|
-              notify(manager) do
-                ConversationMailer.new_group_conversation(originator, manager, conversation, recipient).deliver_later
-              end
-              Decidim::PushNotificationMessageSender.new.new_group_conversation(originator, manager, conversation, recipient).deliver
-            end
-          else
-            notify(recipient) do
-              ConversationMailer.new_conversation(originator, recipient, conversation).deliver_later
-            end
-            Decidim::PushNotificationMessageSender.new.new_conversation(originator, recipient, conversation).deliver
-          end
-        end
-      end
-
-      def notify_comanagers
-        originator.managers.each do |recipient|
           notify(recipient) do
-            ConversationMailer.comanagers_new_conversation(originator, recipient, conversation, form.context.current_user).deliver_later
+            ConversationMailer.new_conversation(originator, recipient, conversation).deliver_later
           end
-          Decidim::PushNotificationMessageSender.new.comanagers_new_conversation(originator, recipient, conversation, form.context.current_user).deliver
+          Decidim::PushNotificationMessageSender.new.new_conversation(originator, recipient, conversation).deliver
         end
       end
 

data/app/commands/decidim/unlike_resource.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A command with all the business logic to unlike a resource.
+  class UnlikeResource < Decidim::Command
+    # Public: Initializes the command.
+    #
+    # resource     - A Decidim::Likeable object.
+    # current_user - The current user.
+    def initialize(resource, current_user)
+      @resource = resource
+      @current_user = current_user
+    end
+
+    # Executes the command. Broadcasts these events:
+    #
+    # - :ok when everything is valid, together with the resource.
+    # - :invalid if the form was not valid and we could not proceed.
+    #
+    # Returns nothing.
+    def call
+      destroy_resource_like
+      broadcast(:ok, @resource)
+    end
+
+    private
+
+    def destroy_resource_like
+      query = @resource.likes.where(author: @current_user)
+
+      query.destroy_all
+    end
+  end
+end

data/app/commands/decidim/update_account.rb

@@ -56,7 +56,7 @@ module Decidim
 
     def update_avatar
       if @form.avatar.present?
-        current_user.avatar.attach(@form.avatar)
+        current_user.avatar.attach(@form.avatar.signed_id)
       elsif @form.remove_avatar
         current_user.avatar = nil
       end

data/app/controllers/concerns/decidim/ephemeral_session_checker.rb

@@ -30,7 +30,7 @@ module Decidim
       if onboarding_manager.valid?
         authorizations = action_authorized_to(onboarding_manager.action, **onboarding_manager.action_authorized_resources)
 
-        return redirect_to decidim_verifications.onboarding_pending_authorizations_path unless authorizations_permitted_paths?(authorizations, onboarding_manager)
+        return redirect_to pending_authorizations_path unless authorizations_permitted_paths?(authorizations, onboarding_manager)
 
         if authorizations.global_code == :unauthorized
           flash[:alert] = t("unauthorized", scope: "decidim.core.actions")
@@ -77,11 +77,15 @@ module Decidim
                      []
                    end
       paths_list.prepend(
-        decidim_verifications.onboarding_pending_authorizations_path,
+        pending_authorizations_path,
         decidim.page_path(terms_of_service_page)
       )
 
       paths_list.find { |el| /\A#{URI.parse(el).path}/.match?(request.path) }
     end
+
+    def pending_authorizations_path
+      onboarding_manager.authorization_path || decidim_verifications.onboarding_pending_authorizations_path
+    end
   end
 end

data/app/controllers/concerns/decidim/user_profile.rb

@@ -10,7 +10,6 @@ module Decidim
   module UserProfile
     extend ActiveSupport::Concern
     include FormFactory
-    include UserGroups
     include HasAccountBreadcrumb
 
     included do

data/app/controllers/decidim/account_controller.rb

@@ -31,7 +31,7 @@ module Decidim
         on(:invalid) do |password|
           fetch_entered_password(password)
           flash[:alert] = t("account.update.error", scope: "decidim")
-          render action: :show
+          render action: :show, status: :unprocessable_entity
         end
       end
     end