decidim-core 0.28.3 → 0.29.0.rc1

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/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/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/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,7 +13,7 @@ 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_back fallback_location: root_path

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

data/app/forms/decidim/form.rb

@@ -11,5 +11,9 @@ module Decidim
              to: :context, prefix: false, allow_nil: true
 
     delegate :available_locales, to: :current_organization, allow_nil: true
+
+    alias organization current_organization
+    alias component current_component
+    alias participatory_space current_participatory_space
   end
 end

data/app/forms/decidim/omniauth_registration_form.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  # A form object used to fisnish signup from omniauth data
+  # A form object used to finish signup from omniauth data
   class OmniauthRegistrationForm < Form
     mimic :user
 

data/app/forms/decidim/upload_validation_form.rb

@@ -73,7 +73,7 @@ module Decidim
     # This class provides ability to interpret the attachment context based on
     # the details available within the context of this class. Normally the
     # attachment context would be defined by the record to which the attachment
-    # are added to, e.g. proposals (participant contenxt) or participatory
+    # are added to, e.g. proposals (participant context) or participatory
     # processes (admin context). Unfortunately this information is not available
     # when the parameters are passed to the upload validation.
     class AttachmentContextProxy

data/app/helpers/concerns/decidim/flash_helper_extensions.rb

@@ -43,7 +43,7 @@ module Decidim
       #
       # @param value [String] - The flash message.
       # @param alert_class [String] - The foundation class of the alert message.
-      # @param closable [Boolean] - Wether the close icon is added.
+      # @param closable [Boolean] - Whether the close icon is added.
       #
       # @return [String] the HTML with the alert box
       def alert_box(value, alert_class, closable, opts = {})

data/app/helpers/decidim/amendments_helper.rb

@@ -5,7 +5,7 @@ module Decidim
   module AmendmentsHelper
     include RichTextEditorHelper
 
-    TOTAL_STEPS = 4
+    TOTAL_STEPS = 2
 
     # Renders the state of an emendation
     #
@@ -130,14 +130,10 @@ module Decidim
 
     def current_step
       @current_step ||= case params[:action].to_sym
-                        when :new, :create
+                        when :new, :create, :edit_draft, :update_draft, :destroy_draft
                           1
-                        when :compare_draft
-                          2
-                        when :edit_draft, :update_draft, :destroy_draft
-                          3
                         when :preview_draft, :publish_draft
-                          4
+                          2
                         end
     end
 
@@ -147,10 +143,6 @@ module Decidim
             when 1
               :new
             when 2
-              :compare_draft
-            when 3
-              :edit_draft
-            when 4
               :preview_draft
             end
 
@@ -162,9 +154,7 @@ module Decidim
       case current_step
       when 1
         Decidim::ResourceLocatorPresenter.new(amendable).path
-      when 3
-        Decidim::Core::Engine.routes.url_helpers.compare_draft_amend_path(amendable.amendment)
-      when 4
+      when 2
         Decidim::Core::Engine.routes.url_helpers.edit_draft_amend_path(amendable.amendment)
       end
     end

data/app/helpers/decidim/application_helper.rb

@@ -105,5 +105,13 @@ module Decidim
     def prevent_timeout_seconds
       0
     end
+
+    def text_initials(name)
+      name.split(/[\s.]+/).map(&:chr).slice(0, 2).join.upcase
+    end
+
+    def add_body_classes(*class_names)
+      content_for :body_class, class_names.map { |class_name| " #{class_name.strip}" }.join
+    end
   end
 end

data/app/helpers/decidim/authorization_form_helper.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 module Decidim
-  # A heper to expose an easy way to add authorization forms in a view.
+  # A helper to expose an easy way to add authorization forms in a view.
   module AuthorizationFormHelper
     # Creates a ew authorization form in a view, accepts the same arguments as
     # `form_for`.
     #
-    # record  - The record to use in the form, it shoulde be a descendant of
+    # record  - The record to use in the form, it should be a descendant of
     # AuthorizationHandler.
     # options - An optional hash with options to pass wo the form builder.
     # block   - A block with the content of the form.

data/app/helpers/decidim/breadcrumb_helper.rb

@@ -22,7 +22,7 @@ module Decidim
     #   HasBreadcrumbItems concern with the add_breadcrumb_item_from_menu
     #   method. The list contains the identifier of a menu to insert its items
     #   in the breadcrumb displaying the active element.
-    # * controller_breadcrumb_items: A list of additional breadrumb items
+    # * controller_breadcrumb_items: A list of additional breadcrumb items
     #   which is expected to receive its elements from controllers and contains
     #   the last items of the breadcrumb.
     def breadcrumb_items(context = :public)

data/app/helpers/decidim/cells_helper.rb

@@ -15,7 +15,7 @@ module Decidim
     end
 
     def current_component
-      from_context.component
+      context[:controller].try(:current_component) || from_context.component
     end
 
     def withdrawable?

data/app/helpers/decidim/check_boxes_tree_helper.rb

@@ -92,7 +92,7 @@ module Decidim
     end
 
     def filter_global_scopes_values
-      filter_scopes_values_from(current_organization.scopes.top_level.includes(:scope_type, :children))
+      filter_scopes_values_from(current_organization.scopes.top_level)
     end
 
     def filter_areas_values

data/app/helpers/decidim/datalist_select_helper.rb

@@ -3,7 +3,7 @@
 module Decidim
   # Helper that provides a single method to create datalist select.
   module DatalistSelectHelper
-    # Public: Creates HTML for datalist select so that you can use seperate ids and labels.
+    # Public: Creates HTML for datalist select so that you can use separate ids and labels.
     #
     # items - Items in datalist, item should have id and name.
     # options - a Hash with options

data/app/helpers/decidim/decidim_form_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  # A heper to expose an easy way to add authorization forms in a view.
+  # A helper to expose an easy way to add authorization forms in a view.
   module DecidimFormHelper
     # A custom form for that injects client side validations with Abide.
     #
@@ -12,7 +12,7 @@ module Decidim
     # Returns a String.
     def decidim_form_for(record, options = {}, &)
       options[:data] ||= {}
-      options[:data].update(abide: true, "live-validate" => true, "validate-on-blur" => true)
+      options[:data].update(:abide => true, "live-validate" => true, "validate-on-blur" => true)
 
       options[:html] ||= {}
       options[:html].update(novalidate: true) unless options[:html].has_key?(:novalidate)
@@ -25,7 +25,7 @@ module Decidim
       if record.is_a?(ActiveRecord::Base)
         object = record.is_a?(Array) ? record.last : record
         format = options[:format]
-        apply_form_for_options!(record, object, options) if object
+        apply_form_for_options!(object, options) if object
         options[:format] = format if format
       end
 

data/app/helpers/decidim/filters_helper.rb

@@ -34,7 +34,7 @@ module Decidim
 
     private
 
-    # Creates a unique namespace for a filter form to prevent dupliacte IDs in
+    # Creates a unique namespace for a filter form to prevent duplicate IDs in
     # the DOM when multiple filter forms are rendered with the same fields (e.g.
     # for desktop and mobile).
     def filter_form_namespace

data/app/helpers/decidim/layout_helper.rb

@@ -3,6 +3,7 @@
 module Decidim
   # View helpers related to the layout.
   module LayoutHelper
+    include Decidim::OrganizationHelper
     include Decidim::ModalHelper
     include Decidim::TooltipHelper
 
@@ -129,28 +130,6 @@ module Decidim
       }
     end
 
-    # Renders a view with the customizable CSS variables in two flavours:
-    # 1. as a hexadecimal valid CSS color (ie: #ff0000)
-    # 2. as a disassembled RGB components (ie: 255 0 0)
-    #
-    # Example:
-    #
-    # --primary: #ff0000;
-    # --primary-rgb: 255 0 0
-    #
-    # Hexadecimal variables can be used as a normal CSS color:
-    #
-    # color: var(--primary)
-    #
-    # While the disassembled variant can be used where you need to manipulate
-    # the color somehow (ie: adding a background transparency):
-    #
-    # background-color: rgba(var(--primary-rgb), 0.5)
-    def organization_colors
-      css = current_organization.colors.each.map { |k, v| "--#{k}: #{v};--#{k}-rgb: #{v[1..2].hex} #{v[3..4].hex} #{v[5..6].hex};" }.join
-      render partial: "layouts/decidim/organization_colors", locals: { css: }
-    end
-
     def current_user_unread_data
       return {} if current_user.blank?
 
@@ -161,22 +140,8 @@ module Decidim
       end
     end
 
-    def organization_description_label
-      @organization_description_label ||= if empty_organization_description?
-                                            t("decidim.pages.home.footer_sub_hero.footer_sub_hero_body_html")
-                                          else
-                                            decidim_sanitize_admin(translated_attribute(current_organization.description))
-                                          end
-    end
-
     private
 
-    def empty_organization_description?
-      organization_description = translated_attribute(current_organization.description)
-
-      organization_description.blank? || organization_description == "<p></p>"
-    end
-
     def tag_builder
       @tag_builder ||= ActionView::Helpers::TagHelper::TagBuilder.new(self)
     end

data/app/helpers/decidim/localized_locales_helper.rb

@@ -21,7 +21,7 @@ module Decidim
     # locales.
     #
     # collection - an Array of Strings. By default it uses all the available
-    #   locales in Decidim, but you can passa nother collection of locales (for
+    #   locales in Decidim, but you can pass another collection of locales (for
     #   example, the available locales for an organization)
     def localized_locales(collection = Decidim.available_locales)
       klass = Class.new do

data/app/helpers/decidim/menu_helper.rb

@@ -43,6 +43,14 @@ module Decidim
       )
     end
 
+    def mobile_breadcrumb_root_menu
+      @mobile_breadcrumb_root_menu ||= ::Decidim::BreadcrumbRootMenuPresenter.new(
+        :mobile_menu,
+        self,
+        container_options: { class: "menu-bar__main-dropdown__menu" }
+      )
+    end
+
     def footer_menu
       @footer_menu ||= ::Decidim::FooterMenuPresenter.new(
         :menu,