decidim-core 0.28.5 → 0.29.0.rc1

data/app/cells/decidim/wizard_step_form_cell.rb

@@ -5,8 +5,6 @@ module Decidim
   # Is designed to be used by different models and so it does not try to compute
   # the information likely to change. Expects a Hash with all necessary data.
   class WizardStepFormCell < Decidim::ViewModel
-    include Decidim::LayoutHelper
-
     def show
       render view
     end
@@ -89,12 +87,6 @@ module Decidim
       view_options[:wizard_header_title]
     end
 
-    # Returns the similar resources count for the compare step.
-    def wizard_header_similar_resources_count
-      count = view_options[:wizard_header_similar_resources_count]
-      "(#{count})" if count
-    end
-
     # Returns the header see steps information, only visible for small screens.
     def wizard_header_see_steps
       content_tag(:span) do

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

@@ -4,13 +4,14 @@ module Decidim
   module Amendable
     # A command with all the business logic when a user starts amending a resource.
     class CreateDraft < Decidim::Command
+      delegate :current_user, to: :form
+
       # Public: Initializes the command.
       #
-      # form         - A form object with the params.
+      # form - A form object with the params.
       def initialize(form)
         @form = form
         @amendable = form.amendable
-        @current_user = form.current_user
         @user_group = Decidim::UserGroup.find_by(id: form.user_group_id)
       end
 
@@ -33,7 +34,7 @@ module Decidim
 
       private
 
-      attr_reader :form, :amendable, :current_user, :user_group
+      attr_reader :form, :amendable, :user_group
 
       # Prevent PaperTrail from creating an additional version
       # in the amendment multi-step creation process (step 1: create)
@@ -53,7 +54,6 @@ module Decidim
             emendation.body = { I18n.locale => form.emendation_params.with_indifferent_access[:body] }
             emendation.component = amendable.component
             emendation.add_author(current_user, user_group)
-            emendation.category = amendable.category if amendable.respond_to?(:category)
             emendation.save!
             emendation
           end

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

@@ -4,6 +4,8 @@ module Decidim
   module Amendable
     # A command with all the business logic when a user promotes a rejected emendation.
     class Promote < Decidim::Command
+      delegate :current_user, to: :form
+
       # Public: Initializes the command.
       #
       # emendation - The emendation to promote.
@@ -14,7 +16,6 @@ module Decidim
         @emendation = form.emendation
         @amendable = form.amendable
         @amender = form.amender
-        @current_user = form.current_user
       end
 
       # Executes the command. Broadcasts these events:
@@ -37,7 +38,7 @@ module Decidim
 
       private
 
-      attr_reader :form, :amendment, :amender, :current_user
+      attr_reader :form, :amendment, :amender
 
       # The log of this action contains unique information:
       # extra_log_info = { promoted_from: emendation.id }

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

@@ -4,6 +4,8 @@ module Decidim
   module Amendable
     # A command with all the business logic when a user publishes an amendment draft.
     class PublishDraft < Decidim::Command
+      delegate :current_user, to: :form
+
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
@@ -13,7 +15,6 @@ module Decidim
         @amendable = form.amendable
         @emendation = form.emendation
         @amender = form.amender
-        @current_user = form.current_user
       end
 
       # Executes the command. Broadcasts these events:
@@ -39,7 +40,7 @@ module Decidim
 
       private
 
-      attr_reader :form, :amendment, :amendable, :emendation, :amender, :current_user
+      attr_reader :form, :amendment, :amendable, :emendation, :amender
 
       # To be able to diff amendments we store the original attributes being amended
       # in the first PaperTrail::Version.

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

@@ -4,15 +4,16 @@ module Decidim
   module Amendable
     # A command with all the business logic when a user updates and amendment draft.
     class UpdateDraft < Decidim::Command
+      delegate :current_user, to: :form
+
       # Public: Initializes the command.
       #
-      # form         - A form object with the params.
+      # form - A form object with the params.
       def initialize(form)
         @form = form
         @amendment = form.amendment
         @amender = form.amender
         @emendation = form.emendation
-        @current_user = form.current_user
         @user_group = Decidim::UserGroup.find_by(id: form.user_group_id)
       end
 
@@ -35,7 +36,7 @@ module Decidim
 
       private
 
-      attr_reader :form, :amendment, :amender, :emendation, :current_user, :user_group
+      attr_reader :form, :amendment, :amender, :emendation, :user_group
 
       # Prevent PaperTrail from creating an additional version
       # in the amendment multi-step creation process (step 3: complete)

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

@@ -18,7 +18,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the resource.
-      # - :invalid if the resource already has supports or does not belong to current user.
+      # - :invalid if the resource already has votes or does not belong to current user.
       #
       # Returns nothing.
       def call

data/app/commands/decidim/create_follow.rb

@@ -3,13 +3,13 @@
 module Decidim
   # A command with all the business logic for when a user starts following a resource.
   class CreateFollow < Decidim::Command
+    delegate :current_user, to: :form
+
     # Public: Initializes the command.
     #
     # form         - A form object with the params.
-    # current_user - The current user.
-    def initialize(form, current_user)
+    def initialize(form)
       @form = form
-      @current_user = current_user
     end
 
     # Executes the command. Broadcasts these events:
@@ -29,7 +29,7 @@ module Decidim
 
     private
 
-    attr_reader :follow, :form, :current_user
+    attr_reader :follow, :form
 
     def create_follow!
       @follow = Follow.find_by(

data/app/commands/decidim/create_omniauth_registration.rb

@@ -55,12 +55,7 @@ module Decidim
         # If user has left the account unconfirmed and later on decides to sign
         # in with omniauth with an already verified account, the account needs
         # to be marked confirmed.
-        if !@user.confirmed? && @user.email == verified_email
-          @user.skip_confirmation!
-          @user.after_confirmation
-        end
-        @user.tos_agreement = "1"
-        @user.save!
+        @user.skip_confirmation! if !@user.confirmed? && @user.email == verified_email
       else
         @user.email = (verified_email || form.email)
         @user.name = form.name
@@ -74,11 +69,10 @@ module Decidim
           @user.avatar.attach(io: file, filename:)
         end
         @user.skip_confirmation! if verified_email
-        @user.tos_agreement = "1"
-        @user.save!
-
-        @user.after_confirmation if verified_email
       end
+
+      @user.tos_agreement = "1"
+      @user.save!
     end
 
     def create_identity

data/app/commands/decidim/create_report.rb

@@ -3,15 +3,15 @@
 module Decidim
   # A command with all the business logic when a user creates a report.
   class CreateReport < Decidim::Command
+    delegate :current_user, to: :form
+
     # Public: Initializes the command.
     #
     # form         - A form object with the params.
     # reportable   - The resource being reported
-    # current_user - The current user.
-    def initialize(form, reportable, current_user)
+    def initialize(form, reportable)
       @form = form
       @reportable = reportable
-      @current_user = current_user
       @tool = Decidim::ModerationTools.new(reportable, current_user)
     end
 

data/app/commands/decidim/create_user_report.rb

@@ -3,15 +3,15 @@
 module Decidim
   # A command with all the business logic when a user creates a report.
   class CreateUserReport < Decidim::Command
+    delegate :current_user, to: :form
+
     # Public: Initializes the command.
     #
     # form         - A form object with the params.
     # reportable   - The resource being reported
-    # current_user - The current user.
-    def initialize(form, reportable, current_user)
+    def initialize(form, reportable)
       @form = form
       @reportable = reportable
-      @current_user = current_user
     end
 
     # Executes the command. Broadcasts these events:
@@ -44,7 +44,7 @@ module Decidim
     def create_report!
       @report = UserReport.create!(
         moderation: @moderation,
-        user: @current_user,
+        user: current_user,
         reason: form.reason,
         details: form.details
       )
@@ -55,7 +55,7 @@ module Decidim
     end
 
     def send_notification_to_admins!
-      @current_user.organization.admins.each do |admin|
+      current_user.organization.admins.each do |admin|
         next unless admin.email_on_moderations
 
         Decidim::UserReportJob.perform_later(admin, report)

data/app/commands/decidim/delete_follow.rb

@@ -3,13 +3,13 @@
 module Decidim
   # A command with all the business logic for when a user stops following a resource.
   class DeleteFollow < Decidim::Command
+    delegate :current_user, to: :form
+
     # Public: Initializes the command.
     #
     # form         - A form object with the params.
-    # current_user - The current user.
-    def initialize(form, current_user)
+    def initialize(form)
       @form = form
-      @current_user = current_user
     end
 
     # Executes the command. Broadcasts these events:
@@ -29,7 +29,7 @@ module Decidim
 
     private
 
-    attr_reader :form, :current_user
+    attr_reader :form
 
     def delete_follow!
       form.follow.destroy!

data/app/commands/decidim/demote_membership.rb

@@ -2,8 +2,8 @@
 
 module Decidim
   # A command with all the business logic to demote an admin. This means
-  # removing their admin righta dn converting them to a basic member. It is the
-  # coutnerpart of `PromoteMembership`.
+  # removing their admin right and converting them to a basic member. It is the
+  # counterpart of `PromoteMembership`.
   class DemoteMembership < Decidim::Command
     # Public: Initializes the command.
     #

data/app/commands/decidim/destroy_account.rb

@@ -3,12 +3,12 @@
 module Decidim
   # This command destroys the user's account.
   class DestroyAccount < Decidim::Command
+    delegate :current_user, to: :form
+
     # Destroy a user's account.
     #
-    # user - The user to be updated.
     # form - The form with the data.
-    def initialize(user, form)
-      @user = user
+    def initialize(form)
       @form = form
     end
 
@@ -29,43 +29,42 @@ module Decidim
 
     private
 
+    attr_reader :form
+
     def destroy_user_account!
-      @user.invalidate_all_sessions!
+      current_user.invalidate_all_sessions!
 
-      @user.name = ""
-      @user.nickname = ""
-      @user.email = ""
-      @user.personal_url = ""
-      @user.about = ""
-      @user.notifications_sending_frequency = "none"
-      @user.delete_reason = @form.delete_reason
-      @user.admin = false if @user.admin?
-      @user.deleted_at = Time.current
-      @user.skip_reconfirmation!
-      @user.avatar.purge
-      @user.save!
+      current_user.name = ""
+      current_user.nickname = ""
+      current_user.email = ""
+      current_user.delete_reason = @form.delete_reason
+      current_user.admin = false if current_user.admin?
+      current_user.deleted_at = Time.current
+      current_user.skip_reconfirmation!
+      current_user.avatar.purge
+      current_user.save!
     end
 
     def destroy_user_identities
-      @user.identities.destroy_all
+      current_user.identities.destroy_all
     end
 
     def destroy_user_group_memberships
-      Decidim::UserGroupMembership.where(user: @user).destroy_all
+      Decidim::UserGroupMembership.where(user: current_user).destroy_all
     end
 
     def destroy_follows
-      Decidim::Follow.where(followable: @user).destroy_all
-      Decidim::Follow.where(user: @user).destroy_all
+      Decidim::Follow.where(followable: current_user).destroy_all
+      Decidim::Follow.where(user: current_user).destroy_all
     end
 
     def destroy_participatory_space_private_user
-      Decidim::ParticipatorySpacePrivateUser.where(user: @user).destroy_all
+      Decidim::ParticipatorySpacePrivateUser.where(user: current_user).destroy_all
     end
 
     def delegate_destroy_to_participatory_spaces
       Decidim.participatory_space_manifests.each do |space_manifest|
-        space_manifest.invoke_on_destroy_account(@user)
+        space_manifest.invoke_on_destroy_account(current_user)
       end
     end
   end

data/app/commands/decidim/endorse_resource.rb

@@ -8,7 +8,7 @@ module Decidim
     #
     # resource     - An instance of Decidim::Endorsable.
     # current_user - The current user.
-    # current_group_id- (optional) The current_grup that is endorsing the Resource.
+    # current_group_id- (optional) The current_group that is endorsing the Resource.
     def initialize(resource, current_user, current_group_id = nil)
       @resource = resource
       @current_user = current_user

data/app/commands/decidim/invite_user_to_group.rb

@@ -23,16 +23,16 @@ module Decidim
       return broadcast(:ok) if user_belongs_to_group?
 
       transaction do
-        invite_user
+        @invitation = invite_user
         send_notification
       end
 
       broadcast(:ok)
     end
 
-    private
+    attr_reader :form, :user_group, :invitation
 
-    attr_reader :form, :user_group
+    private
 
     def invite_user
       Decidim::UserGroupMembership.create!(
@@ -50,7 +50,8 @@ module Decidim
         affected_users: [form.user],
         extra: {
           user_group_name: user_group.name,
-          user_group_nickname: user_group.nickname
+          user_group_nickname: user_group.nickname,
+          membership_id: invitation.id
         }
       )
     end

data/app/commands/decidim/update_account.rb

@@ -3,12 +3,12 @@
 module Decidim
   # This command updates the user's account.
   class UpdateAccount < Decidim::Command
+    delegate :current_user, to: :form
+
     # Updates a user's account.
     #
-    # user - The user to be updated.
     # form - The form with the data.
-    def initialize(user, form)
-      @user = user
+    def initialize(form)
       @form = form
     end
 
@@ -19,15 +19,15 @@ module Decidim
       update_avatar
       update_password
 
-      if @user.valid?
-        changes = @user.changed
-        @user.save!
+      if current_user.valid?
+        changes = current_user.changed
+        current_user.save!
         notify_followers
         send_update_summary!(changes)
-        broadcast(:ok, @user.unconfirmed_email.present?)
+        broadcast(:ok, current_user.unconfirmed_email.present?)
       else
         [:avatar, :password].each do |key|
-          @form.errors.add key, @user.errors[key] if @user.errors.has_key? key
+          @form.errors.add key, current_user.errors[key] if current_user.errors.has_key? key
         end
         broadcast(:invalid, @form.password)
       end
@@ -35,38 +35,40 @@ module Decidim
 
     private
 
+    attr_reader :form
+
     def update_personal_data
-      @user.locale = @form.locale
-      @user.name = @form.name
-      @user.nickname = @form.nickname
-      @user.email = @form.email
-      @user.personal_url = @form.personal_url
-      @user.about = @form.about
+      current_user.locale = @form.locale
+      current_user.name = @form.name
+      current_user.nickname = @form.nickname
+      current_user.email = @form.email
+      current_user.personal_url = @form.personal_url
+      current_user.about = @form.about
     end
 
     def update_avatar
       if @form.avatar.present?
-        @user.avatar.attach(@form.avatar)
+        current_user.avatar.attach(@form.avatar)
       elsif @form.remove_avatar
-        @user.avatar = nil
+        current_user.avatar = nil
       end
     end
 
     def update_password
       return if @form.password.blank?
 
-      @user.password = @form.password
-      @user.password_updated_at = Time.current
+      current_user.password = @form.password
+      current_user.password_updated_at = Time.current
     end
 
     def notify_followers
-      return unless @user.previous_changes.keys.intersect?(%w(about personal_url))
+      return unless current_user.previous_changes.keys.intersect?(%w(about personal_url))
 
       Decidim::EventsManager.publish(
         event: "decidim.events.users.profile_updated",
         event_class: Decidim::ProfileUpdatedEvent,
-        resource: @user,
-        followers: @user.followers
+        resource: current_user,
+        followers: current_user.followers
       )
     end
 
@@ -78,7 +80,7 @@ module Decidim
 
         I18n.t("activemodel.attributes.user.#{attr}")
       end
-      UserUpdateMailer.notify(@user, updates).deliver_later
+      UserUpdateMailer.notify(current_user, updates).deliver_later
     end
 
     def attr_set

data/app/commands/decidim/update_notifications_settings.rb

@@ -3,12 +3,12 @@
 module Decidim
   # This command updates the user's notifications settings.
   class UpdateNotificationsSettings < Decidim::Command
+    delegate :current_user, to: :form
+
     # Updates a user's notifications settings.
     #
-    # user - The user to be updated.
     # form - The form with the data.
-    def initialize(user, form)
-      @user = user
+    def initialize(form)
       @form = form
     end
 
@@ -16,20 +16,22 @@ module Decidim
       return broadcast(:invalid) unless @form.valid?
 
       update_notifications_settings
-      @user.save!
+      current_user.save!
 
-      broadcast(:ok, @user)
+      broadcast(:ok, current_user)
     end
 
     private
 
+    attr_reader :form
+
     def update_notifications_settings
-      @user.newsletter_notifications_at = @form.newsletter_notifications_at
-      @user.notification_types = @form.notification_types
-      @user.direct_message_types = @form.direct_message_types
-      @user.email_on_moderations = @form.email_on_moderations
-      @user.notification_settings = @user.notification_settings.merge(@form.notification_settings)
-      @user.notifications_sending_frequency = @form.notifications_sending_frequency
+      current_user.newsletter_notifications_at = @form.newsletter_notifications_at
+      current_user.notification_types = @form.notification_types
+      current_user.direct_message_types = @form.direct_message_types
+      current_user.email_on_moderations = @form.email_on_moderations
+      current_user.notification_settings = current_user.notification_settings.merge(@form.notification_settings)
+      current_user.notifications_sending_frequency = @form.notifications_sending_frequency
     end
   end
 end

data/app/commands/decidim/update_password.rb

@@ -3,22 +3,22 @@
 module Decidim
   # Decidim command updates user's password
   class UpdatePassword < Decidim::Command
+    delegate :current_user, to: :form
+
     # Updates a user's password.
     #
-    # user - The user to be updated.
     # form - The form with the data.
-    def initialize(user, form)
-      @user = user
+    def initialize(form)
       @form = form
     end
 
     def call
       return broadcast(:invalid) if form.invalid?
 
-      user.password = form.password
-      user.password_updated_at = Time.current
+      current_user.password = form.password
+      current_user.password_updated_at = Time.current
 
-      if user.save
+      if current_user.save
         broadcast(:ok)
       else
         broadcast(:invalid)
@@ -27,6 +27,6 @@ module Decidim
 
     private
 
-    attr_reader :form, :user
+    attr_reader :form
   end
 end

data/app/commands/decidim/update_user_interests.rb

@@ -3,12 +3,12 @@
 module Decidim
   # This command updates the user's interests.
   class UpdateUserInterests < Decidim::Command
-    # Updates a user's intersts.
+    delegate :current_user, to: :form
+
+    # Updates a user's interests.
     #
-    # user - The user to be updated.
     # form - The form with the data.
-    def initialize(user, form)
-      @user = user
+    def initialize(form)
       @form = form
     end
 
@@ -16,16 +16,18 @@ module Decidim
       return broadcast(:invalid) unless @form.valid?
 
       update_interests
-      @user.save!
+      current_user.save!
 
       broadcast(:ok)
     end
 
     private
 
+    attr_reader :form
+
     def update_interests
-      @user.extended_data ||= {}
-      @user.extended_data["interested_scopes"] = selected_scopes_ids
+      current_user.extended_data ||= {}
+      current_user.extended_data["interested_scopes"] = selected_scopes_ids
     end
 
     def selected_scopes_ids

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

@@ -12,7 +12,7 @@ module Decidim
         if user.present? && user.blocked?
           check_user_block_status(user)
         elsif user.needs_password_update?
-          decidim.change_password_path
+          change_password_path
         elsif first_login_and_not_authorized?(user) && !user.admin? && !pending_redirect?(user)
           decidim_verifications.first_login_authorizations_path
         else

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

@@ -16,11 +16,11 @@ module Decidim
       include Decidim::NeedsOrganization
       include Decidim::LocaleSwitcher
       include ImpersonateUsers
+      include NeedsRtlDirection
       include NeedsPermission
       include Decidim::SafeRedirect
       include NeedsSnippets
       include UserBlockedChecker
-      include ActiveStorage::SetCurrent
 
       helper Decidim::TranslationsHelper
       helper Decidim::MetaTagsHelper
@@ -34,6 +34,7 @@ module Decidim
       helper Decidim::CacheHelper
       helper Decidim::SocialShareButtonHelper
       helper Decidim::SanitizeHelper
+      helper Decidim::ApplicationHelper
 
       layout "layouts/decidim/application"