decidim-admin 0.28.4 → 0.29.0.rc1

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

@@ -15,16 +15,16 @@ shared_examples "sorted moderations" do
   before do
     visit participatory_space_path
     if moderations_link_in_admin_menu
-      within_admin_sidebar_menu { click_link(moderations_link_text) }
+      within_admin_sidebar_menu { click_on(moderations_link_text) }
     else
-      within("div.layout-nav") { click_link(moderations_link_text) }
+      within("div.layout-nav") { click_on(moderations_link_text) }
     end
   end
 
   it "sorts the most recent first" do
     link_text = find("ul[data-pages]").text.split("\n")[-2]
     within "ul[data-pages]" do
-      click_link link_text
+      click_on link_text
     end
     all("tbody tr").each_with_index do |row, _index|
       expect(row.find("td:first-child")).to have_content(reportables.first.id)
@@ -54,9 +54,9 @@ shared_examples "manage moderations" do
   before do
     visit participatory_space_path
     if moderations_link_in_admin_menu
-      within_admin_sidebar_menu { click_link(moderations_link_text) }
+      within_admin_sidebar_menu { click_on(moderations_link_text) }
     else
-      within("div.layout-nav") { click_link(moderations_link_text) }
+      within("div.layout-nav") { click_on(moderations_link_text) }
     end
   end
 
@@ -68,7 +68,7 @@ shared_examples "manage moderations" do
 
       visit current_path
 
-      expect(page).not_to have_selector("tr[data-id=\"#{external_moderation.id}\"]")
+      expect(page).to have_no_css("tr[data-id=\"#{external_moderation.id}\"]")
     end
 
     it "user can review them" do
@@ -82,7 +82,7 @@ shared_examples "manage moderations" do
 
     it "user can un-report a resource" do
       within "tr[data-id=\"#{moderation.id}\"]" do
-        click_link "Unreport"
+        click_on "Unreport"
       end
 
       expect(page).to have_admin_callout("Resource successfully unreported")
@@ -90,11 +90,11 @@ shared_examples "manage moderations" do
 
     it "user can hide a resource" do
       within "tr[data-id=\"#{moderation.id}\"]" do
-        click_link "Hide"
+        click_on "Hide"
       end
 
       expect(page).to have_admin_callout("Resource successfully hidden")
-      expect(page).not_to have_content(moderation.reportable.reported_content_url)
+      expect(page).to have_no_content(moderation.reportable.reported_content_url)
     end
 
     it "user can sort by report count" do
@@ -102,7 +102,7 @@ shared_examples "manage moderations" do
       moderations_ordered_by_report_count_asc = moderations.sort_by(&:report_count)
 
       within "table" do
-        click_link "Reports count"
+        click_on "Reports count"
 
         all("tbody tr").each_with_index do |row, index|
           reportable_id = moderations_ordered_by_report_count_asc[index].reportable.id
@@ -116,23 +116,23 @@ shared_examples "manage moderations" do
       within ".filters__section" do
         find(:xpath, "//a[contains(text(), 'Filter')]").hover
         find(:xpath, "//a[contains(text(), 'Type')]").hover
-        click_link reportable_type
+        click_on reportable_type
       end
-      expect(page).to have_selector("tbody tr", count: moderations.length)
+      expect(page).to have_css("tbody tr", count: moderations.length)
     end
 
     it "user can filter by reported content" do
       search = moderation.reportable.id
       within ".filters__section" do
         fill_in("Search Moderation by reportable id or content.", with: search)
-        click_button(type: "submit")
+        within(".input-group-button") { click_on(class: "text-secondary") }
       end
-      expect(page).to have_selector("tbody tr", count: 1)
+      expect(page).to have_css("tbody tr", count: 1)
     end
 
     it "user can see moderation details" do
       within "tr[data-id=\"#{moderation.id}\"]" do
-        click_link "Expand"
+        click_on "Expand"
       end
 
       reported_content_slice = moderation.reportable.reported_searchable_content_text.split("\n").first
@@ -144,7 +144,7 @@ shared_examples "manage moderations" do
         moderation.reportable.destroy
         visit current_path
 
-        expect(page).not_to have_selector("tr[data-id=\"#{moderation.id}\"]")
+        expect(page).to have_no_css("tr[data-id=\"#{moderation.id}\"]")
       end
     end
 
@@ -170,7 +170,7 @@ shared_examples "manage moderations" do
         )
 
         within_language_menu(admin: true) do
-          click_link "Català"
+          click_on "Català"
         end
       end
 
@@ -184,11 +184,11 @@ shared_examples "manage moderations" do
 
   context "when listing hidden resources" do
     before do
-      click_link "Hidden"
+      click_on "Hidden"
     end
 
     it "user cannot unreport them" do
-      expect(page).not_to have_css(".action-icon--unreport")
+      expect(page).to have_no_css(".action-icon--unreport")
     end
 
     it "user can review them" do
@@ -231,11 +231,11 @@ shared_examples "manage moderations" do
     it "user can hide them" do
       moderation_id = moderations.first.id
       within "tr[data-id=\"#{moderation_id}\"]" do
-        click_link "Hide"
+        click_on "Hide"
       end
 
       expect(page).to have_admin_callout("Resource successfully hidden")
-      expect(page).not_to have_selector("tr[data-id=\"#{moderation_id}\"]")
+      expect(page).to have_no_css("tr[data-id=\"#{moderation_id}\"]")
     end
   end
 end

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

@@ -3,7 +3,7 @@
 shared_examples "a paginated collection" do |options|
   before do
     # Current path strips out the request parameters, use current_url when needed
-    # Be aware that current_utl can lead to flaky, use with caution
+    # Be aware that current_url can lead to flaky, use with caution
     if options&.dig(:url)
       visit current_url
     else
@@ -12,17 +12,17 @@ shared_examples "a paginated collection" do |options|
   end
 
   describe "Number of results per page" do
-    it "lists 25 resources per page by default" do
-      expect(page).to have_css(".table-list tbody tr", count: 25)
+    it "lists 15 resources per page by default" do
+      expect(page).to have_css(".table-list tbody tr", count: 15)
     end
 
     it "changes the number of results per page" do
       within "[data-pagination]" do
-        page.find("details", text: "25").click
+        page.find("details", text: "15").click
         click_on "50"
       end
 
-      expect(page).to have_selector(".table-list tbody tr", count: 50)
+      expect(page).to have_css(".table-list tbody tr", count: 50)
     end
   end
 end

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

@@ -15,7 +15,7 @@ shared_examples "manage participatory space publications" do |_options|
     end
 
     it "publishes it" do
-      click_link "Publish"
+      click_on "Publish"
 
       expect(page).to have_content("successfully")
 
@@ -42,7 +42,7 @@ shared_examples "manage participatory space publications" do |_options|
     it "unpublishes it" do
       # we cannot use "a 404 page" shared example as we want to check it
       # inside an example
-      click_link "Unpublish"
+      click_on "Unpublish"
 
       expect(page).to have_content("successfully")
 

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.4"
+      "0.29.0.rc1"
     end
   end
 end

data/lib/decidim/admin.rb

@@ -17,6 +17,21 @@ 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.4
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2024-07-16 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.4
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -94,28 +94,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -162,9 +162,6 @@ files:
 - app/commands/decidim/admin/destroy_newsletter.rb
 - app/commands/decidim/admin/destroy_participatory_space_private_user.rb
 - app/commands/decidim/admin/destroy_scope.rb
-- app/commands/decidim/admin/destroy_share_token.rb
-- app/commands/decidim/admin/destroy_static_page.rb
-- app/commands/decidim/admin/destroy_static_page_topic.rb
 - app/commands/decidim/admin/hide_resource.rb
 - app/commands/decidim/admin/impersonate_user.rb
 - app/commands/decidim/admin/invite_admin.rb
@@ -194,7 +191,7 @@ files:
 - app/commands/decidim/admin/update_category.rb
 - app/commands/decidim/admin/update_component.rb
 - app/commands/decidim/admin/update_component_permissions.rb
-- app/commands/decidim/admin/update_external_domain_whitelist.rb
+- app/commands/decidim/admin/update_external_domain_allowlist.rb
 - app/commands/decidim/admin/update_help_sections.rb
 - app/commands/decidim/admin/update_newsletter.rb
 - app/commands/decidim/admin/update_organization.rb
@@ -215,12 +212,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
@@ -262,7 +259,7 @@ files:
 - app/controllers/decidim/admin/officializations_controller.rb
 - app/controllers/decidim/admin/organization_appearance_controller.rb
 - app/controllers/decidim/admin/organization_controller.rb
-- app/controllers/decidim/admin/organization_external_domain_whitelist_controller.rb
+- app/controllers/decidim/admin/organization_external_domain_allowlist_controller.rb
 - app/controllers/decidim/admin/organization_homepage_content_blocks_controller.rb
 - app/controllers/decidim/admin/organization_homepage_controller.rb
 - app/controllers/decidim/admin/participatory_space/user_role_controller.rb
@@ -299,7 +296,7 @@ files:
 - app/forms/decidim/admin/newsletter_form.rb
 - app/forms/decidim/admin/officialization_form.rb
 - app/forms/decidim/admin/organization_appearance_form.rb
-- app/forms/decidim/admin/organization_external_domain_whitelist_form.rb
+- app/forms/decidim/admin/organization_external_domain_allowlist_form.rb
 - app/forms/decidim/admin/organization_form.rb
 - app/forms/decidim/admin/participatory_space_admin_user_form.rb
 - app/forms/decidim/admin/participatory_space_private_user_csv_import_form.rb
@@ -331,6 +328,7 @@ 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
@@ -357,9 +355,10 @@ files:
 - app/packs/src/decidim/admin/auto_label_by_position.component.js
 - app/packs/src/decidim/admin/budget_rule_toggler.component.js
 - app/packs/src/decidim/admin/choose_language.js
+- app/packs/src/decidim/admin/css_preview.js
 - app/packs/src/decidim/admin/draggable-list.js
 - app/packs/src/decidim/admin/dynamic_fields.component.js
-- app/packs/src/decidim/admin/external_domain_whitelist.js
+- app/packs/src/decidim/admin/external_domain_allowlist.js
 - app/packs/src/decidim/admin/field_dependent_inputs.component.js
 - app/packs/src/decidim/admin/form.js
 - app/packs/src/decidim/admin/managed_users.js
@@ -374,7 +373,9 @@ files:
 - app/packs/src/decidim/admin/sortable.js
 - app/packs/src/decidim/admin/subform_multi_toggler.component.js
 - app/packs/src/decidim/admin/subform_toggler.component.js
+- app/packs/src/decidim/admin/sync_radio_buttons.js
 - app/packs/src/decidim/admin/tab_focus.js
+- app/packs/src/decidim/admin/text_copy.js
 - app/packs/src/decidim/admin/toggle_nav.js
 - app/packs/src/decidim/admin/triadic_color_picker.js
 - app/packs/src/decidim/admin/welcome_notification.js
@@ -383,6 +384,7 @@ files:
 - app/packs/stylesheets/decidim/admin/_color_picker.scss
 - app/packs/stylesheets/decidim/admin/_component-show.scss
 - app/packs/stylesheets/decidim/admin/_data_picker.scss
+- app/packs/stylesheets/decidim/admin/_datepicker.scss
 - app/packs/stylesheets/decidim/admin/_dropdown.scss
 - app/packs/stylesheets/decidim/admin/_filters.scss
 - app/packs/stylesheets/decidim/admin/_forms.scss
@@ -394,6 +396,7 @@ files:
 - app/packs/stylesheets/decidim/admin/_main-nav.scss
 - app/packs/stylesheets/decidim/admin/_minimap.scss
 - app/packs/stylesheets/decidim/admin/_moderations.scss
+- app/packs/stylesheets/decidim/admin/_proposal_status.scss
 - app/packs/stylesheets/decidim/admin/_secondary-nav.scss
 - app/packs/stylesheets/decidim/admin/_show_email.scss
 - app/packs/stylesheets/decidim/admin/_sidebar-menu.scss
@@ -496,9 +499,9 @@ files:
 - app/views/decidim/admin/organization_appearance/form/_header_snippets.html.erb
 - app/views/decidim/admin/organization_appearance/form/_images.html.erb
 - app/views/decidim/admin/organization_appearance/form/_minimap.html.erb
-- app/views/decidim/admin/organization_external_domain_whitelist/_external_domain.html.erb
-- app/views/decidim/admin/organization_external_domain_whitelist/_form.html.erb
-- app/views/decidim/admin/organization_external_domain_whitelist/edit.html.erb
+- app/views/decidim/admin/organization_external_domain_allowlist/_external_domain.html.erb
+- app/views/decidim/admin/organization_external_domain_allowlist/_form.html.erb
+- app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
 - app/views/decidim/admin/participatory_space_private_users/_form.html.erb
 - app/views/decidim/admin/participatory_space_private_users/index.html.erb
 - app/views/decidim/admin/participatory_space_private_users/new.html.erb
@@ -515,6 +518,7 @@ files:
 - app/views/decidim/admin/scopes/index.html.erb
 - app/views/decidim/admin/scopes/new.html.erb
 - app/views/decidim/admin/share_tokens/_share_tokens.html.erb
+- app/views/decidim/admin/shared/_adjacent_navigation.html.erb
 - app/views/decidim/admin/shared/_admin_confirm_modal.html.erb
 - app/views/decidim/admin/shared/_filters.html.erb
 - app/views/decidim/admin/shared/_gallery.html.erb
@@ -549,7 +553,6 @@ files:
 - app/views/layouts/decidim/admin/_title_bar_responsive.html.erb
 - app/views/layouts/decidim/admin/application.html.erb
 - app/views/layouts/decidim/admin/global_moderations.html.erb
-- app/views/layouts/decidim/admin/login.html.erb
 - app/views/layouts/decidim/admin/newsletters.erb
 - app/views/layouts/decidim/admin/settings.html.erb
 - app/views/layouts/decidim/admin/users.html.erb
@@ -705,14 +708,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Decidim organization administration

data/app/commands/decidim/admin/destroy_share_token.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # A command with all the business logic to destroy a share token.
-    class DestroyShareToken < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # share_token - The share_token to destroy
-      # current_user - the user performing the action
-      def initialize(share_token, current_user)
-        @share_token = share_token
-        @current_user = current_user
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the form was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        begin
-          destroy_share_token
-        rescue StandardError
-          broadcast(:invalid)
-        end
-        broadcast(:ok)
-      end
-
-      private
-
-      attr_reader :current_user
-
-      def destroy_share_token
-        Decidim.traceability.perform_action!(
-          "delete",
-          @share_token,
-          current_user
-        ) do
-          @share_token.destroy!
-        end
-      end
-    end
-  end
-end

data/app/commands/decidim/admin/destroy_static_page.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # This command deals with destroying a StaticPage from the admin panel.
-    class DestroyStaticPage < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # page - The StaticPage to be destroyed.
-      def initialize(page, current_user)
-        @page = page
-        @current_user = current_user
-      end
-
-      # Public: Executes the command.
-      #
-      # Broadcasts :ok if it got destroyed
-      def call
-        destroy_page
-        broadcast(:ok)
-      end
-
-      private
-
-      attr_reader :page, :current_user
-
-      def destroy_page
-        transaction do
-          Decidim.traceability.perform_action!(
-            "delete",
-            page,
-            current_user
-          ) do
-            page.destroy!
-          end
-        end
-      end
-    end
-  end
-end

data/app/commands/decidim/admin/destroy_static_page_topic.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # This command deals with destroying a StaticPageTopic from the admin panel.
-    class DestroyStaticPageTopic < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # page - The StaticPageTopic to be destroyed.
-      def initialize(_topic, current_user)
-        @topic = page
-        @current_user = current_user
-      end
-
-      # Public: Executes the command.
-      #
-      # Broadcasts :ok if it got destroyed
-      def call
-        destroy_topic
-        broadcast(:ok)
-      end
-
-      private
-
-      attr_reader :page, :current_user
-
-      def destroy_topic
-        transaction do
-          Decidim.traceability.perform_action!(
-            "delete",
-            topic,
-            current_user
-          ) do
-            topic.destroy!
-          end
-        end
-      end
-    end
-  end
-end

data/app/controllers/concerns/decidim/admin/verification_conflicts/filterable.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/concern"
-
-module Decidim
-  module Admin
-    module VerificationConflicts
-      module Filterable
-        extend ActiveSupport::Concern
-
-        included do
-          include Decidim::Admin::Filterable
-
-          private
-
-          def base_query
-            collection
-          end
-
-          def search_field_predicate
-            :current_user_name_or_current_user_nickname_or_current_user_email_cont
-          end
-
-          def filters
-            []
-          end
-        end
-      end
-    end
-  end
-end

data/app/views/layouts/decidim/admin/login.html.erb

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Decidim - Login</title>
-    <%= render partial: "layouts/decidim/admin/header" %>
-  </head>
-
-  <body class="login">
-    <div class="login-form-wrapper">
-      <div class="login-form">
-        <h1>Decidim</h1>
-        <%= display_flash_messages %>
-        <div class="login-form-inner">
-          <%= yield %>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>