decidim-core 0.29.3 → 0.30.0.rc1

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

@@ -7,14 +7,12 @@ module Decidim
       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
+      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
 
       def locales
         (defined_translations.keys + machine_translations.keys).uniq

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

@@ -8,54 +8,41 @@ module Decidim
 
       implements Decidim::Core::AuthorInterface
 
+      field :avatar_url, GraphQL::Types::String, "The user's avatar url", null: false
+      field :badge, GraphQL::Types::String, "A badge for the user group", null: false
+      field :deleted, GraphQL::Types::Boolean, "Whether the user group's has been deleted or not", null: false
       field :id, GraphQL::Types::ID, "The user group's id", null: false
-
+      field :members, [Decidim::Core::UserType, { null: true }], "Members of this group", null: false, method: :accepted_users
+      field :members_count, GraphQL::Types::Int, "Number of members in this group", 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
+      field :organization_name, Decidim::Core::TranslatedFieldType, "The user group's organization name", null: false
+      field :profile_path, GraphQL::Types::String, "The user group's profile url", 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, Decidim::Core::TranslatedFieldType, "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

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

@@ -8,28 +8,19 @@ module Decidim
 
       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 :badge, GraphQL::Types::String, "A badge for the user group", null: false
+      field :deleted, GraphQL::Types::Boolean, "Whether the user's account has been deleted or not", 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 :groups, [Decidim::Core::UserGroupType, { null: true }], "Groups where this user belongs", null: false, method: :accepted_user_groups
+      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 :organization_name, Decidim::Core::TranslatedFieldType, "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
+      field :profile_path, GraphQL::Types::String, "The user's profile url", null: false
 
       def nickname
         object.presenter.nickname
@@ -59,10 +50,6 @@ module Decidim
         object.presenter.badge
       end
 
-      def groups
-        object.accepted_user_groups
-      end
-
       def self.authorized?(object, context)
         super && object.confirmed? && !object.blocked? && !object.deleted?
       end

data/lib/decidim/asset_router/storage.rb

@@ -52,13 +52,8 @@ module Decidim
         when ActiveStorage::Blob
           blob_url(**)
         else # ActiveStorage::VariantWithRecord, ActiveStorage::Variant
-          if blob && blob.attachments.any?
-            ensure_current_host(blob.attachments.first&.record, **)
-            representation_url(**)
-          else
-            ensure_current_host(nil, **)
-            representation_url(**, only_path: true)
-          end
+          ensure_current_host(nil, **)
+          representation_url(**)
         end
       end
 
@@ -164,7 +159,7 @@ module Decidim
         return unless blob
 
         if options[:only_path] || remote? || !asset_url_available?
-          routes.rails_blob_url(blob, **default_options.merge(options))
+          routes.rails_blob_url(blob, **default_options, **options)
         else
           blob.url(**options)
         end
@@ -189,7 +184,7 @@ module Decidim
         if options[:host]
           rails_representation_url(**options)
         else
-          representation_url(**options.merge(only_path: true))
+          representation_url(**options, only_path: true)
         end
       end
 
@@ -212,10 +207,10 @@ module Decidim
       # @param options The options for building the URL
       # @return [String, nil] The converted representation URL or `nil` if the
       #   asset is not defined.
-      def rails_representation_url(**options)
+      def rails_representation_url(**)
         return unless asset
 
-        representation_url = routes.rails_representation_url(asset, **default_options.merge(options))
+        representation_url = routes.rails_representation_url(asset, **default_options, **)
 
         variation = asset.try(:variation)
         return representation_url unless variation

data/lib/decidim/assets/tailwind/tailwind.config.js.erb

@@ -51,7 +51,8 @@ module.exports = {
         DEFAULT: "#F3F4F7",
         2: "#FAFBFC",
         3: "#EFEFEF",
-        4: "#E4EEFF99" // 60% opacity
+        4: "#E4EEFF99", // 60% opacity
+        5: "#E9E9E9"
       }
     },
     container: {

data/lib/decidim/attachment_attributes.rb

@@ -28,7 +28,7 @@ module Decidim
       # Returns nothing.
       def attachments_attribute(name)
         attribute name, Array[Integer]
-        attribute "add_#{name}".to_sym, Array
+        attribute :"add_#{name}", Array
 
         # Define the getter method that fetches the attachment records based on
         # their types. For Strings and Integers, assumes they are IDs and will

data/lib/decidim/attribute_encryptor.rb

@@ -21,7 +21,7 @@ module Decidim
     def self.cryptor
       @cryptor ||= begin
         key = ActiveSupport::KeyGenerator.new("attribute").generate_key(
-          Rails.application.secrets.secret_key_base, ActiveSupport::MessageEncryptor.key_len
+          Rails.application.secret_key_base, ActiveSupport::MessageEncryptor.key_len
         )
         ActiveSupport::MessageEncryptor.new(key)
       end

data/lib/decidim/attribute_object/nested_validator.rb

@@ -7,7 +7,7 @@ module Decidim
         value = value.values if value.is_a?(Hash)
         return unless Array(value).reject { |r| valid_object?(r) }.any?
 
-        record.errors.add(attribute, :invalid, **options.merge(value:))
+        record.errors.add(attribute, :invalid, **options, value:)
       end
 
       private

data/lib/decidim/attributes/integer_with_units.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Attributes
+    # Custom attributes value to represent an Integer with units.
+    class IntegerWithUnits < ActiveModel::Type::Value
+      def type
+        :"decidim/attributes/integer_with_units"
+      end
+
+      def cast(value)
+        return nil if value.nil?
+
+        case value
+        when ::Hash
+          [value["0"].to_i.abs, value["1"].to_s]
+        when ::Array
+          return value if value.size != 2
+
+          [value[0].to_i.abs, value[1].to_s]
+        else
+          value
+        end
+      end
+    end
+  end
+end

data/lib/decidim/attributes/time_with_zone.rb

@@ -23,11 +23,7 @@ module Decidim
       def cast_value(value)
         return value unless value.is_a?(String)
 
-        if Date._iso8601(value).present?
-          Time.zone.iso8601(value)
-        else
-          Time.zone.strptime(value, I18n.t("time.formats.decidim_short"))
-        end
+        Time.zone.strptime(value, I18n.t("time.formats.decidim_short"))
       rescue ArgumentError
         fallback = super
         return fallback unless fallback.is_a?(Time)

data/lib/decidim/attributes.rb

@@ -13,6 +13,7 @@ module Decidim
     autoload :Model, "decidim/attributes/model"
     autoload :Symbol, "decidim/attributes/symbol"
     autoload :Integer, "decidim/attributes/integer"
+    autoload :IntegerWithUnits, "decidim/attributes/integer_with_units"
 
     # Base types
     ActiveModel::Type.register(:array, Decidim::Attributes::Array)
@@ -30,6 +31,7 @@ module Decidim
     ActiveModel::Type.register(:"decidim/attributes/clean_string", Decidim::Attributes::CleanString)
     ActiveModel::Type.register(:"decidim/attributes/rich_text", Decidim::Attributes::RichText)
     ActiveModel::Type.register(:"decidim/attributes/blob", Decidim::Attributes::Blob)
+    ActiveModel::Type.register(:"decidim/attributes/integer_with_units", Decidim::Attributes::IntegerWithUnits)
 
     ActiveModel::Type.register(:integer, Decidim::Attributes::Integer)
   end

data/lib/decidim/authorization_form_builder.rb

@@ -37,7 +37,6 @@ module Decidim
 
     def input_field(name, type)
       return hidden_field(name) if name.to_s == "handler_name"
-      return scopes_selector if name.to_s == "scope_id"
 
       case type
       when :date, :datetime, :time, :"decidim/attributes/localized_date"
@@ -47,12 +46,6 @@ module Decidim
       end
     end
 
-    def scopes_selector
-      return if object.user.blank?
-
-      collection_select :scope_id, object.user.organization.scopes, :id, ->(scope) { translated_attribute(scope.name) }
-    end
-
     def find_input_type(name)
       value_type = object.class.attribute_types[name]
 

data/lib/decidim/coauthorable.rb

@@ -70,7 +70,7 @@ module Decidim
       def reload(options = nil)
         remove_instance_variable(:@authors) if defined?(@authors)
         remove_instance_variable(:@notifiable_identities) if defined?(@notifiable_identities)
-        super(options)
+        super
       end
 
       # Returns all the authors of a coauthorable.

data/lib/decidim/command.rb

@@ -22,7 +22,7 @@ module Decidim
     end
 
     def evaluate(&block)
-      @caller = eval("self", block.binding, __FILE__, __LINE__)
+      @caller = block.binding.receiver
       instance_eval(&block)
     end
 
@@ -42,10 +42,10 @@ module Decidim
       @caller.respond_to?(method_name, include_private)
     end
 
-    def with_events(with_transaction: false, &block)
+    def with_events(with_transaction: false, &)
       ActiveSupport::Notifications.publish("#{event_namespace}:before", **event_arguments)
 
-      with_transaction ? transaction(&block) : yield
+      with_transaction ? transaction(&) : yield
 
       ActiveSupport::Notifications.publish("#{event_namespace}:after", **event_arguments)
     end

data/lib/decidim/commands/destroy_resource.rb

@@ -40,7 +40,11 @@ module Decidim
           current_user,
           **extra_params
         ) do
-          resource.destroy!
+          if resource.respond_to?(:really_destroy!)
+            resource.really_destroy!
+          else
+            resource.destroy!
+          end
         end
       end
 

data/lib/decidim/commands/resource_handler.rb

@@ -22,7 +22,7 @@ module Decidim
         end
 
         def form_attribute_values
-          raise "You need to define the list of attributes to be fetched from form object fetch_form_attributes" unless defined?(:form_attributes)
+          raise "You need to define the list of attributes to be fetched from form object fetch_form_attributes" if form_attributes.empty?
 
           form_attributes.index_with do |field|
             form.send(field)
@@ -30,7 +30,7 @@ module Decidim
         end
 
         def file_attribute_values
-          return {} unless defined?(:file_attributes)
+          return {} if file_attributes.empty?
 
           attachment_attributes(*file_attributes)
         end

data/lib/decidim/commands/restore_resource.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Commands
+    class RestoreResource < ::Decidim::Command
+      # Initializes the command.
+      #
+      # @param resource [ActiveRecord::Base] the resource to restore.
+      # @param current_user [Decidim::User] the current user.
+      def initialize(resource, current_user)
+        @resource = resource
+        @current_user = current_user
+      end
+
+      # Restores the resource.
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if invalid?
+
+        restore_resource
+
+        broadcast(:ok, resource)
+      rescue Decidim::Commands::HookError, StandardError
+        broadcast(:invalid)
+      end
+
+      protected
+
+      attr_reader :resource, :current_user
+
+      def invalid? = false
+
+      def restore_resource
+        Decidim.traceability.perform_action!(
+          "restore",
+          resource,
+          current_user
+        ) do
+          resource.restore
+        end
+      end
+    end
+  end
+end

data/lib/decidim/commands/soft_delete_resource.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Commands
+    class SoftDeleteResource < ::Decidim::Command
+      # Initializes the command.
+      #
+      # @param resource [ActiveRecord::Base] the resource to soft delete.
+      # @param current_user [Decidim::User] the current user.
+      def initialize(resource, current_user)
+        @resource = resource
+        @current_user = current_user
+      end
+
+      # Soft deletes the resource.
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if invalid?
+
+        soft_delete_resource
+        send_notification_to_authors
+
+        broadcast(:ok, resource)
+      rescue Decidim::Commands::HookError, StandardError
+        broadcast(:invalid)
+      end
+
+      protected
+
+      attr_reader :resource, :current_user
+
+      def invalid? = false
+
+      def soft_delete_resource
+        Decidim.traceability.perform_action!(
+          "soft_delete",
+          resource,
+          current_user
+        ) do
+          resource.destroy!
+        end
+      end
+
+      def send_notification_to_authors
+        coauthors = resource.try(:coauthorships)&.map do |coauthorship|
+          coauthorship.decidim_author_type.constantize.find(coauthorship.decidim_author_id)
+        end || []
+
+        recipients = (resource.try(:authors) || [resource.try(:author)]).compact + coauthors
+
+        return if recipients.empty?
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.resources.soft_deleted",
+          event_class: Decidim::SoftDeleteResourceEvent,
+          resource:,
+          affected_users: recipients.uniq
+        )
+      end
+    end
+  end
+end

data/lib/decidim/component_manifest.rb

@@ -142,6 +142,13 @@ module Decidim
       @seeds&.call(participatory_space)
     end
 
+    # The name of the named Rails route to create the url to the resource.
+    #
+    # Returns a String.
+    def route_name
+      "component"
+    end
+
     # Public: Adds configurable attributes for this component, scoped to a name. It
     # uses the DSL specified under `Decidim::SettingsManifest`.
     #

data/lib/decidim/content_parsers/blob_parser.rb

@@ -20,19 +20,19 @@ module Decidim
       # https://github.com/rails/rails/blob/a7e379896552ce43b822385c03c37f2bd47739d3/activestorage/config/routes.rb#L5-L14
       BLOB_REGEX = %r{
         # Group 1: Host part
-        (?<host_part>
+        (
           # Group 2: Domain and subpath part
-          #{URI::DEFAULT_PARSER.make_regexp(%w(https http))}
+          https?://((?!/rails).)+
         )?
         /rails/active_storage
         # Group 3: Blob path, representation path or disk service path
-        /(?<type_part>blobs/redirect|blobs/proxy|blobs|representations/redirect|representations/proxy|representations|disk)
+        /(blobs/redirect|blobs/proxy|blobs|representations/redirect|representations/proxy|representations|disk)
         # Group 4: Signed ID for blobs or encoded key for disk service
-        /(?<key_part>[^/]+)
+        /([^/]+)
         # Group 5: Variation part (only for representations)
         (
           # Group 6: Variation key for representations
-          /(?<variation_part>[\w.=-]+)
+          /([\w.=-]+)
         )?
         # Group 7: Filename
         /([\w.=-]+)
@@ -46,10 +46,8 @@ module Decidim
 
       def replace_blobs(text)
         text.gsub(BLOB_REGEX) do |match|
-          named_captures = Regexp.last_match.named_captures
-
-          type_part = named_captures["type_part"]
-          key_part = named_captures["key_part"]
+          type_part = Regexp.last_match(3)
+          key_part = Regexp.last_match(4)
 
           variation_key = nil
           blob =
@@ -61,7 +59,7 @@ module Decidim
               # Representation or blob
               if type_part.start_with?("representations")
                 # Representation
-                variation_part = named_captures["variation_part"]
+                variation_part = Regexp.last_match(6)
                 variation_key = generate_variation_key(variation_part)
               end
 

data/lib/decidim/content_parsers/user_parser.rb

@@ -49,7 +49,7 @@ module Decidim
 
       def existing_mentionables
         @existing_mentionables ||= mentionable_class.where(
-          "decidim_organization_id = ? AND nickname IN (?)",
+          "decidim_organization_id = ? AND LOWER(nickname) IN (?)",
           current_organization.id,
           content_nicknames
         )

data/lib/decidim/core/api.rb

@@ -18,6 +18,7 @@ module Decidim
     autoload :AreaTypeType, "decidim/api/types/area_type_type"
     autoload :AttachmentType, "decidim/api/types/attachment_type"
     autoload :CategoryType, "decidim/api/types/category_type"
+    autoload :TaxonomyType, "decidim/api/types/taxonomy_type"
     autoload :ComponentType, "decidim/api/types/component_type"
     autoload :CoordinatesType, "decidim/api/types/coordinates_type"
     autoload :DecidimType, "decidim/api/types/decidim_type"
@@ -64,6 +65,7 @@ module Decidim
     autoload :AuthorableInterface, "decidim/api/interfaces/authorable_interface"
     autoload :CoauthorableInterface, "decidim/api/interfaces/coauthorable_interface"
     autoload :CategoriesContainerInterface, "decidim/api/interfaces/categories_container_interface"
+    autoload :TaxonomizableInterface, "decidim/api/interfaces/taxonomizable_interface"
     autoload :CategorizableInterface, "decidim/api/interfaces/categorizable_interface"
     autoload :ScopableInterface, "decidim/api/interfaces/scopable_interface"
     autoload :AttachableInterface, "decidim/api/interfaces/attachable_interface"