decidim-core 0.29.6 → 0.30.0.rc1

data/app/packs/stylesheets/decidim/resource_history.scss

@@ -0,0 +1,31 @@
+.resource_history {
+  @apply flex flex-col gap-3.5 lg:gap-[20px] p-4;
+
+  &__item {
+    @apply flex flex-row gap-2.5;
+
+    &_icon {
+      @apply w-8 h-8 rounded-full border-secondary border flex justify-center items-center;
+
+      &-creation {
+        @apply bg-secondary w-6 h-6 rounded-full flex justify-center items-center;
+      }
+    }
+
+    &_content {
+      @apply flex flex-col lg:items-center lg:flex-row lg:gap-1;
+    }
+
+    &_date {
+      @apply text-sm text-gray-2;
+    }
+  }
+
+  &_text {
+    @apply flex flex-col lg:flex-none lg:block relative;
+  }
+
+  &__line {
+    @apply absolute -left-[26px] lg:-left-[130px] top-3.5 lg:top-[26px] w-px h-full bg-secondary;
+  }
+}

data/app/permissions/decidim/default_permissions.rb

@@ -5,8 +5,6 @@ module Decidim
   # actions by any kind of user. Also works as a default implementation so other
   # components can inherit from it and get some convenience methods.
   class DefaultPermissions
-    include Decidim::UserRoleChecker
-
     def initialize(user, permission_action, context = {})
       @user = user
       @permission_action = permission_action

data/app/permissions/decidim/permissions.rb

@@ -24,6 +24,7 @@ module Decidim
       user_group_action?
       user_group_invitations_action?
       apply_endorsement_permissions if permission_action.subject == :endorsement
+      show_my_location_button?
 
       permission_action
     end
@@ -56,7 +57,6 @@ module Decidim
 
       return allow! if component.published?
       return allow! if user_can_preview_component?
-      return allow! if user_can_admin_component?
       return allow! if user_can_admin_component_via_space?
 
       disallow!
@@ -106,19 +106,7 @@ module Decidim
         return allow! if component.current_settings.amendment_creation_enabled
       when :accept,
           :reject
-        return disallow! unless component.current_settings.amendment_reaction_enabled
-
-        amendable = context.fetch(:amendable, nil)
-
-        if amendable.respond_to?(:official?) && amendable.official?
-          return allow! if user.admin?
-
-          return disallow!
-        end
-
-        return disallow! unless amendable.authored_by?(user)
-
-        return allow!
+        return allow! if component.current_settings.amendment_reaction_enabled
       when :promote
         return allow! if component.current_settings.amendment_promotion_enabled
       end
@@ -175,7 +163,7 @@ module Decidim
     end
 
     def user_can_preview_component?
-      return allow! if context[:share_token].present? && Decidim::ShareToken.use!(token_for: component, token: context[:share_token])
+      context[:share_token].present? && Decidim::ShareToken.use!(token_for: component, token: context[:share_token], user:)
     rescue ActiveRecord::RecordNotFound, StandardError
       nil
     end
@@ -205,6 +193,12 @@ module Decidim
       end
     end
 
+    def show_my_location_button?
+      return unless permission_action.action == :locate && permission_action.subject == :geolocation
+
+      allow!
+    end
+
     def not_already_active?(authorization)
       Verifications::Authorizations.new(organization: user.organization, user:, name: authorization.name).none?
     end

data/app/presenters/decidim/admin_log/base_user_presenter.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the shared logic for `Decidim::User` and `Decidim::UserGroup`
+    # presenters for the `AdminLog`.
+    class BaseUserPresenter < Decidim::Log::BasePresenter
+      private
+
+      def i18n_params
+        super.merge(
+          blocked_count: blocked_users.count,
+          unblocked_count: unblocked_users.count,
+          unreported_users_count: unreported_users.count
+        )
+      end
+
+      def blocked_users
+        action_log.extra.dig("extra", "blocked")&.values || []
+      end
+
+      def unblocked_users
+        action_log.extra.dig("extra", "unblocked")&.values || []
+      end
+
+      def unreported_users
+        action_log.extra.dig("extra", "unreported")&.values || []
+      end
+
+      def current_justification
+        action_log.extra.dig("extra", "current_justification") || Hash.new("")
+      end
+
+      def changeset
+        config = changeset_config[action.to_s]
+        return {} unless config
+
+        original = config[:original].call
+        return {} if original.values.flatten.all?(&:empty?)
+
+        Decidim::Log::DiffChangesetCalculator.new(original, config[:fields], i18n_labels_scope).changeset
+      end
+
+      def changeset_config
+        {
+          "bulk_block" => {
+            original: -> { { justification: [blocked_users.join(", "), current_justification] } },
+            fields: { justification: :string }
+          },
+          "bulk_unblock" => {
+            original: -> { { unblocked_users: ["", unblocked_users.join(", ")] } },
+            fields: { unblocked_users: :string }
+          },
+          "bulk_ignore" => {
+            original: -> { { unreported_users: ["", unreported_users.join(", ")] } },
+            fields: { unreported_users: :string }
+          }
+        }
+      end
+
+      # override this as it not depend on the old version
+      def has_diff?
+        diff_actions.include?(action.to_s) && changeset.any?
+      end
+    end
+  end
+end

data/app/presenters/decidim/admin_log/component_presenter.rb

@@ -29,9 +29,9 @@ module Decidim
 
       def action_string
         case action
-        when "export_component"
+        when "export_component", "soft_delete", "restore"
           "decidim.admin_log.component.#{action}"
-        when "create", "delete", "publish", "unpublish", "update_permissions"
+        when "create", "delete", "publish", "unpublish", "update_permissions", "update_filters"
           generate_action_string(action)
         else
           super
@@ -48,7 +48,7 @@ module Decidim
       end
 
       def diff_actions
-        super + %w(unpublish update_permissions)
+        super + %w(unpublish update_permissions update_filters)
       end
 
       def i18n_params
@@ -70,6 +70,35 @@ module Decidim
                       })
         end
       end
+
+      def changeset
+        changes = action_log.version.changeset
+        mapping = diff_fields_mapping
+        if action == "update_filters"
+          changes = {
+            "taxonomy_filters" => [
+              filters_for(action_log.version.changeset["settings"].first.dig("global", "taxonomy_filters")),
+              filters_for(action_log.version.changeset["settings"].last.dig("global", "taxonomy_filters"))
+            ]
+          }
+          mapping = { taxonomy_filters: :array }
+        end
+        Decidim::Log::DiffChangesetCalculator.new(
+          changes,
+          mapping,
+          i18n_labels_scope
+        ).changeset
+      end
+
+      def filters_for(ids)
+        return [] if ids.blank?
+
+        @filters_ids ||= {}
+        ids.map do |id|
+          @filters_ids[id] ||= Decidim::TaxonomyFilter.find_by(id: ids)
+          @filters_ids[id] ? "#{id}: #{@filters_ids[id].translated_internal_name}" : id
+        end
+      end
     end
   end
 end

data/app/presenters/decidim/admin_log/moderation_presenter.rb

@@ -12,6 +12,8 @@ module Decidim
     #    view_helpers # => this comes from the views
     #    ModerationPresenter.new(action_log, view_helpers).present
     class ModerationPresenter < Decidim::Log::BasePresenter
+      include Decidim::TranslatableAttributes
+
       private
 
       def diff_fields_mapping
@@ -23,7 +25,7 @@ module Decidim
 
       def action_string
         case action
-        when "hide", "unreport"
+        when "hide", "unreport", "bulk_hide", "bulk_unhide", "bulk_unreport"
           "decidim.admin_log.moderation.#{action}"
         else
           super
@@ -36,12 +38,37 @@ module Decidim
 
       def i18n_params
         super.merge(
-          resource_type: action_log.extra.dig("extra", "reportable_type").try(:demodulize)
+          resource_type: action_log.extra.dig("extra", "reportable_type").try(:demodulize),
+          reported_count: action_log.extra.dig("extra", "reported_count") || "?"
         )
       end
 
+      def reported_content
+        action_log.extra.dig("extra", "reported_content") || {}
+      end
+
+      # Overwrite the changeset.
+      def changeset
+        types = changeset_config.keys.index_with { |_key| :string }
+        Decidim::Log::DiffChangesetCalculator.new(changeset_config, types, "decidim.admin.admin_log.changeset").changeset
+      end
+
+      def changeset_config
+        reported_content.to_h do |key, items|
+          [
+            key.to_sym,
+            ["", items.values.map { |title| translated_attribute(title) }.join(", ")]
+          ]
+        end
+      end
+
+      # override this as it not depend on the old version
+      def has_diff?
+        diff_actions.include?(action.to_s) && changeset.any?
+      end
+
       def diff_actions
-        super + %w(unreport)
+        super + %w(unreport bulk_hide bulk_unhide bulk_unreport)
       end
     end
   end

data/app/presenters/decidim/admin_log/share_token_presenter.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class extends the default resource presenter for logs, so that
+    # it can properly link to the static page.
+    class ShareTokenPresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          token: :string,
+          expires_at: :date,
+          registered_only: :boolean,
+          token_for: :string
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.share_token.#{action}#{suffix}"
+        else
+          super
+        end
+      end
+
+      def suffix
+        return "_with_space" if action_log.extra.dig("component", "title").present?
+
+        ""
+      end
+
+      def diff_actions
+        %w(update create delete)
+      end
+    end
+  end
+end

data/app/presenters/decidim/admin_log/taxonomy_filter_presenter.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::Taxonomy`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    TaxonomyFilterPresenter.new(action_log, view_helpers).present
+    class TaxonomyFilterPresenter < Decidim::Log::BasePresenter
+      include Decidim::SanitizeHelper
+
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          internal_name: :i18n,
+          root_taxonomy_id: :taxonomy,
+          participatory_space_manifests: :array
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          if filter_items_count.present? && taxonomy_name.present?
+            "decidim.admin_log.taxonomy_filter.#{action}_with_filter_info"
+          else
+            "decidim.admin_log.taxonomy_filter.#{action}"
+          end
+        else
+          super
+        end
+      end
+
+      def i18n_params
+        super.merge(
+          filter_items_count:,
+          taxonomy_name: decidim_escape_translated(taxonomy_name)
+        )
+      end
+
+      def filter_items_count
+        action_log.extra.dig("extra", "filter_items_count")
+      end
+
+      def taxonomy_name
+        action_log.extra.dig("extra", "taxonomy_name")
+      end
+    end
+  end
+end

data/app/presenters/decidim/admin_log/taxonomy_presenter.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::Taxonomy`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you should not need to call this class
+    # directly, but here is an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    TaxonomyPresenter.new(action_log, view_helpers).present
+    class TaxonomyPresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          parent_id: :taxonomy
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          if parent_name.present?
+            "decidim.admin_log.taxonomy.#{action}_with_parent"
+          else
+            "decidim.admin_log.taxonomy.#{action}"
+          end
+        else
+          super
+        end
+      end
+
+      def i18n_params
+        super.merge(
+          parent_taxonomy: h.translated_attribute(parent_name)
+        )
+      end
+
+      def parent_name
+        action_log.extra.dig("extra", "parent_name")
+      end
+    end
+  end
+end

data/app/presenters/decidim/admin_log/user_group_presenter.rb

@@ -11,21 +11,21 @@ module Decidim
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views
     #    UserGroupPresenter.new(action_log, view_helpers).present
-    class UserGroupPresenter < Decidim::Log::BasePresenter
+    class UserGroupPresenter < BaseUserPresenter
       private
 
-      def has_diff?
-        false
-      end
-
       def action_string
         case action
-        when "verify", "verify_via_csv", "reject", "block", "unblock"
+        when "verify", "verify_via_csv", "reject", "block", "unblock", "bulk_block", "bulk_unblock", "bulk_ignore"
           "decidim.admin_log.user_group.#{action}"
         else
           super
         end
       end
+
+      def diff_actions
+        %w(bulk_block bulk_unblock bulk_ignore)
+      end
     end
   end
 end

data/app/presenters/decidim/admin_log/user_presenter.rb

@@ -11,12 +11,13 @@ module Decidim
     #    action_log = Decidim::ActionLog.last
     #    view_helpers # => this comes from the views
     #    UserPresenter.new(action_log, view_helpers).present
-    class UserPresenter < Decidim::Log::BasePresenter
+    class UserPresenter < BaseUserPresenter
       private
 
       def action_string
         case action
-        when "grant_id_documents_offline_verification", "invite", "officialize", "remove_from_admin", "show_email", "unofficialize", "block", "unblock", "promote", "transfer"
+        when "grant_id_documents_offline_verification", "invite", "officialize", "remove_from_admin",
+              "show_email", "unofficialize", "block", "unblock", "bulk_block", "bulk_unblock", "promote", "transfer", "bulk_ignore"
           "decidim.admin_log.user.#{action}"
         else
           super
@@ -45,23 +46,8 @@ module Decidim
         action_log.extra.dig("extra", "previous_justification") || ""
       end
 
-      def current_justification
-        action_log.extra.dig("extra", "current_justification") || Hash.new("")
-      end
-
-      # Overwrite the changeset for officialization and block actions.
-      def changeset
-        original = { badge: [previous_user_badge, user_badge] }
-        fields = { badge: :i18n }
-        if action.to_s == "block"
-          original = { justification: [previous_justification, current_justification] }
-          fields = { justification: :string }
-        end
-        Decidim::Log::DiffChangesetCalculator.new(original, fields, i18n_labels_scope).changeset
-      end
-
       def diff_actions
-        %w(officialize unofficialize block)
+        %w(officialize unofficialize block bulk_block bulk_unblock bulk_ignore)
       end
     end
   end

data/app/presenters/decidim/log/user_presenter.rb

@@ -46,7 +46,6 @@ module Decidim
       # Returns an HTML-safe String.
       def present_user
         return h.content_tag(:span, present_user_name, class: "logs__log__author") if user.blank?
-        return I18n.t("decidim.profile.deleted") if user.respond_to?(:deleted?) && user.deleted?
 
         h.link_to(
           present_user_name,

data/app/presenters/decidim/log/value_types/date_presenter.rb

@@ -12,6 +12,7 @@ module Decidim
         # Returns an HTML-safe String.
         def present
           return unless value
+          return h.l(Date.parse(value), format: :long) if value.is_a?(::String)
 
           h.l(value, format: :long)
         end

data/app/presenters/decidim/log/value_types/taxonomy_presenter.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Log
+    module ValueTypes
+      # This class presents the given value as a Decidim::Taxonomy. Check
+      # the `DefaultPresenter` for more info on how value
+      # presenters work.
+      class TaxonomyPresenter < DefaultPresenter
+        # Public: Presents the value as a Decidim::Taxonomy. If the taxonomy can
+        # be found, it shows its title. Otherwise it shows its ID.
+        #
+        # Returns an HTML-safe String.
+        def present
+          return unless value
+          return h.translated_attribute(taxonomy.name) if taxonomy
+
+          I18n.t("not_found", id: value, scope: "decidim.log.value_types.taxonomy_presenter")
+        end
+
+        private
+
+        def taxonomy
+          @taxonomy ||= Decidim::Taxonomy.find_by(id: value)
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/notification_to_mailer_presenter.rb

@@ -14,19 +14,15 @@ module Decidim
     delegate :url_helpers, to: "Decidim::Core::Engine.routes"
     delegate :resource_title, to: :event
     delegate :resource_url, to: :event
+    delegate :email_intro, to: :event
     delegate :resource_path, to: :event
     delegate :safe_resource_text, to: :event
 
-    def email_intro
-      event.email_intro if event.respond_to?(:email_intro)
-    end
-
     def date_time
-      created_at_in_time_zone = created_at.in_time_zone(resource.organization.time_zone)
       if frequency == :daily
-        I18n.l(created_at_in_time_zone, format: :time_of_day)
+        created_at.strftime("%H:%M")
       else
-        I18n.l(created_at_in_time_zone, format: :decidim_short)
+        I18n.l(created_at, format: :decidim_short)
       end
     end
 

data/app/presenters/decidim/participatory_space_private_user_presenter.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Decorator for assembly members
+  #
+  class ParticipatorySpacePrivateUserPresenter < SimpleDelegator
+    delegate :profile_url, to: :user, allow_nil: true
+
+    def name
+      user ? user.name : full_name
+    end
+
+    def nickname
+      user.nickname if user
+    end
+
+    def avatar_url(variant = nil)
+      return user.avatar_url(variant) if user.present?
+
+      non_user_avatar_path(variant)
+    end
+
+    def non_user_avatar_path(variant = nil)
+      return non_user_avatar.default_url(variant) unless non_user_avatar.attached?
+
+      non_user_avatar.path(variant:)
+    end
+
+    def non_user_avatar
+      attached_uploader(:non_user_avatar)
+    end
+
+    def has_tooltip?
+      false
+    end
+
+    def deleted?
+      false
+    end
+
+    private
+
+    def user
+      @user ||= if (user = __getobj__.user.presence)
+                  Decidim::UserPresenter.new(user)
+                end
+    end
+  end
+end

data/app/presenters/decidim/taxonomy_filter_presenter.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Decorator for taxonomies.
+  #
+  class TaxonomyFilterPresenter < SimpleDelegator
+    include Decidim::TranslationsHelper
+    include Decidim::SanitizeHelper
+
+    def translated_name
+      @translated_name ||= decidim_sanitize_translated(name)
+    end
+
+    def translated_internal_name
+      @translated_internal_name ||= decidim_sanitize_translated(internal_name)
+    end
+  end
+end

data/app/presenters/decidim/taxonomy_presenter.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Decorator for taxonomies.
+  #
+  class TaxonomyPresenter < SimpleDelegator
+    include Decidim::TranslationsHelper
+
+    def translated_name
+      @translated_name ||= translated_attribute name
+    end
+  end
+end

data/app/presenters/decidim/user_presenter.rb

@@ -37,7 +37,7 @@ module Decidim
       return default_avatar_url if __getobj__.blocked?
       return default_avatar_url unless avatar.attached?
 
-      avatar.url(variant:)
+      avatar.path(variant:)
     end
 
     def default_avatar_url