decidim-core 0.28.6 → 0.29.0.rc1

data/lib/decidim/manifest_messages.rb

@@ -16,8 +16,8 @@ module Decidim
       @store[key] = block
     end
 
-    def render(key, context = nil, **extra)
-      context.instance_exec(**extra, &@store[key]) if @store[key]
+    def render(key, context = nil, **)
+      context.instance_exec(**, &@store[key]) if @store[key]
     end
   end
 end

data/lib/decidim/map/autocomplete.rb

@@ -42,7 +42,6 @@ module Decidim
           @autocomplete_utility ||= Decidim::Map.autocomplete(
             organization: @template.current_organization
           )
-
           return text_field(attribute, options) unless @autocomplete_utility
 
           # Decidim::Map::Autocomplete::Builder

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

@@ -49,7 +49,46 @@ module Decidim
           private
 
           def language_code
-            I18n.locale.to_s
+            primary = I18n.locale.to_s
+            secondary = primary.split("-")[0]
+            available_language_codes[primary] || available_language_codes[secondary] || ""
+          end
+
+          def available_language_codes
+            @available_language_codes ||= {
+              "ar" => "ara", # Arabic
+              "eu" => "baq", # Basque
+              "ca" => "cat", # Catalan
+              "zh" => "chi", # Chinese (simplified)
+              # "" => "cht", # Chinese (traditional)
+              "cs" => "cze", # Czech
+              "da" => "dan", # Danish
+              "nl" => "dut", # Dutch
+              "en" => "eng", # English
+              "fi" => "fin", # Finnish
+              "fr" => "fre", # French
+              "de" => "ger", # German
+              "ga" => "gle", # Gaelic
+              "el" => "gre", # Greek
+              "he" => "heb", # Hebrew
+              "hi" => "hin", # Hindi
+              "id" => "ind", # Indonesian
+              "it" => "ita", # Italian
+              "no" => "nor", # Norwegian
+              "fa" => "per", # Persian
+              "pl" => "pol", # Polish
+              "pt" => "por", # Portuguese
+              "ru" => "rus", # Russian
+              "si" => "sin", # Sinhalese
+              "es" => "spa", # Spanish
+              "sv" => "swe", # Swedish
+              "th" => "tha", # Thai
+              "tr" => "tur", # Turkish
+              "uk" => "ukr", # Ukrainian
+              "ur" => "urd", # Urdu
+              "vi" => "vie", # Vietnamese
+              "cy" => "wel" # Welsh
+            }
           end
         end
       end

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

@@ -6,42 +6,8 @@ module Decidim
       module StaticMap
         # The static map utility class for the HERE maps service
         class Here < ::Decidim::Map::StaticMap
-          def url(latitude:, longitude:, options: {})
-            map_url = configuration.fetch(:url, nil)
-            return super unless map_url
-
-            return super unless map_url.include?("mia/v3")
-
-            w = options[:width] || Decidim::Map::StaticMap::DEFAULT_SIZE
-            h = options[:height] || Decidim::Map::StaticMap::DEFAULT_SIZE
-
-            params = {
-              apiKey: configuration[:api_key],
-              overlay: "point:#{latitude},#{longitude};icon=cp;size=large|#{latitude},#{longitude};style=circle;width=50m;color=%231B9D2C60"
-            }
-
-            URI.parse("#{map_url}:radius=90/#{w}x#{h}/png8").tap do |uri|
-              uri.query = URI.encode_www_form(params)
-            end.to_s
-          end
-
           # @See Decidim::Map::StaticMap#url_params
           def url_params(latitude:, longitude:, options: {})
-            ActiveSupport::Deprecation.warn(
-              <<~DEPRECATION.strip
-                Please use a V3 version HERE maps.
-                For further information, see:
-                https://www.here.com/docs/bundle/map-image-migration-guide-v3/page/README.html
-                Also make sure your Decidim.maps configurations are using the
-                up to date format.
-                You need to change:
-                  static_url = "https://image.maps.ls.hereapi.com/mia/1.6/mapview" if static_provider == "here" && static_url.blank?
-                to:
-                  static_url = "https://image.maps.hereapi.com/mia/v3/base/mc/overlay" if static_provider == "here"
-                in your config/initializers/decidim.rb file.
-              DEPRECATION
-            )
-
             params = {
               c: "#{latitude}, #{longitude}",
               z: options[:zoom] || Decidim::Map::StaticMap::DEFAULT_ZOOM,

data/lib/decidim/nicknamizable.rb

@@ -52,7 +52,7 @@ module Decidim
         candidate = name
 
         2.step do |n|
-          return candidate if Decidim::UserBaseEntity.where(nickname: candidate.downcase).where(scope).empty?
+          return candidate if Decidim::UserBaseEntity.where("nickname ILIKE ?", candidate.downcase).where(scope).empty?
 
           candidate = numbered_variation_of(name, n)
         end

data/lib/decidim/organization_settings.rb

@@ -79,7 +79,7 @@ module Decidim
       #   Decidim.organization_settings(org).target_config_accessor
       #   #=> returns the organization specific setting
       #
-      #   Decidim.organization_settings(model_beloging_to_org).target_config_accessor
+      #   Decidim.organization_settings(model_belonging_to_org).target_config_accessor
       #   #=> returns the organization specific setting for model's organization
       #
       #   Decidim.organization_settings(nil).target_config_accessor
@@ -104,9 +104,9 @@ module Decidim
         {
           "upload" => {
             "allowed_file_extensions" => {
-              "default" => %w(jpg jpeg png pdf rtf txt),
-              "admin" => %w(jpg jpeg png pdf doc docx xls xlsx ppt pptx ppx rtf txt odt ott odf otg ods ots csv json md),
-              "image" => %w(jpg jpeg png)
+              "default" => %w(jpg jpeg png webp pdf rtf txt),
+              "admin" => %w(jpg jpeg png webp pdf doc docx xls xlsx ppt pptx ppx rtf txt odt ott odf otg ods ots),
+              "image" => %w(jpg jpeg png webp)
             },
             "allowed_content_types" => {
               "default" => %w(
@@ -125,10 +125,7 @@ module Decidim
                 application/vnd.oasis.opendocument
                 application/pdf
                 application/rtf
-                application/json
-                text/markdown
                 text/plain
-                text/csv
               )
             },
             "maximum_file_size" => {
@@ -193,7 +190,7 @@ module Decidim
 
     private
 
-    # Generates a final settigns configuration struct from the given settings
+    # Generates a final settings configuration struct from the given settings
     # hash. Combines the given defaults with the settings hash.
     #
     # @param hash [Hash] The configurations hash.

data/lib/decidim/paddable.rb

@@ -59,7 +59,7 @@ module Decidim
         @pad_id ||= [reference, token].join("-").slice(0, 50)
       end
 
-      # compatibilize with old versions if no salt available (less secure)
+      # compatibility with old versions if no salt available (less secure)
       def token
         if defined?(salt) && salt.present?
           tokenizer = Decidim::Tokenizer.new(salt:)

data/lib/decidim/participable.rb

@@ -31,7 +31,7 @@ module Decidim
 
       def mounted_params
         {
-          host: organization.host,
+          :host => organization.host,
           "#{underscored_name}_slug".to_sym => slug
         }
       end

data/lib/decidim/participatory_space_manifest.rb

@@ -98,7 +98,7 @@ module Decidim
     #
     # Returns nothing.
     def seed!
-      print "Creating seeds for the #{name} space...\n" unless Rails.env.test?
+      print "Creating seeds for the #{name} space...\n" unless Rails.env.test? # rubocop:disable Rails/Output
       @seeds&.call
     end
 

data/lib/decidim/participatory_space_user.rb

@@ -37,10 +37,6 @@ module Decidim
         raise "Not implemented"
       end
 
-      def self.order_by_name
-        includes(:user).order("decidim_users.name ASC")
-      end
-
       private
 
       # Private: check if the process and the user have the same organization

data/lib/decidim/query_extensions.rb

@@ -10,6 +10,22 @@ module Decidim
     #
     # Returns nothing.
     def self.included(type)
+      type.field :participatory_processes,
+                 [Decidim::ParticipatoryProcesses::ParticipatoryProcessType],
+                 null: true,
+                 description: "Lists all participatory_processes" do
+        argument :filter, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputFilter, "This argument lets you filter the results", required: false
+        argument :order, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputSort, "This argument lets you order the results", required: false
+      end
+
+      type.field :participatory_process,
+                 Decidim::ParticipatoryProcesses::ParticipatoryProcessType,
+                 null: true,
+                 description: "Finds a participatory_process" do
+        argument :id, GraphQL::Types::ID, "The ID of the participatory space", required: false
+        argument :slug, String, "The slug of the participatory process", required: false
+      end
+
       type.field :component, Decidim::Core::ComponentInterface, null: true do
         description "Lists the components this space contains."
         argument :id, GraphQL::Types::ID, required: true, description: "The ID of the component to be found"
@@ -46,6 +62,16 @@ module Decidim
       end
     end
 
+    def participatory_processes(filter: {}, order: {})
+      manifest = Decidim.participatory_space_manifests.select { |m| m.name == :participatory_processes }.first
+      Decidim::Core::ParticipatorySpaceListBase.new(manifest:).call(object, { filter:, order: }, context)
+    end
+
+    def participatory_process(id: nil, slug: nil)
+      manifest = Decidim.participatory_space_manifests.select { |m| m.name == :participatory_processes }.first
+      Decidim::Core::ParticipatorySpaceFinderBase.new(manifest:).call(object, { id:, slug: }, context)
+    end
+
     def component(id: {})
       component = Decidim::Component.published.find_by(id:)
       component&.organization == context[:current_organization] ? component : nil

data/lib/decidim/reportable.rb

@@ -53,12 +53,8 @@ module Decidim
       # Public: The reported content url
       #
       # Returns String
-      def reported_content_url(options = {})
-        if hidden?
-          ResourceLocatorPresenter.new(self).index(options)
-        else
-          ResourceLocatorPresenter.new(self).url(options)
-        end
+      def reported_content_url
+        raise NotImplementedError
       end
 
       # Public: The collection of attribute names that are considered

data/lib/decidim/resourceable.rb

@@ -111,7 +111,7 @@ module Decidim
       end
 
       # Check only the resource visibility not its hierarchy.
-      # This method is intended to be overriden by classes that include this module and have the
+      # This method is intended to be overridden by classes that include this module and have the
       # need to impose its own visibility rules.
       #
       # @return If the resource is also Publicable checks if the resource is published, otherwise returns true by default.

data/lib/decidim/search_resource_fields_mapper.rb

@@ -13,8 +13,8 @@ module Decidim
     #
     # @param declared_fields: A Hash with the mappings between a SearchableResource attributes and
     #    any given model. Mapped fields are:
-    # - scope_id: The field where the scope is setted in the model, if any.
-    # - participatory_space: The field where the ParticipatorySpace is setted in the model.
+    # - scope_id: The field where the scope is set in the model, if any.
+    # - participatory_space: The field where the ParticipatorySpace is set in the model.
     # - datetime: The field that describes where in time the model is placed.
     # - A, B, C, D: Weighted text fields.
     #

data/lib/decidim/searchable.rb

@@ -74,7 +74,7 @@ module Decidim
       after_destroy do |searchable|
         remove_from_index(searchable) if self.class.search_resource_fields_mapper
       end
-      # after_create and after_update callbacks are dynamically setted in `searchable_fields` method.
+      # after_create and after_update callbacks are dynamically set in `searchable_fields` method.
 
       # Public: after_create callback to index the model as a SearchableResource, if configured so.
       #
@@ -178,8 +178,8 @@ module Decidim
       # }
       #
       # `conditions` must be a Hash that only accepts a boolean or a Proc that will be evaluated on runtime and returns a boolean for the following keys:
-      # - index_on_create: Whether to index, or not, the current searchabe when it is created. Defaults to true.
-      # - index_on_update: Whether to index, or not, the current searchabe when it is updated. Defaults to true.
+      # - index_on_create: Whether to index, or not, the current searchable when it is created. Defaults to true.
+      # - index_on_update: Whether to index, or not, the current searchable when it is updated. Defaults to true.
       #
       def searchable_fields(declared_fields, conditions = {})
         @search_resource_indexable_fields = SearchResourceFieldsMapper.new(declared_fields)

data/lib/decidim/seeds.rb

@@ -17,6 +17,27 @@ module Decidim
       @admin_user ||= Decidim::User.find_by(organization:, email: "admin@example.org")
     end
 
+    def find_or_initialize_user_by(email:)
+      user = Decidim::User.find_or_initialize_by(email:)
+      user.update!(
+        name: ::Faker::Name.name,
+        nickname: ::Faker::Twitter.unique.screen_name,
+        password: "decidim123456789",
+        organization:,
+        confirmed_at: Time.current,
+        locale: I18n.default_locale,
+        personal_url: ::Faker::Internet.url,
+        about: ::Faker::Lorem.paragraph(sentence_count: 2),
+        avatar: random_avatar,
+        accepted_tos_version: organization.tos_version + 1.hour,
+        newsletter_notifications_at: Time.current,
+        tos_agreement: true,
+        password_updated_at: Time.current
+      )
+
+      user
+    end
+
     def random_scope(participatory_space:)
       if participatory_space.scope
         scopes = participatory_space.scope.descendants
@@ -86,10 +107,51 @@ module Decidim
       )
     end
 
+    def create_report!(reportable:, current_user:)
+      moderation = Moderation.find_or_create_by!(reportable:, participatory_space: reportable.participatory_space)
+
+      Decidim::Report.create!(
+        moderation:,
+        user: current_user,
+        locale: I18n.locale,
+        reason: "spam",
+        details: "From the seeds"
+      )
+    rescue ActiveRecord::RecordInvalid
+      # Ignore in case we have an error in the report creation.
+      # Most likely is a "Validation failed: User has already been taken"
+    end
+
+    def hide_report!(reportable:)
+      moderation = Moderation.find_or_create_by!(reportable:, participatory_space: reportable.participatory_space)
+      moderation.update!(hidden_at: Time.zone.now)
+    end
+
+    def create_user_report!(reportable:, current_user:)
+      moderation = UserModeration.find_or_create_by!(user: reportable)
+
+      UserReport.create!(
+        moderation:,
+        user: current_user,
+        reason: "spam",
+        details: "From the seeds"
+      )
+    end
+
     def seed_components_manifests!(participatory_space:)
       Decidim.component_manifests.each do |manifest|
         manifest.seed!(participatory_space.reload)
       end
     end
+
+    def random_avatar
+      file_number = format("%03d", rand(1...100))
+
+      create_blob!(seeds_file: "avatars/#{file_number}.jpg", filename: "#{file_number}.jpg", content_type: "image/jpeg")
+    end
+
+    def create_follow!(user, followable)
+      Decidim::Follow.create!(followable:, user:)
+    end
   end
 end

data/lib/decidim/settings_manifest.rb

@@ -116,8 +116,6 @@ module Decidim
       validates :type, inclusion: { in: TYPES.keys }
 
       def type_class
-        return Decidim::Attributes::RichText if type == :text && editor == true
-
         TYPES[type][:klass]
       end
 

data/lib/decidim/stats_registry.rb

@@ -40,7 +40,7 @@ module Decidim
     # Public: Returns a number returned by executing the corresponding block.
     #
     # name - The name of the stat
-    # context - An arbritrary context object to compute the result.
+    # context - An arbitrary context object to compute the result.
     # start_at - A date to filter resources created after it
     # end_at - A date to filter resources created before it.
     #
@@ -54,7 +54,7 @@ module Decidim
 
     # Public: Resolves every stat with the given context and return an enumerator
     #
-    # context - An arbritrary context object to compute the result.
+    # context - An arbitrary context object to compute the result.
     # start_at - A date to filter resources created after it
     # end_at - A date to filter resources created before it
     #

data/lib/decidim/translatable_attributes.rb

@@ -17,7 +17,7 @@ module Decidim
       # type - The attribute's type
       # options - Options to send to the form class when defining the attribute.
       # block - An optional block to be called for each attribute name and
-      # locale. The block will receive two arguments, one with the attriubte
+      # locale. The block will receive two arguments, one with the attribute
       # name and another with the locale.
       #
       #
@@ -34,15 +34,12 @@ module Decidim
       #   end
       #
       # Returns nothing.
-      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-      def translatable_attribute(name, type, **options)
+      def translatable_attribute(name, type, **)
         attribute(name, { String => Object }, default: {})
 
         locales.each do |locale|
           attribute_name = "#{name}_#{locale}".gsub("-", "__")
-          attribute attribute_name, type, **options
-
-          value_type = attribute_types[attribute_name.to_s]
+          attribute(attribute_name, type, **)
 
           define_method attribute_name do
             field = public_send(name) || {}
@@ -54,6 +51,7 @@ module Decidim
                 # changed and the old value is still stored against the record.
                 field
               end
+            value_type = self.class.attribute_types[attribute_name.to_s]
             value_type ? value_type.cast(value) : value
           end
 
@@ -62,15 +60,12 @@ module Decidim
             final = super(value)
             return unless final # Do not set the `nil` values for the parent hash
 
-            final = value_type.serialize(final) if value_type && !attachment?(final)
-
             public_send("#{name}=", field.merge(locale => final))
           end
 
           yield(attribute_name, locale) if block_given?
         end
       end
-      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def locales
         Decidim.available_locales
@@ -127,9 +122,5 @@ module Decidim
       locale.to_s == try(:default_locale).to_s ||
         locale.to_s == try(:current_organization).try(:default_locale).to_s
     end
-
-    def attachment?(value)
-      value.is_a?(String) && value.include?(ActiveStorage.routes_prefix)
-    end
   end
 end

data/lib/decidim/translatable_resource.rb

@@ -19,7 +19,7 @@ module Decidim
           method_name = "#{field}="
 
           # We are overriding the attribute setter method so that we can reuse the
-          # machine translations. This is to fix a bug encoutered when updating
+          # machine translations. This is to fix a bug encountered when updating
           # the resource from a FormObject. The FormObject on the `#create`
           # action in the controller does not have the machine translations loaded,
           # so they are effectively lost whenever a resource is updated.

data/lib/decidim/view_hooks.rb

@@ -87,7 +87,7 @@ module Decidim
     # Internal class to encapsulate each view registered on a view hook.
     class ViewHook
       # priority - a Number (Integer|Float) to sort the block.
-      # block - a block that will bbe rendered in a view context.
+      # block - a block that will be rendered in a view context.
       def initialize(priority, block)
         @priority = priority
         @block = block

data/lib/decidim/view_model.rb

@@ -17,7 +17,10 @@ module Decidim
     include Decidim::MarkupHelper
     include Decidim::LayoutHelper
     include Decidim::SanitizeHelper
+    include Decidim::ApplicationHelper
+    include Decidim::IconHelper
 
+    delegate :helper_method, to: :controller
     delegate :current_organization, to: :controller
     delegate_missing_to :view_context
 
@@ -88,7 +91,7 @@ module Decidim
     end
 
     def cache_expiry_time
-      Decidim.cache_expiry_time
+      nil
     end
 
     def decidim

data/lib/decidim/webpacker/esbuild.config.js

@@ -0,0 +1,14 @@
+// eslint-disable-next-line no-undef
+module.exports = {
+  options: {
+    tsconfigRaw: JSON.stringify({}),
+    target: "es2015"
+  },
+  bundle: true,
+  sourcemap: true,
+  minify: true,
+  outdir: "public",
+  outExtension: {
+    ".css": ".scss"
+  }
+};

data/lib/decidim/webpacker/shakapacker.yml

@@ -22,12 +22,12 @@ default: &default
   cache_manifest: false
 
   # Select loader to use, available options are 'babel' (default), 'swc' or 'esbuild'
-  webpack_loader: 'babel'
+  webpack_loader: 'esbuild'
 
   # Set to true to enable check for matching versions of shakapacker gem and NPM package - will raise an error if there is a mismatch or wildcard versioning is used
   ensure_consistent_versioning: true
 
-  # Select whether the compiler will use SHA digest ('digest' option) or most most recent modified timestamp ('mtime') to determine freshness
+  # Select whether the compiler will use SHA digest ('digest' option) or most recent modified timestamp ('mtime') to determine freshness
   compiler_strategy: digest
 
   # Select whether the compiler will always use a content hash and not just in production

data/lib/decidim/webpacker/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "strict": true,                                      /* Enable all strict type-checking options. */
+    "removeComments": true,                              /* Disable emitting comments. */
+    "allowJs": true,                                     /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */
+    "module": "commonjs",                                /* Specify what module code is generated. */
+    "incremental": true,                                 /* Enable incremental compilation */
+    "target": "es6",                                     /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "skipLibCheck": true,                                /* Skip type checking all .d.ts files. */
+  }
+}

data/lib/decidim/webpacker/webpack/custom.js

@@ -1,7 +1,7 @@
 /* eslint-disable */
 const { config } = require("shakapacker");
 const { InjectManifest } = require("workbox-webpack-plugin");
-const TerserPlugin = require('terser-webpack-plugin')
+const { EsbuildPlugin } = require("esbuild-loader");
 
 module.exports = {
   module: {
@@ -15,8 +15,8 @@ module.exports = {
       },
       {
         test: /\.(js|jsx)$/,
-        exclude: /node_modules\/(?!tributejs)/,
-        loader: "babel-loader"
+        exclude: /node_modules\//,
+        loader: "esbuild-loader"
       },
       {
         test: /\.(graphql|gql)$/,
@@ -37,14 +37,11 @@ module.exports = {
         }
       },
       {
-        test: [
-          /\.md$/,
-          /\.odt$/,
-        ],
+        test: [/\.md$/, /\.odt$/],
         exclude: [/\.(js|mjs|jsx|ts|tsx)$/],
-        type: 'asset/resource',
+        type: "asset/resource",
         generator: {
-          filename: 'media/documents/[hash][ext][query]'
+          filename: "media/documents/[hash][ext][query]"
         }
       },
       // Overwrite webpacker files rule to amend the filename output
@@ -68,9 +65,9 @@ module.exports = {
           /\.svg$/
         ],
         exclude: [/\.(js|mjs|jsx|ts|tsx)$/],
-        type: 'asset/resource',
+        type: "asset/resource",
         generator: {
-          filename: 'media/images/[name]-[hash][ext][query]'
+          filename: "media/images/[name]-[hash][ext][query]"
         }
       }
     ]
@@ -81,32 +78,13 @@ module.exports = {
       crypto: false
     }
   },
-  // https://github.com/rails/webpacker/issues/2932
-  // As Decidim uses multiple packs, we need to enforce a single runtime, to prevent duplication
   optimization: {
     minimizer: [
-      new TerserPlugin({
-        parallel: Number.parseInt(process.env.SHAKAPACKER_PARALLEL, 10) || true,
-        terserOptions: {
-          parse: {
-            // Let terser parse ecma 8 code but always output
-            // ES5 compliant code for older browsers
-            ecma: 8
-          },
-          compress: {
-            ecma: 5,
-            warnings: false,
-            comparisons: false
-          },
-          mangle: { safari10: true },
-          output: {
-            ecma: 5,
-            comments: false,
-            ascii_only: true
-          }
-        }
+      new EsbuildPlugin({
+        target: "es2015",
+        css: true
       })
-    ].filter(Boolean)
+    ]
   },
   entry: config.entrypoints,
   plugins: [
@@ -122,4 +100,4 @@ module.exports = {
       swDest: "../sw.js"
     })
   ]
-}
+};

data/lib/devise/models/decidim_newsletterable.rb

@@ -2,7 +2,7 @@
 
 module Devise
   module Models
-    # Newsletterable adds all needed validations to acomplish GDPR standards
+    # Newsletterable adds all needed validations to accomplish GDPR standards
     # in newsletter notification mailing
     #
     # Validates that all users with notifications activated have Opt-in in