decidim-core 0.30.3 → 0.31.0.rc1

data/db/migrate/20250523104311_move_cta_to_hero_content_block.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class MoveCtaToHeroContentBlock < ActiveRecord::Migration[7.0]
+  class Organization < ApplicationRecord
+    self.table_name = :decidim_organizations
+  end
+
+  def up
+    Decidim::ContentBlock.reset_column_information
+    Organization.find_each do |organization|
+      content_block = Decidim::ContentBlock.find_by(organization: organization, scope_name: :homepage, manifest_name: :hero)
+      settings = {}
+      cta_button_text = organization.cta_button_text || {}
+      settings = cta_button_text.inject(settings) { |acc, (k, v)| acc.update("cta_button_text_#{k}" => v) }
+
+      unless organization.cta_button_path.nil?
+        # Adds i18n support to cta_button_path for every defined lang in cta_button_text
+        settings = cta_button_text.inject(settings) { |acc, (k, _v)| acc.update("cta_button_path_#{k}" => organization.cta_button_path) }
+      end
+
+      content_block.settings = settings
+      content_block.settings_will_change!
+      content_block.save!
+    end
+
+    remove_column :decidim_organizations, :cta_button_text
+    remove_column :decidim_organizations, :cta_button_path
+  end
+
+  def down
+    add_column :decidim_organizations, :cta_button_text, :jsonb
+    add_column :decidim_organizations, :cta_button_path, :string
+  end
+end

data/db/migrate/20250527122040_move_highlighted_content_banner_settings_to_content_block.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+class MoveHighlightedContentBannerSettingsToContentBlock < ActiveRecord::Migration[7.0]
+  class Organization < ApplicationRecord
+    self.table_name = :decidim_organizations
+  end
+
+  def up
+    Organization.reset_column_information
+    # Note that we need to use the actual Decidim::ContentBlock clas, as we need access to the `images_container` method
+    Decidim::ContentBlock.reset_column_information
+
+    Organization.find_each do |organization|
+      content_block = Decidim::ContentBlock.find_by(organization: organization, scope_name: :homepage, manifest_name: :highlighted_content_banner)
+      settings = extract_settings(organization)
+
+      # We need to do a workaround for getting the image, as ActiveStorage is polymorphic and expects that the `record_type` is the class name of the model
+      background_image = ActiveStorage::Attachment.find_by(name: "highlighted_content_banner_image", record_type: "Decidim::Organization", record_id: organization.id)
+      content_block.images_container.background_image = background_image.blob if background_image
+
+      content_block.settings = settings
+      content_block.settings_will_change!
+      content_block.save!
+    end
+
+    remove_column :decidim_organizations, :highlighted_content_banner_enabled
+    remove_column :decidim_organizations, :highlighted_content_banner_title
+    remove_column :decidim_organizations, :highlighted_content_banner_short_description
+    remove_column :decidim_organizations, :highlighted_content_banner_action_title
+    remove_column :decidim_organizations, :highlighted_content_banner_action_subtitle
+    remove_column :decidim_organizations, :highlighted_content_banner_action_url
+    remove_column :decidim_organizations, :highlighted_content_banner_image
+  end
+
+  def down
+    add_column :decidim_organizations, :highlighted_content_banner_enabled, :boolean, null: false, default: false
+    add_column :decidim_organizations, :highlighted_content_banner_title, :jsonb
+    add_column :decidim_organizations, :highlighted_content_banner_short_description, :jsonb
+    add_column :decidim_organizations, :highlighted_content_banner_action_title, :jsonb
+    add_column :decidim_organizations, :highlighted_content_banner_action_subtitle, :jsonb
+    add_column :decidim_organizations, :highlighted_content_banner_action_url, :string
+    add_column :decidim_organizations, :highlighted_content_banner_image, :string
+  end
+
+  private
+
+  # rubocop:disable Metrics/CyclomaticComplexity
+  def extract_settings(organization)
+    settings = {}
+
+    title = organization.highlighted_content_banner_title || {}
+    settings = title.inject(settings) { |acc, (k, v)| acc.update("title_#{k}" => v) }
+
+    short_description = organization.highlighted_content_banner_short_description || {}
+    settings = short_description.inject(settings) { |acc, (k, v)| acc.update("short_description_#{k}" => v) }
+
+    action_button_title = organization.highlighted_content_banner_action_title || {}
+    settings = action_button_title.inject(settings) { |acc, (k, v)| acc.update("action_button_title_#{k}" => v) }
+
+    action_button_subtitle = organization.highlighted_content_banner_action_subtitle || {}
+    settings = action_button_subtitle.inject(settings) { |acc, (k, v)| acc.update("action_button_subtitle_#{k}" => v) }
+
+    action_button_url = organization.highlighted_content_banner_action_url || ""
+    settings["action_button_url"] = action_button_url
+
+    settings
+  end
+  # rubocop:enable Metrics/CyclomaticComplexity
+end

data/db/migrate/20250603103953_add_refresh_tokens_enabled_to_doorkeeper_applications.rb

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

data/db/migrate/20250609073104_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# This migration comes from active_storage (originally 20211119233751)
+class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0]
+  def change
+    return unless table_exists?(:active_storage_blobs)
+
+    change_column_null(:active_storage_blobs, :checksum, true)
+  end
+end

data/db/migrate/20250613122148_remove_hashtag_table_from_core.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveHashtagTableFromCore < ActiveRecord::Migration[7.2]
+  def change
+    drop_table :decidim_hashtags, if_exists: true
+  end
+end

data/decidim-core.gemspec

@@ -31,8 +31,7 @@ Gem::Specification.new do |s|
     end
   end
 
-  # Lock Temporarily as it is failing in 0.29 branch. More info: https://github.com/rails/rails/pull/54264
-  s.add_dependency "concurrent-ruby", "= 1.3.4"
+  s.add_dependency "concurrent-ruby", "~> 1.3.0"
 
   s.add_dependency "active_link_to", "~> 1.0"
   s.add_dependency "acts_as_list", "~> 1.0"
@@ -73,14 +72,15 @@ Gem::Specification.new do |s|
   s.add_dependency "premailer-rails", "~> 1.10"
   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", "~> 7.2.0", ">= 7.2.2.2"
   s.add_dependency "rails-i18n", "~> 7.0"
   s.add_dependency "ransack", "~> 4.2.0"
   s.add_dependency "redis", "~> 4.1"
   s.add_dependency "request_store", "~> 1.7.0"
+  s.add_dependency "rqrcode", "~> 2.2.0"
   s.add_dependency "rubyXL", "~> 3.4"
   s.add_dependency "rubyzip", "~> 2.0"
-  s.add_dependency "shakapacker", "~> 7.1.0"
+  s.add_dependency "shakapacker", "~> 8.3.0"
   s.add_dependency "valid_email2", "~> 7.0"
   s.add_dependency "web-push", "~> 3.0"
   s.add_dependency "wisper", "~> 3.0"

data/{app/helpers → lib}/decidim/action_authorization_helper.rb

@@ -160,10 +160,11 @@ module Decidim
       return {} if [resource, permissions_holder].all?(&:blank?)
 
       {
-        "data-onboarding-model" => resource&.to_gid,
-        "data-onboarding-permissions-holder" => permissions_holder&.to_gid,
-        "data-onboarding-action" => action,
-        "data-onboarding-redirect-path" => redirect_path
+        "data-controller" => "onboarding",
+        "data-onboarding-action-value" => action,
+        "data-onboarding-model-value" => resource&.to_gid,
+        "data-onboarding-permissions-holder-value" => permissions_holder&.to_gid,
+        "data-onboarding-redirect-path-value" => redirect_path
       }.compact
     end
 

data/lib/decidim/amendable.rb

@@ -147,16 +147,16 @@ module Decidim
     end
 
     # Handles the logic to assign an author to the resource, be it Authorable or Coauthorable.
-    def add_author(author, user_group = nil)
+    def add_author(author)
       if is_a?(Decidim::Authorable)
         if persisted?
-          update(author: user_group || author)
+          update(author:)
         else
-          self.author = user_group || author
+          self.author = author
         end
       else # Assume is_a?(Decidim::Coauthorable)
         coauthorships.clear
-        add_coauthor(author, user_group:)
+        add_coauthor(author)
       end
     end
 

data/lib/decidim/api/functions/user_entity_finder.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Core
-    # A resolver for the GraphQL user/group endpoints
+    # A resolver for the GraphQL user endpoint
     # Used in the keyword "user", ie:
     #
     # user(nickname: "foo") {

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

@@ -35,13 +35,13 @@ module Decidim
 
       def self.prepare_comments_enabled(active, _ctx)
         lambda do |_model_name, _locale|
-          ["(settings->'global'->>'comments_enabled')::boolean is ?", active]
+          ["settings @> ?", { global: { comments_enabled: active } }.to_json]
         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]
+          ["settings @> ? or manifest_name='meetings'", { global: { geocoding_enabled: active } }.to_json]
         end
       end
 
@@ -54,7 +54,7 @@ module Decidim
       end
 
       def self.prepare_type(value, _ctx)
-        { manifest_name: value.downcase }
+        { manifest_name: value.underscore }
       end
     end
   end

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

@@ -12,16 +12,6 @@ module Decidim
       {
         users(filter:{wildcard:\"sandy\", excludeIds:[2,10,11]}) {
           id
-          ...on User {
-            groups {
-              name
-            }
-          }
-          ...on UserGroup {
-            members {
-              name
-            }
-          }
         }
       }
       ```
@@ -42,11 +32,6 @@ module Decidim
                description: "Filters by nickname of the user entity. Searches (case-insensitive) any fragment of the provided string",
                required: false,
                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",
@@ -77,12 +62,6 @@ module Decidim
         ]
       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? "@"
         [

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    module HasLikeableInputSort
+      def self.included(child_class)
+        child_class.argument :like_count,
+                             type: GraphQL::Types::String,
+                             description: "Sort by number of likes, valid values are ASC or DESC",
+                             required: false,
+                             as: :likes_count
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This interface represents an attachable object.
+    module AttachableCollectionInterface
+      include Decidim::Api::Types::BaseInterface
+      description "An interface that can be used in objects with attachments"
+
+      field :attachment_collections, [Decidim::Core::AttachmentCollectionType, { null: true }], "This object's attachment collections", null: false
+    end
+  end
+end

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

@@ -16,9 +16,9 @@ module Decidim
       field :nickname, String, "The author's nickname", null: false
 
       field :avatar_url, String, "The author's avatar url", null: false
-      field :profile_path, String, "The author's profile path", null: false
       field :badge, String, "The author's badge icon", null: false
       field :organization_name, Decidim::Core::TranslatedFieldType, "The authors's organization name", null: false
+      field :profile_path, String, "The author's profile path", null: false
 
       def organization_name
         object.organization.name
@@ -26,7 +26,6 @@ module Decidim
 
       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
       end
     end
   end

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

@@ -12,8 +12,8 @@ module Decidim
       end
 
       def author
-        author = if object.respond_to?(:normalized_author)
-                   object&.normalized_author
+        author = if object.respond_to?(:author)
+                   object&.author
                  elsif object.respond_to?(:creator_identity)
                    object&.creator_identity
                  end

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

@@ -23,7 +23,7 @@ module Decidim
 
       def author
         author = object.creator_identity
-        author if author.is_a?(Decidim::User) || author.is_a?(Decidim::UserGroup)
+        author if author.is_a?(Decidim::User)
       end
     end
   end

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

@@ -14,6 +14,12 @@ module Decidim
 
       field :participatory_space, ParticipatorySpaceType, "The participatory space in which this component belongs to.", null: false
 
+      field :url, String, "The URL of this component.", null: false
+
+      def url
+        Decidim::EngineRouter.main_proxy(object).root_url
+      end
+
       def self.resolve_type(obj, _ctx)
         obj.manifest.query_type.constantize
       end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This interface represents a followable object.
+    module FollowableInterface
+      include Decidim::Api::Types::BaseInterface
+      description "An interface that can be used in followable objects."
+
+      field :follows_count, GraphQL::Types::Int, "The number of followers of the resource", null: true
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This interface represents an object capable of likes.
+    module LikeableInterface
+      include Decidim::Api::Types::BaseInterface
+      description "An interface that can be used in objects with likes"
+
+      field :likes, [Decidim::Core::AuthorInterface, { null: true }], "The likes of this object.", null: false
+
+      field :likes_count, Integer, description: "The total amount of likes the object has received", null: true
+
+      def likes
+        object.likes.map(&:author)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This interface represents a localizable (that has address, latitude and longitude) object.
+    module LocalizableInterface
+      include Decidim::Api::Types::BaseInterface
+      description "An interface that can be used in localizable objects."
+
+      field :address, GraphQL::Types::String, "The physical address (location) of this result", null: true
+      field :coordinates, Decidim::Core::CoordinatesType, "Physical coordinates for this result", null: true
+
+      def coordinates
+        [object.latitude, object.longitude]
+      end
+    end
+  end
+end

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

@@ -7,15 +7,17 @@ module Decidim
       graphql_name "ParticipatorySpaceInterface"
       description "The interface that all participatory spaces should implement."
 
-      field :id, GraphQL::Types::ID, "The participatory space's unique ID", null: false
+      field :allows_steps, Boolean, description: "The participatory space allows steps", null: false, method: :allows_steps?
       field :components, [ComponentInterface, { null: true }], null: true, description: "Lists the components this space contains." do
         argument :filter, ComponentInputFilter, "Provides several methods to filter the results", required: false
         argument :order, ComponentInputSort, "Provides several methods to order the results", required: false
       end
+      field :has_steps, Boolean, description: "The participatory space allows steps", null: false, method: :has_steps?
+      field :id, GraphQL::Types::ID, "The participatory space's unique ID", null: false
+      field :manifest, Decidim::Core::ParticipatorySpaceManifestType, description: "The manifest information for the participatory space.", null: false
       field :stats, [Decidim::Core::StatisticType, { null: true }], "The statistics collection of this participatory space", null: true
       field :title, TranslatedFieldType, "The graphql_name of this participatory space.", null: false
       field :type, String, description: "The participatory space class name. i.e. Decidim::ParticipatoryProcess", null: false
-      field :manifest, Decidim::Core::ParticipatorySpaceManifestType, description: "The manifest information for the participatory space.", null: false
 
       def type
         object.class.name
@@ -32,13 +34,9 @@ module Decidim
       def stats
         return if object.respond_to?(:show_statistics) && !object.show_statistics
 
-        published_components = Component.where(participatory_space: object).published
-
-        stats = Decidim.component_manifests.map do |component_manifest|
-          component_manifest.stats.with_context(published_components).map { |name, data| [name, data] }.flatten
+        Decidim::ParticipatoryProcesses::ParticipatoryProcessStatsPresenter.new(participatory_process: object).collection.map do |stat|
+          [object.organization, stat]
         end
-
-        stats.reject(&:empty?)
       end
 
       def self.resolve_type(obj, _ctx)

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This interface represents an object that have a reference field.
+    module ReferableInterface
+      include Decidim::Api::Types::BaseInterface
+      description "An interface that can be used in display reference methods"
+
+      field :reference, GraphQL::Types::String, "The reference for this record", null: true
+    end
+  end
+end

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

@@ -8,7 +8,6 @@ module Decidim
       description "An interface that can be used in objects with created_at and updated_at attributes"
 
       field :created_at, Decidim::Core::DateTimeType, description: "The date and time this object was created", null: true
-
       field :updated_at, Decidim::Core::DateTimeType, description: "The date and time this object was updated", null: true
     end
   end

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

@@ -7,8 +7,8 @@ module Decidim
       include Decidim::Api::Types::BaseInterface
       description "An interface that can be used in objects with traceability (versions)"
 
-      field :versions_count, Integer, "Total number of versions", null: false
       field :versions, [Decidim::Core::TraceVersionType, { null: true }], "This object's versions", null: false
+      field :versions_count, Integer, "Total number of versions", null: false
     end
   end
 end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    class AttachmentCollectionType < Decidim::Api::Types::BaseObject
+      description "A file attachment collection"
+
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this AttachmentCollection.", null: false
+      field :name, Decidim::Core::TranslatedFieldType, "The name of this AttachmentCollection.", null: false
+
+      field :attachments, [Decidim::Core::AttachmentType, { null: true }], "This object's attachments", null: false
+    end
+  end
+end

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

@@ -11,7 +11,9 @@ module Decidim
       field :stats, [Core::StatisticType, { null: true }], description: "The statistics associated to this object", null: true
 
       def stats
-        Decidim.stats.with_context(object)
+        Decidim::HomeStatsPresenter.new(organization: object).collection.map do |stat|
+          [object, stat]
+        end
       end
 
       def taxonomies

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

@@ -7,15 +7,10 @@ module Decidim
       description "The current session"
 
       field :user, UserType, "The current user", null: true
-      field :verified_user_groups, [UserGroupType], "The current user verified user groups", null: false
 
       def user
         object
       end
-
-      def verified_user_groups
-        Decidim::UserGroups::ManageableUserGroups.for(object).verified
-      end
     end
   end
 end

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

@@ -5,16 +5,42 @@ module Decidim
     class StatisticType < Decidim::Api::Types::BaseObject
       description "Represents a single statistic"
 
-      field :name, GraphQL::Types::String, "The name of the statistic", null: false
+      field :description, Decidim::Core::TranslatedFieldType, "The description of the statistic calculation", null: true
+      field :key, GraphQL::Types::String, "The unique key of the statistic", null: false
+      field :name, Decidim::Core::TranslatedFieldType, "The name of the statistic", null: true
       field :value, GraphQL::Types::Int, "The actual value of the statistic", null: false
 
-      def name
+      def organization
         object[0]
       end
 
-      def value
+      def stat
         object[1]
       end
+
+      def key
+        stat[:name]
+      end
+
+      def value
+        stat[:data][0]
+      end
+
+      def name
+        organization.available_locales.to_h do |locale|
+          I18n.with_locale(locale) do
+            [locale, I18n.t(key, scope: "decidim.statistics")]
+          end
+        end
+      end
+
+      def description
+        organization.available_locales.to_h do |locale|
+          I18n.with_locale(locale) do
+            [locale, I18n.t(stat[:tooltip_key], scope: "decidim.statistics")]
+          end
+        end
+      end
     end
   end
 end

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

@@ -12,7 +12,7 @@ module Decidim
 
       def editor
         author = Decidim.traceability.version_editor(object)
-        author if author.is_a?(Decidim::User) || author.is_a?(Decidim::UserGroup)
+        author if author.is_a?(Decidim::User)
       end
 
       delegate :changeset, to: :object

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

@@ -9,13 +9,12 @@ 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 :badge, GraphQL::Types::String, "A badge for the user", 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

data/lib/decidim/api_response_helper.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ApiResponseHelper
+    # When passing the JSON types as a variables, it results to a string type.
+    def json_value(value)
+      return JSON.parse(value) if value.is_a?(String)
+
+      value
+    end
+  end
+end