decidim-core 0.28.6 → 0.29.0.rc1

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"
 

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/paginable.rb

@@ -7,7 +7,7 @@ module Decidim
   module Paginable
     extend ActiveSupport::Concern
 
-    OPTIONS = [25, 50, 100].freeze
+    OPTIONS = [10, 20, 50, 100].freeze
 
     included do
       helper_method :per_page, :page_offset

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
@@ -23,7 +24,6 @@ module Decidim
     include DisableRedirectionToExternalHost
     include NeedsPasswordChange
     include LinkedResourceReference
-    include ActiveStorage::SetCurrent
 
     helper Decidim::MetaTagsHelper
     helper Decidim::DecidimFormHelper

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/doorkeeper/credentials_controller.rb

@@ -28,7 +28,7 @@ module Decidim
       end
 
       def avatar_url
-        avatar_url = current_resource_owner.attached_uploader(:avatar).url
+        avatar_url = current_resource_owner.attached_uploader(:avatar).url(host: current_resource_owner.organization.host)
         return unless avatar_url
 
         unless %r{^https?://}.match? avatar_url

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

data/app/controllers/decidim/group_invites_controller.rb

@@ -34,16 +34,29 @@ module Decidim
 
     def update
       enforce_permission_to :accept, :user_group_invitations
-
       AcceptGroupInvitation.call(inviting_user_group, current_user) do
         on(:ok) do
-          flash[:notice] = t("group_invites.accept.success", scope: "decidim")
-          redirect_to profile_groups_path(current_user.nickname)
+          respond_to do |format|
+            format.json do
+              render json: { message: t("group_invites.accept.success", scope: "decidim") }
+            end
+            format.all do
+              flash[:notice] = t("group_invites.accept.success", scope: "decidim")
+              redirect_to profile_groups_path(current_user.nickname)
+            end
+          end
         end
 
         on(:invalid) do
-          flash[:alert] = t("group_invites.accept.error", scope: "decidim")
-          redirect_to profile_groups_path(current_user.nickname)
+          respond_to do |format|
+            format.json do
+              render json: { message: t("group_invites.accept.error", scope: "decidim") }, status: :unprocessable_entity
+            end
+            format.all do
+              flash[:alert] = t("group_invites.accept.error", scope: "decidim")
+              redirect_to profile_groups_path(current_user.nickname)
+            end
+          end
         end
       end
     end
@@ -53,13 +66,27 @@ module Decidim
 
       RejectGroupInvitation.call(inviting_user_group, current_user) do
         on(:ok) do
-          flash[:notice] = t("group_invites.reject.success", scope: "decidim")
-          redirect_to profile_groups_path(current_user.nickname)
+          respond_to do |format|
+            format.json do
+              render json: { message: t("group_invites.reject.success", scope: "decidim") }
+            end
+            format.all do
+              flash[:notice] = t("group_invites.reject.success", scope: "decidim")
+              redirect_to profile_groups_path(current_user.nickname)
+            end
+          end
         end
 
         on(:invalid) do
-          flash[:alert] = t("group_invites.reject.error", scope: "decidim")
-          redirect_to profile_groups_path(current_user.nickname)
+          respond_to do |format|
+            format.json do
+              render json: { message: t("group_invites.reject.error", scope: "decidim") }, status: :unprocessable_entity
+            end
+            format.all do
+              flash[:alert] = t("group_invites.reject.error", scope: "decidim")
+              redirect_to profile_groups_path(current_user.nickname)
+            end
+          end
         end
       end
     end

data/app/controllers/decidim/links_controller.rb

@@ -41,7 +41,7 @@ module Decidim
     end
 
     def escape_url(external_url)
-      before_fragment, fragment = URI.decode_www_form_component(external_url).split("#", 2)
+      before_fragment, fragment = external_url.split("#", 2)
       escaped_before_fragment = URI::Parser.new.escape(before_fragment)
 
       if fragment

data/app/controllers/decidim/newsletters_opt_in_controller.rb

@@ -23,7 +23,7 @@ module Decidim
 
     def check_current_user_with_token
       unless current_user.newsletter_token == params[:token]
-        flash[:alert] = t("newsletters_opt_in.unathorized", scope: "decidim")
+        flash[:alert] = t("newsletters_opt_in.unauthorized", scope: "decidim")
         redirect_to decidim.root_path(host: current_organization)
       end
     end

data/app/controllers/decidim/notifications_settings_controller.rb

@@ -14,7 +14,7 @@ module Decidim
       enforce_permission_to(:update, :user, current_user:)
       @notifications_settings = form(NotificationsSettingsForm).from_params(params)
 
-      UpdateNotificationsSettings.call(current_user, @notifications_settings) do
+      UpdateNotificationsSettings.call(@notifications_settings) do
         on(:ok) do
           flash.now[:notice] = t("notifications_settings.update.success", scope: "decidim")
         end

data/app/controllers/decidim/profiles_controller.rb

@@ -24,11 +24,7 @@ module Decidim
     def show
       return redirect_to profile_members_path if profile_holder.is_a?(Decidim::UserGroup)
 
-      redirect_to profile_activity_path(nickname: params[:nickname].downcase)
-    end
-
-    def tooltip
-      render json: { data: cell("decidim/author", profile_holder.presenter).profile_minicard }
+      redirect_to profile_activity_path(nickname: params[:nickname])
     end
 
     def following
@@ -116,7 +112,7 @@ module Decidim
     def profile_holder
       return if params[:nickname].blank?
 
-      @profile_holder ||= Decidim::UserBaseEntity.find_by("nickname = ? AND decidim_organization_id = ?", params[:nickname].downcase, current_organization.id)
+      @profile_holder ||= Decidim::UserBaseEntity.find_by("LOWER(nickname) = ? AND decidim_organization_id = ?", params[:nickname].downcase, current_organization.id)
     end
   end
 end

data/app/controllers/decidim/report_users_controller.rb

@@ -12,7 +12,7 @@ module Decidim
 
       @form = form(Decidim::ReportForm).from_params(params)
 
-      CreateUserReport.call(@form, reportable, current_user) do
+      CreateUserReport.call(@form, reportable) do
         on(:ok) do
           flash[:notice] = I18n.t("decidim.reports.create.success")
           if @form.block?

data/app/controllers/decidim/reports_controller.rb

@@ -13,10 +13,10 @@ module Decidim
 
       @form = form(Decidim::ReportForm).from_params(params, can_hide: reportable.try(:can_be_administered_by?, current_user))
 
-      CreateReport.call(@form, reportable, current_user) do
+      CreateReport.call(@form, reportable) do
         on(:ok) do
           flash[:notice] = I18n.t("decidim.reports.create.success")
-          redirect_to reportable.reload.reported_content_url
+          redirect_back fallback_location: root_path
         end
 
         on(:invalid) do

data/app/controllers/decidim/user_activities_controller.rb

@@ -22,7 +22,7 @@ module Decidim
     def user
       return unless params[:nickname]
 
-      @user ||= current_organization.users.find_by("nickname = ?", params[:nickname].downcase)
+      @user ||= current_organization.users.find_by("LOWER(nickname) = ?", params[:nickname].downcase)
     end
 
     def activities

data/app/controllers/decidim/user_interests_controller.rb

@@ -14,7 +14,7 @@ module Decidim
       enforce_permission_to(:update, :user, current_user:)
       @user_interests = form(UserInterestsForm).from_params(params)
 
-      UpdateUserInterests.call(current_user, @user_interests) do
+      UpdateUserInterests.call(@user_interests) do
         on(:ok) do
           flash.keep[:notice] = t("user_interests.update.success", scope: "decidim")
         end

data/app/events/decidim/change_nickname_event.rb

@@ -2,7 +2,6 @@
 
 module Decidim
   class ChangeNicknameEvent < Decidim::Events::SimpleEvent
-    include Decidim::Events::NotificationEvent
     delegate :organization, to: :user, prefix: false
     delegate :url_helpers, to: "Decidim::Core::Engine.routes"
 

data/app/events/decidim/invited_to_group_event.rb

@@ -29,5 +29,34 @@ module Decidim
     def user_group_name
       extra["user_group_name"]
     end
+
+    def membership_id
+      extra["membership_id"]
+    end
+
+    def invitation
+      @invitation ||= UserGroupMembership.find_by(user:, id: membership_id, role: "invited")
+    end
+
+    def action_cell
+      "decidim/notification_actions/buttons" if invitation
+    end
+
+    def action_data
+      [
+        {
+          url: url_helpers.group_invite_path(user_group_nickname, membership_id, format: :json),
+          icon: "check-line",
+          method: "patch",
+          i18n_label: "decidim.group_invites.accept_invitation"
+        },
+        {
+          url: url_helpers.group_invite_path(user_group_nickname, membership_id, format: :json),
+          icon: "close-circle-line",
+          method: "delete",
+          i18n_label: "decidim.group_invites.reject_invitation"
+        }
+      ]
+    end
   end
 end

data/app/events/decidim/welcome_notification_event.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  class WelcomeNotificationEvent < Decidim::Events::BaseEvent
-    include Decidim::Events::EmailEvent
-    include Decidim::Events::NotificationEvent
+  class WelcomeNotificationEvent < Decidim::Events::SimpleEvent
     include TranslationsHelper
 
     delegate :organization, to: :user, prefix: false
@@ -46,7 +44,7 @@ module Decidim
     def interpolate(template)
       template
         .gsub("{{name}}", user.name)
-        .gsub("{{organization}}", organization.name)
+        .gsub("{{organization}}", organization_name(organization))
         .gsub("{{help_url}}", url_helpers.pages_url(host: organization.host))
         .gsub("{{badges_url}}", url_helpers.gamification_badges_url(host: organization.host))
         .html_safe