decidim-core 0.26.4 → 0.27.0.rc1

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_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
@@ -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/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

data/app/{services/decidim/activity_search.rb → queries/decidim/public_activities.rb}

@@ -1,100 +1,60 @@
 # frozen_string_literal: true
 
 module Decidim
-  # A class to search for recent activity performed in a Decidim Organization.
-  # It is intended to be used in the user profile, to retrieve activity and
-  # timeline for that user.
+  # This query finds the public ActionLog entries that can be shown in the
+  # participant views of the application within a Decidim Organization. It is
+  # intended to be used in the user profile, to retrieve activity and timeline
+  # for that user.
   #
-  # It will return any action for a given resource, except `create` on resources
-  # that implement the `Decidim::Publicable` concern to avoid leaking private
-  # data.
+  # This will create the base query for the activities but the resulting query
+  # needs to be scoped with either `with_resource_type` or
+  # `with_new_resource_type` in order to avoid leaking private data.
   #
   # Possible options:
   #
-  # :organization - the `Decidim::Organization` to scope to search. Required.
-  # :user - an optional `Decidim::USer` that performed the activites
+  # :resource_name - an optional name for a resource for searching only that
+  #    type of resources.
+  # :user - an optional `Decidim::User` that performed the activites
+  # :current_user - an optional `Decidim::User` for defining whether to show the
+  #   private log entries that relate to the current user.
   # :follows - a collection of `Decidim::Follow` resources. It will return any
   #   activity affecting any of these resources, performed by any of them or
   #   contained in any of them as spaces.
   # :scopes - a collection of `Decidim::Scope`. It will return any activity that
   #   took place in any of those scopes.
-  class ActivitySearch < Searchlight::Search
-    # Needed by Searchlight, this is the base query that will be used to
-    # append other criteria to the search.
-    def base_query
+  class PublicActivities < Decidim::Query
+    def initialize(organization, options = {})
+      @organization = organization
+      @resource_name = options[:resource_name]
+      @user = options[:user]
+      @current_user = options[:current_user]
+      @follows = options[:follows]
+      @scopes = options[:scopes]
+    end
+
+    def query
       query = ActionLog
-              .where(visibility: %w(public-only all))
-              .where(organization: options.fetch(:organization))
+              .where(visibility: visibility)
+              .where(organization: organization)
 
-      query = query.where(user: options[:user]) if options[:user]
-      query = query.where(resource_type: options[:resource_name]) if options[:resource_name]
+      query = query.where(user: user) if user
+      query = query.where(resource_type: resource_name) if resource_name.present?
 
       query = filter_follows(query)
-      filter_hidden(query)
-    end
-
-    # Overwrites the default Searchlight run method since we want to return
-    # activities in an specific order but we need to set it at the end of the chain.
-    def run
-      super.order(created_at: :desc)
-    end
-
-    # Adds a constrain to filter by resource type(s).
-    def search_resource_type
-      if resource_types.include?(resource_type)
-        scope_for(resource_type)
-      else
-        all_resources_scope
-      end
-    end
+      query = filter_hidden(query)
 
-    # All the resource types that are eligible to be included as an activity.
-    def resource_types
-      @resource_types ||= %w(
-        Decidim::Accountability::Result
-        Decidim::Blogs::Post
-        Decidim::Comments::Comment
-        Decidim::Consultations::Question
-        Decidim::Debates::Debate
-        Decidim::Meetings::Meeting
-        Decidim::Proposals::Proposal
-        Decidim::Surveys::Survey
-        Decidim::Assembly
-        Decidim::Consultation
-        Decidim::Initiative
-        Decidim::ParticipatoryProcess
-      ).select do |klass|
-        klass.safe_constantize.present?
-      end
+      query.order(created_at: :desc)
     end
 
     private
 
-    def publicable_resource_types
-      @publicable_resource_types ||= resource_types.select { |klass| klass.constantize.column_names.include?("published_at") }
-    end
-
-    def scope_for(resource_type)
-      if publicable_resource_types.include?(resource_type)
-        query.where(resource_type: resource_type).where.not(action: "create")
-      else
-        query.where(resource_type: resource_type)
-      end
-    end
+    attr_reader :organization, :resource_name, :user, :current_user, :follows, :scopes
 
-    def all_resources_scope
-      query
-        .where(
-          "(action <> ? AND resource_type IN (?)) OR (resource_type IN (?))",
-          "create",
-          publicable_resource_types,
-          (resource_types - publicable_resource_types)
-        )
+    def visibility
+      %w(public-only all)
     end
 
     def filter_follows(query)
-      follows = options[:follows]
-      interesting_scopes = options[:scopes]
       conditions = []
 
       if follows.present?
@@ -108,14 +68,12 @@ module Decidim
         conditions += followed_spaces_conditions(follows)
       end
 
-      conditions += interesting_scopes_conditions(interesting_scopes)
+      conditions += interesting_scopes_conditions(scopes)
 
       return query if conditions.empty?
 
       chained_conditions = conditions.inject do |previous_condition, condition|
-        next condition unless previous_condition
-
-        previous_condition.or(condition)
+        previous_condition.present? ? previous_condition.or(condition) : condition
       end
 
       query.where(chained_conditions)
@@ -134,7 +92,7 @@ module Decidim
 
       # Filter out the private space items that should not be visible for the
       # current user.
-      current_user_id = options.fetch(:current_user, nil)&.id.to_i
+      current_user_id = current_user&.id.to_i
       Decidim.participatory_space_manifests.map do |manifest|
         klass = manifest.model_class_name.constantize
         next unless klass.include?(Decidim::HasPrivateUsers)
@@ -149,7 +107,6 @@ module Decidim
               LEFT JOIN decidim_participatory_space_private_users AS #{manifest.name}_private_users
                 ON #{manifest.name}_private_users.privatable_to_type = '#{manifest.model_class_name}'
                 AND #{table}.id = #{manifest.name}_private_users.privatable_to_id
-                AND #{table}.private_space = 't'
             SQL
           ).to_s
         ).where(

data/app/queries/decidim/public_components.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This query finds the published components for all public participatory
   # spaces in the given organization. Can filter by manifest name.
-  class PublicComponents < Rectify::Query
+  class PublicComponents < Decidim::Query
     def self.for(organization, manifest_name: nil)
       new(organization, manifest_name: manifest_name).query
     end

data/app/queries/decidim/similar_emendations.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # Class used to retrieve similar emendations, scoped to the current component.
-  class SimilarEmendations < Rectify::Query
+  class SimilarEmendations < Decidim::Query
     include Decidim::TranslationsHelper
 
     # Syntactic sugar to initialize the class and return the queried objects.

data/app/queries/decidim/stats_users_count.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This query counts registered users from a collection of organizations
   # in an optional interval of time.
-  class StatsUsersCount < Rectify::Query
+  class StatsUsersCount < Decidim::Query
     def self.for(organization, start_at = nil, end_at = nil)
       new(organization, start_at, end_at).query
     end

data/app/queries/decidim/user_groups/accepted_memberships.rb

@@ -3,7 +3,7 @@
 module Decidim
   module UserGroups
     # Use this class to find the accepted memberships of the given user group.
-    class AcceptedMemberships < Rectify::Query
+    class AcceptedMemberships < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user_group - a UserGroup that needs to find its accepted memberships

data/app/queries/decidim/user_groups/accepted_user_groups.rb

@@ -5,7 +5,7 @@ module Decidim
     # Use this class to find the user groups the given user is accepted. In order
     # to calculate this, we get those groups where the user has a role of
     # member, creator or admin.
-    class AcceptedUserGroups < Rectify::Query
+    class AcceptedUserGroups < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user - a User that needs to find the groups where they are accepted

data/app/queries/decidim/user_groups/accepted_users.rb

@@ -3,7 +3,7 @@
 module Decidim
   module UserGroups
     # Use this class to find the accepted members of the given user group.
-    class AcceptedUsers < Rectify::Query
+    class AcceptedUsers < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user_group - a UserGroup that needs to find its accepted members

data/app/queries/decidim/user_groups/admin_memberships.rb

@@ -4,7 +4,7 @@ module Decidim
   module UserGroups
     # Use this class to find the the admins of the given user group with the
     # "admin" role. It returns memberships.
-    class AdminMemberships < Rectify::Query
+    class AdminMemberships < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user_group - a UserGroup that needs to find its admin users

data/app/queries/decidim/user_groups/invited_memberships.rb

@@ -3,7 +3,7 @@
 module Decidim
   module UserGroups
     # Use this class to find the invitations to user groups the given user has.
-    class InvitedMemberships < Rectify::Query
+    class InvitedMemberships < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user - a User that needs to find which groups they have been invited to

data/app/queries/decidim/user_groups/manageable_user_groups.rb

@@ -5,7 +5,7 @@ module Decidim
     # Use this class to find the user groups the given user can manage. In order
     # to calculate this, we get those groups where the user has a role of
     # creator or admin.
-    class ManageableUserGroups < Rectify::Query
+    class ManageableUserGroups < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user - a User that needs to find which groups can manage

data/app/queries/decidim/user_groups/member_memberships.rb

@@ -4,7 +4,7 @@ module Decidim
   module UserGroups
     # Use this class to find the the members of the given user group with the
     # "member" role. It returns memberships.
-    class MemberMemberships < Rectify::Query
+    class MemberMemberships < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user_group - a UserGroup that needs to find its member users

data/app/services/decidim/{data_portability_exporter.rb → download_your_data_exporter.rb}

@@ -9,11 +9,11 @@ module Decidim
   # somewhere so users can download their data.
   #
   # In fact, the 7z file wraps a ZIP file which finally contains the data files.
-  class DataPortabilityExporter
+  class DownloadYourDataExporter
     include ::Decidim::ZipStream::Writer
 
     DEFAULT_EXPORT_FORMAT = "CSV"
-    ZIP_FILE_NAME = "data-portability.zip"
+    ZIP_FILE_NAME = "download-your-data.zip"
 
     # Public: Initializes the class.
     #
@@ -56,18 +56,18 @@ module Decidim
       export_data = []
       export_attachments = []
 
-      data_portability_entities.each do |object|
+      download_your_data_entities.each do |object|
         klass = Object.const_get(object)
         export_data << [klass.model_name.name.parameterize.pluralize, Exporters.find_exporter(format).new(klass.user_collection(user), klass.export_serializer).export]
-        attachments = klass.data_portability_images(user)
+        attachments = klass.download_your_data_images(user)
         export_attachments << [klass.model_name.name.parameterize.pluralize, attachments.flatten] unless attachments.nil?
       end
 
       [export_data, export_attachments]
     end
 
-    def data_portability_entities
-      @data_portability_entities ||= DataPortabilitySerializers.data_entities
+    def download_your_data_entities
+      @download_your_data_entities ||= DownloadYourDataSerializers.data_entities
     end
   end
 end

data/app/services/decidim/email_notification_generator.rb

@@ -54,7 +54,7 @@ module Decidim
     attr_reader :event, :event_class, :resource, :followers, :affected_users, :extra
 
     # Private: sends the notification email to the user if they have the
-    # `email_on_notification` flag active.
+    # `notifications_sending_frequency` set to real_time.
     #
     # recipient - The user that will receive the email.
     # user_role - the role the user takes for this notification (either
@@ -63,7 +63,7 @@ module Decidim
     # Returns nothing.
     def send_email_to(recipient, user_role:)
       return unless recipient
-      return unless recipient.email_on_notification?
+      return unless recipient.notifications_sending_frequency == "real_time"
       return if resource.respond_to?(:can_participate?) && !resource.can_participate?(recipient)
 
       wait_time = 0