decidim-core 0.22.0 → 0.23.3

data/app/models/decidim/scope.rb

@@ -7,6 +7,9 @@ module Decidim
   class Scope < ApplicationRecord
     include Decidim::Traceable
     include Decidim::Loggable
+    include Decidim::TranslatableResource
+
+    translatable_fields :name
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -53,7 +56,7 @@ module Decidim
     end
 
     def descendants
-      organization.scopes.where("? = ANY(decidim_scopes.part_of)", id)
+      @descendants ||= organization.scopes.where("? = ANY(decidim_scopes.part_of)", id)
     end
 
     def ancestor_of?(scope)

data/app/models/decidim/scope_type.rb

@@ -4,6 +4,9 @@ module Decidim
   # Scope types allows to use different types of scopes in participatory process
   # (municipalities, provinces, states, countries, etc.)
   class ScopeType < ApplicationRecord
+    include Decidim::TranslatableResource
+
+    translatable_fields :name, :plural
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization",

data/app/models/decidim/share_token.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ShareToken < ApplicationRecord
+    validates :organization, presence: true
+    validates :user, presence: true
+    validates :token, presence: true, uniqueness: { scope: [:decidim_organization_id, :token_for_type, :token_for_id] }
+
+    belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"
+    belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
+    belongs_to :token_for, foreign_key: "token_for_id", foreign_type: "token_for_type", polymorphic: true
+
+    after_initialize :generate, :set_default_expiration
+
+    def self.use!(token_for:, token:)
+      record = find_by!(token_for: token_for, token: token)
+      record.use!
+    end
+
+    def use!
+      return raise StandardError, "Share token '#{token}' for '#{token_for_type}' with id = #{token_for_id} has expired." if expired?
+
+      update!(times_used: times_used + 1, last_used_at: Time.zone.now)
+    end
+
+    def expired?
+      expires_at.past?
+    end
+
+    def url
+      token_for.shareable_url(self)
+    end
+
+    private
+
+    def generate
+      return if token.present?
+
+      loop do
+        self.token = SecureRandom.hex(32)
+        break if ShareToken.find_by(token: token).blank?
+      end
+    end
+
+    def set_default_expiration
+      self.expires_at ||= 1.day.from_now
+    end
+  end
+end

data/app/models/decidim/static_page.rb

@@ -10,6 +10,9 @@ module Decidim
   class StaticPage < ApplicationRecord
     include Decidim::Traceable
     include Decidim::Loggable
+    include Decidim::TranslatableResource
+
+    translatable_fields :title, :content
 
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization", inverse_of: :static_pages
     belongs_to :topic, foreign_key: "topic_id", class_name: "Decidim::StaticPageTopic", optional: true
@@ -19,7 +22,7 @@ module Decidim
 
     # These pages will be created by default when registering an organization
     # and cannot be deleted.
-    DEFAULT_PAGES = %w(faq terms-and-conditions accessibility).freeze
+    DEFAULT_PAGES = %w(terms-and-conditions).freeze
 
     after_create :update_organization_tos_version
     before_destroy :can_be_destroyed?

data/app/models/decidim/static_page_topic.rb

@@ -3,6 +3,9 @@
 module Decidim
   class StaticPageTopic < ApplicationRecord
     validates :title, presence: true
+    include Decidim::TranslatableResource
+
+    translatable_fields :title, :description
 
     default_scope { order(arel_table[:weight].asc) }
 

data/app/models/decidim/user.rb

@@ -53,8 +53,16 @@ module Decidim
     scope :not_confirmed, -> { where(confirmed_at: nil) }
 
     scope :interested_in_scopes, lambda { |scope_ids|
-      ids = scope_ids.map { |i| "%#{i}%" }.join(",")
-      where("extended_data->>'interested_scopes' ~~ ANY('{#{ids}}')")
+      actual_ids = scope_ids.select(&:presence)
+      if actual_ids.count.positive?
+        ids = actual_ids.map(&:to_i).join(",")
+        where("extended_data->'interested_scopes' @> ANY('{#{ids}}')")
+      else
+        # Do not apply the scope filter when there are scope ids available. Note
+        # that the active record scope must always return an active record
+        # collection.
+        self
+      end
     }
 
     scope :org_admins_except_me, ->(user) { where(organization: user.organization, admin: true).where.not(id: user.id) }
@@ -206,7 +214,7 @@ module Decidim
 
     # Caches a Decidim::DataPortabilityUploader with the retrieved file.
     def data_portability_file(filename)
-      @data_portability_file ||= DataPortabilityUploader.new.tap do |uploader|
+      @data_portability_file ||= DataPortabilityUploader.new(self).tap do |uploader|
         uploader.retrieve_from_store!(filename)
         uploader.cache!(filename)
       end

data/app/models/decidim/user_base_entity.rb

@@ -11,15 +11,19 @@ module Decidim
     include Resourceable
     include Decidim::Followable
     include Decidim::Loggable
+    include Decidim::HasUploadValidations
 
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"
     has_many :notifications, foreign_key: "decidim_user_id", class_name: "Decidim::Notification", dependent: :destroy
     has_many :following_follows, foreign_key: "decidim_user_id", class_name: "Decidim::Follow", dependent: :destroy
 
-    validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
+    # Regex for name & nickname format validations
+    REGEXP_NAME = /\A(?!.*[<>?%&\^*#@\(\)\[\]\=\+\:\;\"\{\}\\\|])/.freeze
+
+    validates_avatar
     mount_uploader :avatar, Decidim::AvatarUploader
 
-    validates :name, :nickname, format: { with: /\A(?!.*[<>?%&\^*#@\(\)\[\]\=\+\:\;\"\{\}\\\|])/ }
+    validates :name, :nickname, format: { with: REGEXP_NAME }
 
     # Public: Returns a collection with all the entities this user is following.
     #

data/app/permissions/decidim/permissions.rb

@@ -46,6 +46,7 @@ module Decidim
                     permission_action.action == :read
 
       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?
 
@@ -152,6 +153,14 @@ module Decidim
       allow! if permission_action.subject == :user_group_invitations
     end
 
+    def user_can_preview_component?
+      return allow! if context[:share_token].present? && Decidim::ShareToken.use!(token_for: component, token: context[:share_token])
+    rescue ActiveRecord::RecordNotFound
+      nil
+    rescue StandardError
+      nil
+    end
+
     def user_can_admin_component?
       new_permission_action = Decidim::PermissionAction.new(
         action: permission_action.action,

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

@@ -35,8 +35,8 @@ module Decidim
         end
       end
 
-      def has_diff?
-        action == "unpublish" || super
+      def diff_actions
+        super + %w(unpublish)
       end
     end
   end

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

@@ -40,8 +40,8 @@ module Decidim
         )
       end
 
-      def has_diff?
-        action == "unreport" || super
+      def diff_actions
+        super + %w(unreport)
       end
     end
   end

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

@@ -89,8 +89,8 @@ module Decidim
         "activemodel.attributes.organization"
       end
 
-      def has_diff?
-        action == "update_id_documents_config" || super
+      def diff_actions
+        super + %w(update_id_documents_config)
       end
     end
   end

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

@@ -51,8 +51,8 @@ module Decidim
       end
 
       # If the action is officialization, then we want to show the diff
-      def has_diff?
-        %w(officialize unofficialize).include?(action)
+      def diff_actions
+        %w(officialize unofficialize)
       end
     end
   end

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

@@ -190,7 +190,7 @@ module Decidim
       def i18n_params
         {
           user_name: user_presenter.present,
-          resource_name: resource_presenter.present,
+          resource_name: resource_presenter.try(:present),
           space_name: space_presenter.present
         }
       end
@@ -199,7 +199,15 @@ module Decidim
       #
       # Returns a Boolean.
       def has_diff?
-        %w(update create).include?(action.to_s) && action_log.version.present?
+        diff_actions.include?(action.to_s) && action_log.version.present?
+      end
+
+      # Private: Lists the log actions for which the diff changeset should be
+      # shown.
+      #
+      # Returns an Array of Strings.
+      def diff_actions
+        %w(update create)
       end
 
       # Private: Calculates whether the diff should show the previous value

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

@@ -16,7 +16,7 @@ module Decidim
       #
       # Check the other presenters in this folder for more examples.
       class DefaultPresenter
-        # value - the vakue to render, can be of any type.
+        # value - the value to render, can be of any type.
         # view_helpers - an object encapsulating all the view helpers,
         #   it will most likely come from the top of the chain.
         def initialize(value, view_helpers)

data/app/presenters/decidim/official_author_presenter.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # A dummy presenter to abstract out the author of an official resource.
+  #
+  class OfficialAuthorPresenter
+    def nickname
+      ""
+    end
+
+    def badge
+      ""
+    end
+
+    def profile_path
+      ""
+    end
+
+    def avatar_url
+      ActionController::Base.helpers.asset_path("decidim/default-avatar.svg")
+    end
+
+    def deleted?
+      false
+    end
+
+    def can_be_contacted?
+      false
+    end
+
+    def has_tooltip?
+      false
+    end
+  end
+end

data/app/presenters/decidim/resource_locator_presenter.rb

@@ -2,6 +2,7 @@
 
 module Decidim
   # A presenter to get the url or path from a resource.
+  # resource - a record or array of nested records.
   class ResourceLocatorPresenter
     def initialize(resource)
       @resource = resource
@@ -26,7 +27,7 @@ module Decidim
     #
     # Returns a String.
     def url(options = {})
-      member_route("url", options.merge(host: resource.organization.host))
+      member_route("url", options.merge(host: root_resource.organization.host))
     end
 
     # Builds the index path to the associated collection of resources.
@@ -53,7 +54,9 @@ module Decidim
     #
     # Returns a String.
     def show(options = {})
-      admin_route_proxy.send("#{member_route_name}_path", resource, options)
+      options.merge!(options_for_polymorphic)
+
+      admin_route_proxy.send("#{member_route_name}_path", target, options)
     end
 
     # Builds the admin edit path to the resource.
@@ -62,53 +65,101 @@ module Decidim
     #
     # Returns a String.
     def edit(options = {})
-      admin_route_proxy.send("edit_#{member_route_name}_path", resource, options)
+      options.merge!(options_for_polymorphic)
+
+      admin_route_proxy.send("edit_#{member_route_name}_path", target, options)
     end
 
     private
 
+    def polymorphic?
+      resource.is_a? Array
+    end
+
+    def target
+      if polymorphic?
+        resource.last
+      else
+        resource
+      end
+    end
+
+    def root_resource
+      if polymorphic?
+        resource.first
+      else
+        resource
+      end
+    end
+
     # Private: Build the route to the resource.
     #
     # Returns a String.
     def member_route(route_type, options)
-      route_proxy.send("#{member_route_name}_#{route_type}", resource, options)
+      options.merge!(options_for_polymorphic)
+
+      route_proxy.send("#{member_route_name}_#{route_type}", target, options)
     end
 
     # Private: Build the route to the associated collection of resources.
     #
     # Returns a String.
     def collection_route(route_type, options)
+      options.merge!(options_for_polymorphic)
+
       route_proxy.send("#{collection_route_name}_#{route_type}", options)
     end
 
     def admin_collection_route(route_type, options)
+      options.merge!(options_for_polymorphic)
+
       admin_route_proxy.send("#{collection_route_name}_#{route_type}", options)
     end
 
-    def manifest
-      resource.try(:resource_manifest) ||
-        resource.class.try(:resource_manifest) ||
-        resource.class.try(:participatory_space_manifest)
+    def manifest_for(record)
+      record.try(:resource_manifest) ||
+        record.class.try(:resource_manifest) ||
+        record.class.try(:participatory_space_manifest)
     end
 
     def component
-      resource.component if resource.respond_to?(:component)
+      root_resource.try(:component)
     end
 
     def member_route_name
-      manifest.route_name
+      if polymorphic?
+        polymorphic_member_route_name
+      else
+        manifest_for(target).route_name
+      end
+    end
+
+    def polymorphic_member_route_name
+      return unless polymorphic?
+
+      resource.map { |record| manifest_for(record).route_name }.join("_")
     end
 
     def collection_route_name
       member_route_name.pluralize
     end
 
+    def options_for_polymorphic
+      return {} unless polymorphic?
+
+      parent_resources = {}
+      (resource - [target]).each do |parent|
+        parent_resources["#{manifest_for(parent).route_name}_id"] = parent.id
+      end
+      parent_resources
+    end
+
     def route_proxy
-      @route_proxy ||= EngineRouter.main_proxy(component || resource)
+      @route_proxy ||= EngineRouter.main_proxy(component || target)
     end
 
     def admin_route_proxy
-      @admin_route_proxy ||= EngineRouter.admin_proxy(component || resource)
+      @admin_route_proxy ||= EngineRouter.admin_proxy(component || target)
     end
   end
 end