decidim-admin 0.32.0.rc1 → 0.32.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9da138630750a0739cd6fd8b161f7093193e6293fa32a00e24355c7c0fca9a0c
-  data.tar.gz: ba05f9d1e15ac506f29ce14428c7952be077fd8f251c886be250267a1b32fbb9
+  metadata.gz: 36901230e8c91881b21c0860524d5d6efb35a23046bc3e61dee9a160ac855d9b
+  data.tar.gz: 1d5570c6dce765730164a865bcaee1c16041ecd5f1a790e42adec090e565b644
 SHA512:
-  metadata.gz: 135c143b735ee0ada94c33046c6f9c5cbf81027b91ee609677a66b3fd04db2051781eab9b465836666acf5b3268ba372ab69ed823509d4cba115f2b600cd1a83
-  data.tar.gz: 501dd3d2f79cc2b1699830d82b7f411ebeb8656aab4ac0de1da085b7ec5a4882053187796221a38687544a5a24446d4df752bdecee3fd445b581c9ef7481b7fe
+  metadata.gz: 9d9cb0bcaec7d4d6543130f006d915e7d4d4fb756da9f0bf894ccdaefd64b32169aeaae9b3d80599e11525435106eed5e13f66214a7a10e9cfd8160306ce500e
+  data.tar.gz: 570d5c96c847ae27c440eddbed91477258311eb101ce5ff410be11ec7b1a435ce41034dc5fc85aa97e1dfc5c1269c34b46e7d0963a3d000a4cfeadf1ea02c296

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

@@ -31,7 +31,7 @@ module Decidim
             @content_block = content_block
           end
           on(:invalid) do
-            raise "There was a problem persisting the changes to the content block"
+            raise Decidim::Commands::HookError, "There was a problem persisting the changes to the content block"
           end
         end
       end

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

@@ -10,6 +10,8 @@ module Decidim
       def new
         enforce_permission_to :block, :admin_user
 
+        return redirect_to(officializations_path, alert: I18n.t("officializations.block.no_user", scope: "decidim.admin")) unless user
+
         @form = form(BlockUserForm).from_model(user)
         @form.hide = params[:hide] || false
       end

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

@@ -56,6 +56,7 @@ module Decidim
 
           on(:invalid) do |newsletter|
             @newsletter = newsletter
+            @form.images = content_block.images_container
             flash.now[:error] = I18n.t("newsletters.create.error", scope: "decidim.admin")
             render action: :new, status: :unprocessable_content
           end

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

@@ -33,35 +33,6 @@ module Decidim
           end
         end
       end
-
-      def users
-        search(current_organization.users.available)
-      end
-
-      private
-
-      def search(relation)
-        respond_to do |format|
-          format.json do
-            if (term = params[:term].to_s).present?
-              query = if term.start_with?("@")
-                        nickname = term.delete("@")
-                        relation.where("nickname LIKE ?", "#{nickname}%")
-                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("similarity(nickname, '#{nickname}') DESC")))
-                      else
-                        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
-              render json: []
-            end
-          end
-        end
-      end
     end
   end
 end

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

@@ -10,7 +10,6 @@ import AutoComplete from "src/decidim/refactor/moved/autocomplete";
  * - name: assembly_member[user_id],
  * - options: [],
  * - placeholder: "Select a participant",
- * - searchURL: "http://..."
  * - selected: "",
  *
  * @param {HTMLElement} el The element to generate the autocomplete for.
@@ -18,7 +17,6 @@ import AutoComplete from "src/decidim/refactor/moved/autocomplete";
  */
 const autoConfigure = (el) => {
   const config = JSON.parse(el.dataset.autocomplete);
-  const searchUrl = new URL(config.searchURL);
   const textInput = document.createElement("input");
   textInput.type = "text";
   textInput.className = "autocomplete-input";
@@ -46,16 +44,24 @@ const autoConfigure = (el) => {
     }
   }
 
+  const graphqlEscapedQuery = (query) => query.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
+
   const dataSource = (query, callback) => {
-    const params = new URLSearchParams({
-      ...Object.fromEntries(searchUrl.searchParams),
-      term: query
-    });
-    fetch(`${searchUrl.origin}${searchUrl.pathname}?${params.toString()}`, {
-      method: "GET",
-      headers: { "Content-Type": "application/json" }
+    const apiPath = window.Decidim.config.get("api_path");
+    fetch(apiPath, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        query: `{users(filter:{wildcard:"${graphqlEscapedQuery(query)}"}){id,nickname,name,__typename}}`
+      })
     }).then((response) => response.json()).then((data) => {
-      callback(data)
+      const users = data?.data?.users || [];
+      callback(users.map((user) => ({
+        value: user.id,
+        label: `${user.name} (${user.nickname})`
+      })))
+    }).catch(() => {
+      callback([])
     });
   };
 

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

@@ -51,7 +51,7 @@
                           <% end %>
                         <% else %>
                           <div class="dropdown__button-disabled">
-                            <%= with_tooltip t("tooltips.deleted_attachment_collections_info", scope: "decidim.admin") do %>
+                            <%= with_tooltip t("tooltips.deleted_attachment_collections_info", scope: "decidim.admin"), class: :left do %>
                               <%= icon "delete-bin-line", class: "text-gray" %>
                               <span>
                                 <%= t("actions.destroy", scope: "decidim.admin") %>

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

@@ -98,7 +98,7 @@
           <hr>
           <li class="dropdown__item">
             <div class="dropdown__button-disabled">
-              <%= with_tooltip t("tooltips.deleted_component_info", scope: "decidim.admin") do %>
+              <%= with_tooltip t("tooltips.deleted_component_info", scope: "decidim.admin"), class: :left do %>
                 <%= icon "delete-bin-line", class: "text-gray" %>
                 <span>
                   <%= t("actions.soft_delete", scope: "decidim.admin") %>

data/app/views/decidim/admin/moderations/_moderation-tr.html.erb

@@ -85,7 +85,7 @@
           <li class="dropdown__item">
             <% if moderation.reportable.respond_to?(:commentable) && moderation.reportable.commentable.try(:hidden?) %>
               <div class="dropdown__button-disabled">
-                <%= with_tooltip(t("actions.parent_hidden", scope: "decidim.moderations"), title: t("actions.parent_hidden", scope: "decidim.moderations")) do %>
+                <%= with_tooltip(t("actions.parent_hidden", scope: "decidim.moderations"), title: t("actions.parent_hidden", scope: "decidim.moderations"), class: :left) do %>
                   <%= icon "eye-line", class: "text-gray" %>
                   <span><%= t("actions.unhide", scope: "decidim.moderations") %></span>
                 <% end %>

data/app/views/decidim/admin/officializations/show_email.html.erb

@@ -1,3 +1,9 @@
 <% add_decidim_page_title(t(".title")) %>
 
-<%= link_to user.email, "mailto:#{user.email}" %>
+<% if user.present? %>
+  <%= link_to user.email, "mailto:#{user.email}" %>
+<% else %>
+  <div class="flash alert my-0">
+    <%= t(".no_user") %>
+  </div>
+<% end %>

data/app/views/decidim/admin/taxonomy_filters/_table.html.erb

@@ -36,7 +36,7 @@
                   </li>
                 <% else %>
                   <div class="dropdown__button-disabled">
-                    <%= with_tooltip t("tooltips.cannot_edit_taxonomy_filter", scope: "decidim.admin") do %>
+                    <%= with_tooltip t("tooltips.cannot_edit_taxonomy_filter", scope: "decidim.admin"), class: :left do %>
                       <%= icon "pencil-line", class: "text-gray" %>
                       <%= t(".edit") %>
                     <% end %>
@@ -54,7 +54,7 @@
                   </li>
                 <% else %>
                   <div class="dropdown__button-disabled">
-                    <%= with_tooltip t("tooltips.cannot_destroy_taxonomy_filter", scope: "decidim.admin") do %>
+                    <%= with_tooltip t("tooltips.cannot_destroy_taxonomy_filter", scope: "decidim.admin"), class: :left do %>
                       <%= icon "delete-bin-line", class: "text-gray" %>
                       <%= t(".destroy") %>
                     <% end %>

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

@@ -11,7 +11,7 @@
   </head>
   <body>
 
-    <main class="main">
+    <main class="main" role="main">
       <div class="layout-wrapper">
         <div class="block md:hidden col-start-1 col-end-2">
           <%= render partial: "layouts/decidim/admin/title_bar_responsive" %>

data/config/locales/ar.yml

@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:

data/config/locales/bg.yml

@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:

data/config/locales/bs-BA.yml

@@ -1,3 +1,4 @@
+---
 bs:
   activemodel:
     attributes:

data/config/locales/ca-IT.yml

@@ -1,3 +1,4 @@
+---
 ca-IT:
   activemodel:
     attributes:
@@ -899,6 +900,7 @@ ca-IT:
       officializations:
         block:
           error: Hi ha hagut un problema en bloquejar a la participant.
+          no_user: No s'ha trobat cap usuària
           success: Participant bloquejada correctament.
         bulk_action:
           block:
@@ -934,6 +936,7 @@ ca-IT:
           officialize: Oficialitza
           title: Oficialitza la participant "%{name}"
         show_email:
+          no_user: No s'ha trobat cap usuària
           title: Mostra el correu electrònic
         show_email_modal:
           description: Si necessites contactar a una participant directament pots clicar al botó Mostra per veure la seva adreça de correu electrònic. Aquesta acció es registrarà.

data/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -899,6 +900,7 @@ ca:
       officializations:
         block:
           error: Hi ha hagut un problema en bloquejar a la participant.
+          no_user: No s'ha trobat cap usuària
           success: Participant bloquejada correctament.
         bulk_action:
           block:
@@ -934,6 +936,7 @@ ca:
           officialize: Oficialitza
           title: Oficialitza la participant "%{name}"
         show_email:
+          no_user: No s'ha trobat cap usuària
           title: Mostra el correu electrònic
         show_email_modal:
           description: Si necessites contactar a una participant directament pots clicar al botó Mostra per veure la seva adreça de correu electrònic. Aquesta acció es registrarà.

data/config/locales/cs.yml

@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -905,6 +906,7 @@ cs:
       officializations:
         block:
           error: Při blokování účastníka došlo k chybě.
+          no_user: Nebyl nalezen žádný uživatel
           success: Účastník byl úspěšně zablokován.
         bulk_action:
           block:
@@ -940,6 +942,7 @@ cs:
           officialize: Ověřit
           title: Oficializovat účastníka "%{name}"
         show_email:
+          no_user: Nebyl nalezen žádný uživatel
           title: Zobrazit e-mail
         show_email_modal:
           description: Pokud potřebujete kontaktovat účastníka, můžete kliknout na tlačítko Zobrazit pro zobrazení e-mailové adresy. Tato akce bude zaznamenána.

data/config/locales/de.yml

@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -265,6 +266,8 @@ de:
         edit:
           title: Ordner bearbeiten
           update: Aktualisieren
+        index:
+          title: Ordner für Anhänge
         new:
           create: Erstellen
           title: Neuer Ordner
@@ -280,6 +283,8 @@ de:
         edit:
           title: Anhang bearbeiten
           update: Aktualisieren
+        index:
+          title: Anhänge
         new:
           create: Anhang erstellen
           title: Neuer Anhang

data/config/locales/el.yml

@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:

data/config/locales/en.yml

@@ -900,6 +900,7 @@ en:
       officializations:
         block:
           error: There was a problem blocking the participant.
+          no_user: No user found
           success: Participant successfully blocked.
         bulk_action:
           block:
@@ -935,6 +936,7 @@ en:
           officialize: Officialize
           title: Officialize participant "%{name}"
         show_email:
+          no_user: No user found
           title: Show email
         show_email_modal:
           description: If you need to contact a participant directly, you can click on the Show button to see their email address. This action will be logged.

data/config/locales/eo.yml

@@ -1,3 +1,4 @@
+---
 eo:
   activemodel:
     attributes:

data/config/locales/es-MX.yml

@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -899,6 +900,7 @@ es-MX:
       officializations:
         block:
           error: Se ha producido un error al bloquear a la participante.
+          no_user: No se ha encontrado ninguna usuaria
           success: Participante bloqueada correctamente.
         bulk_action:
           block:
@@ -934,6 +936,7 @@ es-MX:
           officialize: Oficializar
           title: Oficializar el usuario "%{name}"
         show_email:
+          no_user: No se ha encontrado ninguna usuaria
           title: Mostrar el correo electrónico
         show_email_modal:
           description: Si necesitas contactar directamente con una participante, puedes hacer clic en el botón Mostrar para ver la dirección de correo electrónico. Esta acción se registrará.

data/config/locales/es-PY.yml

@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -899,6 +900,7 @@ es-PY:
       officializations:
         block:
           error: Se ha producido un error al bloquear a la participante.
+          no_user: No se ha encontrado ninguna usuaria
           success: Participante bloqueada correctamente.
         bulk_action:
           block:
@@ -934,6 +936,7 @@ es-PY:
           officialize: Oficializar
           title: Oficializar el usuario "%{name}"
         show_email:
+          no_user: No se ha encontrado ninguna usuaria
           title: Mostrar el correo electrónico
         show_email_modal:
           description: Si necesitas contactar directamente con una participante, puedes hacer clic en el botón Mostrar para ver la dirección de correo electrónico. Esta acción se registrará.

data/config/locales/es.yml

@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -899,6 +900,7 @@ es:
       officializations:
         block:
           error: Se ha producido un error al bloquear a la participante.
+          no_user: No se ha encontrado ninguna usuaria
           success: Participante bloqueada correctamente.
         bulk_action:
           block:
@@ -934,6 +936,7 @@ es:
           officialize: Oficializar
           title: Oficializar participante "%{name}"
         show_email:
+          no_user: No se ha encontrado ninguna usuaria
           title: Mostrar el correo electrónico
         show_email_modal:
           description: Si necesitas contactar directamente con una participante, puedes hacer clic en el botón Mostrar para ver la dirección de correo electrónico. Esta acción se registrará.