decidim-core 0.23.3 → 0.24.0.rc1

data/lib/decidim/attachment_attributes.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # A set of convenience methods to deal with attachment attributes for Virtus
+  # models that may set the attachment records through the original model
+  # (Decidim::Attachment) or through the user submitted form data (String).
+  module AttachmentAttributes
+    extend ActiveSupport::Concern
+
+    class_methods do
+      # Public: Mirrors Virtus' `attribute` interface to define attachment
+      # attributes for form objects.
+      #
+      # name - The attribute's name
+      #
+      #
+      # Example:
+      #
+      #   attachment_attribute :photos
+      #   # This will create two attributes of the following types:
+      #   #   attribute :photos, Array[String]
+      #   #   attribute :add_photos, Array
+      #   # In addition, it will generate the getter method for the attribute
+      #   # returning an array of the Decidim::Attachment records.
+      #
+      # Returns nothing.
+      def attachments_attribute(name)
+        attribute name, Array[String]
+        attribute "add_#{name}".to_sym, Array
+
+        # Define the getter method that fetches the attachment records based on
+        # their types. For Strings and Integers, assumes they are IDs and will
+        # fetch the attachment record matching that ID.
+        variable_name = "@#{name}_records"
+        define_method name do
+          return instance_variable_get(variable_name) if instance_variable_defined?(variable_name)
+
+          original = instance_variable_get("@#{name}")
+          return original unless original.is_a?(Array)
+
+          instance_variable_set(
+            variable_name,
+            original.map do |attachment|
+              if attachment.is_a?(String) || attachment.is_a?(Integer)
+                Decidim::Attachment.find_by(id: attachment)
+              else
+                attachment
+              end
+            end.compact
+          )
+        end
+      end
+    end
+  end
+end

data/lib/decidim/attributes.rb

@@ -4,5 +4,6 @@ module Decidim
   module Attributes
     autoload :TimeWithZone, "decidim/attributes/time_with_zone"
     autoload :LocalizedDate, "decidim/attributes/localized_date"
+    autoload :CleanString, "decidim/attributes/clean_string"
   end
 end

data/lib/decidim/attributes/clean_string.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Attributes
+    # Custom Virtus value to "standardize" the newline characters within strings
+    # that are sent through user entered forms. This strips out the carriage
+    # return characters from the strings in order to avoid validation mismatches
+    # with the string lengths between the frontend and the backend.
+    #
+    # This type should be used with forms that have:
+    # - A user input defined with the <textarea> element
+    # - The input element having the `maxlength` attribute defined for it
+    # - The backend having a maximum length validation for the input
+    class CleanString < Virtus::Attribute
+      # When using Windows or copying texts from existing documents, the text
+      # can contain the carriage return characters (\r) that the front-end
+      # character counter does not consider as actual characters. This happens
+      # because the character counter currently counts the characters using
+      # jQuery's `$input.val()` method which strips out the carriage return
+      # characters as explained at:
+      #   https://api.jquery.com/val/
+      #
+      #   Note: At present, using .val() on <textarea> elements strips carriage
+      #   return characters from the browser-reported value.
+      #
+      # The backend, on the other hand, calculates these as characters as they
+      # are included in the data that gets sent to the server. In order to fix
+      # this mismatch, remove the carriage return characters from the text
+      # using this attribute type.
+      def coerce(value)
+        return value unless value.is_a?(String)
+
+        value.gsub(/\r/, "")
+      end
+    end
+  end
+end

data/lib/decidim/coauthorable.rb

@@ -91,7 +91,7 @@ module Decidim
       #
       # author - the author to check for authorship
       def authored_by?(author)
-        coauthorships.where(author: author).exists?
+        coauthorships.exists?(author: author)
       end
 
       # Returns the identities for the authors, whether they are user groups, users or others.
@@ -140,8 +140,8 @@ module Decidim
       def add_coauthor(author, extra_attributes = {})
         user_group = extra_attributes[:user_group]
 
-        return if coauthorships.where(decidim_author_id: author.id, decidim_author_type: author.class.base_class.name).exists? && user_group.blank?
-        return if user_group && coauthorships.where(user_group: user_group).exists?
+        return if coauthorships.exists?(decidim_author_id: author.id, decidim_author_type: author.class.base_class.name) && user_group.blank?
+        return if user_group && coauthorships.exists?(user_group: user_group)
 
         coauthorship_attributes = extra_attributes.merge(author: author)
 

data/lib/decidim/component_manifest.rb

@@ -2,6 +2,7 @@
 
 require "decidim/settings_manifest"
 require "decidim/exporters/export_manifest"
+require "decidim/importers/import_manifest"
 
 module Decidim
   # This class handles all the logic associated to configuring a component
@@ -189,6 +190,22 @@ module Decidim
       end
     end
 
+    def imports(name, &block)
+      return unless name
+
+      @imports ||= []
+      @imports << [name, block]
+      @import_manifests = nil
+    end
+
+    def import_manifests
+      @import_manifests ||= Array(@imports).map do |(name, block)|
+        Decidim::Importers::ImportManifest.new(name, self).tap do |manifest|
+          block.call(manifest)
+        end
+      end
+    end
+
     def serializes_specific_data?
       serializes_specific_data
     end

data/lib/decidim/content_block_manifest.rb

@@ -53,7 +53,7 @@ module Decidim
     private
 
     def image_names_are_unique
-      image_names = images.map { |image| image[:name] }
+      image_names = images.pluck(:name)
       errors.add(:images, "names must be unique per manifest") if image_names.count != image_names.uniq.count
     end
 

data/lib/decidim/content_parsers/hashtag_parser.rb

@@ -25,7 +25,7 @@ module Decidim
       # @return [String] the content with the hashtags replaced by global ids
       def rewrite
         content.gsub(HASHTAG_REGEX) do |match|
-          hashtag(match[1..-1]).to_global_id.to_s + "/" + (extra_hashtags? ? "_" : "") + match[1..-1]
+          "#{hashtag(match[1..-1]).to_global_id}/#{(extra_hashtags? ? "_" : "")}#{match[1..-1]}"
         end
       end
 
@@ -40,11 +40,8 @@ module Decidim
       end
 
       def hashtags
-        @hashtags ||= Hash[
-          existing_hashtags.map do |hashtag|
-            [hashtag.name, hashtag]
-          end
-        ]
+        @hashtags ||=
+          existing_hashtags.index_by(&:name)
       end
 
       def existing_hashtags

data/lib/decidim/content_parsers/user_group_parser.rb

@@ -38,11 +38,8 @@ module Decidim
       private
 
       def groups
-        @groups ||= Hash[
-          existing_groups.map do |group|
-            [group.nickname, group]
-          end
-        ]
+        @groups ||=
+          existing_groups.index_by(&:nickname)
       end
 
       def existing_groups

data/lib/decidim/content_parsers/user_parser.rb

@@ -38,11 +38,8 @@ module Decidim
       private
 
       def users
-        @users ||= Hash[
-          existing_users.map do |user|
-            [user.nickname, user]
-          end
-        ]
+        @users ||=
+          existing_users.index_by(&:nickname)
       end
 
       def existing_users

data/lib/decidim/content_processor.rb

@@ -116,7 +116,7 @@ module Decidim
       return content if content.blank?
 
       Decidim.content_processors.reduce(content) do |result, type|
-        renderer_klass(type).constantize.new(result).render(options)
+        renderer_klass(type).constantize.new(result).render(**options)
       end
     end
 

data/lib/decidim/content_renderers/hashtag_renderer.rb

@@ -10,7 +10,7 @@ module Decidim
     # @see BaseRenderer Examples of how to use a content renderer
     class HashtagRenderer < BaseRenderer
       # Matches a global id representing a Decidim::Hashtag
-      GLOBAL_ID_REGEX = %r{gid:\/\/[\w-]*\/Decidim::Hashtag\/(\d+)\/?(_?)([[:alnum:]](?:[[:alnum:]]|_)*)?\b}.freeze
+      GLOBAL_ID_REGEX = %r{gid://[\w-]*/Decidim::Hashtag/(\d+)/?(_?)([[:alnum:]](?:[[:alnum:]]|_)*)?\b}.freeze
 
       # Replaces found Global IDs matching an existing hashtag with
       # a link to their detail page. The Global IDs representing an
@@ -47,11 +47,8 @@ module Decidim
       private
 
       def hashtags
-        @hashtags ||= Hash[
-          existing_hashtags.map do |hashtag|
-            [hashtag.id, hashtag]
-          end
-        ]
+        @hashtags ||=
+          existing_hashtags.index_by(&:id)
       end
 
       def existing_hashtags

data/lib/decidim/core.rb

@@ -20,6 +20,7 @@ module Decidim
   autoload :Traceable, "decidim/traceable"
   autoload :Loggable, "decidim/loggable"
   autoload :Reportable, "decidim/reportable"
+  autoload :UserReportable, "decidim/user_reportable"
   autoload :Authorable, "decidim/authorable"
   autoload :Coauthorable, "decidim/coauthorable"
   autoload :Participable, "decidim/participable"
@@ -92,6 +93,8 @@ module Decidim
   autoload :HasUploadValidations, "decidim/has_upload_validations"
   autoload :FileValidatorHumanizer, "decidim/file_validator_humanizer"
   autoload :ShareableWithToken, "decidim/shareable_with_token"
+  autoload :RecordEncryptor, "decidim/record_encryptor"
+  autoload :AttachmentAttributes, "decidim/attachment_attributes"
 
   include ActiveSupport::Configurable
   # Loads seeds from all engines.
@@ -115,7 +118,7 @@ module Decidim
           organization,
           manifest.name,
           Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.sentence(15)
+            Decidim::Faker::Localized.sentence(word_count: 15)
           end
         )
       end
@@ -149,7 +152,7 @@ module Decidim
 
   # Exposes a configuration option: The application available locales.
   config_accessor :available_locales do
-    %w(en bg ar ca cs da de el eo es es-MX es-PY et eu fi-pl fi fr fr-CA ga gl hr hu id is it ja lt lv mt nl no pl pt pt-BR ro ru sk sl sr sv tr uk)
+    %w(en bg ar ca cs da de el eo es es-MX es-PY et eu fi-pl fi fr fr-CA ga gl hr hu id is it ja ko lt lv mt nl no pl pt pt-BR ro ru sk sl sr sv tr uk vi zh-CN zh-TW)
   end
 
   # Exposes a configuration option: The application default locale.
@@ -357,6 +360,11 @@ module Decidim
     "decidim-cc"
   end
 
+  # Defines how often session_timeouter.js checks time between current moment and last request
+  config_accessor :session_timeouter_interval do
+    10_000
+  end
+
   # Public: Registers a global engine. This method is intended to be used
   # by component engines that also offer unscoped functionality
   #
@@ -556,7 +564,7 @@ module Decidim
     organization = begin
       if model.is_a?(Decidim::Organization)
         model
-      elsif model.respond_to?(:organization)
+      elsif model.respond_to?(:organization) && model.organization.present?
         model.organization
       end
     end

data/lib/decidim/core/api.rb

@@ -2,21 +2,76 @@
 
 module Decidim
   module Core
-    autoload :ParticipatorySpaceInterface, "decidim/api/participatory_space_interface"
-    autoload :ComponentInterface, "decidim/api/component_interface"
-    autoload :AuthorInterface, "decidim/api/author_interface"
-    autoload :AuthorableInterface, "decidim/api/authorable_interface"
-    autoload :CoauthorableInterface, "decidim/api/coauthorable_interface"
-    autoload :CategorizableInterface, "decidim/api/categorizable_interface"
-    autoload :ScopableInterface, "decidim/api/scopable_interface"
-    autoload :AttachableInterface, "decidim/api/attachable_interface"
-    autoload :HashtagInterface, "decidim/api/hashtag_interface"
-    autoload :ParticipatorySpaceResourceableInterface, "decidim/api/participatory_space_resourceable_interface"
-    autoload :FingerprintInterface, "decidim/api/fingerprint_interface"
-    autoload :AmendableInterface, "decidim/api/amendable_interface"
-    autoload :AmendableEntityInterface, "decidim/api/amendable_entity_interface"
-    autoload :TraceableInterface, "decidim/api/traceable_interface"
-    autoload :TimestampsInterface, "decidim/api/timestamps_interface"
-    autoload :EndorsableInterface, "decidim/api/endorsable_interface"
+    autoload :ComponentFinderBase, "decidim/api/functions/component_finder_base"
+    autoload :ComponentList, "decidim/api/functions/component_list"
+    autoload :ComponentListBase, "decidim/api/functions/component_list_base"
+    autoload :NeedsApiFilterAndOrder, "decidim/api/functions/needs_api_filter_and_order"
+    autoload :NeedsApiDefaultOrder, "decidim/api/functions/needs_api_default_order"
+    autoload :ParticipatorySpaceFinderBase, "decidim/api/functions/participatory_space_finder_base"
+    autoload :ParticipatorySpaceListBase, "decidim/api/functions/participatory_space_list_base"
+    autoload :UserEntityFinder, "decidim/api/functions/user_entity_finder"
+    autoload :UserEntityList, "decidim/api/functions/user_entity_list"
+
+    autoload :AmendmentType, "decidim/api/types/amendment_type"
+    autoload :AreaApiType, "decidim/api/types/area_api_type"
+    autoload :AreaTypeType, "decidim/api/types/area_type_type"
+    autoload :AttachmentType, "decidim/api/types/attachment_type"
+    autoload :CategoryType, "decidim/api/types/category_type"
+    autoload :ComponentType, "decidim/api/types/component_type"
+    autoload :CoordinatesType, "decidim/api/types/coordinates_type"
+    autoload :DecidimType, "decidim/api/types/decidim_type"
+    autoload :FingerprintType, "decidim/api/types/fingerprint_type"
+    autoload :HashtagType, "decidim/api/types/hashtag_type"
+    autoload :LocalizedStringType, "decidim/api/types/localized_string_type"
+    autoload :MetricHistoryType, "decidim/api/types/metric_history_type"
+    autoload :MetricType, "decidim/api/types/metric_type"
+    autoload :OrganizationType, "decidim/api/types/organization_type"
+    autoload :ParticipatorySpaceType, "decidim/api/types/participatory_space_type"
+    autoload :ParticipatorySpaceLinkType, "decidim/api/types/participatory_space_link_type"
+    autoload :ScopeApiType, "decidim/api/types/scope_api_type"
+    autoload :SessionType, "decidim/api/types/session_type"
+    autoload :StatisticType, "decidim/api/types/statistic_type"
+    autoload :TraceVersionType, "decidim/api/types/trace_version_type"
+    autoload :TranslatedFieldType, "decidim/api/types/translated_field_type"
+    autoload :UserGroupType, "decidim/api/types/user_group_type"
+    autoload :UserType, "decidim/api/types/user_type"
+
+    autoload :BaseInputFilter, "decidim/api/input_filters/base_input_filter"
+    autoload :ComponentInputFilter, "decidim/api/input_filters/component_input_filter"
+    autoload :HasHastaggableInputFilter, "decidim/api/input_filters/has_hastaggable_input_filter"
+    autoload :HasLocalizedInputFilter, "decidim/api/input_filters/has_localized_input_filter"
+    autoload :HasPublishableInputFilter, "decidim/api/input_filters/has_publishable_input_filter"
+    autoload :HasTimestampInputFilter, "decidim/api/input_filters/has_timestamp_input_filter"
+    autoload :ParticipatorySpaceInputFilter, "decidim/api/input_filters/participatory_space_input_filter"
+    autoload :UserEntityInputFilter, "decidim/api/input_filters/user_entity_input_filter"
+
+    autoload :BaseInputSort, "decidim/api/input_sorts/base_input_sort"
+    autoload :ComponentInputSort, "decidim/api/input_sorts/component_input_sort"
+    autoload :HasEndorsableInputSort, "decidim/api/input_sorts/has_endorsable_input_sort"
+    autoload :HasLocalizedInputSort, "decidim/api/input_sorts/has_localized_input_sort"
+    autoload :HasPublishableInputSort, "decidim/api/input_sorts/has_publishable_input_sort"
+    autoload :HasTimestampInputSort, "decidim/api/input_sorts/has_timestamp_input_sort"
+    autoload :ParticipatorySpaceInputSort, "decidim/api/input_sorts/participatory_space_input_sort"
+    autoload :UserEntityInputSort, "decidim/api/input_sorts/user_entity_input_sort"
+
+    autoload :ParticipatorySpaceInterface, "decidim/api/interfaces/participatory_space_interface"
+    autoload :ComponentInterface, "decidim/api/interfaces/component_interface"
+    autoload :AuthorInterface, "decidim/api/interfaces/author_interface"
+    autoload :AuthorableInterface, "decidim/api/interfaces/authorable_interface"
+    autoload :CoauthorableInterface, "decidim/api/interfaces/coauthorable_interface"
+    autoload :CategorizableInterface, "decidim/api/interfaces/categorizable_interface"
+    autoload :ScopableInterface, "decidim/api/interfaces/scopable_interface"
+    autoload :AttachableInterface, "decidim/api/interfaces/attachable_interface"
+    autoload :HashtagInterface, "decidim/api/interfaces/hashtag_interface"
+    autoload :ParticipatorySpaceResourceableInterface, "decidim/api/interfaces/participatory_space_resourceable_interface"
+    autoload :FingerprintInterface, "decidim/api/interfaces/fingerprint_interface"
+    autoload :AmendableInterface, "decidim/api/interfaces/amendable_interface"
+    autoload :AmendableEntityInterface, "decidim/api/interfaces/amendable_entity_interface"
+    autoload :TraceableInterface, "decidim/api/interfaces/traceable_interface"
+    autoload :TimestampsInterface, "decidim/api/interfaces/timestamps_interface"
+    autoload :EndorsableInterface, "decidim/api/interfaces/endorsable_interface"
+
+    autoload :DateTimeType, "decidim/api/scalars/date_time_type"
+    autoload :DateType, "decidim/api/scalars/date_type"
   end
 end

data/lib/decidim/core/engine.rb

@@ -37,7 +37,6 @@ require "kaminari"
 require "doorkeeper"
 require "doorkeeper-i18n"
 require "nobspw"
-require "kaminari"
 require "batch-loader"
 require "etherpad-lite"
 require "diffy"
@@ -89,9 +88,9 @@ module Decidim
       end
 
       initializer "decidim.graphql_api" do
-        Decidim::Api::QueryType.define do
-          Decidim::QueryExtensions.define(self)
-        end
+        # Enable them method `!` everywhere for compatibility, this line will be removed when upgrading to GraphQL 2.0
+        GraphQL::DeprecatedDSL.activate
+        Decidim::Api::QueryType.include Decidim::QueryExtensions
 
         Decidim::Api.add_orphan_type Decidim::Core::UserType
         Decidim::Api.add_orphan_type Decidim::Core::UserGroupType
@@ -110,7 +109,7 @@ module Decidim
         # that may be using the `geocoded_by` or `reverse_geocoded_by` class
         # methods injected by the Geocoder gem.
         ActiveSupport.on_load :active_record do
-          ActiveRecord::Base.send(:include, Decidim::Geocodable)
+          ActiveRecord::Base.include Decidim::Geocodable
         end
       end
 
@@ -335,6 +334,36 @@ module Decidim
           end
         end
 
+        Decidim.metrics_registry.register(:blocked_users) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Metrics::BlockedUsersMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: false
+            settings.attribute :scopes, type: :array, default: %w(home)
+            settings.attribute :weight, type: :integer, default: 1
+          end
+        end
+
+        Decidim.metrics_registry.register(:user_reports) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Metrics::UserReportsMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: false
+            settings.attribute :scopes, type: :array, default: %w(home)
+            settings.attribute :weight, type: :integer, default: 1
+          end
+        end
+
+        Decidim.metrics_registry.register(:reported_users) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Metrics::ReportedUsersMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: false
+            settings.attribute :scopes, type: :array, default: %w(home)
+            settings.attribute :weight, type: :integer, default: 1
+          end
+        end
+
         Decidim.metrics_registry.register(:participants) do |metric_registry|
           metric_registry.manager_class = "Decidim::Metrics::ParticipantsMetricManage"
 
@@ -513,7 +542,7 @@ module Decidim
       end
 
       config.to_prepare do
-        FoundationRailsHelper::FlashHelper.send(:include, Decidim::FlashHelperExtensions)
+        FoundationRailsHelper::FlashHelper.include Decidim::FlashHelperExtensions
       end
     end
   end