decidim-core 0.29.2 → 0.30.0.rc2

data/app/cells/decidim/resource_history_cell.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ResourceHistoryCell < Decidim::ViewModel
+    def show
+      render
+    end
+
+    def history_items
+      return @history_items if @history_items.present?
+
+      @history_items = []
+      linked_resources_items.each do |item|
+        add_linked_resources_items(item[:resources], item)
+      end
+
+      @history_items << creation_item if @history_items.any?
+
+      @history_items.sort_by! { |item| item[:date] }
+    end
+
+    # return an unique id to identify the type of history cell
+    def history_cell_id
+      raise NotImplementedError
+    end
+
+    # return an array of linked resources to show in the history
+    def linked_resources_items
+      raise NotImplementedError
+    end
+
+    # return the creation item to show in the history, it will be added only if there are linked resources
+    def creation_item
+      raise NotImplementedError
+    end
+
+    def render?
+      linked_resources_items.any? { |item| item[:resources].present? }
+    end
+
+    private
+
+    def add_linked_resources_items(resources, options)
+      return if resources.blank?
+
+      resources.each do |resource|
+        title = decidim_sanitize_translated(resource.title)
+        url = resource_locator(resource).path
+        link = link_to(title, url, class: "underline decoration-current text-secondary font-semibold")
+
+        @history_items << {
+          id: "#{options[:link_name]}_#{resource.id}",
+          date: resource.updated_at,
+          text: t(options[:text_key], scope: "activerecord.models", link:),
+          icon: resource_type_icon_key(options[:icon_key])
+        }
+      end
+    end
+
+    def history_items_contains?(link_name)
+      return false if @history_items.blank?
+
+      @history_items.any? { |item| item[:id].include?(link_name.to_s) }
+    end
+  end
+end

data/app/cells/decidim/share_button_cell.rb

@@ -4,10 +4,6 @@ module Decidim
   class ShareButtonCell < ButtonCell
     private
 
-    def button_classes
-      "button button__sm button__text-secondary"
-    end
-
     def text
       t("decidim.shared.share_modal.share")
     end

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

@@ -0,0 +1,26 @@
+<%= decidim_modal id: "socialShare", class: "share-modal" do %>
+  <div data-dialog-container>
+    <%= icon "share-line" %>
+    <h2 id="dialog-title-socialShare" tabindex="-1" data-dialog-title><%= t("share", scope: "decidim.shared.share_modal") %></h2>
+    <div>
+      <%= social_share_button_tag(decidim_page_title,
+                                  url: decidim_meta_url,
+                                  image: decidim_meta_image_url,
+                                  desc: decidim_html_escape(decidim_meta_description || ""),
+                                  via: decidim_meta_twitter_handler) %>
+
+      <div class="share-modal__input">
+        <input id="urlShareLink" type="text" title="<%= t("share_link" , scope: "decidim.shared.share_modal") %>" value="<%= resource_name ? short_url(route_name: resource_name, params:) : decidim_meta_url %>" readonly>
+        <button type="button"
+                class="button button__sm button__text-secondary"
+                data-clipboard-copy="#urlShareLink"
+                data-clipboard-copy-label="<%= t("copy_share_link_copied", scope: "decidim.shared.share_modal") %>"
+                data-clipboard-copy-message="<%= t("copy_share_link_message", scope: "decidim.shared.share_modal") %>"
+                title="<%= t("copy_share_link_clarification", scope: "decidim.shared.share_modal") %>">
+          <span><%= t("copy_share_link", scope: "decidim.shared.share_modal") %></span>
+          <%= icon "file-copy-line" %>
+        </button>
+      </div>
+    </div>
+  </div>
+<% end %>

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

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

data/app/cells/decidim/share_widget_cell.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ShareWidgetCell < Decidim::ViewModel
+    include Decidim::ShortLinkHelper
+    include Decidim::SocialShareButtonHelper
+
+    def show
+      render
+    end
+
+    private
+
+    def resource_name
+      return "budget_project" if model.is_a?(Decidim::Budgets::Project)
+
+      model.class.name.demodulize.underscore
+    end
+  end
+end

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

@@ -1,4 +1,7 @@
-<%= content_tag :ul, class: tags_classes, data: { tags: "" } do %>
-  <%= content_tag :li, link_to_tag(category_path, category_name, t("decidim.tags.filter_results_for_category", resource: category_name)) if category? %>
-  <%= content_tag :li, link_to_tag(scope_path, scope_name, t("decidim.tags.filter_results_for_scope", resource: scope_name)) if scope? %>
-<% end %>
+<section class="layout-main__section">
+  <%= content_tag :ul, class: tags_classes, data: { tags: "" } do %>
+    <% taxonomies.each do |tax| %>
+      <%= content_tag :li, link_to_tag(tax[:url], tax[:name], t("decidim.tags.filter_results_for_taxonomy", resource: tax[:name])) %>
+    <% end %>
+  <% end %>
+</section>

data/app/cells/decidim/tags_cell.rb

@@ -1,24 +1,16 @@
 # frozen_string_literal: true
 
 module Decidim
-  # This cell renders the category of a resource
+  # This cell renders the taxonomies of a resource
   # shown with the translated name and links to
   # the resource parent `component` and `participatory space` index.
   # The context `resource` must be present
   # example use inside another `cell`:
-  #   <%= cell("decidim/category", model.category, context: {resource: model}) %>
+  #   <%= cell("decidim/tags", model.taxonomies, context: {resource: model}) %>
   #
   class TagsCell < Decidim::ViewModel
     def show
-      render if category? || scope?
-    end
-
-    def category
-      render if category?
-    end
-
-    def scope
-      render if scope?
+      render if taxonomies.any?
     end
 
     private
@@ -27,27 +19,14 @@ module Decidim
       (["tag-container"] + context[:extra_classes].to_a).join(" ")
     end
 
-    def category?
-      model.category.present?
-    end
-
-    # deprecated
-    def link_to_category
-      accessible_title = t("decidim.tags.filter_results_for_category", resource: category_name)
+    def taxonomies
+      return [] unless model.respond_to?(:taxonomies)
 
-      link_to category_path, title: accessible_title, class: "tag" do
-        sr_title = content_tag(
-          :span,
-          accessible_title,
-          class: "sr-only"
-        )
-        display_title = content_tag(
-          :span,
-          category_name,
-          "aria-hidden": true
-        )
-
-        sr_title + display_title
+      @taxonomies ||= model.taxonomies.map do |taxonomy|
+        {
+          name: decidim_sanitize_translated(taxonomy.name),
+          url: resource_locator(model).index(filter: { "with_any_taxonomies[#{taxonomy.root_taxonomy.id}]" => [taxonomy.id.to_s] })
+        }
       end
     end
 
@@ -68,48 +47,8 @@ module Decidim
       end
     end
 
-    def category_name
-      decidim_html_escape model.category.translated_name
-    end
-
-    def category_path
-      resource_locator(model).index(filter: { filter_param(:category) => [model.category.id.to_s] })
-    end
-
-    def scope?
-      has_visible_scopes?(model)
-    end
-
-    # deprecated
-    def link_to_scope
-      accessible_title = t("decidim.tags.filter_results_for_scope", resource: scope_name)
-
-      link_to scope_path, title: accessible_title, class: "tag" do
-        sr_title = content_tag(
-          :span,
-          accessible_title,
-          class: "sr-only"
-        )
-        display_title = content_tag(
-          :span,
-          scope_name,
-          "aria-hidden": true
-        )
-
-        sr_title + display_title
-      end
-    end
-
-    def scope_name
-      translated_attribute model.scope.name
-    end
-
-    def scope_path
-      resource_locator(model).index(filter: { filter_param(:scope) => [model.scope.id] })
-    end
-
     def filter_param(name)
-      candidates = ["with_any_#{name}".to_sym, "with_#{name}".to_sym]
+      candidates = [:"with_any_#{name}", :"with_#{name}"]
       return candidates.first unless controller.respond_to?(:default_filter_params, true)
 
       available_params = controller.send(:default_filter_params)

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

@@ -4,7 +4,7 @@ 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
+      delegate :current_user, :current_organization, to: :form
 
       # Public: Initializes the command.
       #
@@ -53,8 +53,8 @@ module Decidim
             emendation.title = { I18n.locale => form.emendation_params.with_indifferent_access[:title] }
             emendation.body = { I18n.locale => form.emendation_params.with_indifferent_access[:body] }
             emendation.component = amendable.component
+            emendation.taxonomies = amendable.taxonomies if amendable.respond_to?(:taxonomies)
             emendation.add_author(current_user, user_group)
-            emendation.category = amendable.category if amendable.respond_to?(:category)
             emendation.save!
             emendation
           end

data/app/commands/decidim/create_ephemeral_user.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A command with all the business logic to create an ephemeral user.
+  class CreateEphemeralUser < Decidim::Command
+    # Public: Initializes the command.
+    #
+    # form - A form object with the params.
+    def initialize(form)
+      @form = form
+    end
+
+    # Executes the command. Broadcasts these events:
+    #
+    # - :ok when everything is valid.
+    # - :invalid if the form was not valid and we could not proceed.
+    #
+    # Returns nothing.
+    def call
+      return broadcast(:invalid) if form.invalid?
+
+      create_user!
+      confirm_user
+
+      broadcast(:ok, @user)
+    rescue ActiveRecord::RecordInvalid
+      broadcast(:invalid)
+    end
+
+    private
+
+    attr_reader :form
+
+    def create_user!
+      # The user is saved with tos_agreement to true but in the verification
+      # phase the tos_agreement will be mandatory for ephemeral users
+      @user = User.create!(
+        name: form.name,
+        nickname: form.nickname,
+        organization: form.organization,
+        locale: form.locale,
+        tos_agreement: true,
+        managed: true,
+        extended_data: { ephemeral: true, verified: form.verified }
+      )
+    end
+
+    def confirm_user
+      @user.confirm
+    end
+  end
+end

data/app/commands/decidim/create_omniauth_registration.rb

@@ -36,6 +36,8 @@ module Decidim
         trigger_omniauth_registration
 
         broadcast(:ok, @user)
+      rescue NeedTosAcceptance
+        broadcast(:add_tos_errors, @user)
       rescue ActiveRecord::RecordInvalid => e
         broadcast(:error, e.record)
       end
@@ -73,10 +75,12 @@ module Decidim
           file = url.open
           @user.avatar.attach(io: file, filename:)
         end
+        @user.tos_agreement = form.tos_agreement
+        @user.accepted_tos_version = Time.current
+        raise NeedTosAcceptance if @user.tos_agreement.blank?
+
         @user.skip_confirmation! if verified_email
-        @user.tos_agreement = "1"
         @user.save!
-
         @user.after_confirmation if verified_email
       end
     end
@@ -129,11 +133,17 @@ module Decidim
         name: form.name,
         nickname: form.normalized_nickname,
         avatar_url: form.avatar_url,
-        raw_data: form.raw_data
+        raw_data: form.raw_data,
+        tos_agreement: form.tos_agreement,
+        newsletter_notifications_at: form.newsletter_at,
+        accepted_tos_version: form.current_organization.tos_version
       )
     end
   end
 
+  class NeedTosAcceptance < StandardError
+  end
+
   class InvalidOauthSignature < StandardError
   end
 end

data/app/commands/decidim/create_report.rb

@@ -53,7 +53,7 @@ module Decidim
     end
 
     def participatory_space_moderators
-      @participatory_space_moderators ||= participatory_space.moderators
+      @participatory_space_moderators ||= participatory_space.respond_to?(:moderators) ? participatory_space.moderators : []
     end
 
     def send_report_notification_to_moderators
@@ -84,9 +84,5 @@ module Decidim
         ReportedMailer.hide(moderator, @report).deliver_later
       end
     end
-
-    def participatory_space
-      @participatory_space ||= @reportable.component&.participatory_space || @reportable.try(:participatory_space)
-    end
   end
 end

data/app/commands/decidim/create_user_group.rb

@@ -19,7 +19,7 @@ module Decidim
     def call
       return broadcast(:invalid) if form.invalid?
 
-      transaction do
+      with_events(with_transaction: true) do
         create_user_group
         create_membership
       end
@@ -30,7 +30,11 @@ module Decidim
 
     private
 
-    attr_reader :form
+    attr_reader :form, :user_group
+
+    def event_arguments
+      { resource: user_group }
+    end
 
     def create_user_group
       @user_group = UserGroup.create!(

data/app/commands/decidim/destroy_ephemeral_user.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A command with all the business logic to create an ephemeral user.
+  class DestroyEphemeralUser < Decidim::Command
+    # Public: Initializes the command.
+    #
+    # user - An ephemeral user.
+    def initialize(user)
+      @user = user
+    end
+
+    # Executes the command. Broadcasts these events:
+    #
+    # - :ok when everything is valid.
+    # - :invalid if the user is not ephemeral
+    #
+    # Returns nothing.
+    def call
+      return broadcast(:invalid) unless user.ephemeral?
+
+      destroy_pending_authorizations!
+      destroy_account!
+
+      broadcast(:ok)
+    rescue ActiveRecord::RecordInvalid
+      broadcast(:invalid)
+    end
+
+    private
+
+    attr_reader :user
+
+    def destroy_pending_authorizations!
+      Decidim::Authorization.where(user:, granted_at: nil).destroy_all
+    end
+
+    def destroy_account!
+      user.invalidate_all_sessions!
+
+      user.delete_reason = "Ephemeral user session expired"
+      user.deleted_at = Time.current
+      user.skip_reconfirmation!
+      user.save!
+    end
+  end
+end

data/app/commands/decidim/update_account.rb

@@ -20,10 +20,12 @@ module Decidim
       update_password
 
       if current_user.valid?
-        changes = current_user.changed
-        current_user.save!
+        with_events do
+          changes = current_user.changed
+          current_user.save!
+          send_update_summary!(changes)
+        end
         notify_followers
-        send_update_summary!(changes)
         broadcast(:ok, current_user.unconfirmed_email.present?)
       else
         [:avatar, :password].each do |key|
@@ -33,6 +35,12 @@ module Decidim
       end
     end
 
+    protected
+
+    def event_arguments
+      { resource: current_user }
+    end
+
     private
 
     attr_reader :form

data/app/commands/decidim/update_notifications_settings.rb

@@ -30,6 +30,7 @@ module Decidim
       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.email_on_assigned_proposals = @form.email_on_assigned_proposals
       current_user.notification_settings = current_user.notification_settings.merge(@form.notification_settings)
       current_user.notifications_sending_frequency = @form.notifications_sending_frequency
     end

data/app/commands/decidim/update_resources_taxonomies.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  #  A command with all the business logic when an admin batch updates taxonomies on several resources.
+  class UpdateResourcesTaxonomies < Decidim::Command
+    # Public: Initializes the command.
+    #
+    # taxonomy_ids - the taxonomy ids to update
+    # resources - an ApplicationRecord collection of resources to update.
+    def initialize(taxonomy_ids, resources, organization)
+      @organization = organization
+      @taxonomies = Decidim::Taxonomy.non_roots.where(organization:, id: taxonomy_ids)
+      @resources = resources
+      @response = { taxonomies: [], successful: [], errored: [] }
+    end
+
+    # Executes the command. Broadcasts these events:
+    #
+    # - :update_resources_taxonomies - when everything is ok, returns @response.
+    # - :invalid_taxonomies - if the taxonomy is blank.
+    # - :invalid_resources - if the resource_ids is blank.
+    #
+    # Returns @response hash:
+    #
+    # - :taxonomies - Array of the updated taxonomies
+    # - :successful - Array of the updated resources
+    # - :errored - Array of the resources not updated because they already had the taxonomies assigned
+    def call
+      return broadcast(:invalid_taxonomies) if @taxonomies.blank?
+      return broadcast(:invalid_resources) if @resources.blank? || !@resources.respond_to?(:find_each)
+
+      update_resources_taxonomies
+
+      broadcast(:update_resources_taxonomies, @response)
+    end
+
+    # Useful for running any code that you may want to execute before updating taxonomies on each resource.
+    def run_before_hooks(resource); end
+
+    # Useful for running any code that you may want to execute after updating taxonomies on each resource.
+    def run_after_hooks(resource); end
+
+    private
+
+    attr_reader :taxonomies, :resources, :organization
+
+    def update_resources_taxonomies
+      @response[:taxonomies] = taxonomies
+      resources.find_each do |resource|
+        if taxonomies == resource.taxonomies
+          @response[:errored] << resource
+        else
+          update_resource_taxonomies!(resource)
+          @response[:successful] << resource
+        end
+      end
+    end
+
+    def update_resource_taxonomies!(resource)
+      transaction do
+        run_before_hooks(resource)
+        resource.update!(taxonomies:)
+        run_after_hooks(resource)
+      end
+    end
+  end
+end

data/app/commands/decidim/update_user_group.rb

@@ -22,7 +22,9 @@ module Decidim
       return broadcast(:invalid) if form.invalid?
 
       was_verified = user_group.verified?
-      update_user_group
+      with_events do
+        update_user_group
+      end
       notify_admins if was_verified
 
       broadcast(:ok, user_group)
@@ -32,6 +34,10 @@ module Decidim
 
     attr_reader :form, :user_group
 
+    def event_arguments
+      { resource: user_group }
+    end
+
     def update_user_group
       user_group_attributes = attributes
       user_group_attributes.delete(:avatar) if form.avatar.blank?

data/app/constraints/decidim/current_component.rb

@@ -33,7 +33,7 @@ module Decidim
     end
 
     def detect_current_component(params)
-      @participatory_space.components.find do |component|
+      @participatory_space.components.with_deleted.find do |component|
         params["component_id"] == component.id.to_s && component.manifest_name == @manifest.name.to_s
       end
     end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module AjaxPermissionHandler
+    extend ActiveSupport::Concern
+
+    included do
+      rescue_from Decidim::ActionForbidden, with: :ajax_user_has_no_permission
+    end
+
+    private
+
+    def ajax_user_has_no_permission
+      return user_has_no_permission unless request.xhr?
+
+      render json: { message: I18n.t("actions.unauthorized", scope: "decidim.core") }, status: :unprocessable_entity
+    end
+  end
+end

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

@@ -6,6 +6,7 @@ module Decidim
   module DeviseAuthenticationMethods
     extend ActiveSupport::Concern
     include Decidim::UserBlockedChecker
+    include Decidim::OnboardingActionMethods
 
     included do
       def after_sign_in_path_for(user)
@@ -13,8 +14,8 @@ module Decidim
           check_user_block_status(user)
         elsif user.needs_password_update?
           decidim.change_password_path
-        elsif first_login_and_not_authorized?(user) && !user.admin? && !pending_redirect?(user)
-          decidim_verifications.first_login_authorizations_path
+        elsif pending_onboarding_action?(user)
+          decidim_verifications.onboarding_pending_authorizations_path
         else
           super
         end
@@ -27,10 +28,6 @@ module Decidim
       def pending_redirect?(user)
         store_location_for(user, stored_location_for(user))
       end
-
-      def first_login_and_not_authorized?(user)
-        user.is_a?(User) && user.sign_in_count == 1 && current_organization.available_authorizations.any? && user.verifiable?
-      end
     end
   end
 end

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

@@ -22,6 +22,7 @@ module Decidim
       include NeedsSnippets
       include UserBlockedChecker
       include ActiveStorage::SetCurrent
+      include Decidim::OnboardingActionMethods
 
       helper Decidim::TranslationsHelper
       helper Decidim::MetaTagsHelper
@@ -36,6 +37,7 @@ module Decidim
       helper Decidim::SocialShareButtonHelper
       helper Decidim::SanitizeHelper
       helper Decidim::ApplicationHelper
+      helper Decidim::OnboardingActionHelper
 
       layout "layouts/decidim/application"
 

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

@@ -8,7 +8,7 @@ module Decidim
 
     included do
       def redirect_back(fallback_location:, allow_other_host: true, **args) # rubocop:disable Lint/UnusedMethodArgument
-        super fallback_location:, allow_other_host: Decidim.allow_open_redirects, **args
+        super(fallback_location:, allow_other_host: Decidim.allow_open_redirects, **args)
       end
     end
   end