decidim-core 0.30.2 → 0.31.0.rc1

data/lib/decidim/assets/tailwind/instance.rb

@@ -47,7 +47,7 @@ module Decidim
             if defined?(Rails)
               Rails.application.root
             else
-              # This is used when Rails is not available from the webpacker binstubs
+              # This is used when Rails is not available from the shakapacker binstubs
               File.expand_path(".", Dir.pwd)
             end
         end

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

@@ -15,7 +15,7 @@ const withOpacity =
       : `rgb(var(${variable}) / ${opacityValue})`;
 
 module.exports = {
-  // This content is generated automatically by decidim:webpacker:install task, it
+  // This content is generated automatically by decidim:shakapacker:install task, it
   // should not be updated manually.
   // The array must contain all the decidim modules active in the application
   content: [<%= tailwind_content_directories %>].flatMap(directory => [
@@ -33,7 +33,7 @@ module.exports = {
       current,
       transparent,
       white,
-      neutral, 
+      neutral,
       primary: withOpacity("--primary-rgb"),
       secondary: withOpacity("--secondary-rgb"),
       tertiary: withOpacity("--tertiary-rgb"),
@@ -46,7 +46,8 @@ module.exports = {
         2: "#3E4C5C",
         3: "#E1E5EF",
         4: "#242424",
-        5: "#F6F8FA"
+        5: "#F6F8FA",
+        6: "#D3D5D9"
       },
       background: {
         DEFAULT: "#F3F4F7",

data/lib/decidim/attribute_encryptor.rb

@@ -20,7 +20,7 @@ module Decidim
 
     def self.cryptor
       @cryptor ||= begin
-        key = ActiveSupport::KeyGenerator.new("attribute").generate_key(
+        key = ActiveSupport::KeyGenerator.new("attribute", hash_digest_class: OpenSSL::Digest::SHA1).generate_key(
           Rails.application.secret_key_base, ActiveSupport::MessageEncryptor.key_len
         )
         ActiveSupport::MessageEncryptor.new(key)

data/lib/decidim/attributes/time_with_zone.rb

@@ -33,7 +33,7 @@ module Decidim
         return fallback unless fallback.is_a?(Time)
         return Time.zone.parse(fallback.strftime("%F %T")) if ISO_DATETIME_WITHOUT_TIMEZONE.match?(value)
 
-        ActiveSupport::TimeWithZone.new(fallback, Time.zone)
+        fallback
       end
     end
   end

data/lib/decidim/authorable.rb

@@ -11,26 +11,19 @@ module Decidim
 
     included do
       belongs_to :author, polymorphic: true, foreign_key: "decidim_author_id", foreign_type: "decidim_author_type"
-      belongs_to :user_group, foreign_key: "decidim_user_group_id", class_name: "Decidim::UserGroup", optional: true
 
       scope :with_official_origin, lambda {
         where(decidim_author_type: "Decidim::Organization")
       }
 
-      scope :with_user_group_origin, lambda {
-        where(decidim_author_type: "Decidim::UserBaseEntity")
-          .where.not(decidim_user_group_id: nil)
-      }
-
       scope :with_participants_origin, lambda {
         where(decidim_author_type: "Decidim::UserBaseEntity")
-          .where(decidim_user_group_id: nil)
       }
 
       scope :with_any_origin, lambda { |*origin_keys|
         search_values = origin_keys.compact.compact_blank
 
-        conditions = [:official, :participants, :user_group].map do |key|
+        conditions = [:official, :participants].map do |key|
           search_values.member?(key.to_s) ? try("with_#{key}_origin") : nil
         end.compact
         return self unless conditions.any?
@@ -43,23 +36,13 @@ module Decidim
         scoped_query
       }
 
-      validate :verified_user_group, :user_group_membership
       validate :author_belongs_to_organization
 
-      # Checks whether the user is author of the given resource, either directly
-      # authoring it or via a user group.
+      # Checks whether the user is author of the given resource
       #
       # user - the user to check for authorship
-      def authored_by?(other_author)
-        other_author == author || (other_author.respond_to?(:user_groups) && other_author.user_groups.include?(user_group))
-      end
-
-      # Returns the normalized author, whether it is a user group or a user. Ideally this should be
-      # the *author* method, but it is pending a refactor.
-      #
-      # Returns an Author, a UserGroup or nil.
-      def normalized_author
-        user_group || author
+      def authored_by?(user)
+        user == author
       end
 
       # Public: Checks whether the resource is official or not.
@@ -70,23 +53,11 @@ module Decidim
       end
 
       def author_name
-        translated_attribute(normalized_author.name)
+        translated_attribute(author.name)
       end
 
       private
 
-      def verified_user_group
-        return unless user_group
-
-        errors.add :user_group, :invalid unless user_group.verified?
-      end
-
-      def user_group_membership
-        return unless user_group
-
-        errors.add :user_group, :invalid unless user_group.users.include? author
-      end
-
       def author_belongs_to_organization
         return if !author || !organization
 

data/lib/decidim/coauthorable.rb

@@ -5,7 +5,6 @@ module Decidim
   #
   # Coauthorable shares nearly the same object interface as Authorable but with some differences.
   # - `authored_by?(user)` is exactly the same
-  # - `normalized_author` is now `identities`.
   #
   # All coauthors, including the initial author, will share the same permissions.
   module Coauthorable
@@ -13,32 +12,22 @@ module Decidim
 
     included do
       has_many :coauthorships, -> { order(:created_at) }, as: :coauthorable, class_name: "Decidim::Coauthorship", dependent: :destroy, inverse_of: :coauthorable
-      has_many :user_groups, -> { order(:created_at) }, as: :coauthorable, class_name: "Decidim::UserGroup", through: :coauthorships
 
       # retrieves models from all identities of the author.
       scope :from_all_author_identities, lambda { |author|
         joins(:coauthorships).where("decidim_coauthorships.decidim_author_id = ? AND decidim_coauthorships.decidim_author_type = ?", author.id, author.class.base_class.name)
       }
-      # retrieves models from the given author, ignoring the UserGroups it belongs to.
-      scope :from_author, ->(author) { from_all_author_identities(author).where("decidim_coauthorships.decidim_user_group_id": nil) }
-      # retrieves models from the given UserGroup.
-      scope :from_user_group, ->(user_group) { joins(:coauthorships).where("decidim_coauthorships.decidim_user_group_id": user_group.id) }
+      # retrieves models from the given author.
+      scope :from_author, ->(author) { from_all_author_identities(author) }
       scope :with_official_origin, lambda {
         where.not(coauthorships_count: 0)
              .joins(:coauthorships)
              .where(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
       }
       scope :with_participants_origin, lambda {
-        where.not(coauthorships_count: 0)
-             .joins(:coauthorships)
-             .where.not(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
-             .where(decidim_coauthorships: { decidim_user_group_id: nil })
-      }
-      scope :with_user_group_origin, lambda {
         where.not(coauthorships_count: 0)
              .joins(:coauthorships)
              .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
-             .where.not(decidim_coauthorships: { decidim_user_group_id: nil })
       }
       scope :with_meeting_origin, lambda {
         where.not(coauthorships_count: 0)
@@ -49,7 +38,7 @@ module Decidim
       scope :with_any_origin, lambda { |*origin_keys|
         search_values = origin_keys.compact.compact_blank
 
-        conditions = [:official, :participants, :user_group, :meeting].map do |key|
+        conditions = [:official, :participants, :meeting].map do |key|
           search_values.member?(key.to_s) ? try("with_#{key}_origin") : nil
         end.compact
         return self unless conditions.any?
@@ -96,32 +85,29 @@ module Decidim
         @notifiable_identities ||= identities.flat_map do |identity|
           if identity.is_a?(Decidim::User)
             identity
-          elsif identity.is_a?(Decidim::UserGroup)
-            identity.managers
           elsif respond_to?(:component)
             component.participatory_space.admins
           end
         end.compact.uniq
       end
 
-      # Checks whether the user is author of the given proposal, either directly
-      # authoring it or via a user group.
+      # Checks whether the user is author of the given proposal.
       #
       # author - the author to check for authorship
       def authored_by?(author)
         coauthorships.exists?(author:)
       end
 
-      # Returns the identities for the authors, whether they are user groups, users or others.
+      # Returns the identities for the authors, whether they are users or others.
       #
-      # Returns an Array of User, UserGroups or any other entity capable object (such as Organization).
+      # Returns an Array of Users or any other entity capable object (such as Organization).
       def identities
-        coauthorships.includes(:author, :user_group).order(:created_at).collect(&:identity)
+        coauthorships.includes(:author).order(:created_at).collect(&:identity)
       end
 
-      # Returns the identities for the authors, only if they are user groups or users.
+      # Returns the identities for the authors, only if they are users.
       #
-      # Returns an Array of User and/or UserGroups.
+      # Returns an Array of Users.
       def user_identities
         coauthorships.where(decidim_author_type: "Decidim::UserBaseEntity").order(:created_at).collect(&:identity)
       end
@@ -143,23 +129,19 @@ module Decidim
         creator.try(:author)
       end
 
-      # Syntactic sugar to access first identity whether it is a User or a UserGroup.
-      # @return The User od UserGroup that created this Coauthorable.
+      # Syntactic sugar to access first identity.
+      # @return The User that created this Coauthorable.
       def creator_identity
         creator.try(:identity)
       end
 
       # Adds a new coauthor to the list of coauthors. The coauthorship is created with
-      # current object as coauthorable and `user` param as author. To set the user group
-      # use `extra_attributes` with the `user_group` key.
+      # current object as coauthorable and `user` param as author.
       #
       # @param author: The new coauthor.
       # @extra_attrs: Extra
       def add_coauthor(author, extra_attributes = {})
-        user_group = extra_attributes[:user_group]
-
-        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:)
+        return if coauthorships.exists?(decidim_author_id: author.id, decidim_author_type: author.class.base_class.name)
 
         coauthorship_attributes = extra_attributes.merge(author:)
 

data/lib/decidim/content_parsers/blob_parser.rb

@@ -55,7 +55,7 @@ module Decidim
           blob =
             if type_part == "disk"
               # Disk service URL
-              decoded = ActiveStorage.verifier.verified(key_part, purpose: :blob_key)
+              decoded = ActiveStorage.verifier.verified(key_part, purpose: :blob_key).with_indifferent_access
               ActiveStorage::Blob.find_by(key: decoded[:key]) if decoded
             else
               # Representation or blob

data/lib/decidim/content_parsers/mention_resource_parser.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentParsers
+    # A parser that searches resource mentions in content.
+    #
+    # A word starting with `/` will be considered as a possible mention if
+    # they only contains letters, numbers or underscores.
+    #
+    # @see BaseParser Examples of how to use a content parser
+    class MentionResourceParser < TagParser
+      private
+
+      def tag_data_type
+        "mentionResource"
+      end
+
+      def replace_tags(text)
+        text
+      end
+    end
+  end
+end

data/lib/decidim/content_parsers/tag_parser.rb

@@ -11,8 +11,8 @@ module Decidim
     class TagParser < BaseParser
       # Replaces tags name with new or existing tags models global ids.
       #
-      # The actual tags depend on the context, these can be hashtags, user
-      # mentions, user group mentions, etc.
+      # The actual tags depend on the context, these can be user
+      # mentions (with a "@"), resource mentions (with a "/"), etc.
       #
       # @return [String] the content with the tags replaced by global ids
       def rewrite

data/lib/decidim/content_parsers/user_parser.rb

@@ -39,7 +39,7 @@ module Decidim
         text.scan(MENTION_REGEX)
       end
 
-      def mentionable_class
+      def mentionable_base_relation
         Decidim::User
       end
 
@@ -48,7 +48,7 @@ module Decidim
       end
 
       def existing_mentionables
-        @existing_mentionables ||= mentionable_class.where(
+        @existing_mentionables ||= mentionable_base_relation.where(
           "decidim_organization_id = ? AND nickname IN (?)",
           current_organization.id,
           content_nicknames

data/lib/decidim/content_parsers.rb

@@ -1,16 +1,28 @@
 # frozen_string_literal: true
 
+# This module provides a collection of content parsers for Decidim.
+# Each parser is responsible for processing and transforming specific types of content,
+# such as user mentions, links, blobs, and inline images.
+#
+# You can use these parsers by referencing their symbolic names with Decidim's content processor.
+# For example, to parse inline images in content, use the :inline_images parser:
+#
+#   Decidim::ContentProcessor.parse_with_processor(:inline_images, content, options)
+#
+# Available parsers include:
+#   :inline_images, :blob, :user, :link, :tag, :mention_resource, :resource, :newline, :base
+#
+# See each parser's documentation for details on their specific behavior.
 module Decidim
   module ContentParsers
     autoload :BaseParser, "decidim/content_parsers/base_parser"
     autoload :BlobParser, "decidim/content_parsers/blob_parser"
     autoload :UserParser, "decidim/content_parsers/user_parser"
-    autoload :UserGroupParser, "decidim/content_parsers/user_group_parser"
-    autoload :HashtagParser, "decidim/content_parsers/hashtag_parser"
     autoload :NewlineParser, "decidim/content_parsers/newline_parser"
     autoload :LinkParser, "decidim/content_parsers/link_parser"
     autoload :InlineImagesParser, "decidim/content_parsers/inline_images_parser"
     autoload :ResourceParser, "decidim/content_parsers/resource_parser"
     autoload :TagParser, "decidim/content_parsers/tag_parser"
+    autoload :MentionResourceParser, "decidim/content_parsers/mention_resource_parser"
   end
 end

data/lib/decidim/content_processor.rb

@@ -57,7 +57,7 @@ module Decidim
     end
 
     # Public: Calls the specified processors to process the given content with
-    # it. For example, to convert hashtags to its Global ID representation.
+    # it. For example, to convert user mentions to its Global ID representation.
     #
     # @param type [String] the name of the processor to use.
     # @param content [String] already rewritten content or regular content

data/lib/decidim/content_renderers/mention_resource_renderer.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentRenderers
+    # A renderer that searches Global IDs representing resources in content
+    # and replaces it with a link to the resource.
+    #
+    # e.g. gid://<APP_NAME>/Decidim::Proposals::Proposal/1
+    #
+    # @see BaseRenderer Examples of how to use a content renderer
+    class MentionResourceRenderer < BaseRenderer
+      include Rails.application.routes.mounted_helpers
+      include ActionView::Helpers::UrlHelper
+      include Decidim::SanitizeHelper
+
+      # Matches a global id representing a Decidim::Proposals::Proposal
+      GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::Proposals::Proposal/\d+}
+
+      # Replaces found Global IDs matching an existing proposal with
+      # a link to the resource.
+      #
+      # @return [String] the content ready to display (contains HTML)
+      def render(editor: false, **_)
+        replace_pattern(content, GLOBAL_ID_REGEX, editor:)
+      end
+
+      protected
+
+      def replace_pattern(text, pattern, editor:)
+        return text unless text.respond_to?(:gsub)
+
+        text.gsub(pattern) do |resource_gid|
+          resource = GlobalID::Locator.locate(resource_gid)
+          if editor
+            render_editor(resource_gid, resource)
+          else
+            render_resource_link(resource)
+          end
+        rescue ActiveRecord::RecordNotFound => _e
+          ""
+        end
+      end
+
+      def render_editor(resource_gid, resource)
+        title = presenter_for(resource).title
+        %(<span data-type="mentionResource" data-id="#{resource_gid}" data-label="#{title}">#{title}</span>)
+      end
+
+      def render_resource_link(resource)
+        link_to mention_title(resource), resource_path(resource)
+      end
+
+      def mention_title(resource)
+        title = presenter_for(resource).title
+
+        "<span class='editor-mention'>
+          #{mention_avatar(resource)}
+          <span>#{title}</span>
+        </span>".html_safe
+      end
+
+      def mention_avatar(resource)
+        author = resource.authors.first
+
+        "<img src='#{author.presenter.avatar_url(:thumb)}' class='not-prose' />"
+      end
+
+      def resource_path(resource)
+        Decidim::ResourceLocatorPresenter.new(resource).path
+      end
+
+      def presenter_for(resource)
+        Decidim::Proposals::ProposalPresenter.new(resource)
+      end
+    end
+  end
+end

data/lib/decidim/content_renderers.rb

@@ -5,9 +5,8 @@ module Decidim
     autoload :BaseRenderer, "decidim/content_renderers/base_renderer"
     autoload :BlobRenderer, "decidim/content_renderers/blob_renderer"
     autoload :UserRenderer, "decidim/content_renderers/user_renderer"
-    autoload :UserGroupRenderer, "decidim/content_renderers/user_group_renderer"
-    autoload :HashtagRenderer, "decidim/content_renderers/hashtag_renderer"
     autoload :LinkRenderer, "decidim/content_renderers/link_renderer"
     autoload :ResourceRenderer, "decidim/content_renderers/resource_renderer"
+    autoload :MentionResourceRenderer, "decidim/content_renderers/mention_resource_renderer"
   end
 end

data/lib/decidim/core/api.rb

@@ -17,16 +17,14 @@ module Decidim
     autoload :AreaApiType, "decidim/api/types/area_api_type"
     autoload :AreaTypeType, "decidim/api/types/area_type_type"
     autoload :AttachmentType, "decidim/api/types/attachment_type"
+    autoload :AttachmentCollectionType, "decidim/api/types/attachment_collection_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"
     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"
@@ -37,13 +35,11 @@ module Decidim
     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 :CategoryInputFilter, "decidim/api/input_filters/category_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"
@@ -52,7 +48,7 @@ module Decidim
 
     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 :HasLikeableInputSort, "decidim/api/input_sorts/has_likeable_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"
@@ -67,16 +63,19 @@ module Decidim
     autoload :CategoriesContainerInterface, "decidim/api/interfaces/categories_container_interface"
     autoload :TaxonomizableInterface, "decidim/api/interfaces/taxonomizable_interface"
     autoload :CategorizableInterface, "decidim/api/interfaces/categorizable_interface"
+    autoload :AttachableCollectionInterface, "decidim/api/interfaces/attachable_collection_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 :LikeableInterface, "decidim/api/interfaces/likeable_interface"
+    autoload :LocalizableInterface, "decidim/api/interfaces/localizable_interface"
+    autoload :FollowableInterface, "decidim/api/interfaces/followable_interface"
+    autoload :ReferableInterface, "decidim/api/interfaces/referable_interface"
 
     autoload :DateTimeType, "decidim/api/scalars/date_time_type"
     autoload :DateType, "decidim/api/scalars/date_type"

data/lib/decidim/core/content_blocks/registry_manager.rb

@@ -19,6 +19,8 @@ module Decidim
 
             content_block.settings do |settings|
               settings.attribute :welcome_text, type: :text, translated: true
+              settings.attribute :cta_button_path, type: :string, translated: true
+              settings.attribute :cta_button_text, type: :string, translated: true
             end
 
             content_block.default!
@@ -38,7 +40,24 @@ module Decidim
 
           Decidim.content_blocks.register(:homepage, :highlighted_content_banner) do |content_block|
             content_block.cell = "decidim/content_blocks/highlighted_content_banner"
+            content_block.settings_form_cell = "decidim/content_blocks/highlighted_content_banner_settings_form"
             content_block.public_name_key = "decidim.content_blocks.highlighted_content_banner.name"
+
+            content_block.images = [
+              {
+                name: :background_image,
+                uploader: "Decidim::HomepageImageUploader"
+              }
+            ]
+
+            content_block.settings do |settings|
+              settings.attribute :title, type: :text, translated: true
+              settings.attribute :short_description, type: :text, translated: true
+              settings.attribute :action_button_title, type: :text, translated: true
+              settings.attribute :action_button_subtitle, type: :text, translated: true
+              settings.attribute :action_button_url, type: :text
+            end
+
             content_block.default!
           end
 
@@ -60,11 +79,6 @@ module Decidim
             content_block.default!
           end
 
-          Decidim.content_blocks.register(:homepage, :metrics) do |content_block|
-            content_block.cell = "decidim/content_blocks/organization_metrics"
-            content_block.public_name_key = "decidim.content_blocks.metrics.name"
-          end
-
           Decidim.content_blocks.register(:homepage, :footer_sub_hero) do |content_block|
             content_block.cell = "decidim/content_blocks/footer_sub_hero"
             content_block.public_name_key = "decidim.content_blocks.footer_sub_hero.name"