decidim-core 0.28.1 → 0.28.3

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

@@ -54,7 +54,7 @@ shared_examples "comments" do
       expect(page).to have_css(".comment", minimum: 1)
 
       within("#accordion-#{single_comment.id}") do
-        expect(page).to have_content "Hide replies"
+        expect(page).to have_content "Hide reply"
       end
     end
 
@@ -70,7 +70,7 @@ shared_examples "comments" do
         expect(page).to have_css(".comment", minimum: 1)
 
         within("#accordion-#{single_comment.id}") do
-          expect(page).not_to have_content "Hide replies"
+          expect(page).not_to have_content "Hide reply"
         end
       end
     end
@@ -117,7 +117,8 @@ shared_examples "comments" do
   context "when not authenticated" do
     it "does not show form to add comments to user" do
       visit resource_path
-      expect(page).not_to have_selector(".add-comment form")
+      expect(page).not_to have_css(".add-comment form")
+      expect(page).to have_css(".comment-thread")
     end
   end
 
@@ -131,6 +132,32 @@ shared_examples "comments" do
       expect(page).to have_selector(".add-comment form")
     end
 
+    context "when user is not authorized to comment" do
+      let(:permissions) do
+        {
+          comment: {
+            authorization_handlers: {
+              "dummy_authorization_handler" => { "options" => {} }
+            }
+          }
+        }
+      end
+
+      before do
+        organization.available_authorizations = ["dummy_authorization_handler"]
+        organization.save!
+        commentable.create_resource_permission(permissions:)
+        allow(commentable).to receive(:user_allowed_to_comment?).with(user).and_return(false)
+        allow(commentable).to receive(:user_authorized_to_comment?).with(user).and_return(true)
+      end
+
+      it "shows a message indicating that comments are restricted" do
+        visit resource_path
+        expect(page).not_to have_content("Comments are disabled at this time")
+        expect(page).to have_content("You need to be verified to comment at this moment")
+      end
+    end
+
     describe "when using emojis" do
       before do
         within_language_menu do
@@ -520,7 +547,7 @@ shared_examples "comments" do
         it "displays the hide button" do
           visit current_path
           within "#comment_#{thread.id}" do
-            expect(page).to have_content("Hide replies")
+            expect(page).to have_content("Hide reply")
             expect(page).to have_content(new_reply_body)
           end
         end
@@ -528,7 +555,7 @@ shared_examples "comments" do
         it "displays the show button" do
           visit current_path
           within "#comment_#{thread.id}" do
-            click_button "Hide replies"
+            click_button "Hide reply"
             expect(page).to have_content("Show reply")
             expect(page).not_to have_content(new_reply_body)
           end
@@ -540,7 +567,7 @@ shared_examples "comments" do
           it "displays the show button" do
             visit current_path
             within "#comment_#{thread.id}" do
-              click_button "Hide replies"
+              click_button "Hide 3 replies"
               expect(page).to have_content("Show 3 replies")
               expect(page).not_to have_content(new_reply_body)
             end
@@ -969,3 +996,46 @@ shared_examples "comments" do
     end
   end
 end
+
+shared_examples "comments blocked" do
+  context "when not authenticated" do
+    context "when comments are blocked" do
+      let(:active_step_id) { component.participatory_space.active_step.id }
+
+      before do
+        component.update!(step_settings: { active_step_id => { comments_blocked: true } })
+      end
+
+      it "shows a message indicating that comments are disabled" do
+        visit resource_path
+        expect(page).to have_content("Comments are disabled at this time")
+        expect(page).not_to have_content("You need to be verified to comment at this moment")
+      end
+    end
+  end
+
+  context "when authenticated" do
+    let!(:organization) { create(:organization) }
+    let!(:user) { create(:user, :confirmed, organization:) }
+    let!(:comments) { create_list(:comment, 3, commentable:) }
+
+    before do
+      login_as user, scope: :user
+      visit resource_path
+    end
+
+    context "when comments are blocked" do
+      let(:active_step_id) { component.participatory_space.active_step.id }
+
+      before do
+        component.update!(step_settings: { active_step_id => { comments_blocked: true } })
+      end
+
+      it "shows a message indicating that comments are disabled" do
+        visit resource_path
+        expect(page).to have_content("Comments are disabled at this time")
+        expect(page).not_to have_content("You need to be verified to comment at this moment")
+      end
+    end
+  end
+end

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-shared_examples "follows" do
+# When using these shared examples, make sure there are no prior requests within
+# the same group of examples where this is included. Otherwise you may end up
+# in race conditions that cause these to fail as explained at:
+# https://github.com/decidim/decidim/pull/6161
+shared_examples "followable content for users" do
   before do
+    switch_to_host(organization.host)
     login_as user, scope: :user
   end
 
@@ -34,9 +39,9 @@ shared_examples "follows" do
   end
 end
 
-shared_examples "follows with a component" do
+shared_examples "followable content for users with a component" do
   include_context "with a component"
-  include_examples "follows"
+  include_examples "followable content for users"
 
   context "when the user is following the followable's participatory space" do
     before do

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

@@ -5,7 +5,7 @@ require "spec_helper"
 shared_examples "email with logo" do
   context "when organization has a logo" do
     let(:organization_logo) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
-    let(:organization) { create(:organization, logo: organization_logo) }
+    let(:organization) { create(:organization, name: "O'Higgins", logo: organization_logo) }
     let(:mail) { described_class.event_received(event, event_class_name, resource, user, :follower, extra) }
     let(:logo_path) { Rails.application.routes.url_helpers.rails_representation_path(organization.logo.variant(resize_to_fit: [600, 160]), only_path: true) }
 
@@ -14,7 +14,7 @@ shared_examples "email with logo" do
     end
 
     it "includes organization logo with full link" do
-      expect(mail.body).to include("alt=\"#{organization.name}\"")
+      expect(mail.body).to include("alt=\"#{decidim_escape_translated(organization.name)}\"")
       expect(mail.body).to match(%r{https{0,1}://#{organization.host}:#{Capybara.server_port}#{logo_path}})
     end
   end

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

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
 shared_examples "a paginated resource" do
-  let(:collection_size) { 30 }
+  let(:collection_size) { 50 }
 
   before do
     visit_component
   end
 
-  it "lists 10 resources per page by default" do
-    expect(page).to have_css(resource_selector, count: 10)
-    expect(page).to have_css("[data-pages] [data-page]", count: 3)
+  it "lists 25 resources per page by default" do
+    expect(page).to have_css(resource_selector, count: 25)
+    expect(page).to have_css("[data-pages] [data-page]", count: 2)
   end
 
   it "results per page can be changed from the selector" do
     expect(page).to have_css("[data-pagination]")
 
     within "[data-pagination]" do
-      page.find("summary", text: "10").click
+      page.find("summary", text: "25").click
       click_link "50"
     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.28.1"
+      "0.28.3"
     end
   end
 end

data/lib/decidim/core.rb

@@ -191,8 +191,13 @@ module Decidim
       resource_type.constantize.find_each do |resource|
         # exclude the users that already endorsed
         users = resource.endorsements.map(&:author)
-        rand(50).times do
+        remaining_count = Decidim::User.count - users.count
+        next if remaining_count < 1
+
+        rand([50, remaining_count].min).times do
           user = (Decidim::User.all - users).sample
+          next unless user
+
           Decidim::Endorsement.create!(resource:, author: user)
           users << user
         end

data/lib/decidim/events/base_event.rb

@@ -111,6 +111,10 @@ module Decidim
         Decidim::ContentProcessor.render_without_format(title, links: false).html_safe
       end
 
+      def hidden_resource?
+        resource.respond_to?(:hidden?) && resource.hidden?
+      end
+
       private
 
       def component

data/lib/decidim/organization_settings.rb

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

data/lib/decidim/seven_zip_wrapper.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "shellwords"
+
+module Decidim
+  class SevenZipWrapper
+    class << self
+      def compress_and_encrypt(filename:, password:, input_directory:)
+        run("cd #{escape(input_directory)} && 7z a -tzip -p#{escape(password)} -mem=AES256 #{escape(filename)} .")
+      end
+
+      def extract_and_decrypt(filename:, password:, output_directory:)
+        run("7z x -tzip #{escape(filename)} -o#{escape(output_directory)} -p#{escape(password)}")
+      end
+
+      private
+
+      def run(command)
+        success = system(command)
+
+        raise "Command failed: #{command}" unless success
+      end
+
+      def escape(string)
+        Shellwords.escape(string)
+      end
+    end
+  end
+end

data/lib/tasks/upgrade/decidim_fix_categorization.rake

@@ -2,7 +2,107 @@
 
 namespace :decidim do
   namespace :upgrade do
-    desc "Remove orphan categorizations"
+    namespace :clean do
+      desc "Removes all the invalid records from search, notifications, follows and action_logs"
+      task invalid_records: [
+        :"decidim:upgrade:clean:searchable_resources",
+        :"decidim:upgrade:clean:notifications",
+        :"decidim:upgrade:clean:follows",
+        :"decidim:upgrade:clean:action_logs"
+      ]
+
+      desc "Removes any action logs belonging to invalid resources"
+      task :action_logs, [] => :environment do
+        puts "=== Deleting Action logs\n"
+        invalid = 0
+        Decidim::ActionLog.find_each do |log|
+          log.participatory_space if log.participatory_space_type.present?
+          log.resource if log.resource_type.present?
+
+          if log.resource_type == "Decidim::Component" && log.resource.blank?
+            log.delete
+            invalid += 1
+          end
+
+          next if log.decidim_component_id.blank?
+          next if log.component.present?
+
+          log.delete
+          invalid += 1
+        rescue NameError
+          log.delete
+          invalid += 1
+        end
+        puts "===== Deleted #{invalid} invalid action logs\n"
+      end
+
+      desc "Removes any follows belonging to invalid resources"
+      task :follows, [] => :environment do
+        puts "=== Deleting Follows\n"
+        invalid = 0
+        Decidim::Follow.find_each do |follow|
+          follow.followable
+
+          next unless follow.followable.respond_to?(:component)
+          next if follow.followable.component.present?
+
+          # We attempt to remove any of the follows that refer to spaces or components that disappeared
+          follow.destroy
+          invalid += 1
+        rescue NameError
+          # We use delete as we do not want to call the hooks
+          follow.delete
+          invalid += 1
+        end
+        puts "===== Deleted #{invalid} invalid follows\n"
+      end
+
+      desc "Removes any notifications belonging to invalid resources"
+      task :notifications, [] => :environment do
+        puts "=== Deleting Notification\n"
+        invalid = 0
+        Decidim::Notification.find_each do |notification|
+          # Check if the resource class still exists
+          notification.resource
+          # Check if the event class still exists
+          notification.event_class_instance
+        rescue NameError
+          notification.destroy
+          invalid += 1
+        end
+        puts "===== Deleted #{invalid} invalid notifications\n"
+      end
+
+      desc "Removes any resources from search index that do not exist"
+      task :searchable_resources, [] => :environment do
+        puts "=== Deleting Searchable results\n"
+        puts "==== Deleting invalid spaces \n"
+        invalid = 0
+        Decidim::SearchableResource.where.not(decidim_participatory_space_type: nil).find_each do |search|
+          search.decidim_participatory_space
+        rescue NameError
+          search.destroy!
+          invalid += 1
+        end
+        puts "===== Deleted #{invalid} invalid spaces\n"
+
+        puts "==== Deleting invalid resources from search index \n"
+        invalid = 0
+        Decidim::SearchableResource.find_each do |search|
+          next unless search.resource.respond_to?(:component)
+          next if search.resource.component.present?
+
+          search.destroy
+          invalid += 1
+        rescue NameError
+          search.destroy!
+          invalid += 1
+        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...")

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.28.3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -688,20 +688,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: seven_zip_ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: shakapacker
   requirement: !ruby/object:Gem::Requirement
@@ -764,28 +750,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.3
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1023,6 +1009,7 @@ files:
 - app/cells/decidim/newsletter_templates/image_text_cta_cell.rb
 - app/cells/decidim/newsletter_templates/image_text_cta_settings_form/show.erb
 - app/cells/decidim/newsletter_templates/image_text_cta_settings_form_cell.rb
+- app/cells/decidim/notification/moderated.erb
 - app/cells/decidim/notification/show.erb
 - app/cells/decidim/notification_cell.rb
 - app/cells/decidim/notifications/show.erb
@@ -1538,6 +1525,7 @@ files:
 - app/packs/images/decidim/vendor/social-share-button/x.svg
 - app/packs/images/decidim/vendor/social-share-button/xing.svg
 - app/packs/src/decidim/a11y.js
+- app/packs/src/decidim/abide_form_validator_fixer.js
 - app/packs/src/decidim/account_form.js
 - app/packs/src/decidim/append_elements.js
 - app/packs/src/decidim/append_redirect_url_to_modals.js
@@ -1878,7 +1866,6 @@ files:
 - app/services/decidim/static_map_generator.rb
 - app/services/decidim/tokenizer.rb
 - app/services/decidim/traceability.rb
-- app/services/decidim/zip_stream/writer.rb
 - app/uploaders/decidim/application_uploader.rb
 - app/uploaders/decidim/attachment_uploader.rb
 - app/uploaders/decidim/avatar_uploader.rb
@@ -2812,6 +2799,7 @@ files:
 - lib/decidim/searchable.rb
 - lib/decidim/seeds.rb
 - lib/decidim/settings_manifest.rb
+- lib/decidim/seven_zip_wrapper.rb
 - lib/decidim/shareable_with_token.rb
 - lib/decidim/snippets.rb
 - lib/decidim/social_share_service_manifest.rb
@@ -2868,7 +2856,7 @@ metadata:
   funding_uri: https://opencollective.com/decidim
   homepage_uri: https://decidim.org
   source_code_uri: https://github.com/decidim/decidim
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -2883,8 +2871,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: The core of the Decidim framework.
 test_files: []

data/app/services/decidim/zip_stream/writer.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ZipStream
-    module Writer
-      def add_user_data_to_zip_stream(out, user_data)
-        user_data.each do |element|
-          filename_file = element.last.filename(element.first.parameterize)
-
-          out.put_next_entry(filename_file)
-          if element.last.read.presence
-            out.write element.last.read
-          else
-            out.write "No data"
-          end
-        end
-      end
-
-      def add_attachments_to_zip_stream(out, export_attachments)
-        export_attachments.each do |attachment_block|
-          next if attachment_block.last.nil?
-
-          folder_name = attachment_block.first.parameterize
-          attachment_block.last.each do |attachment|
-            next unless attachment.attached?
-
-            blobs = attachment.is_a?(ActiveStorage::Attached::One) ? [attachment.blob] : attachment.blobs
-            blobs.each do |blob|
-              out.put_next_entry("#{folder_name}/#{blob.filename}")
-              blob.open do |f|
-                out << f.read
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end