decidim-core 0.28.3 → 0.28.4

data/config/locales/zh-TW.yml

@@ -824,7 +824,6 @@ zh-TW:
           title_required: 標題為必填欄位！
           uploaded: 已上傳
           validating: 驗證中...
-          validation_error: 驗證錯誤!
         select_file: 選擇檔案
       upload_help:
         dropzone: 將檔案拖曳到此處或點擊按鈕上傳。

data/lib/decidim/core/engine.rb

@@ -275,6 +275,12 @@ module Decidim
         app.config.exceptions_app = Decidim::Core::Engine.routes
       end
 
+      initializer "decidim_core.direct_uploader_paths", after: "decidim_core.exceptions_app" do |_app|
+        config.to_prepare do
+          ActiveStorage::DirectUploadsController.include Decidim::DirectUpload
+        end
+      end
+
       initializer "decidim_core.locales" do |app|
         app.config.i18n.fallbacks = true
       end

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

@@ -494,6 +494,16 @@ shared_examples "comments" do
         expect(page).to have_selector("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

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,18 +51,18 @@ 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
-          click_button "Like"
+        within "#resource-#{resource.id}-endorsement-block" do
+          click_on "Like"
         end
 
         expect(page).to have_css("#loginModal", visible: :visible)
@@ -77,8 +77,8 @@ 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
-            click_button "Like"
+          within "#resource-#{resource.id}-endorsement-block" do
+            click_on "Like"
             expect(page).to have_button("Dislike")
           end
         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).not_to have_button("Like")
           end
@@ -97,8 +97,8 @@ shared_examples "Endorse resource system specs" do
 
         it "is able to undo the endorsement" do
           visit_resource
-          within "[data-buttons]" do
-            click_button "Dislike"
+          within "#resource-#{resource.id}-endorsement-block" do
+            click_on "Dislike"
             expect(page).to have_button("Like")
           end
         end
@@ -124,8 +124,8 @@ 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
-              click_button "Like"
+            within "#resource-#{resource.id}-endorsement-block" do
+              click_on "Like"
             end
             expect(page).to have_css("#authorizationModal", visible: :visible)
           end
@@ -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
-              click_button "Like"
+            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.28.3"
+      "0.28.4"
     end
   end
 end

data/lib/decidim/core.rb

@@ -542,6 +542,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/organization_settings.rb

@@ -105,7 +105,7 @@ 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),
+              "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)
             },
             "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/view_model.rb

@@ -87,7 +87,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.28.3
+  version: 0.28.4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -750,28 +750,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.28.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.28.4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.28.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.28.4
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1162,6 +1162,7 @@ files:
 - app/controllers/concerns/decidim/amendments_controller.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
@@ -2840,6 +2841,7 @@ files:
 - lib/tasks/decidim_robots.rake
 - lib/tasks/decidim_tasks.rake
 - lib/tasks/decidim_webpacker_tasks.rake
+- lib/tasks/upgrade/decidim_attachments.rake
 - lib/tasks/upgrade/decidim_deduplicate_endorsements.rake
 - lib/tasks/upgrade/decidim_fix_categorization.rake
 - lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake