decidim-core 0.28.4 → 0.28.6

data/lib/decidim/core/test/shared_examples/comments_examples.rb

@@ -613,7 +613,7 @@ shared_examples "comments" do
     end
 
     context "when the user has verified organizations" do
-      let(:user_group) { create(:user_group, :verified) }
+      let(:user_group) { create(:user_group, :verified, organization:) }
       let(:content) { "This is a new comment" }
 
       before do
@@ -741,6 +741,20 @@ shared_examples "comments" do
               expect(page).to have_content("Edited")
             end
           end
+
+          it "has only one edit modal" do
+            expect(page).to have_css("#editCommentModal#{comment.id}", visible: :hidden, count: 1)
+            3.times do |index|
+              sleep 2
+              within "#comment_#{comment.id}" do
+                page.find("[id^='dropdown-trigger']").click
+                click_on "Edit"
+              end
+              fill_in "edit_comment_#{comment.id}", with: " This comment has been edited #{1 + index} times"
+              click_on "Send"
+            end
+            expect(page).to have_css("#editCommentModal#{comment.id}", visible: :all, count: 1)
+          end
         end
       end
     end
@@ -1025,7 +1039,6 @@ shared_examples "comments blocked" do
   end
 
   context "when authenticated" do
-    let!(:organization) { create(:organization) }
     let!(:user) { create(:user, :confirmed, organization:) }
     let!(:comments) { create_list(:comment, 3, commentable:) }
 

data/lib/decidim/core/test/shared_examples/reports_examples.rb

@@ -33,17 +33,47 @@ shared_examples "higher user role hides" do
     before do
       login_as user, scope: :user
     end
-    around do |example|
-      previous = Capybara.raise_server_errors
 
-      Capybara.raise_server_errors = false
-      example.run
-      Capybara.raise_server_errors = previous
+    it "reports the resource" do
+      visit reportable_path
+
+      expect(page).to have_css(%(button[data-dialog-open="flagModal"]))
+      find(%(button[data-dialog-open="flagModal"])).click
+      expect(page).to have_css(".flag-modal", visible: :visible)
+
+      within ".flag-modal" do
+        find(:css, "input[name='report[hide]']").set(true)
+        click_on "Hide"
+      end
+
+      sleep(1)
+
+      expect(page).to have_current_path(reportable_index_path, ignore_query: true)
+
+      expect(reportable.reload).to be_hidden
     end
+  end
+end
+
+shared_examples "higher user role hides resource with comments" do
+  context "and the admin hides a resource with comments" do
+    let!(:comments) { create_list(:comment, 2, body: "Dummy comment", commentable: reportable, author: user) }
+
+    before do
+      login_as user, scope: :user
+      Decidim::Ai::SpamDetection.create_reporting_user!
+    end
+
+    it "hides the resource" do
+      visit decidim.search_path
+      expect(page).to have_content(translated(comments.first.body))
+      expect(page).to have_content(translated(comments.second.body))
 
-    it "reports the resource" do
       visit reportable_path
 
+      expect(page).to have_content(translated(comments.first.body))
+      expect(page).to have_content(translated(comments.second.body))
+
       expect(page).to have_css(%(button[data-dialog-open="flagModal"]))
       find(%(button[data-dialog-open="flagModal"])).click
       expect(page).to have_css(".flag-modal", visible: :visible)
@@ -53,7 +83,19 @@ shared_examples "higher user role hides" do
         click_button "Hide"
       end
 
+      sleep(1)
+
+      expect(page).to have_current_path(reportable_index_path, ignore_query: true)
+
+      perform_enqueued_jobs
+
       expect(reportable.reload).to be_hidden
+      expect(comments.first.reload).to be_hidden
+      expect(comments.second.reload).to be_hidden
+
+      visit decidim.search_path
+      expect(page).not_to have_content(translated(comments.first.body))
+      expect(page).not_to have_content(translated(comments.second.body))
     end
   end
 end

data/lib/decidim/core/test/shared_examples/uncommentable_component_examples.rb

@@ -8,6 +8,7 @@ shared_examples "an uncommentable component" do
            manifest:,
            participatory_space:)
   end
+  let!(:comment) { create(:comment, commentable: resources.first) }
 
   it "does not displays comments count" do
     component.update!(settings: { comments_enabled: false })
@@ -18,4 +19,29 @@ shared_examples "an uncommentable component" do
       expect(page).not_to have_link(resource_locator(ressource).path)
     end
   end
+
+  describe "when search a comment in the global search" do
+    it "does displays the comments" do
+      visit decidim.root_path
+
+      within ".main-bar__search" do
+        fill_in "term", with: comment.body["en"]
+        find("input#input-search").native.send_keys :enter
+      end
+
+      expect(page).to have_content("1 Results for the search")
+    end
+
+    it "does not displays the comment when comments are disable" do
+      component.update!(settings: { comments_enabled: false })
+      visit decidim.root_path
+
+      within ".main-bar__search" do
+        fill_in "term", with: comment.body["en"]
+        find("input#input-search").native.send_keys :enter
+      end
+
+      expect(page).to have_content("0 Results for the search")
+    end
+  end
 end

data/lib/decidim/core/test/shared_examples/versions_controller_examples.rb

@@ -2,6 +2,32 @@
 
 require "spec_helper"
 
+shared_examples "a version of a hidden object" do
+  before do
+    visit resource_path
+    click_on "see other versions"
+    click_on("Version 1 of #{hidden_object.reload.versions.size}")
+  end
+
+  around do |example|
+    previous = Capybara.raise_server_errors
+
+    Capybara.raise_server_errors = false
+    example.run
+    Capybara.raise_server_errors = previous
+  end
+
+  it "shows an error page" do
+    expect(page).to have_content("Changes at")
+
+    create(:moderation, reportable: hidden_object, hidden_at: 1.day.ago)
+
+    visit current_path
+
+    expect(page).to have_content(ActiveRecord::RecordNotFound)
+  end
+end
+
 shared_examples "versions controller" do
   let(:base_params) do
     if resource.is_a?(Decidim::Participable)

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.28.4"
+      "0.28.6"
     end
   end
 end

data/lib/decidim/diffy_extension.rb

@@ -13,6 +13,24 @@ module Decidim
         str = wrap_lines(@diff.map { |line| wrap_line(line) })
         ActionView::Base.new(ActionView::LookupContext.new(nil), {}, nil).sanitize(str, tags: TAGS)
       end
+
+      private
+
+      def wrap_line(line)
+        cleaned = clean_line(line)
+        case line
+        when /^(---|\+\+\+|\\\\)/
+          "    <li class=\"diff-comment\"><div>#{line.chomp}</div></li>"
+        when /^\+/
+          "    <li class=\"ins\"><ins>#{cleaned}</ins></li>"
+        when /^-/
+          "    <li class=\"del\"><del>#{cleaned}</del></li>"
+        when /^ /
+          "    <li class=\"unchanged\"><div>#{cleaned}</div></li>"
+        when /^@@/
+          "    <li class=\"diff-block-info\"><div>#{line.chomp}</div></li>"
+        end
+      end
     end
 
     # Adding a new method to Diffy::Format so we can pass the

data/lib/decidim/form_builder.rb

@@ -390,7 +390,7 @@ module Decidim
     # options      - A Hash with options to build the field. See upload method for
     # more detailed information.
     def attachment(attribute, options = {})
-      object_attachment = object.attachment.present?
+      object_attachment = object.respond_to?(:attachment) && object.attachment.present?
       record = object_attachment ? object.attachment : object
       options = {
         titled: options[:multiple],

data/lib/decidim/map/autocomplete.rb

@@ -42,6 +42,7 @@ 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,46 +49,7 @@ module Decidim
           private
 
           def language_code
-            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
-            }
+            I18n.locale.to_s
           end
         end
       end

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

@@ -6,8 +6,42 @@ 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 ILIKE ?", candidate.downcase).where(scope).empty?
+          return candidate if Decidim::UserBaseEntity.where(nickname: candidate.downcase).where(scope).empty?
 
           candidate = numbered_variation_of(name, n)
         end

data/lib/decidim/participatory_space_user.rb

@@ -37,6 +37,10 @@ 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,22 +10,6 @@ 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"
@@ -62,16 +46,6 @@ 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,8 +53,12 @@ module Decidim
       # Public: The reported content url
       #
       # Returns String
-      def reported_content_url
-        raise NotImplementedError
+      def reported_content_url(options = {})
+        if hidden?
+          ResourceLocatorPresenter.new(self).index(options)
+        else
+          ResourceLocatorPresenter.new(self).url(options)
+        end
       end
 
       # Public: The collection of attribute names that are considered

data/lib/decidim/settings_manifest.rb

@@ -116,6 +116,8 @@ 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/translatable_attributes.rb

@@ -34,6 +34,7 @@ module Decidim
       #   end
       #
       # Returns nothing.
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def translatable_attribute(name, type, **options)
         attribute(name, { String => Object }, default: {})
 
@@ -41,6 +42,8 @@ module Decidim
           attribute_name = "#{name}_#{locale}".gsub("-", "__")
           attribute attribute_name, type, **options
 
+          value_type = attribute_types[attribute_name.to_s]
+
           define_method attribute_name do
             field = public_send(name) || {}
             value =
@@ -51,7 +54,6 @@ 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
 
@@ -60,12 +62,15 @@ 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
@@ -122,5 +127,9 @@ 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/view_model.rb

@@ -19,6 +19,7 @@ module Decidim
     include Decidim::SanitizeHelper
 
     delegate :current_organization, to: :controller
+    delegate_missing_to :view_context
 
     cache :show, if: :perform_caching?, expires_in: :cache_expiry_time do
       cache_hash

data/lib/tasks/upgrade/decidim_fix_categorization.rake

@@ -8,9 +8,18 @@ namespace :decidim do
         :"decidim:upgrade:clean:searchable_resources",
         :"decidim:upgrade:clean:notifications",
         :"decidim:upgrade:clean:follows",
-        :"decidim:upgrade:clean:action_logs"
+        :"decidim:upgrade:clean:action_logs",
+        :"decidim:upgrade:clean:clean_deleted_users",
+        :"decidim:upgrade:clean:fix_blocked_user_notification"
       ]
 
+      desc "Remove data from deleted users"
+      task clean_deleted_users: :environment do
+        logger = Logger.new($stdout)
+        logger.info("=== Removing extra data from deleted users")
+        Decidim::User.where.not(deleted_at: nil).update_all(personal_url: "", about: "", notifications_sending_frequency: "none") # rubocop:disable Rails/SkipsModelValidations
+      end
+
       desc "Removes any action logs belonging to invalid resources"
       task :action_logs, [] => :environment do
         puts "=== Deleting Action logs\n"
@@ -100,15 +109,32 @@ namespace :decidim do
         end
         puts "===== Deleted #{invalid} invalid resources\n"
       end
-    end
 
-    desc "Removes orphan categorizations"
-    task fix_orphan_categorizations: :environment do
-      logger = Logger.new($stdout)
-      logger.info("Removing orphan categorizations...")
+      desc "Removes orphan categorizations"
+      task fix_orphan_categorizations: :environment do
+        logger = Logger.new($stdout)
+        logger.info("Removing orphan categorizations...")
+
+        Decidim::Categorization.find_each do |categorization|
+          categorization.destroy if categorization.categorizable.nil?
+        end
+      end
+
+      desc "Update all blocked users notifications_sending_frequency setting"
+      task fix_blocked_user_notification: :environment do
+        logger.info("=== Updating all blocked users notifications_sending_frequency ...")
+        blocked_users = 0
+        Decidim::User.blocked.where.not("notifications_sending_frequency = ?", "none").find_each do |blocked_user|
+          unless blocked_user.notifications_sending_frequency == "none"
+            blocked_user.update(notifications_sending_frequency: "none")
+            blocked_users += 1
+          end
+        end
+        logger.info("===== Updated #{blocked_users} blocked users")
+      end
 
-      Decidim::Categorization.find_each do |categorization|
-        categorization.destroy if categorization.categorizable.nil?
+      def logger
+        @logger ||= Logger.new($stdout)
       end
     end
   end

data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake

@@ -2,37 +2,40 @@
 
 namespace :decidim do
   namespace :upgrade do
-    desc "Modify nicknames with random numbers when exists similar ones case insensitively"
-    task fix_nickname_uniqueness: :environment do
-      logger = Logger.new($stdout)
-      logger.info("Updating conflicting user nicknames...")
+    desc "Modifies nickname of the user to lower case"
+    task fix_nickname_casing: :environment do
+      logger.info("Fixing user nicknames case...")
 
-      # list of users already changed in the process
       has_changed = []
+      Decidim::UserBaseEntity.not_deleted.find_each do |user|
+        user.nickname.downcase!
 
-      Decidim::User.not_deleted.find_each do |user|
-        next if has_changed.include? user.id
-
-        Decidim::User.where(organization: user.organization)
-                     .where("nickname ILIKE ?", user.nickname.downcase)
-                     .where.not(id: has_changed + [user.id])
-                     .not_deleted
-                     .order(:created_at)
-                     .each do |similar_user|
-          # change her nickname to the lowercased one with numbers if needed
-          begin
-            update_user_nickname(similar_user, Decidim::UserBaseEntity.nicknamize(similar_user.nickname, organization: similar_user.organization))
-          rescue ActiveRecord::RecordInvalid => e
-            logger.warn("User ID (#{similar_user.id}) : #{e}")
+        begin
+          if user.nickname_changed?
+            user.save!
+            has_changed << user.id
           end
-          has_changed.append(similar_user.id)
+        rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+          update_user_nickname(user, Decidim::UserBaseEntity.nicknamize(user.nickname, organization: user.organization))
+          has_changed << user.id
+        rescue ActiveRecord::RecordInvalid # rubocop:disable Lint/DuplicateRescueException
+          logger.warn("User ID (#{user.id}) : #{e}")
         end
       end
       logger.info("Process terminated, #{has_changed.count} users nickname have been updated.")
     end
 
+    desc "Modifies nicknames with random numbers when exists similar ones case-insensitively"
+    task fix_nickname_uniqueness: :environment do
+      Rake::Task["decidim:upgrade:fix_nickname_casing"].execute
+    end
+
     private
 
+    def logger
+      @logger ||= Logger.new($stdout)
+    end
+
     def send_notification_to(user)
       Decidim::EventsManager.publish(
         event: "decidim.events.nickname_event",