decidim-admin 0.28.1 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cf03aeb983e0ddb8c344dbe1f8b8d21f7fbdfbd2a0f0c75f2ca76010320dd77
-  data.tar.gz: 91db438a29f5e05315b436f3b1cf96d0d0b2ad6fa03f4ec5955f30605fd99f12
+  metadata.gz: 75ccdc4a2f091d223bff9fa56f75347e91c6d8752bfba25eaf0a758191d705c0
+  data.tar.gz: f451da89da78adc0809dd9fee4af0f87761870f5cbb8eee8cc9c20868dc9b023
 SHA512:
-  metadata.gz: 8fa198551d57ea25461ecd2e86a0f7aae31f4b3e67151ed8e952ed4e91bcfb088c460ebde206520b83c7d13e5ab478b510d5eb6b9fe8e870ef1df2fe92f14cb4
-  data.tar.gz: cb21f050e6fa924f96579bd440058c7290d2ca29a6a4501e22a3b10c6b5199aa39b686e153e03a32aef78c80cc4c0d9c07746d00bc67656aeb56ba862e3a29c7
+  metadata.gz: 11998db7b9f88af5bef0396a5adb179a9495a8acb21e80b55f9a2e3257557356a5c414039016cf826e06a16e1e6fb5adcbe4e36830000beff84ee9c1abd41852
+  data.tar.gz: 5fbf7d4e81e2fd1a366310eb5dbfd1d6aad2473d3d54af70ef1e6a095739468c8c0cf6e17df1208d6829af345fe52b4aa713d5abb7443f8da15fb63ae44ba929

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/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/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/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/_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: في كل صفحة