decidim-core 0.29.1 → 0.29.3

data/lib/decidim/content_renderers/blob_renderer.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentRenderers
+    # A renderer that searches Global IDs representing blobs in content and
+    # replaces it with a URL to these blobs.
+    #
+    # e.g. gid://<APP_NAME>/ActiveStorage::Blob/1
+    #
+    # OR for representations
+    #
+    # e.g. gid://<APP_NAME>/ActiveStorage::Blob/1/<encoded variant transformations>
+    #
+    # The `<encoded variant transformations>` part of the URL is a Base64
+    # encoded string that contains an unencrypted JSON-encoded value about the
+    # blob transformations. This way the specific representations can be stored
+    # in the database without having these values expiring.
+    #
+    # @see BaseRenderer Examples of how to use a content renderer
+    class BlobRenderer < BaseRenderer
+      # Matches a global id representing a Decidim::User
+      GLOBAL_ID_REGEX = %r{(gid://[\w-]+/ActiveStorage::Blob/\d+)(/([\w=-]+))?}
+
+      # Replaces found Global IDs matching an existing blob with a URL to
+      # that blob. The Global IDs representing an invalid ActiveStorage::Blob
+      # are replaced with an empty string.
+      #
+      # @return [String] the content ready to display (contains HTML)
+      def render(_options = nil)
+        replace_pattern(content, GLOBAL_ID_REGEX)
+      end
+
+      protected
+
+      def replace_pattern(text, pattern)
+        return text unless text.respond_to?(:gsub)
+
+        text.gsub(pattern) do
+          blob_gid = Regexp.last_match(1)
+          variation_key = Regexp.last_match(3)
+
+          blob = GlobalID::Locator.locate(blob_gid)
+          if variation_key
+            variation = begin
+              ActiveSupport::JSON.decode(Base64.strict_decode64(variation_key))
+            rescue JSON::ParseError
+              variation_key
+            end
+            blob_url(blob, variation)
+          else
+            blob_url(blob)
+          end
+        rescue ActiveRecord::RecordNotFound => _e
+          ""
+        end
+      end
+
+      def blob_url(blob, variation = nil)
+        url = begin
+          if variation
+            blob.variant(variation).url
+          else
+            blob.url
+          end
+        rescue ArgumentError
+          # ArgumentError is raised in case the blob's service is set to
+          # ActiveStorage::Service::DiskService and
+          # `ActiveStorage::Current.url_options` is not set.
+        end
+        raise URI::InvalidURIError if url.blank?
+
+        url
+      rescue URI::InvalidURIError
+        local_blob_url(blob, variation)
+      end
+
+      def local_blob_url(blob, variation = nil)
+        if variation
+          routes.rails_representation_url(blob.variant(variation), only_path: true)
+        else
+          routes.rails_blob_url(blob, only_path: true)
+        end
+      end
+
+      def routes
+        @routes ||= Rails.application.routes.url_helpers
+      end
+    end
+  end
+end

data/lib/decidim/content_renderers.rb

@@ -3,6 +3,7 @@
 module Decidim
   module ContentRenderers
     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"

data/lib/decidim/core/engine.rb

@@ -239,6 +239,34 @@ module Decidim
         app.config.action_mailer.deliver_later_queue_name = :mailers
       end
 
+      initializer "decidim_core.active_storage", before: "active_storage.configs" do |app|
+        next if app.config.active_storage.service_urls_expire_in.present?
+
+        # Ensure that the ActiveStorage URLs are valid long enough because with
+        # the default configuration they would expire in 5 minutes which is a
+        # problem:
+        #   a) for the backend blob URL replacement
+        #   and
+        #   b) for caching
+        #
+        # Note the limitations for each storage service regarding the signed URL
+        # expiration times. This limitation has to be also considered when
+        # defining a caching strategy, otherwise e.g. images or files may not
+        # display correctly when caching is enabled.
+        #
+        # ActiveStorage disk service (default): no limitation
+        #
+        # S3: maximum is 7 days from the creation of the URL
+        # https://docs.aws.amazon.com/AmazonS3/latest/userguide/PresignedUrlUploadObject.html
+        #
+        # Google: maximum is 7 days (604800 seconds)
+        # https://cloud.google.com/storage/docs/access-control/signed-urls
+        #
+        # Azure: no limitation
+        # https://learn.microsoft.com/en-us/azure/storage/common/storage-sas-overview#best-practices-when-using-sas
+        app.config.active_storage.service_urls_expire_in = 7.days
+      end
+
       initializer "decidim_core.signed_global_id", after: "global_id" do |app|
         next if app.config.global_id.fetch(:expires_in, nil).present?
 
@@ -414,7 +442,7 @@ module Decidim
 
       initializer "decidim_core.content_processors" do |_app|
         Decidim.configure do |config|
-          config.content_processors += [:user, :user_group, :hashtag, :link]
+          config.content_processors += [:user, :user_group, :hashtag, :link, :blob]
         end
       end
 

data/lib/decidim/core/test/factories.rb

@@ -218,8 +218,15 @@ FactoryBot.define do
     end
 
     trait :deleted do
+      name { "" }
+      nickname { "" }
       email { "" }
+      delete_reason { "I want to delete my account" }
+      admin { false }
       deleted_at { Time.current }
+      avatar { nil }
+      personal_url { "" }
+      about { "" }
     end
 
     trait :admin_terms_accepted do
@@ -1022,4 +1029,25 @@ FactoryBot.define do
         end
     end
   end
+
+  factory :blob, class: "ActiveStorage::Blob" do
+    transient do
+      filepath { Decidim::Dev.asset("city.jpeg") }
+    end
+
+    filename { File.basename(filepath) }
+    content_type { MiniMime.lookup_by_filename(filepath)&.content_type || "text/plain" }
+
+    before(:create) do |object, evaluator|
+      object.upload(File.open(evaluator.filepath))
+    end
+
+    trait :image do
+      filepath { Decidim::Dev.asset("city.jpeg") }
+    end
+
+    trait :document do
+      filepath { Decidim::Dev.asset("Exampledocument.pdf") }
+    end
+  end
 end

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

@@ -18,7 +18,7 @@ shared_examples_for "authorable interface" do
     end
 
     describe "with a regular user" do
-      let(:author) { create(:user, organization: model.participatory_space.organization) }
+      let(:author) { create(:user, :confirmed, organization: model.participatory_space.organization) }
       let(:query) { "{ author { name } }" }
 
       before do

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

@@ -619,7 +619,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
@@ -747,6 +747,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
@@ -1031,7 +1045,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,46 @@ 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
+    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 +82,19 @@ shared_examples "higher user role hides" do
         click_on "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).to have_no_content(translated(comments.first.body))
+      expect(page).to have_no_content(translated(comments.second.body))
     end
   end
 end
@@ -120,6 +161,7 @@ shared_examples "reports by user type" do
     let!(:user) { create(:user, :admin, :confirmed, organization:) }
     include_examples "higher user role reports"
     include_examples "higher user role hides"
+    include_examples "higher user role hides resource with comments"
   end
   context "When reporting user is process admin" do
     let!(:user) { create :process_admin, :confirmed, participatory_process: }

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+def visit_resource
+  return visit resource if resource.is_a?(String)
+
+  return visit decidim.root_path if resource.is_a?(Decidim::Organization)
+
+  visit resource_locator(resource).path
+end
+
+shared_examples "a social share widget" do
+  it "has the social share button" do
+    visit_resource
+
+    expect(page).to have_css('button[data-dialog-open="socialShare"]')
+  end
+
+  it "lists all the expected social share providers" do
+    visit_resource
+    click_on "Share"
+
+    within "#socialShare" do
+      expect(page).to have_css('a[title="Share to X"]')
+      expect(page).to have_css('a[title="Share to Facebook"]')
+      expect(page).to have_css('a[title="Share to WhatsApp"]')
+      expect(page).to have_css('a[title="Share to Telegram"]')
+      expect(page).to have_css(".share-modal__input")
+    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).to have_no_link(resource_locator(resource).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.29.1"
+      "0.29.3"
     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/moderation_tools.rb

@@ -59,9 +59,11 @@ module Decidim
         event_class: Decidim::ResourceHiddenEvent,
         resource: @reportable,
         extra: {
-          report_reasons:
+          report_reasons:,
+          force_email: true
         },
-        affected_users: @reportable.try(:authors) || [@reportable.try(:normalized_author)]
+        affected_users:,
+        force_send: true
       }
 
       Decidim::EventsManager.publish(**data)
@@ -80,10 +82,22 @@ module Decidim
         @reportable.moderation.update!(hidden_at: Time.current)
         @reportable.try(:touch)
       end
+
+      if @reportable.is_a?(Decidim::Comments::Commentable)
+        @reportable.comment_threads.each do |comment|
+          Decidim::HideChildResourcesJob.perform_later(comment, @current_user.id)
+        end
+      end
+
+      send_notification_to_author
     end
 
     private
 
+    def affected_users
+      @affected_users ||= (@reportable.try(:authors) || [@reportable.try(:author)]).select { |author| author.is_a?(Decidim::User) }
+    end
+
     def report_reasons
       @reportable.moderation.reports.pluck(:reason).uniq
     end

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