decidim-core 0.30.1 → 0.31.0.rc1

data/lib/decidim/env.rb

@@ -16,7 +16,7 @@ module Decidim
       @value.presence || @default
     end
 
-    delegate :to_s, :to_json, to: :value
+    delegate :to_json, :to_s, to: :value
 
     def blank?
       value.blank? || FALSE_VALUES.include?(value.to_s.downcase)
@@ -52,5 +52,7 @@ module Decidim
       str = blank? ? @default : value
       str.to_s.split(separator).map(&:strip)
     end
+
+    alias to_a to_array
   end
 end

data/lib/decidim/events.rb

@@ -8,7 +8,6 @@ module Decidim
     autoload :SimpleEvent, "decidim/events/simple_event"
     autoload :AuthorEvent, "decidim/events/author_event"
     autoload :CoauthorEvent, "decidim/events/coauthor_event"
-    autoload :UserGroupEvent, "decidim/events/user_group_event"
     autoload :MachineTranslatedEvent, "decidim/events/machine_translated_event"
   end
 end

data/lib/decidim/form_builder.rb

@@ -7,6 +7,7 @@ module Decidim
     include ActionView::Context
     include Decidim::TranslatableAttributes
     include Decidim::Map::Autocomplete::FormBuilder
+    include Decidim::TooltipHelper
 
     # Public: generates a check boxes input from a collection and adds help
     # text and errors.
@@ -73,18 +74,11 @@ module Decidim
         safe_join [field_label, language_selector]
       end
 
-      hashtaggable = options.delete(:hashtaggable)
       tabs_content = content_tag(:div, class: "tabs-content", data: { tabs_content: tabs_id }) do
         locales.each_with_index.inject("".html_safe) do |string, (locale, index)|
           tab_content_id = "#{tabs_id}-#{name}-panel-#{index}"
           string + content_tag(:div, class: tab_element_class_for("panel", index), id: tab_content_id, "aria-hidden": tab_attr_aria_hidden_for(index)) do
-            if hashtaggable
-              hashtaggable_text_field(type, name, locale, options.merge(label: false))
-            elsif type.to_sym == :editor
-              send(type, name_with_locale(name, locale), options.merge(label: false, hashtaggable:))
-            else
-              send(type, name_with_locale(name, locale), options.merge(label: false))
-            end
+            send(type, name_with_locale(name, locale), options.merge(label: false))
           end
         end
       end
@@ -92,6 +86,20 @@ module Decidim
       safe_join [label_tabs, tabs_content]
     end
 
+    def datetime_field(attribute, opts = {})
+      label = label_for(attribute)
+      opts.reverse_merge!(
+        data: {
+          "date-label": I18n.t("datetime.widget.label.date", label:),
+          "time-label": I18n.t("datetime.widget.label.time", label:),
+          "button-date-label": I18n.t("datetime.widget.picker.date_button", label:),
+          "button-time-label": I18n.t("datetime.widget.picker.time_button", label:)
+        }
+      )
+
+      super
+    end
+
     def password_field(attribute, options = {})
       field attribute, options do |opts|
         opts[:autocomplete] ||= :off
@@ -101,8 +109,6 @@ module Decidim
     end
 
     def translated_one_locale(type, name, locale, options = {})
-      return hashtaggable_text_field(type, name, locale, options) if options.delete(:hashtaggable)
-
       send(
         type,
         "#{name}_#{locale.to_s.gsub("-", "__")}",
@@ -110,25 +116,6 @@ module Decidim
       )
     end
 
-    # Public: Generates a field for hashtaggable type.
-    # type - The form field's type, like `text_area` or `text_field`
-    # name - The name of the field
-    # locale - The locale to be created
-    # options - The set of options to send to the field
-    #
-    # Renders form fields for each locale.
-    def hashtaggable_text_field(type, name, locale, options = {})
-      options[:hashtaggable] = true if type.to_sym == :editor
-
-      content_tag(:div) do
-        if options[:value]
-          send(type, name_with_locale(name, locale), options.merge(label: options[:label], value: options[:value][locale]))
-        else
-          send(type, name_with_locale(name, locale), options.merge(label: options[:label]))
-        end
-      end
-    end
-
     # Public: Generates a form field for each social.
     #
     # type - The form field's type, like `text_area` or `text_field`
@@ -193,7 +180,7 @@ module Decidim
       help_text = options.delete(:help_text)
       editor_image = Decidim::EditorImage.new
       editor_options = editor_options(editor_image, options)
-      hidden_options = extract_validations(name, options).merge(options)
+      hidden_options = editor_hidden_options(name, options)
 
       @template.append_stylesheet_pack_tag "decidim_editor"
       @template.append_javascript_pack_tag "decidim_editor", defer: false
@@ -212,6 +199,7 @@ module Decidim
           nil,
           class: editor_options[:editor].delete("class").join(" "),
           data: {
+            controller: :editor,
             toolbar:,
             disabled: options[:disabled],
             options: editor_options[:editor]
@@ -458,6 +446,16 @@ module Decidim
 
     private
 
+    def editor_hidden_options(name, options)
+      hidden_options = extract_validations(name, options).merge(options)
+      if hidden_options[:minlength] || hidden_options[:maxlength]
+        hidden_options[:data] ||= {}
+        hidden_options[:data][:controller] ||= ""
+        hidden_options[:data][:controller] += " character-counter"
+      end
+      hidden_options
+    end
+
     # Private: Override from FoundationRailsHelper in order to render
     # inputs inside the label and to automatically inject validations
     # from the object.
@@ -697,13 +695,13 @@ module Decidim
         I18n.t("required", scope: "forms"),
         class: "sr-only"
       )
-      content_tag(
-        :span,
-        visible_title + screenreader_title,
-        title: I18n.t("required", scope: "forms"),
-        data: { tooltip: true, disable_hover: false, keep_on_hover: true },
-        class: "label-required"
-      ).html_safe
+      with_tooltip(I18n.t("required", scope: "forms"), options.merge(class: "top")) do
+        content_tag(
+          :span,
+          visible_title + screenreader_title,
+          class: "label-required"
+        )
+      end.html_safe
     end
 
     # Private: Returns the help text and error tags at the end of the field.
@@ -816,14 +814,10 @@ module Decidim
       upload_options = options.delete(:image_upload) || {}
       upload_options[:modal_id] ||= "upload_#{SecureRandom.uuid}"
 
-      hashtaggable = options.delete(:hashtaggable)
-      mentionable = options.delete(:mentionable)
-      emojiable = options.delete(:emojiable)
+      resource_mentionable = options.delete(:resource_mentionable)
 
       editor_classes = ["editor-container"]
-      editor_classes << "js-hashtags" if hashtaggable
-      editor_classes << "js-mentions" if mentionable
-      editor_classes << "js-emojis" if emojiable
+      editor_classes << "js-resource-mentions" if resource_mentionable
 
       editor_options = {
         class: editor_classes,
@@ -836,6 +830,9 @@ module Decidim
         upload_dialog_selector: "##{upload_options[:modal_id]}"
       }.transform_keys { |key| key.to_s.camelize(:lower) }
 
+      editor_options[:mention] = options.delete(:mentionable)
+      editor_options[:emoji] = options.delete(:emojiable)
+
       { editor: editor_options, upload: upload_options }
     end
 

data/lib/decidim/gamification/badge_scorer.rb

@@ -126,8 +126,6 @@ module Decidim
         case @model
         when User
           [@model]
-        when UserGroup
-          @model.users
         end
       end
     end

data/lib/decidim/gamification.rb

@@ -101,7 +101,7 @@ module Decidim
     #
     # Returns nothing.
     def self.reset_badges(users = nil)
-      return reset_badges(User.all) && reset_badges(UserGroup.all) unless users
+      return reset_badges(User.all) unless users
 
       badges.each do |badge|
         Rails.logger.info "Resetting #{badge.name}..."

data/lib/decidim/has_conversations.rb

@@ -17,28 +17,6 @@ module Decidim
         )
       end
 
-      def new_group_conversation(originator, manager, conversation, group)
-        send_notification(
-          from: originator,
-          to: manager,
-          conversation:,
-          message: conversation.messages.first.body,
-          action: "new_group_conversation",
-          third_party: group
-        )
-      end
-
-      def comanagers_new_conversation(group, user, conversation, manager)
-        send_notification(
-          from: group,
-          to: user,
-          conversation:,
-          message: conversation.messages.first.body,
-          action: "comanagers_new_conversation",
-          third_party: manager
-        )
-      end
-
       def new_message(sender, user, conversation, message)
         send_notification(
           from: sender,
@@ -49,28 +27,6 @@ module Decidim
         )
       end
 
-      def new_group_message(sender, user, conversation, message, group)
-        send_notification(
-          from: sender,
-          to: user,
-          conversation:,
-          message: message.body,
-          action: "new_group_message",
-          third_party: group
-        )
-      end
-
-      def comanagers_new_message(sender, user, conversation, message, manager)
-        send_notification(
-          from: sender,
-          to: user,
-          conversation:,
-          message: message.body,
-          action: "comanagers_new_message",
-          third_party: manager
-        )
-      end
-
       private
 
       def get_subject(action:, sender:, third_party:)

data/lib/decidim/has_workflows.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # A concern to include logic to manage workflows inside a module. The method
+  # workflow_manifest_class must be implemented returning the class which
+  # implements the workflow manifest API
+  module HasWorkflows
+    extend ActiveSupport::Concern
+
+    autoload :WorkflowRegistry, "decidim/workflow_registry"
+
+    class_methods do
+      delegate :workflow_collection, :register_workflow, :unregister_workflow, :reset_workflows, :find_workflow_manifest, to: :registry
+
+      #
+      # Collection of registered workflows
+      #
+      def workflows
+        workflow_collection
+      end
+
+      #
+      # Collection of registered workflows having an admin engine
+      #
+      def admin_workflows
+        workflows.select(&:admin_engine)
+      end
+
+      def workflow_manifest_class
+        raise NotImplementedError, "You must define a workflow manifest class"
+      end
+
+      private
+
+      def registry
+        @registry ||= WorkflowRegistry.new(workflow_manifest_class)
+      end
+    end
+  end
+end

data/lib/decidim/icon_registry.rb

@@ -18,14 +18,14 @@ module Decidim
     # @param description [String] The description of the icon. It will be used to show the purpose of the icon in DDG.
     # @param engine [String] The engine name. It is used internally to identify the module where the icon is being used.
     def register(name:, icon:, description:, category:, engine:)
-      ActiveSupport::Deprecation.warn("#{name} already registered. #{@icons[name].inspect}") if @icons[name]
+      Decidim.deprecator.warn("#{name} already registered. #{@icons[name].inspect}") if @icons[name]
 
       @icons[name] = { name:, icon:, description:, category:, engine: }
     end
 
     def find(name)
       if name.blank?
-        ActiveSupport::Deprecation.warn "The requested icon is blank."
+        Decidim.deprecator.warn "The requested icon is blank."
         name = "other"
       end
 
@@ -47,8 +47,8 @@ module Decidim
         Decidim.icons.register(name: "#{name}", icon: "#{name}", category: "system", description: "", engine: :core)
       }
 
-      ActiveSupport::Deprecation.warn(message)
-      raise message if Rails.env.development? || Rails.env.test?
+      Decidim.deprecator.warn(message)
+      raise message if Rails.env.local?
 
       @icons["other"]
     end

data/lib/decidim/legacy_form_builder.rb

@@ -10,8 +10,8 @@ module Decidim
   class LegacyFormBuilder < ActionView::Helpers::FormBuilder
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::OutputSafetyHelper
-    %w(file_field email_field text_field text_area url_field
-       number_field date_field datetime_field search_field color_field)
+    %w(file_field email_field text_field url_field
+       number_field search_field color_field)
       .each do |method_name|
       define_method(method_name) do |*args|
         attribute = args[0]
@@ -22,6 +22,21 @@ module Decidim
       end
     end
 
+    %w(date_field datetime_field datetime_local_field).each do |method_name|
+      define_method(method_name) do |*args|
+        attribute = args[0]
+        options = args[1] || {}
+
+        options[:data] ||= {}
+        options[:data][:controller] ||= ""
+        options[:data][:controller] += " date-picker"
+
+        field(attribute, options) do |opts|
+          super(attribute, opts)
+        end
+      end
+    end
+
     def label(attribute, text = nil, options = {})
       if error?(attribute)
         options[:class] ||= ""

data/lib/decidim/likeable.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This concern contains the logic related with resources that can be liked.
+  # Thus, it is expected to be included into a resource that is wanted to be likeable.
+  # This resource will have many `Decidim::Like`s.
+  module Likeable
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :likes,
+               as: :resource,
+               dependent: :destroy,
+               counter_cache: "likes_count"
+
+      # Public: Check if the user has liked the resource.
+      #
+      # Returns Boolean.
+      def liked_by?(user)
+        likes.where(author: user).any?
+      end
+    end
+  end
+end

data/lib/decidim/manifest_registry.rb

@@ -33,7 +33,7 @@ module Decidim
     private
 
     def manifest_class
-      "Decidim::#{@entity.to_s.classify}Manifest".constantize
+      "Decidim::#{@entity.to_s.classify}Manifest".safe_constantize || "Decidim::#{@entity.to_s.camelize}Manifest".constantize
     end
   end
 end

data/lib/decidim/map/provider/dynamic_map/here.rb

@@ -13,25 +13,6 @@ module Decidim
             base_config = configuration.fetch(:tile_layer, {})
 
             api_key = configuration[:api_key]
-            if api_key.is_a?(Array)
-              # Support for legacy style configurations
-              ActiveSupport::Deprecation.warn(
-                <<~DEPRECATION.strip
-                  Please use a single api_key configuration for HERE maps.
-
-                  For further information, see:
-                  https://developer.here.com/documentation/maps/3.1.16.1/dev_guide/topics/migration.html
-
-                  Also make sure your Decidim.maps configurations are using the
-                  up to date format.
-                DEPRECATION
-              )
-
-              return base_config.merge(
-                app_id: api_key[0],
-                app_code: api_key[1]
-              )
-            end
 
             base_config.merge(api_key:, language: language_code)
           end

data/lib/decidim/map/provider/static_map/here.rb

@@ -27,7 +27,7 @@ module Decidim
 
           # @See Decidim::Map::StaticMap#url_params
           def url_params(latitude:, longitude:, options: {})
-            ActiveSupport::Deprecation.warn(
+            Decidim.deprecator.warn(
               <<~DEPRECATION.strip
                 Please use a V3 version HERE maps.
                 For further information, see:
@@ -50,15 +50,7 @@ module Decidim
               f: 1
             }
 
-            api_key = configuration[:api_key]
-            if api_key.is_a?(Array)
-              # Legacy way of configuring the API credentials
-              params[:app_id] = api_key[0]
-              params[:app_code] = api_key[1]
-            else
-              # The new way of configuring the API key
-              params[:apiKey] = api_key
-            end
+            params[:apiKey] = configuration[:api_key]
 
             params
           end

data/lib/decidim/menu.rb

@@ -46,7 +46,7 @@ module Decidim
     #   menu.item "Gestor de Procesos", "/processes", if: admin?
     #
     def item(label, url, options = {})
-      ActiveSupport::Deprecation.warn("Using menu.item in #{@name} context is deprecated. Use menu.add_item")
+      Decidim.deprecator.warn("Using menu.item in #{@name} context is deprecated. Use menu.add_item")
       add_item(nil, label, url, options)
     end
 

data/lib/decidim/moderation_tools.rb

@@ -111,7 +111,7 @@ module Decidim
     private
 
     def affected_users
-      @affected_users ||= (@reportable.try(:authors) || [@reportable.try(:normalized_author)]).select { |author| author.is_a?(Decidim::User) }
+      @affected_users ||= (@reportable.try(:authors) || [@reportable.try(:author)]).select { |author| author.is_a?(Decidim::User) }
     end
 
     def report_reasons

data/lib/decidim/mutation_registry.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  class MutationRegistry
+    include Singleton
+
+    attr_reader :mutation_types
+
+    def initialize
+      @mutation_types = []
+    end
+
+    def register(type_class)
+      mutation_types << type_class unless mutation_types.include?(type_class)
+    end
+  end
+end

data/lib/decidim/newsletter_encryptor.rb

@@ -13,7 +13,7 @@ module Decidim
     end
 
     def self.crypt_data
-      key = ActiveSupport::KeyGenerator.new("sent_at").generate_key(
+      key = ActiveSupport::KeyGenerator.new("sent_at", hash_digest_class: OpenSSL::Digest::SHA1).generate_key(
         Rails.application.secret_key_base, ActiveSupport::MessageEncryptor.key_len
       )
       ActiveSupport::MessageEncryptor.new(key)

data/lib/decidim/oauth/token_generator.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module OAuth
+    module TokenGenerator
+      def self.generate(options = {})
+        # For any request containing the `user` or `api:read` scope, generate a
+        # JWT token that can be used to identify the user with the API through
+        # Warden::JWTAuth. For the `api:write` scope, the `user` scope is
+        # additionally always required in order to represent the user.
+        #
+        # Note that the `user` scope needs to match what is set at the
+        # `devise_for` call because this needs to match the Devise/Warden scope
+        # that the user is authenticated against.
+        if %w(user api:read).any? { |scope| options[:scopes].exists?(scope) }
+          # Note that warden-jwt_auth uses the `scp` claim to map the token to
+          # the correct Warden scope, i.e. the one that `device_for` was called
+          # for (e.g. `:user`). This is a limitation of the gem.
+          #
+          # The requested scopes are stored in the Doorkeeper's token stored
+          # locally in the database which we can utilize later on when the user
+          # is authenticated with the `Authorization` header.
+          scp = options[:scopes].exists?("user") ? "user" : "anonymous"
+          user = Decidim::User.find(options[:resource_owner_id])
+          aud = options[:application][:uid]
+          token, _payload = Warden::JWTAuth::UserEncoder.new.call(user, scp, aud)
+          return token
+        end
+
+        # Default doorkeeper token generator
+        ::Doorkeeper::OAuth::Helpers::UniqueToken.generate(options)
+      end
+    end
+  end
+end

data/lib/decidim/oauth.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Decidim
+  module OAuth
+    autoload :TokenGenerator, "decidim/oauth/token_generator"
+  end
+end

data/lib/decidim/organization_settings.rb

@@ -132,20 +132,12 @@ module Decidim
               )
             },
             "maximum_file_size" => {
-              "default" => default_maximum_attachment_size,
-              "avatar" => default_maximum_avatar_size
+              "default" => Decidim.maximum_attachment_size.to_f,
+              "avatar" => Decidim.maximum_avatar_size.to_f
             }
           }
         }
       end
-
-      def default_maximum_attachment_size
-        (Rails.application.secrets.decidim[:maximum_attachment_size].presence || 10).to_f
-      end
-
-      def default_maximum_avatar_size
-        (Rails.application.secrets.decidim[:maximum_avatar_size].presence || 5).to_f
-      end
     end
 
     def initialize(organization)

data/lib/decidim/paddable.rb

@@ -66,7 +66,7 @@ module Decidim
           return tokenizer.hex_digest(id)
         end
 
-        Digest::MD5.hexdigest("#{id}-#{Rails.application.secret_key_base}")
+        Digest::SHA256.hexdigest("#{id}-#{Rails.application.secret_key_base}")
       end
 
       def build_pad_url(id)

data/lib/decidim/participatory_space_resourceable.rb

@@ -125,8 +125,8 @@ module Decidim
           Decidim::ParticipatorySpaceRoleConfig::Admin.new(user)
         when :admin # ParticipatorySpace admin
           Decidim::ParticipatorySpaceRoleConfig::ParticipatorySpaceAdmin.new(user)
-        when :valuator
-          Decidim::ParticipatorySpaceRoleConfig::Valuator.new(user)
+        when :evaluator
+          Decidim::ParticipatorySpaceRoleConfig::Evaluator.new(user)
         when :moderator
           Decidim::ParticipatorySpaceRoleConfig::Moderator.new(user)
         when :collaborator

data/lib/decidim/participatory_space_user.rb

@@ -6,7 +6,7 @@ module Decidim
   module ParticipatorySpaceUser
     extend ActiveSupport::Concern
 
-    ROLES = %w(admin collaborator moderator valuator).freeze
+    ROLES = %w(admin collaborator moderator evaluator).freeze
 
     included do
       validate :user_and_space_same_organization