decidim-admin 0.28.2 → 0.28.4

data/lib/decidim/admin/test/invite_participatory_space_users_shared_context.rb

@@ -18,6 +18,7 @@ shared_context "when inviting participatory space users" do
     fill_in "Email", with: email
     select role, from: "Role"
     click_on "Create"
+    expect(page).to have_content("successfully added")
     logout :user
   end
 

data/lib/decidim/admin/test/manage_attachments_examples.rb

@@ -26,7 +26,19 @@ shared_examples "manage attachments examples" do
       expect(page).to have_selector("input#attachment_description_en[value='#{translated(attachment.description, locale: :en)}']")
       expect(page).to have_selector("input#attachment_weight[value='#{attachment.weight}']")
       expect(page).to have_select("attachment_attachment_collection_id", selected: translated(attachment_collection.name, locale: :en))
-      expect(page).to have_css("img[src~='#{attachment.url}']")
+
+      # The image's URL changes every time it is requested because the disk
+      # service generates a unique URL based on the expiry time of the link.
+      # This expiry time is calculated at the time when the URL is requested
+      # which is why it changes every time to different URL. This changes the
+      # JSON encoded file identifier which includes the expiry time as well as
+      # the digest of the URL because the digest is calculated based on the
+      # passed data.
+      filename = attachment.file.blob.filename
+      within %([data-active-uploads] [data-filename="#{filename}"]) do
+        src = page.find("img")["src"]
+        expect(src).to be_blob_url(attachment.file.blob)
+      end
     end
 
     it "can add attachments without a collection to a process" do

data/lib/decidim/admin/test/manage_paginated_collection_examples.rb

@@ -12,14 +12,14 @@ shared_examples "a paginated collection" do |options|
   end
 
   describe "Number of results per page" do
-    it "lists 15 resources per page by default" do
-      expect(page).to have_css(".table-list tbody tr", count: 15)
+    it "lists 25 resources per page by default" do
+      expect(page).to have_css(".table-list tbody tr", count: 25)
     end
 
     it "changes the number of results per page" do
       within "[data-pagination]" do
-        page.find("details", text: "15").click
-        click_link "50"
+        page.find("details", text: "25").click
+        click_on "50"
       end
 
       expect(page).to have_selector(".table-list tbody tr", count: 50)

data/lib/decidim/admin/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.28.2"
+      "0.28.4"
     end
   end
 end

data/lib/decidim/admin.rb

@@ -17,21 +17,6 @@ module Decidim
 
     include ActiveSupport::Configurable
 
-    # Public Setting that configures Kaminari configuration options
-    # https://github.com/kaminari/kaminari#general-configuration-options
-
-    # Range of number of results per_page. Defaults to [15, 50, 100].
-    # per_page_range.first sets the default number per page
-    # per_page_range.last sets the default max_per_page
-    config_accessor :per_page_range do
-      [15, 50, 100]
-    end
-
-    Kaminari.configure do |config|
-      config.default_per_page = Decidim::Admin.per_page_range.first
-      config.max_per_page = Decidim::Admin.per_page_range.last
-    end
-
     # Public: Stores an instance of ViewHooks
     def self.view_hooks
       @view_hooks ||= ViewHooks.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.28.2
+  version: 0.28.4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-16 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.28.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.28.4
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -94,28 +94,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.28.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.28.4
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.28.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.28.4
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -215,12 +215,12 @@ files:
 - app/controllers/concerns/decidim/admin/logs/filterable.rb
 - app/controllers/concerns/decidim/admin/needs_admin_tos_accepted.rb
 - app/controllers/concerns/decidim/admin/officializations/filterable.rb
-- app/controllers/concerns/decidim/admin/paginable.rb
 - app/controllers/concerns/decidim/admin/participatory_space_admin_breadcrumb.rb
 - app/controllers/concerns/decidim/admin/participatory_space_admin_context.rb
 - app/controllers/concerns/decidim/admin/participatory_space_export.rb
 - app/controllers/concerns/decidim/admin/user_groups.rb
 - app/controllers/concerns/decidim/admin/user_groups/filterable.rb
+- app/controllers/concerns/decidim/admin/verification_conflicts/filterable.rb
 - app/controllers/concerns/decidim/moderated_users/admin/filterable.rb
 - app/controllers/concerns/decidim/moderations/admin/filterable.rb
 - app/controllers/concerns/decidim/participatory_space_private_users/admin/filterable.rb
@@ -331,7 +331,6 @@ files:
 - app/helpers/decidim/admin/moderations/reports_helper.rb
 - app/helpers/decidim/admin/moderations_helper.rb
 - app/helpers/decidim/admin/newsletters_helper.rb
-- app/helpers/decidim/admin/paginable/per_page_helper.rb
 - app/helpers/decidim/admin/reminders_helper.rb
 - app/helpers/decidim/admin/resource_permissions_helper.rb
 - app/helpers/decidim/admin/resource_scope_helper.rb

data/app/controllers/concerns/decidim/admin/paginable.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/concern"
-
-module Decidim
-  module Admin
-    module Paginable
-      # Common logic to paginate admin resources
-      extend ActiveSupport::Concern
-
-      included do
-        include Decidim::Paginable
-
-        def per_page
-          params[:per_page].present? ? params[:per_page].to_i : Decidim::Admin.per_page_range.first
-        end
-      end
-    end
-  end
-end

data/app/helpers/decidim/admin/paginable/per_page_helper.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    module Paginable
-      # This module includes helpers the :per_page cell's option
-      module PerPageHelper
-        def per_page_options
-          OpenStruct.new(
-            per_page:,
-            per_page_range: Decidim::Admin.per_page_range
-          )
-        end
-
-        # Renders the pagination dropdown menu in the admin panel.
-        def admin_filters_pagination
-          cell("decidim/admin/results_per_page", per_page_options)
-        end
-      end
-    end
-  end
-end