decidim-core 0.29.0 → 0.29.2

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

@@ -500,6 +500,16 @@ shared_examples "comments" do
         expect(page).to have_css("span.comments-count", text: "#{commentable.comments.count} comments")
         expect(page.find("#add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}").value).to be_empty
       end
+
+      it "shows the entry in last activities" do
+        visit decidim.last_activities_path
+        expect(page).to have_content("New comment: #{content}")
+
+        within "#filters" do
+          find("a", class: "filter", text: "Comment", match: :first).click
+        end
+        expect(page).to have_content("New comment: #{content}")
+      end
     end
 
     context "when user adds a new comment with a link" do
@@ -609,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
@@ -737,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
@@ -1021,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/system_endorse_resource_examples.rb

@@ -25,7 +25,7 @@ shared_examples "Endorse resource system specs" do
   end
 
   context "when endorsements are not enabled" do
-    let(:component_traits) { [:with_votes_enabled, :with_endorsements_disabled] }
+    let(:component_traits) { [:with_endorsements_disabled] }
 
     context "when the user is not logged in" do
       it "does not show the endorse resource button and counts" do
@@ -51,17 +51,17 @@ shared_examples "Endorse resource system specs" do
 
     it "shows the endorsements count and the endorse button is disabled" do
       visit_resource
-      expect(page).to have_css("[data-buttons] button[disabled='true']")
+      expect(page).to have_css("#resource-#{resource.id}-endorsement-block button[disabled='true']")
     end
   end
 
   context "when endorsements are enabled" do
-    let(:component_traits) { [:with_votes_enabled, :with_endorsements_enabled] }
+    let(:component_traits) { [:with_endorsements_enabled] }
 
     context "when the user is not logged in" do
       it "is given the option to sign in" do
         visit_resource
-        within "[data-buttons]", match: :first do
+        within "#resource-#{resource.id}-endorsement-block" do
           click_on "Like"
         end
 
@@ -77,7 +77,7 @@ shared_examples "Endorse resource system specs" do
       context "when the resource is not endorsed yet" do
         it "is able to endorse the resource" do
           visit_resource
-          within "[data-buttons]" do
+          within "#resource-#{resource.id}-endorsement-block" do
             click_on "Like"
             expect(page).to have_button("Dislike")
           end
@@ -89,7 +89,7 @@ shared_examples "Endorse resource system specs" do
 
         it "is not able to endorse it again" do
           visit_resource
-          within "[data-buttons]" do
+          within "#resource-#{resource.id}-endorsement-block" do
             expect(page).to have_button("Dislike")
             expect(page).to have_no_button("Like")
           end
@@ -97,7 +97,7 @@ shared_examples "Endorse resource system specs" do
 
         it "is able to undo the endorsement" do
           visit_resource
-          within "[data-buttons]" do
+          within "#resource-#{resource.id}-endorsement-block" do
             click_on "Dislike"
             expect(page).to have_button("Like")
           end
@@ -124,7 +124,7 @@ shared_examples "Endorse resource system specs" do
         context "when user is NOT verified" do
           it "is NOT able to endorse" do
             visit_resource
-            within "[data-buttons]", match: :first do
+            within "#resource-#{resource.id}-endorsement-block" do
               click_on "Like"
             end
             expect(page).to have_css("#authorizationModal", visible: :visible)
@@ -142,13 +142,111 @@ shared_examples "Endorse resource system specs" do
 
           it "IS able to endorse", :slow do
             visit_resource
-            within "[data-buttons]", match: :first do
+            within "#resource-#{resource.id}-endorsement-block" do
               click_on "Like"
             end
             expect(page).to have_button("Dislike")
           end
         end
       end
+
+      context "when user being a part of a group" do
+        let(:component_traits) { [:with_endorsements_enabled] }
+        let!(:user_group) do
+          create(
+            :user_group,
+            :verified,
+            name: "Tester's Organization",
+            nickname: "test_org",
+            email: "t.mail.org@example.org",
+            users: [user],
+            organization:
+          )
+        end
+
+        before do
+          organization.update(user_groups_enabled:)
+          login_as user, scope: :user
+          visit_resource
+        end
+
+        context "when organization is not allowing user groups" do
+          let(:user_groups_enabled) { false }
+
+          it "is able to endorse the resource" do
+            within "#resource-#{resource.id}-endorsement-block" do
+              click_on "Like"
+              expect(page).to have_button("Dislike")
+            end
+          end
+        end
+
+        context "when organization allows user groups" do
+          let(:user_groups_enabled) { true }
+
+          it "opens a modal where you select identity as a user or a group" do
+            click_on "Like"
+            expect(page).to have_content("Select identity")
+            expect(page).to have_content("Tester's Organization")
+            expect(page).to have_content(user.name)
+          end
+
+          def add_likes
+            click_on "Like"
+            within "#user-identities" do
+              click_on "Tester's Organization"
+              click_on user.name
+              click_on "Done"
+            end
+            visit_resource
+            click_on "Dislike"
+          end
+
+          context "when both identities picked" do
+            it "likes the post as a group and a user" do
+              add_likes
+
+              within ".identities-modal__list" do
+                expect(page).to have_css(".is-selected", count: 2)
+              end
+            end
+          end
+
+          context "when like cancelled as a user" do
+            it "does not cancel group like" do
+              add_likes
+              find(".is-selected", match: :first).click
+              click_on "Done"
+              visit current_path
+              click_on "Like"
+
+              within ".identities-modal__list" do
+                expect(page).to have_css(".is-selected", count: 1)
+                within ".is-selected" do
+                  expect(page).to have_content("Tester's Organization")
+                end
+              end
+            end
+          end
+
+          context "when like cancelled as a group" do
+            it "does not cancel user like" do
+              add_likes
+              page.all(".is-selected")[1].click
+              click_on "Done"
+              visit current_path
+              click_on "Dislike"
+
+              within ".identities-modal__list" do
+                expect(page).to have_css(".is-selected", count: 1)
+                within ".is-selected" do
+                  expect(page).to have_text(user.name, exact: true)
+                end
+              end
+            end
+          end
+        end
+      end
     end
   end
 end

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.0"
+      "0.29.2"
     end
   end
 end

data/lib/decidim/core.rb

@@ -551,6 +551,17 @@ module Decidim
     "/"
   end
 
+  # This is the maximum time that the cache will be stored. If nil, the cache will be stored indefinitely.
+  # Currently, cache is applied in the Cells where the method `cache_hash` is defined.
+  config_accessor :cache_expiry_time do
+    24.hours
+  end
+
+  # Same as before, but specifically for cell displaying stats
+  config_accessor :stats_cache_expiry_time do
+    10.minutes
+  end
+
   # Enable/Disable the service worker
   config_accessor :service_worker_enabled do
     Rails.env.exclude?("development")

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/organization_settings.rb

@@ -105,7 +105,7 @@ module Decidim
           "upload" => {
             "allowed_file_extensions" => {
               "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),
+              "admin" => %w(jpg jpeg png webp pdf doc docx xls xlsx ppt pptx ppx rtf txt odt ott odf otg ods ots csv json md),
               "image" => %w(jpg jpeg png webp)
             },
             "allowed_content_types" => {
@@ -125,7 +125,10 @@ module Decidim
                 application/vnd.oasis.opendocument
                 application/pdf
                 application/rtf
+                application/json
+                text/markdown
                 text/plain
+                text/csv
               )
             },
             "maximum_file_size" => {

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/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, **)
         attribute(name, { String => Object }, default: {})
 
@@ -41,6 +42,8 @@ module Decidim
           attribute_name = "#{name}_#{locale}".gsub("-", "__")
           attribute(attribute_name, type, **)
 
+          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
+
             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

data/lib/decidim/view_model.rb

@@ -91,7 +91,7 @@ module Decidim
     end
 
     def cache_expiry_time
-      nil
+      Decidim.cache_expiry_time
     end
 
     def decidim

data/lib/tasks/upgrade/decidim_attachments.rake

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    desc "Cleanup the orphaned blobs attachments"
+    task :attachments_cleanup, [:clean_up_unattached_blobs_after_in_minutes] => :environment do |_task, args|
+      args.with_defaults(clean_up_unattached_blobs_after_in_minutes: 60)
+
+      clean_up_unattached_blobs_after_in_minutes = args[:clean_up_unattached_blobs_after_in_minutes].to_i
+
+      ActiveStorage::Blob.unattached.where(created_at: ..clean_up_unattached_blobs_after_in_minutes.minutes.ago).find_each(batch_size: 100, &:purge_later)
+    end
+  end
+end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.29.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,8 +10,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2025-02-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -758,28 +772,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.29.2
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1173,6 +1187,7 @@ files:
 - app/constraints/decidim/current_component.rb
 - app/controllers/concerns/decidim/devise_authentication_methods.rb
 - app/controllers/concerns/decidim/devise_controllers.rb
+- app/controllers/concerns/decidim/direct_upload.rb
 - app/controllers/concerns/decidim/disable_redirection_to_external_host.rb
 - app/controllers/concerns/decidim/filter_resource.rb
 - app/controllers/concerns/decidim/flaggable.rb
@@ -1312,6 +1327,7 @@ files:
 - app/forms/decidim/user_interest_scope_form.rb
 - app/forms/decidim/user_interests_form.rb
 - app/helpers/concerns/decidim/flash_helper_extensions.rb
+- app/helpers/concerns/decidim/user_role_checker.rb
 - app/helpers/decidim/account_helper.rb
 - app/helpers/decidim/action_authorization_helper.rb
 - app/helpers/decidim/amendments_helper.rb
@@ -1673,6 +1689,7 @@ files:
 - app/packs/src/decidim/notifications_actions.js
 - app/packs/src/decidim/password_toggler.js
 - app/packs/src/decidim/remote_modal.js
+- app/packs/src/decidim/remote_tooltips.js
 - app/packs/src/decidim/responsive_horizontal_tabs.js
 - app/packs/src/decidim/results_listing.js
 - app/packs/src/decidim/scroll_to_last_child.js
@@ -2137,6 +2154,8 @@ files:
 - config/locales/ar.yml
 - config/locales/bg-BG.yml
 - config/locales/bg.yml
+- config/locales/bn-BD.yml
+- config/locales/bs-BA.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
@@ -2640,6 +2659,7 @@ files:
 - lib/decidim/attributes/localized_date.rb
 - lib/decidim/attributes/model.rb
 - lib/decidim/attributes/object.rb
+- lib/decidim/attributes/rich_text.rb
 - lib/decidim/attributes/symbol.rb
 - lib/decidim/attributes/time_with_zone.rb
 - lib/decidim/authorable.rb
@@ -2663,6 +2683,7 @@ files:
 - lib/decidim/content_blocks/has_related_components.rb
 - lib/decidim/content_parsers.rb
 - lib/decidim/content_parsers/base_parser.rb
+- lib/decidim/content_parsers/blob_parser.rb
 - lib/decidim/content_parsers/hashtag_parser.rb
 - lib/decidim/content_parsers/inline_images_parser.rb
 - lib/decidim/content_parsers/link_parser.rb
@@ -2674,6 +2695,7 @@ files:
 - lib/decidim/content_processor.rb
 - lib/decidim/content_renderers.rb
 - lib/decidim/content_renderers/base_renderer.rb
+- lib/decidim/content_renderers/blob_renderer.rb
 - lib/decidim/content_renderers/hashtag_renderer.rb
 - lib/decidim/content_renderers/link_renderer.rb
 - lib/decidim/content_renderers/resource_renderer.rb
@@ -2966,6 +2988,7 @@ files:
 - lib/tasks/decidim_tasks.rake
 - lib/tasks/decidim_webpacker_tasks.rake
 - lib/tasks/upgrade/decidim_active_storage_migration_tasks.rake
+- lib/tasks/upgrade/decidim_attachments.rake
 - lib/tasks/upgrade/decidim_content_blocks_tasks.rake
 - lib/tasks/upgrade/decidim_deduplicate_endorsements.rake
 - lib/tasks/upgrade/decidim_fix_categorization.rake
@@ -2976,7 +2999,7 @@ files:
 - lib/tasks/upgrade/decidim_user_moderation.rake
 homepage: https://decidim.org
 licenses:
-- AGPL-3.0
+- AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/decidim/decidim/issues
   documentation_uri: https://docs.decidim.org/