decidim-core 0.23.2 → 0.24.0

data/lib/decidim/api/types/translated_field_type.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This type represents a translated field in multiple languages.
+    class TranslatedFieldType < Decidim::Api::Types::BaseObject
+      description "A translated field"
+
+      field :locales, [GraphQL::Types::String, { null: true }], description: "Lists all the locales in which this translation is available", null: true
+
+      field :translations, [LocalizedStringType, { null: true }], description: "All the localized strings for this translation.", null: false do
+        argument :locales, [GraphQL::Types::String], description: "A list of locales to scope the translations to.", required: false
+      end
+
+      field :translation, GraphQL::Types::String, description: "Returns a single translation given a locale.", null: true do
+        argument :locale, GraphQL::Types::String, "A locale to search for", required: true
+      end
+
+      def locales
+        object.keys
+      end
+
+      def translation(locale: "")
+        translations = object.stringify_keys
+        translations[locale]
+      end
+
+      def translations(locales: [])
+        translations = object.stringify_keys
+        translations = translations.slice(*locales) unless locales.empty?
+
+        translations.map { |locale, text| OpenStruct.new(locale: locale, text: text) }
+      end
+    end
+  end
+end

data/lib/decidim/api/types/user_group_type.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This type represents a UserGroup
+    class UserGroupType < Decidim::Api::Types::BaseObject
+      description "A user group"
+
+      implements Decidim::Core::AuthorInterface
+
+      field :id, GraphQL::Types::ID, "The user group's id", null: false
+
+      field :name, GraphQL::Types::String, "The user group's name", null: false
+
+      field :nickname, GraphQL::Types::String, "The user group nickname", null: false
+
+      def nickname
+        object.presenter.nickname
+      end
+
+      field :avatar_url, GraphQL::Types::String, "The user's avatar url", null: false
+
+      def avatar_url
+        object.presenter.avatar_url
+      end
+
+      field :profile_path, GraphQL::Types::String, "The user group's profile url", null: false
+
+      def profile_path
+        object.presenter.profile_path
+      end
+
+      field :organization_name, GraphQL::Types::String, "The user group's organization name", null: false
+
+      def organization_name
+        object.organization.name
+      end
+
+      field :deleted, GraphQL::Types::Boolean, "Whether the user group's has been deleted or not", null: false
+
+      def deleted
+        object.presenter.deleted?
+      end
+
+      field :badge, GraphQL::Types::String, "A badge for the user group", null: false
+
+      def badge
+        object.presenter.badge
+      end
+
+      field :members, [Decidim::Core::UserType, { null: true }], "Members of this group", null: false
+
+      def members
+        object.accepted_users
+      end
+
+      field :members_count, GraphQL::Types::Int, "Number of members in this group", null: false
+
+      def members_count
+        object.accepted_memberships.count
+      end
+    end
+  end
+end

data/lib/decidim/api/types/user_type.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This type represents a User.
+    class UserType < Decidim::Api::Types::BaseObject
+      description "A user"
+
+      implements Decidim::Core::AuthorInterface
+
+      field :id, GraphQL::Types::ID, "The user's id", null: false
+
+      field :name, GraphQL::Types::String, "The user's name", null: false
+
+      field :nickname, GraphQL::Types::String, "The user's nickname", null: false
+
+      field :avatar_url, GraphQL::Types::String, "The user's avatar url", null: false
+
+      field :profile_path, GraphQL::Types::String, "The user's profile url", null: false
+
+      field :direct_messages_enabled, GraphQL::Types::String,
+            null: false,
+            description: ["If the user making the request is logged in, it will return whether this recipient accepts a conversation or not.",
+                          " It will return false for non-logged requests."].join
+
+      field :organization_name, GraphQL::Types::String, "The user's organization name", null: false
+
+      field :deleted, GraphQL::Types::Boolean, "Whether the user's account has been deleted or not", null: false
+
+      field :badge, GraphQL::Types::String, "A badge for the user group", null: false
+
+      field :groups, [Decidim::Core::UserGroupType, { null: true }], "Groups where this user belongs", null: false
+
+      def nickname
+        object.presenter.nickname
+      end
+
+      def avatar_url
+        object.presenter.avatar_url(:thumb)
+      end
+
+      def profile_path
+        object.presenter.profile_path
+      end
+
+      def direct_messages_enabled
+        object.presenter.direct_messages_enabled?(context.to_h)
+      end
+
+      def organization_name
+        object.organization.name
+      end
+
+      def deleted
+        object.presenter.deleted?
+      end
+
+      def badge
+        object.presenter.badge
+      end
+
+      def groups
+        object.accepted_user_groups
+      end
+    end
+  end
+end

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/attribute_encryptor.rb

@@ -7,7 +7,15 @@ module Decidim
     end
 
     def self.decrypt(string_encrypted)
-      cryptor.decrypt_and_verify(string_encrypted) if string_encrypted.present?
+      return if string_encrypted.blank?
+
+      # `ActiveSupport::MessageEncryptor` expects all values passed to the
+      # `#decrypt_and_verify` method to be instances of String as the message
+      # verifier calls `#split` on the value objects: https://git.io/JqfOO.
+      # If something else is passed, just return the value as is.
+      return string_encrypted unless string_encrypted.is_a?(String)
+
+      cryptor.decrypt_and_verify(string_encrypted)
     end
 
     def self.cryptor

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