decidim-core 0.26.9 → 0.27.0.rc1

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

@@ -18,7 +18,8 @@ module Decidim
         {
           name: :i18n,
           published_at: :date,
-          weight: :integer
+          weight: :integer,
+          permissions: :jsonb
         }
       end
 
@@ -28,15 +29,46 @@ module Decidim
 
       def action_string
         case action
-        when "create", "delete", "publish", "unpublish"
+        when "export_component"
           "decidim.admin_log.component.#{action}"
+        when "create", "delete", "publish", "unpublish", "update_permissions"
+          generate_action_string(action)
         else
           super
         end
       end
 
+      def generate_action_string(action)
+        string = if action_log.participatory_space.present?
+                   "#{action}_with_space"
+                 else
+                   action
+                 end
+        "decidim.log.base_presenter.#{string}"
+      end
+
       def diff_actions
-        super + %w(unpublish)
+        super + %w(unpublish update_permissions)
+      end
+
+      def i18n_params
+        case action_log.extra["name"]
+        when "proposal_comments", "result_comments", "comments", "meeting_comments"
+          super.merge({
+                        component_name: I18n.t("decidim.admin_log.helpers.comments"),
+                        format_name: action_log.extra["format"]
+                      })
+        when "projects", "results", "answers"
+          super.merge({
+                        component_name: I18n.t("decidim.admin_log.helpers.#{action_log.extra["name"]}"),
+                        format_name: action_log.extra["format"]
+                      })
+        else
+          super.merge({
+                        component_name: "",
+                        format_name: action_log.extra["format"]
+                      })
+        end
       end
     end
   end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::ContextualHelpSection`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    ContextualHelpSectionPresenter.new(action_log, view_helpers).present
+    class ContextualHelpSectionPresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          content: :i18n
+        }
+      end
+
+      def action_string
+        case action
+        when "update"
+          "decidim.admin_log.contextual_help_section.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -15,6 +15,8 @@ module Decidim
       private
 
       def diff_fields_mapping
+        return { external_domain_whitelist: :string } if action == "update_external_domain"
+
         settings_attributes_mapping
           .merge(omnipresent_banner_attributes_mapping)
           .merge(highlighted_content_banner_attributes_mapping)
@@ -79,9 +81,12 @@ module Decidim
       end
 
       def action_string
-        return "decidim.admin_log.organization.update_id_documents_config" if action == "update_id_documents_config"
-
-        "decidim.admin_log.organization.update"
+        case action
+        when "update_id_documents_config", "update_external_domain"
+          "decidim.admin_log.organization.#{action}"
+        else
+          "decidim.admin_log.organization.update"
+        end
       end
 
       def i18n_labels_scope
@@ -89,7 +94,7 @@ module Decidim
       end
 
       def diff_actions
-        super + %w(update_id_documents_config)
+        super + %w(update_id_documents_config update_external_domain)
       end
     end
   end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    # This class holds the logic to present a `Decidim::ScopeType`
+    # for the `AdminLog` log.
+    #
+    # Usage should be automatic and you shouldn't need to call this class
+    # directly, but here's an example:
+    #
+    #    action_log = Decidim::ActionLog.last
+    #    view_helpers # => this comes from the views
+    #    ScopeTypePresenter.new(action_log, view_helpers).present
+    class ScopeTypePresenter < Decidim::Log::BasePresenter
+      private
+
+      def diff_fields_mapping
+        {
+          name: :i18n,
+          plural: :i18n
+        }
+      end
+
+      def action_string
+        case action
+        when "create", "delete", "update"
+          "decidim.admin_log.scope_type.#{action}"
+        else
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ module Decidim
 
       def action_string
         case action
-        when "verify", "verify_via_csv", "reject", "block", "unblock"
+        when "verify", "verify_via_csv", "reject"
           "decidim.admin_log.user_group.#{action}"
         else
           super

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

@@ -52,7 +52,7 @@ module Decidim
       end
 
       def unreported_user
-        @unreported_user ||= Decidim::UserBaseEntity.find_by(id: action_log.extra.dig("extra", "user_id"))
+        @unreported_user ||= Decidim::User.find_by(id: action_log.extra.dig("extra", "user_id"))
       end
 
       def has_diff?

data/app/presenters/decidim/home_stats_presenter.rb

@@ -2,8 +2,10 @@
 
 module Decidim
   # A presenter to render statistics in the homepage.
-  class HomeStatsPresenter < Rectify::Presenter
-    attribute :organization, Decidim::Organization
+  class HomeStatsPresenter < SimpleDelegator
+    def organization
+      __getobj__.fetch(:organization)
+    end
 
     # Public: Render a collection of primary stats.
     def highlighted
@@ -40,19 +42,12 @@ module Decidim
     end
 
     def component_stats(conditions)
-      stats = {}
       Decidim.component_manifests.flat_map do |component|
-        component
-          .stats.except([:supports_count])
-          .filter(conditions)
-          .with_context(published_components)
-          .each do |name, data|
-            stats[name] ||= 0
-            stats[name] += data
-          end
+        component.stats.except([:supports_count])
+                 .filter(conditions)
+                 .with_context(published_components)
+                 .map { |name, data| [name, data] }
       end
-
-      stats.to_a
     end
 
     def published_components

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

@@ -107,7 +107,7 @@ module Decidim
         h.content_tag(:div, class: "logs__log__explanation") do
           I18n.t(
             action_string,
-            i18n_params
+            **i18n_params
           ).html_safe
         end
       end

data/app/presenters/decidim/menu_item_presenter.rb

@@ -28,7 +28,7 @@ module Decidim
     def render
       content_tag :li, class: link_wrapper_classes do
         output = [link_to(composed_label, url, link_options)]
-        output.push(@view.send(:simple_menu, @menu_item.submenu).render) if @menu_item.submenu
+        output.push(@view.send(:simple_menu, **@menu_item.submenu).render) if @menu_item.submenu
 
         safe_join(output)
       end

data/app/presenters/decidim/metric_charts_presenter.rb

@@ -2,7 +2,13 @@
 
 module Decidim
   # A presenter to render metrics in pages
-  class MetricChartsPresenter < Rectify::Presenter
+  class MetricChartsPresenter < SimpleDelegator
+    delegate :content_tag, :concat, :safe_join, to: :view_context
+
+    def view_context
+      @view_context ||= __getobj__.fetch(:view_context, ActionController::Base.new.view_context)
+    end
+
     # Public: Render a collection of primary metrics.
     def highlighted
       render_highlighted(highlighted_metrics)

data/app/presenters/decidim/nil_presenter.rb

@@ -7,7 +7,9 @@ module Decidim
   #
   # It behaves as a presenter for deleted resources.
   # Returns an empty string for most of the method calls.
-  class NilPresenter < Rectify::Presenter
+  class NilPresenter
+    def initialize(*); end
+
     def deleted?
       true
     end

data/app/presenters/decidim/notification_presenter.rb

@@ -11,7 +11,7 @@ module Decidim
 
     def created_at_in_words
       if created_at.between?(1.month.ago, Time.current)
-        I18n.t("decidim.user_conversations.index.time_ago", time: time_ago_in_words(created_at))
+        time_ago_in_words(created_at)
       else
         format = created_at.year == Time.current.year ? :ddmm : :ddmmyyyy
         I18n.l(created_at, format: format)

data/app/presenters/decidim/notification_to_mailer_presenter.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Decorator for notifications in mail digest
+  #
+  class NotificationToMailerPresenter < SimpleDelegator
+    include Decidim::TranslatableAttributes
+
+    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
+
+    def date_time
+      if frequency == :daily
+        created_at.strftime("%H:%M")
+      else
+        I18n.l(created_at, format: :decidim_short)
+      end
+    end
+
+    private
+
+    def event
+      @event ||= event_class.constantize.new(
+        resource: resource,
+        user: user,
+        event_name: event_name,
+        extra: extra
+      )
+    end
+
+    def frequency
+      @frequency ||= user.notifications_sending_frequency
+    end
+  end
+end

data/app/presenters/decidim/notifications_digest_presenter.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Decorator for events in mail digest
+  #
+  class NotificationsDigestPresenter < SimpleDelegator
+    def subject
+      I18n.t("decidim.notifications_digest_mailer.subject")
+    end
+
+    def header
+      I18n.t("decidim.notifications_digest_mailer.header.#{frequency}")
+    end
+
+    def formated_date(date)
+      I18n.l(date, format: :long)
+    end
+
+    def greeting
+      I18n.t("decidim.notifications_digest_mailer.hello", name: name)
+    end
+
+    def intro
+      I18n.t("decidim.notifications_digest_mailer.intro.#{frequency}")
+    end
+
+    def outro
+      I18n.t("decidim.notifications_digest_mailer.outro")
+    end
+
+    def see_more
+      I18n.t("decidim.notifications_digest_mailer.see_more")
+    end
+
+    private
+
+    def frequency
+      notifications_sending_frequency || "daily"
+    end
+  end
+end

data/app/presenters/decidim/official_author_presenter.rb

@@ -5,6 +5,10 @@ module Decidim
   # A dummy presenter to abstract out the author of an official resource.
   #
   class OfficialAuthorPresenter
+    def name
+      I18n.t("decidim.author.official_author")
+    end
+
     def nickname
       ""
     end

data/app/presenters/decidim/organization_presenter.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A general presenter to render organization logic to build a manifest
+  class OrganizationPresenter < SimpleDelegator
+    def html_name
+      name.html_safe
+    end
+
+    def translated_description
+      ActionView::Base.full_sanitizer.sanitize(translated_attribute(description)).html_safe
+    end
+
+    def pwa_display
+      "standalone"
+    end
+
+    def start_url
+      "/"
+    end
+  end
+end

data/app/presenters/decidim/push_notification_presenter.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Decorator for push notifications.
+  #
+  class PushNotificationPresenter < SimpleDelegator
+    def title
+      event_class.constantize.model_name.human
+    end
+
+    def body
+      ActionView::Base.full_sanitizer.sanitize(event_class_instance.notification_title)
+    end
+
+    def icon
+      user.organization.attached_uploader(:favicon).variant_url(:big, host: user.organization.host)
+    end
+
+    def url
+      resource.reported_content_url
+    end
+  end
+end

data/app/presenters/decidim/stats_presenter.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # A general presenter to render statistics in participatory spaces.
-  class StatsPresenter < Rectify::Presenter
+  class StatsPresenter < SimpleDelegator
     def comments_stats(name)
       comments = Decidim.component_manifests.map do |component_manifest|
         component_manifest.stats.only([:comments_count])
@@ -15,17 +15,18 @@ module Decidim
     end
 
     def statistics(grouped_stats)
-      statistics = {}
-
+      statistics = []
       grouped_stats.each do |_manifest_name, stats|
-        stats.each do |_space_manifest, component_manifest, count|
-          next if count.zero?
+        stats.each_with_index.each do |stat, _index|
+          stat.each_with_index.map do |_item, subindex|
+            next unless (subindex % 3).zero?
+            next if stat[subindex + 2].zero?
 
-          statistics[component_manifest] ||= 0
-          statistics[component_manifest] += count
+            statistics << { stat_title: stat[subindex + 1], stat_number: stat[subindex + 2] }
+          end
         end
       end
-      statistics.map { |key, number| { stat_title: key, stat_number: number } }
+      statistics
     end
   end
 end

data/app/presenters/decidim/user_group_presenter.rb

@@ -16,7 +16,7 @@ module Decidim
     end
 
     def can_be_contacted?
-      true unless blocked?
+      true
     end
 
     def officialization_text

data/app/presenters/decidim/user_presenter.rb

@@ -5,6 +5,7 @@ module Decidim
   # Decorator for users
   #
   class UserPresenter < SimpleDelegator
+    include Rails.application.routes.mounted_helpers
     include ActionView::Helpers::UrlHelper
     include Decidim::TranslatableAttributes
 
@@ -12,8 +13,6 @@ module Decidim
     # nickname presented in a twitter-like style
     #
     def nickname
-      return "" if __getobj__.blocked?
-
       "@#{__getobj__.nickname}"
     end
 
@@ -26,7 +25,7 @@ module Decidim
     def profile_url
       return "" if respond_to?(:deleted?) && deleted?
 
-      decidim.profile_url(__getobj__.nickname)
+      decidim.profile_url(__getobj__.nickname, host: __getobj__.organization.host)
     end
 
     def avatar
@@ -34,14 +33,13 @@ module Decidim
     end
 
     def avatar_url(variant = nil)
-      return default_avatar_url if __getobj__.blocked?
-      return default_avatar_url unless avatar.attached?
+      return avatar.default_url unless avatar.attached?
 
       avatar.path(variant: variant)
     end
 
     def default_avatar_url
-      avatar.default_url
+      attached_uploader.default_url
     end
 
     def profile_path
@@ -61,7 +59,7 @@ module Decidim
     end
 
     def can_be_contacted?
-      true unless blocked?
+      true
     end
 
     def officialization_text
@@ -76,11 +74,5 @@ module Decidim
     def has_tooltip?
       true
     end
-
-    private
-
-    def decidim
-      @decidim ||= Decidim::EngineRouter.new("decidim", { host: __getobj__.organization.host })
-    end
   end
 end

data/app/presenters/decidim/validation_errors_presenter.rb

@@ -4,7 +4,7 @@ module Decidim
   #
   # Decorator to format validation errors of a form in html format
   #
-  class ValidationErrorsPresenter < Rectify::Presenter
+  class ValidationErrorsPresenter < SimpleDelegator
     include Decidim::SanitizeHelper
 
     attr_reader :error, :form

data/app/queries/decidim/messaging/user_conversations.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Messaging
     # A class used to find the conversations a user is participating in.
-    class UserConversations < Rectify::Query
+    class UserConversations < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user - a User that needs to find which processes can manage

data/app/queries/decidim/metric_manage.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # This class search for objects related to Metrics, and creates a new registry within
-  # his own parameters
+  # its own parameters
   class MetricManage
     def self.for(day_string, organization)
       new(day_string, organization)

data/app/queries/decidim/metrics/users_metric_manage.rb

@@ -11,15 +11,15 @@ module Decidim
       private
 
       def query
-        @query ||= Decidim::User.where(organization: @organization)
-                                .where("deleted_at IS NULL OR deleted_at > ?", end_time)
-                                .where("blocked_at IS NULL OR blocked_at > ?", end_time)
-                                .confirmed
-                                .where("created_at <= ?", end_time)
+        return @query if @query
+
+        @query = Decidim::User.where(organization: @organization)
+        @query = @query.where("created_at <= ?", end_time)
+        @query
       end
 
       def quantity
-        @quantity ||= query.where("created_at >= ?", start_time).count
+        @quantity ||= @query.where("created_at >= ?", start_time).count
       end
     end
   end

data/app/queries/decidim/own_activities.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  class OwnActivities < PublicActivities
+    private
+
+    def visibility
+      %w(private-only public-only all)
+    end
+  end
+end

data/app/queries/decidim/participatory_processes_with_user_role.rb

@@ -3,7 +3,7 @@
 module Decidim
   # A class used to find the ParticipatoryProcesses that the given user has
   # the specific role privilege.
-  class ParticipatoryProcessesWithUserRole < Rectify::Query
+  class ParticipatoryProcessesWithUserRole < Decidim::Query
     # Syntactic sugar to initialize the class and return the queried objects.
     #
     # user - a User that needs to find which processes can manage