decidim-admin 0.29.0.rc2 → 0.29.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84e3cd62d56492d5c74d5c9f4a8bcdae31eb80f698c592ac4a0b08a61a6897d6
-  data.tar.gz: fd0c3ff54c73c7da35802fd23d10f4bf96497526a3fd80eb821e5779bb982ee7
+  metadata.gz: c877f632437efb1ca6924a56a4d1c69a627dd579b13b4f3aaad1e4968265f94b
+  data.tar.gz: 5091d36c76fd1be662162c90c851fb6e92d72e9aa983ce6676765b6b375d3af6
 SHA512:
-  metadata.gz: acd7ea54ff83475e46329b3708c475d9952b2326f8ba78030356c1985f03d1ebc4377a9246fb3c3ee69c36c53190a2d429d1ba510e53fa8a299a66c1ac3a60ac
-  data.tar.gz: 0be29b327109a17ac6f0d081ce0d3f20b8b5153a6f840a485425a0557358c3926b228fca0aea3527afd3cf0090683c963b329d921de48a3267124fcc866a48a9
+  metadata.gz: 9084ab29f342406ebd1ea041ce3f4b466257db1a191c4b433d32bbf2eb704b26cdcae8de99bd14238ae973c9427e27dd1a774721e079fd62fed31479bc0581ba
+  data.tar.gz: 4dfbfc46e584d15f1cadeab09cbe7fe2419d6d541882da5c9d8cd3fc9e705e628c9ea0e22c6e20ce17af74534df16f2894301f803a847fc4c33ef1eb916e3f34

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

@@ -0,0 +1,31 @@
+# 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/controllers/decidim/admin/application_controller.rb

@@ -18,6 +18,7 @@ module Decidim
       include Headers::ContentSecurityPolicy
       include DisableRedirectionToExternalHost
       include Decidim::Admin::Concerns::HasBreadcrumbItems
+      include ActiveStorage::SetCurrent
 
       helper Decidim::Admin::ApplicationHelper
       helper Decidim::Admin::AttributesDisplayHelper

data/app/controllers/decidim/admin/conflicts_controller.rb

@@ -3,18 +3,16 @@
 module Decidim
   module Admin
     class ConflictsController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::VerificationConflicts::Filterable
+
       layout "decidim/admin/users"
 
-      helper_method :context_breadcrumb_items
+      helper_method :context_breadcrumb_items, :conflicts
 
       add_breadcrumb_item_from_menu :impersonate_menu
 
       def index
         enforce_permission_to :index, :impersonatable_user
-
-        @conflicts = Decidim::Verifications::Conflict.joins(:current_user).where(
-          decidim_users: { decidim_organization_id: current_organization.id }
-        )
       end
 
       def edit
@@ -66,6 +64,16 @@ module Decidim
           url: decidim_admin.impersonatable_users_path
         }
       end
+
+      def collection
+        @collection ||= Decidim::Verifications::Conflict.joins(:current_user).where(
+          decidim_users: { decidim_organization_id: current_organization.id }
+        )
+      end
+
+      def conflicts
+        @conflicts ||= filtered_collection.order(created_at: :desc)
+      end
     end
   end
 end

data/app/views/decidim/admin/components/index.html.erb

@@ -14,8 +14,12 @@
         <div class="dropdown-pane" id="add-component-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
           <ul class="vertical menu add-components font-normal">
             <% @manifests.each do |manifest| %>
-              <li><%= link_to t("#{manifest.name}.name", scope: "decidim.components"), new_component_path(type: manifest.name), class: manifest.name %></li>
+             <%= link_to new_component_path(type: manifest.name), class: manifest.name do %>
+              <li>
+                <%= t("#{manifest.name}.name", scope: "decidim.components") %>
+              </li>
             <% end %>
+          <% end %>
           </ul>
         </div>
       </div>

data/app/views/decidim/admin/conflicts/index.html.erb

@@ -1,10 +1,32 @@
 <% add_decidim_page_title(t("title", scope: "decidim.admin.conflicts")) %>
-<div class="card">
-  <div class="item_show__header">
-    <h1 class="item_show__header-title">
-      <%= t("title", scope: "decidim.admin.conflicts") %>
-    </h1>
+<div class="item_show__header">
+  <h1 class="item_show__header-title">
+    <%= t("title", scope: "decidim.admin.conflicts") %>
+  </h1>
+</div>
+
+<div class="filters__section">
+  <div class="fcell search">
+    <%= search_form_for(query, url: url_for) do |form| %>
+      <%= applied_filters_hidden_field_tags %>
+      <div class="input-group">
+        <%= form.search_field(
+              search_field_predicate,
+              class: "input-group-field",
+              label: false,
+              placeholder: t(".text")
+            ) %>
+        <div class="input-group-button">
+          <button type="submit" class="text-secondary" aria-label="<%= t("decidim.search.term_input_placeholder") %>">
+            <%= icon "search-line", class: "fill-secondary w-4 h-4" %>
+          </button>
+        </div>
+      </div>
+    <% end %>
   </div>
+</div>
+
+<div class="card">
   <div class="table-scroll">
     <table class="table-list">
       <thead>
@@ -17,7 +39,7 @@
         </tr>
       </thead>
       <tbody>
-        <% @conflicts.each do |conflict| %>
+        <% conflicts.each do |conflict| %>
           <tr>
             <td><%= conflict.current_user.name %></td>
             <td><%= conflict.managed_user.name %></td>
@@ -30,3 +52,4 @@
     </table>
   </div>
 </div>
+<%= decidim_paginate conflicts %>

data/app/views/decidim/admin/exports/_dropdown.html.erb

@@ -10,11 +10,11 @@
   <ul class="vertical menu add-components">
     <% component.manifest.export_manifests.each do |manifest| %>
       <% manifest.formats.each do |format| %>
-        <li class="exports--format--<%= format.downcase %> exports--<%= manifest.name %>">
-          <%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{component.manifest.name}.admin.exports.#{manifest.name}"), export_format: t("decidim.admin.exports.formats.#{format}")),
-                      exports_path(component, id: manifest.name, format:, resource_id:, filters:),
-                      method: :post %>
-        </li>
+        <%= link_to exports_path(component, id: manifest.name, format:, resource_id:, filters:), method: :post do %>
+          <li class="exports--format--<%= format.downcase %> exports--<%= manifest.name %>">
+            <%= t("decidim.admin.exports.export_as", name: t("decidim.#{component.manifest.name}.admin.exports.#{manifest.name}"), export_format: t("decidim.admin.exports.formats.#{format}")) %>
+          </li>
+        <% end %>
       <% end %>
     <% end %>
   </ul>

data/app/views/decidim/admin/imports/_dropdown.html.erb

@@ -7,10 +7,12 @@
     <% if custom %>
       <%= yield %>
     <% else %>
-      <% component.manifest.import_manifests.each do |import_manifest| %>
-        <li class="imports--file imports--<%= import_manifest.name %>">
-          <%= link_to import_manifest.message(:label, self), admin_imports_path(component, resource_id:, name: import_manifest.name) %>
-        </li>
+     <% component.manifest.import_manifests.each do |import_manifest| %>
+        <%= link_to admin_imports_path(component, resource_id:, name: import_manifest.name) do %>
+          <li class="imports--file imports--<%= import_manifest.name %>">
+            <%= import_manifest.message(:label, self) %>
+          </li>
+        <% end %>
       <% end %>
     <% end %>
   </ul>

data/app/views/decidim/admin/imports/new.html.erb

@@ -12,10 +12,11 @@
         <div class="dropdown-pane" id="example-dropdown" data-dropdown data-position=bottom data-alignment=right data-auto-focus="true" data-close-on-click="true">
           <ul class="vertical menu add-components">
             <% mime_types.each do |format, name| %>
-              <li class="examples--format--<%= format.downcase %> examples--<%= import_manifest.name %>">
-                <%= link_to t(".download_example_format", name:),
-                            admin_imports_example_path(@current_component, name: import_manifest.name, format:) %>
-              </li>
+              <%= link_to admin_imports_example_path(@current_component, name: import_manifest.name, format:) do %>
+                <li class="examples--format--<%= format.downcase %> examples--<%= import_manifest.name %>">
+                  <%= t(".download_example_format", name:) %>
+                </li>
+              <% end %>
             <% end %>
           </ul>
         </div>

data/app/views/decidim/admin/organization_appearance/form/_minimap.html.erb

@@ -3,7 +3,7 @@
   <div id="minimap" class="grid grid-cols-1 md:grid-cols-2">
     <div class="minimap-tab">
       <% if current_organization.favicon.attached? %>
-        <%= image_tag current_organization.attached_uploader(:favicon).path, class: "minimap-favicon" %>
+        <%= image_tag current_organization.attached_uploader(:favicon).url, class: "minimap-favicon" %>
       <% else %>
         <%= content_tag :div, nil, { class: "minimap-favicon placeholder", style: "width: #{image_width(current_organization, :favicon) * size_factor}px; height: #{image_height(current_organization, :favicon) * size_factor}px;" } do %>
           <span><%= t("favicon", scope: "activemodel.attributes.organization") %></span>
@@ -13,7 +13,7 @@
 
     <div class="minimap-header">
       <% if current_organization.logo.present? %>
-        <%= image_tag current_organization.attached_uploader(:logo).path, class: "minimap-logo" %>
+        <%= image_tag current_organization.attached_uploader(:logo).url, class: "minimap-logo" %>
       <% else %>
         <%= content_tag :div, nil, { class: "minimap-logo placeholder", style: "width: #{image_width(current_organization, :logo) * size_factor}px; height: #{image_height(current_organization, :logo) * size_factor}px;" } do %>
           <span><%= t("logo", scope: "activemodel.attributes.organization") %></span>
@@ -26,7 +26,7 @@
 
     <div class="minimap-footer">
       <% if current_organization.official_img_footer.attached? %>
-        <%= image_tag current_organization.attached_uploader(:official_img_footer).path, class: "minimap-official_img_footer" %>
+        <%= image_tag current_organization.attached_uploader(:official_img_footer).url, class: "minimap-official_img_footer" %>
       <% else %>
         <%= content_tag :div, nil, { class: "minimap-official_img_footer placeholder", style: "width: #{image_width(current_organization, :official_img_footer) * size_factor}px; height: #{image_height(current_organization, :official_img_footer) * size_factor}px;" } do %>
         <span><%= t("official_img_footer", scope: "activemodel.attributes.organization") %></span>

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

@@ -23,7 +23,7 @@
           <div class="layout-nav">
             <%= link_to decidim_admin.root_path, class: "logo hidden md:block", data: { "external-link": false }, aria: { label: t("decidim.accessibility.logo", organization: current_organization_name) } do %>
               <% if current_organization.logo.present? %>
-                <%= image_tag current_organization.attached_uploader(:logo).path, alt: current_organization_name %>
+                <%= image_tag current_organization.attached_uploader(:logo).url, alt: current_organization_name %>
               <% else %>
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 134 109">
                   <g fill="#fff">

data/config/locales/ca.yml

@@ -351,6 +351,8 @@ ca:
       conflicts:
         attempts: Intents
         'false': 'No'
+        index:
+          text: Cercar per correu electrònic, nom o àlies.
         managed_user_name: Usuari gestionat
         solved: Resolt
         title: Conflictes de verificació

data/config/locales/de.yml

@@ -351,6 +351,8 @@ de:
       conflicts:
         attempts: Versuche
         'false': 'Nein'
+        index:
+          text: Suche nach bestehender E-Mail, Name oder Spitzname des Teilnehmenden.
         managed_user_name: Verwalteter Benutzer
         solved: Gelöst
         title: Überprüfungskonflikte

data/config/locales/en.yml

@@ -351,6 +351,8 @@ en:
       conflicts:
         attempts: Attempts
         'false': 'No'
+        index:
+          text: Search by current user email, name or nickname.
         managed_user_name: Managed User
         solved: Solved
         title: Verification conflicts

data/config/locales/es.yml

@@ -351,6 +351,8 @@ es:
       conflicts:
         attempts: Intentos
         'false': 'No'
+        index:
+          text: Buscar por correo electrónico, nombre o alias.
         managed_user_name: Usuario gestionado
         solved: Resuelto
         title: Conflictos de verificación

data/config/locales/fr-CA.yml

@@ -351,6 +351,8 @@ fr-CA:
       conflicts:
         attempts: Tentatives
         'false': 'Non'
+        index:
+          text: Recherche par adresse e-mail, nom ou pseudonyme.
         managed_user_name: Utilisateur représenté
         solved: Résolu
         title: Conflits de vérification

data/config/locales/fr.yml

@@ -351,6 +351,8 @@ fr:
       conflicts:
         attempts: Tentatives
         'false': 'Non'
+        index:
+          text: Recherche par adresse e-mail, nom ou pseudonyme.
         managed_user_name: Utilisateur représenté
         solved: Résolu
         title: Conflits de vérification

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_css("input#attachment_description_en[value='#{translated(attachment.description, locale: :en)}']")
       expect(page).to have_css("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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.29.0.rc2
+  version: 0.29.0.rc4
 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-07-30 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.29.0.rc2
+        version: 0.29.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0.rc2
+        version: 0.29.0.rc4
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -94,28 +94,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0.rc2
+        version: 0.29.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0.rc2
+        version: 0.29.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0.rc2
+        version: 0.29.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0.rc2
+        version: 0.29.0.rc4
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -218,6 +218,7 @@ files:
 - 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