decidim-core 0.29.2 → 0.30.0.rc1

data/db/migrate/20240704115429_create_decidim_taxonomies.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class CreateDecidimTaxonomies < ActiveRecord::Migration[7.0]
+  def change
+    create_table :decidim_taxonomies do |t|
+      t.jsonb :name, null: false, default: {}
+      t.references :decidim_organization, null: false, index: true
+      t.references :parent, index: true
+      t.integer :weight
+      t.integer :children_count, null: false, default: 0
+      t.integer :taxonomizations_count, null: false, default: 0
+      t.timestamps
+    end
+
+    create_table :decidim_taxonomizations do |t|
+      t.references :taxonomy, null: false, index: true
+      t.references :taxonomizable, null: false, polymorphic: true, index: { name: "index_taxonomizations_on_taxonomizable" }
+      t.timestamps
+    end
+
+    add_index :decidim_taxonomizations, [:taxonomy_id, :taxonomizable_id, :taxonomizable_type], name: "index_taxonomizations_on_id_tid_and_ttype", unique: true
+  end
+end

data/db/migrate/20240717093514_add_registered_only_to_decidim_share_tokens.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddRegisteredOnlyToDecidimShareTokens < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_share_tokens, :registered_only, :boolean
+  end
+end

data/db/migrate/20240722215500_change_object_changes_on_versions.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class ChangeObjectChangesOnVersions < ActiveRecord::Migration[6.1]
+  def up
+    rename_column :versions, :object_changes, :old_object_changes
+    add_column :versions, :object_changes, :jsonb # or :json
+
+    PaperTrail::Version.where.not(old_object_changes: nil).find_each do |version|
+      # This is an adaptation of PaperTrail internal load_changeset method,having in mind that we
+      # need to call also the code from PaperTrail::AttributeSerializer::ObjectChangesAttribute
+      object_changes = ActiveSupport::HashWithIndifferentAccess.new(YAML.unsafe_load(version.old_object_changes))
+      unless version.item_type.constantize.unscoped.find_by(id: version.item_id).nil?
+        # This is the deserialization code from `PaperTrail::AttributeSerializer::ObjectChangesAttribute`
+        # where we skip checking the object changeset column type, as we migrate it from YAML to JSON
+        changes_to_serialize = object_changes.clone
+        if changes_to_serialize.present?
+          serializer = PaperTrail::AttributeSerializers::CastAttributeSerializer.new(version.item_type.constantize)
+          changes_to_serialize.each do |key, change|
+            # `change` is an Array with two elements, representing before and after.
+            object_changes[key] = Array(change).map do |value|
+              serializer.send(:deserialize, key, value)
+            end
+          end
+        end
+      end
+
+      version.update_columns(old_object_changes: nil, object_changes:) # rubocop:disable Rails/SkipsModelValidations
+    rescue NameError
+      Rails.logger.info "Skipping History of #{version.item_type} with id #{version.item_id}"
+    end
+
+    PaperTrail::Version.reset_column_information
+    remove_column :versions, :old_object_changes
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20240806065417_create_decidim_taxonomy_filters.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class CreateDecidimTaxonomyFilters < ActiveRecord::Migration[7.0]
+  def change
+    create_table :decidim_taxonomy_filters do |t|
+      t.references :root_taxonomy, null: false, foreign_key: { to_table: :decidim_taxonomies }
+      t.integer :filter_items_count, null: false, default: 0
+      t.string :space_manifest, null: false
+      t.timestamps
+    end
+
+    create_table :decidim_taxonomy_filter_items do |t|
+      t.references :taxonomy_filter, null: false, index: true
+      t.references :taxonomy_item, null: false, foreign_key: { to_table: :decidim_taxonomies }
+      t.timestamps
+    end
+
+    add_index :decidim_taxonomy_filter_items, [:taxonomy_filter_id, :taxonomy_item_id], name: "index_taxonomy_filter_items_on_filter_id_and_item_id", unique: true
+
+    add_column :decidim_taxonomies, :filters_count, :integer, null: false, default: 0
+    add_column :decidim_taxonomies, :filter_items_count, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20240822161348_add_deleted_at_to_decidim_components.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddDeletedAtToDecidimComponents < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_components, :deleted_at, :datetime
+    add_index :decidim_components, :deleted_at
+  end
+end

data/db/migrate/20240906162524_add_part_of_to_taxonomies.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class AddPartOfToTaxonomies < ActiveRecord::Migration[7.0]
+  class Taxonomy < ApplicationRecord
+    self.table_name = :decidim_taxonomies
+    belongs_to :parent, class_name: "Taxonomy", optional: true
+  end
+
+  def change
+    add_column :decidim_taxonomies, :part_of, :integer, array: true, default: [], null: false
+    add_index :decidim_taxonomies, :part_of, using: "gin"
+
+    reversible do |dir|
+      dir.up do
+        Taxonomy.find_each do |taxonomy|
+          if taxonomy.parent
+            taxonomy.part_of.clear.append(taxonomy.id).concat(taxonomy.parent.reload.part_of)
+          else
+            taxonomy.part_of.clear.append(taxonomy.id)
+          end
+          taxonomy.save
+        end
+      end
+    end
+  end
+end

data/db/migrate/20241001135825_add_role_to_participatory_space_private_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddRoleToParticipatorySpacePrivateUsers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_participatory_space_private_users, :role, :jsonb
+  end
+end

data/db/migrate/20241001140408_add_published_to_participatory_space_private_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPublishedToParticipatorySpacePrivateUsers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_participatory_space_private_users, :published, :boolean, default: false
+  end
+end

data/db/migrate/20241022002600_create_private_exports.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class CreatePrivateExports < ActiveRecord::Migration[7.0]
+  def change
+    create_table :decidim_private_exports, id: :uuid do |t|
+      t.string :export_type, null: false
+      t.string :attached_to_type
+      t.integer :attached_to_id
+      t.string :file
+      t.string :content_type, null: false
+      t.string :file_size, null: false
+      t.datetime :expires_at
+      t.jsonb :metadata, default: {}
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20241028114430_add_component_counter_to_taxonomy_filters.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddComponentCounterToTaxonomyFilters < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_taxonomy_filters, :components_count, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20241111104357_add_names_and_space_boolean_to_taxonomy_filters.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddNamesAndSpaceBooleanToTaxonomyFilters < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_taxonomy_filters, :name, :jsonb, default: {}
+    add_column :decidim_taxonomy_filters, :internal_name, :jsonb, default: {}
+    add_column :decidim_taxonomy_filters, :space_filter, :boolean, null: false, default: false
+  end
+end

data/db/migrate/20241127093708_add_taxonomy_to_metrics.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddTaxonomyToMetrics < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :decidim_metrics, :decidim_taxonomy, index: true
+  end
+end

data/db/migrate/20241204121445_add_participatory_space_manifests_from_taxonomy_filters.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddParticipatorySpaceManifestsFromTaxonomyFilters < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :decidim_taxonomy_filters, :space_manifest
+    remove_column :decidim_taxonomy_filters, :space_filter
+    add_column :decidim_taxonomy_filters, :participatory_space_manifests, :string, array: true, default: [], null: false
+  end
+end

data/decidim-core.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.summary = "The core of the Decidim framework."
   s.description = "Adds core features so other engines can hook into the framework."
   s.license = "AGPL-3.0-or-later"
-  s.required_ruby_version = "~> 3.2.0"
+  s.required_ruby_version = "~> 3.3.0"
 
   s.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").select do |f|
@@ -36,57 +36,54 @@ Gem::Specification.new do |s|
 
   s.add_dependency "active_link_to", "~> 1.0"
   s.add_dependency "acts_as_list", "~> 1.0"
-  s.add_dependency "batch-loader", "~> 1.2"
-  s.add_dependency "browser", "~> 2.7"
+  s.add_dependency "batch-loader", "~> 2.0"
+  s.add_dependency "browser", "~> 6.2.0"
   s.add_dependency "cells-erb", "~> 0.1.0"
   s.add_dependency "cells-rails", "~> 0.1.3"
   s.add_dependency "charlock_holmes", "~> 0.7"
+  s.add_dependency "chartkick", "~> 5.1.2"
   s.add_dependency "date_validator", "~> 0.12.0"
   s.add_dependency "devise", "~> 4.7"
-  s.add_dependency "devise-i18n", "~> 1.2", "< 1.11.1"
+  s.add_dependency "devise-i18n", "~> 1.2"
   s.add_dependency "diffy", "~> 3.3"
   s.add_dependency "doorkeeper", "~> 5.6", ">= 5.6.6"
   s.add_dependency "doorkeeper-i18n", "~> 4.0"
   s.add_dependency "file_validators", "~> 3.0"
   s.add_dependency "fog-local", "~> 0.6"
-  s.add_dependency "foundation_rails_helper", "~> 4.0"
   s.add_dependency "geocoder", "~> 1.8"
   s.add_dependency "hashdiff", ">= 0.4.0", "< 2.0.0"
+  s.add_dependency "hexapdf", "~> 1.1.0"
   s.add_dependency "image_processing", "~> 1.2"
   s.add_dependency "invisible_captcha", "~> 0.12"
   s.add_dependency "kaminari", "~> 1.2", ">= 1.2.1"
   s.add_dependency "loofah", "~> 2.19", ">= 2.19.1"
   s.add_dependency "mime-types", ">= 1.16", "< 4.0"
   s.add_dependency "mini_magick", "~> 4.9"
-  s.add_dependency "net-smtp", "~> 0.3.1"
+  s.add_dependency "net-smtp", "~> 0.5.0"
   s.add_dependency "nokogiri", "~> 1.16", ">= 1.16.2"
   s.add_dependency "omniauth", "~> 2.0"
   s.add_dependency "omniauth-facebook", "~> 5.0"
   s.add_dependency "omniauth-google-oauth2", "~> 1.0"
   s.add_dependency "omniauth-rails_csrf_protection", "~> 1.0"
   s.add_dependency "omniauth-twitter", "~> 1.4"
-  s.add_dependency "paper_trail", "~> 12.0"
-  s.add_dependency "pg", "~> 1.4.0", "< 2"
+  s.add_dependency "paper_trail", "~> 16.0"
+  s.add_dependency "paranoia", "~> 3.0.0"
+  s.add_dependency "pg", "~> 1.5.0", "< 2"
   s.add_dependency "pg_search", "~> 2.2"
   s.add_dependency "premailer-rails", "~> 1.10"
-  # We need psych 4+ in order to use the `aliases: true` option,
-  # see https://stackoverflow.com/questions/71191685/visit-psych-nodes-alias-unknown-alias-default-psychbadalias
-  # Also note that we need Rails 6.1.5+,
-  # see https://gist.github.com/yahonda/2776d8d7b6ea7045359f38c10449937b
-  s.add_dependency "psych", "~> 4.0"
   s.add_dependency "rack", "~> 2.2", ">= 2.2.8.1"
   s.add_dependency "rack-attack", "~> 6.0"
   s.add_dependency "rails", "~> 7.0.8"
   s.add_dependency "rails-i18n", "~> 7.0"
-  s.add_dependency "ransack", "~> 3.2.1"
+  s.add_dependency "ransack", "~> 4.2.0"
   s.add_dependency "redis", "~> 4.1"
-  s.add_dependency "request_store", "~> 1.5.0"
+  s.add_dependency "request_store", "~> 1.7.0"
   s.add_dependency "rubyXL", "~> 3.4"
   s.add_dependency "rubyzip", "~> 2.0"
   s.add_dependency "shakapacker", "~> 7.1.0"
-  s.add_dependency "valid_email2", "~> 4.0"
+  s.add_dependency "valid_email2", "~> 7.0"
   s.add_dependency "web-push", "~> 3.0"
-  s.add_dependency "wisper", "~> 2.0"
+  s.add_dependency "wisper", "~> 3.0"
 
   s.add_development_dependency "decidim-api", Decidim::Core.version
   s.add_development_dependency "decidim-dev", Decidim::Core.version

data/lib/decidim/action_authorization.rb

@@ -14,7 +14,7 @@ module Decidim
 
     def action_authorized_to(action, resource: nil, permissions_holder: nil)
       action_authorization_cache[action_authorization_cache_key(action, resource, permissions_holder)] ||=
-        ::Decidim::ActionAuthorizer.new(current_user, action, permissions_holder || resource&.component || current_component, resource).authorize
+        ::Decidim::ActionAuthorizer.new(current_user, action, permissions_holder || resource.try(:component) || current_component, resource).authorize
     end
 
     def action_authorization_cache
@@ -29,7 +29,8 @@ module Decidim
       elsif permissions_holder
         "#{action}-#{permissions_holder.class.name}-#{permissions_holder.id}"
       else
-        "#{action}-#{current_component.id}"
+        component = resource.try(:component) || current_component
+        "#{action}-#{component.id}"
       end
     end
   end

data/lib/decidim/amendable.rb

@@ -57,7 +57,7 @@ module Decidim
         when "participants"
           return only_amendables unless user
 
-          where.not(id: joins(:amendable).where.not("decidim_amendments.decidim_user_id = ?", user.id))
+          where.not(id: joins(:amendable).where.not(decidim_amendments: { decidim_user_id: user.id }))
         else # Assume 'all'
           all
         end

data/lib/decidim/api/input_filters/category_input_filter.rb

@@ -10,9 +10,11 @@ module Decidim
                type: [ID, { null: true }],
                description: "Returns the sub-categories for the given parent category or top-level categories if set to `null`",
                required: false,
-               prepare: lambda { |parent_id, _ctx|
-                          { parent_id: }
-                        }
+               prepare: :prepare_parent_id
+
+      def self.prepare_parent_id(parent_id, _ctx)
+        { parent_id: }
+      end
     end
   end
 end

data/lib/decidim/api/input_filters/component_input_filter.rb

@@ -9,40 +9,53 @@ module Decidim
       graphql_name "ComponentFilter"
       description "A type used for filtering any component parent objects"
 
-      argument :type,
-               type: GraphQL::Types::String,
-               description: "Filters by type of component",
-               required: false,
-               prepare: lambda { |value, _ctx|
-                          { manifest_name: value.downcase }
-                        }
       argument :name,
                type: GraphQL::Types::String,
                description: "Filters by name of the component, additional locale parameter can be provided to specify in which to search",
                required: false,
-               prepare: lambda { |search, ctx|
-                          lambda { |model_name, locale|
-                            locale = ctx[:current_organization].default_locale if locale.blank?
-                            op = Arel::Nodes::InfixOperation.new("->>", model_name.arel_table[:name], Arel::Nodes.build_quoted(locale))
-                            op.matches("%#{search}%")
-                          }
-                        }
+               prepare: :prepare_name
+
+      argument :type,
+               type: GraphQL::Types::String,
+               description: "Filters by type of component",
+               required: false,
+               prepare: :prepare_type
 
       argument :with_geolocation_enabled,
                type: GraphQL::Types::Boolean,
                description: "Returns components with geolocation activated (may be Proposals or Meetings)",
                required: false,
-               prepare: lambda { |active, _ctx|
-                          ->(_model_name, _locale) { ["(settings->'global'->>'geocoding_enabled')::boolean is ? or manifest_name='meetings'", active] }
-                        }
+               prepare: :prepare_geolocation_enabled
 
       argument :with_comments_enabled,
                type: GraphQL::Types::Boolean,
                description: "Returns components with comments enabled globally (can still be deactivated in the current step if the component has steps)",
                required: false,
-               prepare: lambda { |active, _ctx|
-                          ->(_model_name, _locale) { ["(settings->'global'->>'comments_enabled')::boolean is ?", active] }
-                        }
+               prepare: :prepare_comments_enabled
+
+      def self.prepare_comments_enabled(active, _ctx)
+        lambda do |_model_name, _locale|
+          ["(settings->'global'->>'comments_enabled')::boolean is ?", active]
+        end
+      end
+
+      def self.prepare_geolocation_enabled(active, _ctx)
+        lambda do |_model_name, _locale|
+          ["(settings->'global'->>'geocoding_enabled')::boolean is ? or manifest_name='meetings'", active]
+        end
+      end
+
+      def self.prepare_name(search, ctx)
+        lambda do |model_name, locale|
+          locale = ctx[:current_organization].default_locale if locale.blank?
+          op = Arel::Nodes::InfixOperation.new("->>", model_name.arel_table[:name], Arel::Nodes.build_quoted(locale))
+          op.matches("%#{search}%")
+        end
+      end
+
+      def self.prepare_type(value, _ctx)
+        { manifest_name: value.downcase }
+      end
     end
   end
 end

data/lib/decidim/api/input_filters/user_entity_input_filter.rb

@@ -27,63 +27,72 @@ module Decidim
       ```
       "
 
-      argument :type,
-               type: String,
-               description: "Filters by type of entity (User or UserGroup)",
+      argument :exclude_ids,
+               type: [ID],
+               description: "Excludes users contained in given ids. Valid values are one or more IDs (passed as an array)",
                required: false,
-               prepare: lambda { |value, _ctx|
-                          type = value.downcase.camelcase
-                          type = "UserGroup" if %w(Group Usergroup).include?(type)
-                          { type: "Decidim::#{type}" }
-                        }
+               prepare: :prepare_exclude_ids
       argument :name,
                type: String,
                description: "Filters by name of the user entity. Searches (case-insensitive) any fragment of the provided string",
                required: false,
-               prepare: lambda { |value, _ctx|
-                 [
-                   lambda { |model_class, _locale|
-                     model_class.arel_table[:name].matches("%#{value}%")
-                   }
-                 ]
-               }
+               prepare: :prepare_name
       argument :nickname,
                type: String,
                description: "Filters by nickname of the user entity. Searches (case-insensitive) any fragment of the provided string",
                required: false,
-               prepare: lambda { |value, _ctx|
-                          value = value[1..-1] if value.starts_with? "@"
-                          [
-                            lambda { |model_class, _locale|
-                              model_class.arel_table[:nickname].matches("%#{value}%")
-                            }
-                          ]
-                        }
+               prepare: :prepare_nickname
+      argument :type,
+               type: String,
+               description: "Filters by type of entity (User or UserGroup)",
+               required: false,
+               prepare: :prepare_type
       argument :wildcard,
                type: String,
                description: "Filters by nickname or name of the user entity. Searches (case-insensitive) any fragment of the provided string",
                required: false,
-               prepare: lambda { |value, _ctx|
-                          value = value[1..-1] if value.starts_with? "@"
-                          [
-                            lambda { |model_class, _locale|
-                              op_name = model_class.arel_table[:name].matches("%#{value}%")
-                              op_nick = model_class.arel_table[:nickname].matches("%#{value}%")
-                              op_name.or(op_nick)
-                            }
-                          ]
-                        }
-      argument :exclude_ids,
-               type: [ID],
-               description: "Excludes users contained in given ids. Valid values are one or more IDs (passed as an array)",
-               required: false,
-               prepare: lambda { |value, _ctx|
-                          [
-                            lambda { |model_class, _locale|
-                              model_class.arel_table[:id].not_in(value)
-                            }
-                          ]
-                        }
+               prepare: :prepare_wildcard
+      def self.prepare_nickname(value, _ctx)
+        value = value[1..-1] if value.starts_with? "@"
+        [
+          lambda do |model_class, _locale|
+            model_class.arel_table[:nickname].matches("%#{value}%")
+          end
+        ]
+      end
+
+      def self.prepare_name(value, _ctx)
+        [
+          lambda do |model_class, _locale|
+            model_class.arel_table[:name].matches("%#{value}%")
+          end
+        ]
+      end
+
+      def self.prepare_exclude_ids(value, _ctx)
+        [
+          lambda do |model_class, _locale|
+            model_class.arel_table[:id].not_in(value)
+          end
+        ]
+      end
+
+      def self.prepare_type(value, _ctx)
+        type = value.downcase.camelcase
+        type = "UserGroup" if %w(Group Usergroup).include?(type)
+        { type: "Decidim::#{type}" }
+      end
+
+      def self.prepare_wildcard(value, _ctx)
+        value = value[1..-1] if value.starts_with? "@"
+        [
+          lambda do |model_class, _locale|
+            op_name = model_class.arel_table[:name].matches("%#{value}%")
+            op_nick = model_class.arel_table[:nickname].matches("%#{value}%")
+            op_name.or(op_nick)
+          end
+        ]
+      end
     end
   end
 end

data/lib/decidim/api/input_sorts/component_input_sort.rb

@@ -9,24 +9,26 @@ module Decidim
       description "A type used for sorting any component parent objects"
 
       argument :id, GraphQL::Types::String, "Sort by ID, valid values are ASC or DESC", required: false
-      argument :weight, GraphQL::Types::String, "Sort by weight (order in the website), valid values are ASC or DESC", required: false
-      argument :type,
-               type: GraphQL::Types::String,
-               description: "Sort by type of component, alphabetically, valid values are ASC or DESC",
-               required: false,
-               as: :manifest_name
       argument :name,
                type: GraphQL::Types::String,
                description: "Sort by name of the component, alphabetically, valid values are ASC or DESC",
                required: false,
                as: :name,
-               prepare: lambda { |direction, ctx|
-                          lambda { |locale|
-                            locale = ctx[:current_organization].default_locale if locale.blank?
-                            field = Arel::Nodes::InfixOperation.new("->", Arel.sql("name"), Arel::Nodes.build_quoted(locale))
-                            Arel::Nodes::InfixOperation.new("", field, Arel.sql(direction.upcase))
-                          }
-                        }
+               prepare: :prepared_name
+      argument :type,
+               type: GraphQL::Types::String,
+               description: "Sort by type of component, alphabetically, valid values are ASC or DESC",
+               required: false,
+               as: :manifest_name
+      argument :weight, GraphQL::Types::String, "Sort by weight (order in the website), valid values are ASC or DESC", required: false
+
+      def self.prepared_name(direction, ctx)
+        lambda do |locale|
+          locale = ctx[:current_organization].default_locale if locale.blank?
+          field = Arel::Nodes::InfixOperation.new("->", Arel.sql("name"), Arel::Nodes.build_quoted(locale))
+          Arel::Nodes::InfixOperation.new("", field, Arel.sql(direction.upcase))
+        end
+      end
     end
   end
 end

data/lib/decidim/api/input_sorts/user_entity_input_sort.rb

@@ -7,10 +7,6 @@ module Decidim
       description "A type used for sorting any component parent objects"
 
       argument :id, GraphQL::Types::String, "Sort by ID, valid values are ASC or DESC", required: false
-      argument :type,
-               type: GraphQL::Types::String,
-               description: "Sort by type of user entity (user or group), alphabetically, valid values are ASC or DESC",
-               required: false
       argument :name,
                type: GraphQL::Types::String,
                description: "Sort by name of the user entity (user or group), alphabetically, valid values are ASC or DESC",
@@ -19,6 +15,10 @@ module Decidim
                type: GraphQL::Types::String,
                description: "Sort by nickname of the user entity (user or group), alphabetically, valid values are ASC or DESC",
                required: false
+      argument :type,
+               type: GraphQL::Types::String,
+               description: "Sort by type of user entity (user or group), alphabetically, valid values are ASC or DESC",
+               required: false
     end
   end
 end

data/lib/decidim/api/interfaces/author_interface.rb

@@ -9,6 +9,9 @@ module Decidim
       description "An author"
 
       field :id, ID, "The author ID", null: false
+
+      field :deleted, Boolean, "Whether the author's account has been deleted or not", null: false
+
       field :name, String, "The author's name", null: false
       field :nickname, String, "The author's nickname", null: false
 
@@ -21,8 +24,6 @@ module Decidim
         object.organization.name
       end
 
-      field :deleted, Boolean, "Whether the author's account has been deleted or not", null: false
-
       def self.resolve_type(obj, _ctx)
         return Decidim::Core::UserType if obj.is_a? Decidim::User
         return Decidim::Core::UserGroupType if obj.is_a? Decidim::UserGroup

data/lib/decidim/api/interfaces/coauthorable_interface.rb

@@ -12,6 +12,11 @@ module Decidim
             description: "The total amount of co-authors that contributed to the entity. Note that this field may include also non-user authors like meetings or the organization",
             null: true
 
+      field :authors, [Decidim::Core::AuthorInterface, { null: true }],
+            method: :user_identities,
+            description: "The resource co-authors. Include only users or groups of users",
+            null: false
+
       field :author, Decidim::Core::AuthorInterface,
             description: "The resource author. Note that this can be null on official proposals or meeting-proposals",
             null: true
@@ -20,11 +25,6 @@ module Decidim
         author = object.creator_identity
         author if author.is_a?(Decidim::User) || author.is_a?(Decidim::UserGroup)
       end
-
-      field :authors, [Decidim::Core::AuthorInterface, { null: true }],
-            method: :user_identities,
-            description: "The resource co-authors. Include only users or groups of users",
-            null: false
     end
   end
 end