decidim-core 0.28.2 → 0.29.0.rc2

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,40 +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.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_controllers.rb

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

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

@@ -38,7 +38,7 @@ module Decidim
       end
 
       def search_collection
-        raise NotImplementedError, "A search class is neeeded to filter resources"
+        raise NotImplementedError, "A search class is needed to filter resources"
       end
 
       def filter

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module NeedsRtlDirection
+    extend ActiveSupport::Concern
+
+    included do
+      helper_method :rtl_direction
+
+      def rtl_direction
+        return "rtl" if rtl_languages_codes.include?(I18n.locale.to_s)
+
+        "ltr"
+      end
+
+      private
+
+      def rtl_languages_codes
+        %w(ar ar-BH ar-EG ar-SA ar-YE dv he fa ks ks-PK ug ur-IN ur-PK ydd)
+      end
+    end
+  end
+end

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

@@ -7,21 +7,6 @@ module Decidim
   module ParticipatorySpaceContext
     extend ActiveSupport::Concern
 
-    class_methods do
-      # Public: Called on a controller, it sets up all the surrounding methods to render a
-      # participatory space's template. It expects the method `current_participatory_space` to be
-      # defined, from which it will extract the participatory manifest.
-      #
-      # options - A hash used to modify the behavior of the layout. :only: - An array of actions on
-      #           which the layout will be applied.
-      #
-      # Returns nothing.
-      def participatory_space_layout(options = {})
-        layout :layout, **options
-        before_action :authorize_participatory_space, **options
-      end
-    end
-
     included do
       include Decidim::NeedsOrganization
 
@@ -91,7 +76,7 @@ module Decidim
       current_participatory_space_manifest.context(current_participatory_space_context).layout
     end
 
-    # Method for current user can visit the space (assembly or proces)
+    # Method for current user can visit the space (assembly or process)
     def current_user_can_visit_space?
       return true unless current_participatory_space.try(:private_space?) &&
                          !current_participatory_space.try(:is_transparent?)
@@ -100,13 +85,6 @@ module Decidim
       current_user.admin || current_participatory_space.users.include?(current_user)
     end
 
-    def check_current_user_can_visit_space
-      return if current_user_can_visit_space?
-
-      flash[:alert] = I18n.t("participatory_space_private_users.not_allowed", scope: "decidim")
-      redirect_to action: "index"
-    end
-
     def help_section
       @help_section ||= Decidim::ContextualHelpSection.find_content(
         current_organization,

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

@@ -5,13 +5,14 @@ require "active_support/concern"
 module Decidim
   module PayloadInfo
     extend ActiveSupport::Concern
+    include Decidim::TranslatableAttributes
 
     included do
       def append_info_to_payload(payload)
         super
         payload[:user_id] = try(:current_user).try(:id)
         payload[:organization_id] = try(:current_organization).try(:id)
-        payload[:app] = try(:current_organization).try(:name)
+        payload[:app] = translated_attribute(try(:current_organization).try(:name))
         payload[:remote_ip] = request.remote_ip
         payload[:referer] = request.referer.to_s
         payload[:request_id] = request.uuid

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

@@ -10,8 +10,8 @@ module Decidim
   module RegistersPermissions
     extend ActiveSupport::Concern
 
-    def self.register_permissions(artifact, *permission_classes)
-      ::Decidim.permissions_registry.register_permissions(artifact, *permission_classes)
+    def self.register_permissions(artifact, *)
+      ::Decidim.permissions_registry.register_permissions(artifact, *)
     end
 
     class_methods do
@@ -19,8 +19,8 @@ module Decidim
       #
       # +artifact+ is expected to be the class or module that declares `NeedsPermission.permission_class_chain`.
       # +permission_classes+ are subclasses of `DefaultPermissions` or at least should quack as one.
-      def register_permissions(artifact, *permission_classes)
-        RegistersPermissions.register_permissions(artifact, *permission_classes)
+      def register_permissions(artifact, *)
+        RegistersPermissions.register_permissions(artifact, *)
       end
     end
   end

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

@@ -12,7 +12,7 @@ module Decidim
       around_action :use_organization_time_zone
       helper_method :organization_time_zone
 
-      # Executes a block of code in the context of the the organization's time zone
+      # Executes a block of code in the context of the organization's time zone
       #
       # &action - a block of code to be wrapped around the time zone
       #

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

@@ -3,7 +3,7 @@
 require "active_support/concern"
 
 module Decidim
-  # A controller concern to enable withawing the controller resources. Only
+  # A controller concern to enable withdrawing the controller resources. Only
   # affects the UI, so the actual logic to withdraw the resource will still need
   # to be implemented.
   module Withdrawable

data/app/controllers/decidim/account_controller.rb

@@ -16,7 +16,7 @@ module Decidim
     def update
       enforce_permission_to(:update, :user, current_user:)
       @account = form(AccountForm).from_params(account_params)
-      UpdateAccount.call(current_user, @account) do
+      UpdateAccount.call(@account) do
         on(:ok) do |email_is_unconfirmed|
           flash[:notice] = if email_is_unconfirmed
                              t("account.update.success_with_email_confirmation", scope: "decidim")
@@ -45,7 +45,7 @@ module Decidim
       enforce_permission_to(:delete, :user, current_user:)
       @form = form(DeleteAccountForm).from_params(params)
 
-      DestroyAccount.call(current_user, @form) do
+      DestroyAccount.call(@form) do
         on(:ok) do
           sign_out(current_user)
           flash[:notice] = t("account.destroy.success", scope: "decidim")

data/app/controllers/{concerns/decidim → decidim}/amendments_controller.rb

@@ -9,8 +9,8 @@ module Decidim
     helper UserGroupHelper
 
     before_action :authenticate_user!
-    helper_method :amendment, :amendable, :emendation, :similar_emendations
-    before_action :ensure_is_draft_from_user, only: [:compare_draft, :edit_draft, :update_draft, :destroy_draft, :preview_draft, :publish_draft]
+    helper_method :amendment, :amendable, :emendation
+    before_action :ensure_is_draft_from_user, only: [:edit_draft, :update_draft, :destroy_draft, :preview_draft, :publish_draft]
 
     def new
       raise ActionController::RoutingError, "Not Found" unless amendable
@@ -34,7 +34,7 @@ module Decidim
       Decidim::Amendable::CreateDraft.call(@form) do
         on(:ok) do |amendment|
           flash[:notice] = t("created.success", scope: "decidim.amendments")
-          redirect_to compare_draft_amend_path(amendment)
+          redirect_to preview_draft_amend_path(amendment)
         end
 
         on(:invalid) do
@@ -44,15 +44,6 @@ module Decidim
       end
     end
 
-    def compare_draft
-      enforce_permission_to :create, :amendment, current_component: amendable.component
-
-      if similar_emendations.empty?
-        flash[:notice] = t("no_similars_found", scope: "decidim.amendments.compare_draft")
-        redirect_to edit_draft_amend_path(amendment)
-      end
-    end
-
     def edit_draft
       enforce_permission_to :create, :amendment, current_component: amendable.component
 
@@ -219,10 +210,6 @@ module Decidim
       raise ActionController::RoutingError, "Not Found" unless amendment.draft? && amender == current_user
     end
 
-    def similar_emendations
-      @similar_emendations ||= Decidim::SimilarEmendations.for(amendment)
-    end
-
     def breadcrumb_item
       {
         label: t("decidim.amendments.name"),

data/app/controllers/decidim/application_controller.rb

@@ -6,6 +6,7 @@ module Decidim
     include Browser::ActionController
 
     include NeedsOrganization
+    include NeedsRtlDirection
     include LocaleSwitcher
     include UseOrganizationTimeZone
     include NeedsPermission

data/app/controllers/decidim/components/base_controller.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Components
     # Controller from which all component engines inherit from. It is in charge of
-    # setting the appropiate layout, including necessary helpers, and overall
+    # setting the appropriate layout, including necessary helpers, and overall
     # fooling the engine into thinking it is isolated.
     class BaseController < Decidim::ApplicationController
       include Settings

data/app/controllers/decidim/devise/invitations_controller.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Devise
-    # This controller customizes the behaviour of Devise::Invitiable.
+    # This controller customizes the behaviour of Devise::Invitable.
     class InvitationsController < ::Devise::InvitationsController
       include Decidim::DeviseControllers
       include NeedsTosAccepted

data/app/controllers/decidim/devise/passwords_controller.rb

@@ -25,8 +25,8 @@ module Decidim
         self.resource = current_user
         @send_path = apply_password_path
 
-        @form = Decidim::PasswordForm.from_params(params["user"])
-        Decidim::UpdatePassword.call(current_user, @form) do
+        @form = Decidim::PasswordForm.from_params(params["user"]).with_context(current_user:)
+        Decidim::UpdatePassword.call(@form) do
           on(:ok) do
             flash[:notice] = t("passwords.update.success", scope: "decidim")
             bypass_sign_in(current_user)

data/app/controllers/decidim/endorsements_controller.rb

@@ -48,7 +48,7 @@ module Decidim
       render :identities, layout: false
     end
 
-    # should be pubic in order to be visibe in NeedsPermission#permissions_context
+    # should be pubic in order to be visible in NeedsPermission#permissions_context
     def current_component
       resource.component
     end

data/app/controllers/decidim/favicon_controller.rb

@@ -4,7 +4,7 @@ module Decidim
   # We serve a custom /favicon.ico route for Decidim in order to show the
   # correct favicons also when browsing e.g. PDF documents originating from the
   # same domain displayed inline in the browser. For those special files
-  # displayed in the browser, the favicon could be otherwise incorrectly sohwn
+  # displayed in the browser, the favicon could be otherwise incorrectly shown
   # or cached.
   #
   # This custom route ensures that the favicons are always correctly served for

data/app/controllers/decidim/follows_controller.rb

@@ -10,7 +10,7 @@ module Decidim
       @form = form(Decidim::FollowForm).from_params(params)
       enforce_permission_to :delete, :follow, follow: @form.follow
 
-      DeleteFollow.call(@form, current_user) do
+      DeleteFollow.call(@form) do
         on(:ok) do
           render :update_button
         end
@@ -25,7 +25,7 @@ module Decidim
       @form = form(Decidim::FollowForm).from_params(params)
       enforce_permission_to :create, :follow
 
-      CreateFollow.call(@form, current_user) do
+      CreateFollow.call(@form) do
         on(:ok) do
           render :update_button
         end