decidim-admin 0.28.1 → 0.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cf03aeb983e0ddb8c344dbe1f8b8d21f7fbdfbd2a0f0c75f2ca76010320dd77
-  data.tar.gz: 91db438a29f5e05315b436f3b1cf96d0d0b2ad6fa03f4ec5955f30605fd99f12
+  metadata.gz: 1b4c55445cbf1d61f5aabef092569d33d79906e1de58106cab2d0650cf4046b5
+  data.tar.gz: 508c3c95f08c68df503df0b9bd9bb752a9d8c999f048421133da80190a876add
 SHA512:
-  metadata.gz: 8fa198551d57ea25461ecd2e86a0f7aae31f4b3e67151ed8e952ed4e91bcfb088c460ebde206520b83c7d13e5ab478b510d5eb6b9fe8e870ef1df2fe92f14cb4
-  data.tar.gz: cb21f050e6fa924f96579bd440058c7290d2ca29a6a4501e22a3b10c6b5199aa39b686e153e03a32aef78c80cc4c0d9c07746d00bc67656aeb56ba862e3a29c7
+  metadata.gz: 5cfe3db6149075c9308985f333d7f9cbd03e7f6878f34545c40c67c40378466e105ec82fe960c1a1625d75f1b8a31870aedc17647d7e7c72677c2cc424f1bd76
+  data.tar.gz: 4bd3495d6613ee0619dba4825ad378eba623983bb1f7074649039ab4a7381f07edc4bb6c641722779c8ac57d7057421145049c7a7574ce1b430a1b4f88c5606d

data/README.md

@@ -42,19 +42,6 @@ There are some pages that exist by default and cannot be deleted since there
 are links to them inside the Decidim framework, see `Decidim::StaticPage` for
 the default list.
 
-### Pager Configuration
-
-The number of results shown per page and per page range can be configured in the app `decidim.rb` initializer as follows:
-
-```ruby
-Decidim::Admin.configure do |config|
-  config.per_page_range = [15, 50, 100]
-end
-```
-
-* `Decidim::Admin.per_page_range.first` sets the `default_per_page` value for `Decidim::Admin` (in Kaminari)
-* `Decidim::Admin.per_page_range.last` sets the `max_per_page`  value for `Decidim::Admin` (in Kaminari)
-
 ## Contributing
 
 See [Decidim](https://github.com/decidim/decidim).

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

@@ -44,6 +44,7 @@ module Decidim
       end
 
       def run_before_hooks
+        Decidim::Reminder.where(component: @component).destroy_all
         @component.manifest.run_hooks(:before_destroy, @component)
       end
 

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

@@ -9,7 +9,7 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        include Decidim::Admin::Paginable
+        include Decidim::Paginable
         include Decidim::TranslatableAttributes
 
         helper Decidim::Admin::FilterableHelper

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

@@ -17,6 +17,7 @@ module Decidim
       include Headers::ContentSecurityPolicy
       include DisableRedirectionToExternalHost
       include Decidim::Admin::Concerns::HasBreadcrumbItems
+      include ActiveStorage::SetCurrent
 
       helper Decidim::Admin::ApplicationHelper
       helper Decidim::Admin::AttributesDisplayHelper
@@ -25,7 +26,6 @@ module Decidim
       helper Decidim::Admin::IconWithTooltipHelper
       helper Decidim::Admin::MenuHelper
       helper Decidim::Admin::ScopesHelper
-      helper Decidim::Admin::Paginable::PerPageHelper
       helper Decidim::DecidimFormHelper
       helper Decidim::ReplaceButtonsHelper
       helper Decidim::ScopesHelper

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

@@ -10,7 +10,9 @@ module Decidim
       def index
         enforce_permission_to :index, :authorization_workflow
 
-        @workflows = Decidim::Verifications.admin_workflows
+        @workflows = Decidim::Verifications.admin_workflows.select do |manifest|
+          current_organization.available_authorizations.include?(manifest.name.to_s)
+        end
 
         # Decidim::Verifications::Authorizations Query
         @authorizations = Decidim::Verifications::Authorizations.new(

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/controllers/decidim/admin/organization_controller.rb

@@ -46,13 +46,16 @@ module Decidim
         respond_to do |format|
           format.json do
             if (term = params[:term].to_s).present?
-              query = relation.order(name: :asc)
               query = if term.start_with?("@")
-                        query.where("nickname ILIKE ?", "#{term.delete("@")}%")
+                        nickname = term.delete("@")
+                        relation.where("nickname ILIKE ?", "#{nickname}%")
+                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("similarity(nickname, '#{nickname}') DESC")))
                       else
-                        query.where("name ILIKE ?", "%#{term}%").or(
-                          query.where("email ILIKE ?", "%#{term}%")
+                        relation.where("name ILIKE ?", "%#{term}%").or(
+                          relation.where("email ILIKE ?", "%#{term}%")
                         )
+                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("GREATEST(similarity(name, '#{term}'), similarity(email, '#{term}')) DESC")))
+                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("(similarity(name, '#{term}') + similarity(email, '#{term}')) / 2 DESC")))
                       end
               render json: query.all.collect { |u| { value: u.id, label: "#{u.name} (@#{u.nickname})" } }
             else

data/app/helpers/decidim/admin/application_helper.rb

@@ -16,6 +16,19 @@ module Decidim
       include Decidim::Admin::ResourceScopeHelper
       include Decidim::Admin::SearchFormHelper
 
+      # Public: Overwrites the `cell` helper method to automatically set some
+      # common context.
+      #
+      # name - the name of the cell to render
+      # model - the cell model
+      # options - a Hash with options
+      #
+      # Renders the cell contents.
+      def cell(name, model, options = {}, &)
+        options = { context: { view_context: self, current_user: } }.deep_merge(options)
+        super
+      end
+
       def participatory_space_active_link?(component)
         endpoints = component.manifest.admin_engine.try(:participatory_space_endpoints)
         endpoints && is_active_link?(decidim_admin_participatory_processes.components_path(current_participatory_space), %r{/\d+/manage/(#{endpoints.join("|")})\b})

data/app/packs/src/decidim/admin/application.js

@@ -12,8 +12,13 @@ window.Decidim.managedUsersForm = managedUsersForm
 window.Decidim.config = new Configuration()
 window.Decidim.InputCharacterCounter = InputCharacterCounter;
 
+// REDESIGN_PENDING: deprecated
+window.initFoundation = (element) => {
+  $(element).foundation();
+};
+
 $(() => {
-  $(document).foundation();
+  window.initFoundation(document);
 
   $(document).on("show.zf.dropdownMenu", function(event, $element) {
     $element.attr("aria-hidden", "false");

data/app/packs/src/decidim/admin/choose_language.js

@@ -7,7 +7,9 @@ export default function initLanguageChangeSelect(elements) {
       let targetTabPaneSelector = select.value;
       let tabsContent = select.parentElement.parentElement.nextElementSibling;
 
+      tabsContent.querySelector(".is-active").ariaHidden = "true";
       tabsContent.querySelector(".is-active").classList.remove("is-active");
+      tabsContent.querySelector(targetTabPaneSelector).ariaHidden = "false";
       tabsContent.querySelector(targetTabPaneSelector).classList.add("is-active");
     })
   });

data/app/packs/src/decidim/admin/dynamic_fields.component.js

@@ -159,7 +159,8 @@ class DynamicFieldsComponent {
       $newField.appendTo($container);
     }
 
-    $newField.foundation();
+    // REDESIGN_PENDING: deprecated
+    window.initFoundation($newField);
 
     if (this.onAddField) {
       this.onAddField($newField);

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

@@ -19,7 +19,7 @@
               <%= cell("decidim/announcement", t(".already_reported_html"), callout_class: "alert" ) %>
             <% end %>
 
-            <% if defined?(Decidim::Templates) %>
+            <% if Decidim.module_installed?(:templates) %>
               <%= render "decidim/templates/admin/block_user_templates/template_chooser", form: f %>
             <% 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/decidim/admin/shared/_js-callout.html.erb

@@ -1,7 +1,7 @@
 <div class="flash <%= css %>" data-closable>
-  <span class="flash__message">
+  <div class="flash__message">
     <%= text %>
-  </span>
+  </div>
   <button class="close-button" type="button" data-close="">
     <span aria-hidden="true">×</span>
   </button>

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/app/views/layouts/decidim/admin/_sidebar_menu.html.erb

@@ -5,13 +5,13 @@
       <div class="hidden md:block">
         <%= sidebar_menu(secondary_root_menu).render %>
       </div>
-      <button data-component="dropdown" data-target="dropdown-menu-sidebar" data-auto-close="true" data-disabled-md="true" data-scroll-to-menu="true">
+      <button data-component="dropdown" data-target="dropdown-menu-sidebar" data-auto-close="true" data-scroll-to-menu="true">
         <span><%= t("menu", scope: "decidim.admin.titles") %></span>
         <%= icon "arrow-down-s-line" %>
         <%= icon "arrow-up-s-line" %>
       </button>
 
-      <ul id="dropdown-menu-sidebar" class="md:hidden">
+      <ul id="dropdown-menu-sidebar" class="md:hidden" aria-hidden="true">
         <%= sidebar_menu(secondary_root_menu).render %>
       </ul>
     </div>

data/config/locales/ar.yml

@@ -150,6 +150,7 @@ ar:
           new: فئة جديدة
         export: تصدير الكل
         import: استيراد
+        manage: تدبير
         newsletter:
           new: رسالة إخبارية جديدة
         per_page: في كل صفحة