decidim-admin 0.24.2 → 0.25.0.rc3

data/app/packs/stylesheets/decidim/admin/vendor/mathsass/functions/_fact.scss

@@ -0,0 +1,21 @@
+// Returns the factorial of a non-negative integer.
+// @param {Number} $x A non-negative integer.
+// @return {Number}
+// @example
+//     fact(0) // 1
+//     fact(8) // 40320
+@function fact ($x){
+  @if $x < 0 or  $x != floor($x){
+    @warn "Argument for `fact()` must be a positive integer.";
+
+    @return null;
+  }
+  $ret: 1;
+
+  @while $x > 0{
+    $ret: $ret * $x;
+    $x: $x - 1;
+  }
+
+  @return $ret;
+}

data/app/packs/stylesheets/decidim/admin/vendor/mathsass/functions/_frexp.scss

@@ -0,0 +1,25 @@
+// Returns a two-element list containing the normalized fraction and exponent of number.
+// @param {Number} $x
+// @return {List} fraction, exponent
+@function frexp ($x){
+  $exp: 0;
+
+  @if $x < 0{
+    $x: $x * -1;
+  }
+
+  @if $x < .5{
+    @while $x < .5{
+      $x: $x * 2;
+      $exp: $exp - 1;
+    }
+  }
+  @else if $x >= 1{
+    @while $x >= 1{
+      $x: $x * .5;
+      $exp: $exp + 1;
+    }
+  }
+
+  @return $x, $exp;
+}

data/app/packs/stylesheets/decidim/admin/vendor/mathsass/functions/_ldexp.scss

@@ -0,0 +1,20 @@
+// Returns $x * 2^$exp
+// @param {Number} $x
+// @param {Number} $exp
+@function ldexp ($x, $exp){
+  $b: if($exp >= 0, 2, 1 * .5);
+
+  @if $exp < 0{
+    $exp: $exp * -1;
+  }
+
+  @while $exp > 0{
+    @if $exp % 2 == 1{
+      $x: $x * $b;
+    }
+    $b: $b * $b;
+    $exp: floor($exp * .5);
+  }
+
+  @return $x;
+}

data/app/packs/stylesheets/decidim/admin/vendor/mathsass/functions/_log.scss

@@ -0,0 +1,39 @@
+// Returns the natural logarithm of a number.
+// @param {Number} $x
+// @param {Number} $b The base number
+// @example
+//     log(2)     // 0.69315
+//     log(10)    // 2.30259
+//     log(2, 10) // 0.30103
+@use "sass:math";
+
+@function log ($x, $b: null){
+  @if $b == null{
+    @return _log($x);
+  }
+  @else{
+    @return math.div(_log($x), _log($b));
+  }
+}
+
+@function _log ($x){
+  @if $x <= 0{
+    @return math.div(0, 0);
+  }
+  $k: nth(frexp(math.div($x, $SQRT2)), 2);
+  $x: math.div($x, ldexp(1, $k));
+  $x: math.div($x - 1, $x + 1);
+  $x2: $x * $x;
+  $i: 1;
+  $s: $x;
+  $sp: null;
+
+  @while $sp != $s{
+    $x: $x * $x2;
+    $i: $i + 2;
+    $sp: $s;
+    $s: $s + math.div($x, $i);
+  }
+
+  @return $LN2 * $k + 2 * $s;
+}

data/app/packs/stylesheets/decidim/admin/vendor/mathsass/functions/_pow.scss

@@ -0,0 +1,34 @@
+// Returns base to the exponent power.
+// @param {Number} $base The base number
+// @param {Number} $exp The exponent to which to raise base
+// @return {Number}
+// @example
+//     pow(4, 2)   // 16
+//     pow(4, -2)  // 0.0625
+//     pow(4, 0.2) // 1.31951
+@use "sass:math";
+
+@function pow ($base, $exp){
+  @if $exp == floor($exp){
+    $r: 1;
+    $s: 0;
+
+    @if $exp < 0{
+      $exp: $exp * -1;
+      $s: 1;
+    }
+
+    @while $exp > 0{
+      @if $exp % 2 == 1{
+        $r: $r * $base;
+      }
+      $exp: floor($exp * .5);
+      $base: $base * $base;
+    }
+
+    @return if($s != 0, math.div(1, $r), $r);
+  }
+  @else{
+    @return exp(log($base) * $exp);
+  }
+}

data/app/{assets → packs}/stylesheets/decidim/admin/vendor/mathsass/functions/_sec.scss

@@ -3,7 +3,10 @@
 // @example
 //     sec(0.7854) // 1.41422
 //     sec(45deg)  // 1.41422
-@function sec ($x) {
-    $x: unitless-rad($x);
-    @return 1 / cos($x);
+@use "sass:math";
+
+@function sec ($x){
+  $x: unitless-rad($x);
+
+  @return math.div(1, cos($x));
 }

data/app/{assets → packs}/stylesheets/decidim/admin/vendor/mathsass/functions/_sin.scss

@@ -3,7 +3,8 @@
 // @example
 //     sin(1.0472) // 0.86603
 //     sin(60deg)  // 0.86603
-@function sin ($x) {
-    $x: unitless-rad($x);
-    @return cos($x - $PI / 2);
+@function sin ($x){
+  $x: unitless-rad($x);
+
+  @return cos($x - $PI * .5);
 }

data/app/packs/stylesheets/decidim/admin/vendor/mathsass/functions/_sqrt.scss

@@ -0,0 +1,21 @@
+// Returns the square root of a number.
+// @param {Number} $x
+// @example
+//     sqrt(2) // 1.41421
+//     sqrt(5) // 2.23607
+@use "sass:math";
+
+@function sqrt ($x){
+  @if $x < 0{
+    @warn "Argument for `sqrt()` must be a positive number.";
+
+    @return null;
+  }
+  $ret: 1;
+
+  @for $i from 1 through 24{
+    $ret: $ret - math.div(pow($ret, 2) - $x, 2 * $ret);
+  }
+
+  @return $ret;
+}

data/app/{assets → packs}/stylesheets/decidim/admin/vendor/mathsass/functions/_tan.scss

@@ -3,7 +3,10 @@
 // @example
 //     tan(0.5236) // 0.57735
 //     tan(30deg)  // 0.57735
-@function tan ($x) {
-    $x: unitless-rad($x);
-    @return sin($x) / cos($x);
+@use "sass:math";
+
+@function tan ($x){
+  $x: unitless-rad($x);
+
+  @return math.div(sin($x), cos($x));
 }

data/app/packs/stylesheets/decidim/admin/vendor/mathsass/helpers/_deg-to-rad.scss

@@ -0,0 +1,6 @@
+// Convert deg to rad
+@use "sass:math";
+
+@function deg-to-rad ($deg, $unit: true){
+  @return math.div(strip-unit($deg) * $PI, 180) * if($unit, 1rad, 1);
+}

data/app/packs/stylesheets/decidim/admin/vendor/mathsass/helpers/_rad-to-deg.scss

@@ -0,0 +1,6 @@
+// Convert rad to deg
+@use "sass:math";
+
+@function rad-to-deg ($rad, $unit: true){
+  @return math.div(strip-unit($rad) * 180, $PI) * if($unit, 1deg, 1);
+}

data/app/packs/stylesheets/decidim/admin/vendor/mathsass/helpers/_strip-unit.scss

@@ -0,0 +1,11 @@
+// Strip unit from a number
+@use "sass:math";
+
+@function strip-unit ($number){
+  @if unitless($number){
+    @return $number;
+  }
+  @else{
+    @return math.div($number, $number * 0 + 1);
+  }
+}

data/app/packs/stylesheets/decidim/admin/vendor/mathsass/helpers/_unitless-rad.scss

@@ -0,0 +1,19 @@
+// Convert to unitless rad
+@use "sass:math";
+
+@function unitless-rad ($angle){
+  @if unitless($angle){
+    @return $angle;
+  }
+  @else if unit($angle) == rad{
+    @return math.div($angle, 1rad);
+  }
+  @else if unit($angle) == deg{
+    @return deg-to-rad($angle, false);
+  }
+  @else if type-of($angle) != number or not unitless($angle){
+    @warn "#{ $angle } is not a valid number.";
+
+    @return $angle;
+  }
+}

data/app/presenters/decidim/admin/simple_menu_presenter.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class SimpleMenuPresenter < Decidim::MenuPresenter
+      def render(&block)
+        render_menu(&block)
+      end
+    end
+  end
+end

data/app/queries/decidim/admin/newsletter_recipients.rb

@@ -21,7 +21,9 @@ module Decidim
 
       def query
         recipients = Decidim::User.where(organization: @form.current_organization)
-                                  .where.not(newsletter_notifications_at: nil, email: nil, confirmed_at: nil)
+                                  .where.not(newsletter_notifications_at: nil)
+                                  .where.not(email: nil)
+                                  .where.not(confirmed_at: nil)
                                   .not_deleted
 
         recipients = recipients.interested_in_scopes(@form.scope_ids) if @form.scope_ids.present?

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

@@ -34,7 +34,7 @@
                       <%= icon_link_to "circle-x", polymorphic_path([collection_for, attachment_collection]), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                     <% else %>
                       <span class="action-icon" title="<%= t("attachment_collections.index.attachment_collection_used", scope: "decidim.admin") %>" data-tooltip="true" data-disable-hover="false">
-                        <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
+                        <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", "aria-hidden": true %>
                       </span>
                     <% end %>
                   <% end %>

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

@@ -34,7 +34,7 @@
                       <%= icon_link_to "circle-x", category_path(current_participatory_space, category), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                     <% else %>
                       <span class="action-icon" title="<%= t("categories.index.category_used", scope: "decidim.admin") %>" data-tooltip="true" data-disable-hover="false">
-                        <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
+                        <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", "aria-hidden": true %>
                       </span>
                     <% end %>
                   <% end %>

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

@@ -84,5 +84,3 @@
     </div>
   </div>
 </div>
-
-<%= javascript_include_tag "decidim/admin/form" %>

data/app/views/decidim/admin/impersonations/_form.html.erb

@@ -34,5 +34,7 @@
 </div>
 
 <% if other_available_authorizations.any? %>
-  <%= javascript_include_tag "decidim/admin/managed_users" %>
+  <script>
+    window.Decidim.managedUsersForm()
+  </script>
 <% end %>

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

@@ -19,13 +19,7 @@
       </div>
       <% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
         <div class="field">
-          <%=
-            form.select(
-              :user_group_id,
-              user_groups.map { |g| [g.name, g.id] },
-              include_blank: current_user.name
-            )
-          %>
+          <%= user_group_select_field form, :user_group_id %>
         </div>
       <% end %>
       <div class="grid-x">
@@ -53,5 +47,3 @@
     <%= form.submit t(".import") %>
   </div>
 <% end -%>
-
-<%= javascript_include_tag "decidim/admin/import_guidance" %>

data/app/views/decidim/admin/newsletters/select_recipients_to_deliver.html.erb

@@ -74,5 +74,3 @@
     </div>
   </div>
 <% end %>
-
-<%= javascript_include_tag "decidim/admin/newsletters" %>

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

@@ -45,13 +45,13 @@
                 <% end %>
                 <%= icon_link_to "envelope-closed", current_or_new_conversation_path_with(user), t("decidim.contact"), class:"action-icon--new" %>
                 <% if user.officialized? %>
-                  <%= icon "circle-check", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "circle-check", class: "action-icon action-icon--disabled", role: "img", aria_label: t(".officialize") %>
                   <%= icon_link_to "pencil", new_officialization_path(user_id: user.id), t(".reofficialize"), class: "action-icon--new" %>
                   <%= icon_link_to "circle-x", officialization_path(user.id), t(".unofficialize"), method: :delete, class: "action-icon--reject" %>
                 <% else %>
                   <%= icon_link_to "circle-check", new_officialization_path(user_id: user.id), t(".officialize"), class: "action-icon--verify" %>
-                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img" %>
-                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img", aria_label: t(".reofficialize") %>
+                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t(".unofficialize") %>
                 <% end %>
               </td>
             </tr>

data/app/views/decidim/admin/organization/_form.html.erb

@@ -54,6 +54,12 @@
   </div>
 </div>
 
+<div class="row">
+  <div class="columns xlarge-6">
+    <%= form.check_box :enable_participatory_space_filters %>
+  </div>
+</div>
+
 <% if Decidim.config.enable_machine_translations %>
   <div class="row">
     <div class="columns xlarge-6">
@@ -100,5 +106,3 @@
     <%= form.translated :editor, :admin_terms_of_use_body %>
   </div>
 </div>
-
-<%= javascript_include_tag "decidim/admin/welcome_notification.js" %>

data/app/views/decidim/admin/organization_appearance/_form.html.erb

@@ -1,5 +1,3 @@
-<%= javascript_include_tag "decidim/slug_form" %>
-
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title"><%= t ".homepage_appearance_title" %></h2>

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

@@ -11,19 +11,35 @@
 
     <div class="organization-images">
       <div class="preview">
-        <%= form.upload :favicon, dimensions_info: current_organization.favicon.dimensions_info, extension_allowlist: current_organization.favicon.extension_allowlist %>
+        <%= form.upload(
+              :favicon,
+              dimensions_info: current_organization.attached_uploader(:favicon).dimensions_info,
+              extension_allowlist: current_organization.attached_uploader(:favicon).extension_allowlist
+            ) %>
       </div>
 
       <div class="preview">
-        <%= form.upload :logo, dimensions_info: current_organization.logo.dimensions_info, extension_allowlist: current_organization.favicon.extension_allowlist %>
+        <%= form.upload(
+              :logo,
+              dimensions_info: current_organization.attached_uploader(:logo).dimensions_info,
+              extension_allowlist: current_organization.attached_uploader(:favicon).extension_allowlist
+            ) %>
       </div>
 
       <div class="preview">
-        <%= form.upload :official_img_header, dimensions_info: current_organization.official_img_header.dimensions_info, extension_allowlist: current_organization.favicon.extension_allowlist %>
+        <%= form.upload(
+              :official_img_header,
+              dimensions_info: current_organization.attached_uploader(:official_img_header).dimensions_info,
+              extension_allowlist: current_organization.attached_uploader(:favicon).extension_allowlist
+            ) %>
       </div>
 
       <div class="preview">
-        <%= form.upload :official_img_footer, dimensions_info: current_organization.official_img_footer.dimensions_info, extension_allowlist: current_organization.favicon.extension_allowlist %>
+        <%= form.upload(
+              :official_img_footer,
+              dimensions_info: current_organization.attached_uploader(:official_img_footer).dimensions_info,
+              extension_allowlist: current_organization.attached_uploader(:favicon).extension_allowlist
+            ) %>
       </div>
     </div>
   </div>

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

@@ -2,8 +2,8 @@
 <div id="minimap-wrapper">
   <div id="minimap">
     <div class="minimap-tab">
-      <% if current_organization.favicon.present? %>
-        <%= image_tag current_organization.favicon.url, class: "minimap-favicon" %>
+      <% if current_organization.favicon.attached? %>
+        <%= image_tag current_organization.attached_uploader(:favicon).path, 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 %>
         <% end %>
@@ -14,15 +14,15 @@
 
     <div class="minimap-header">
       <% if current_organization.logo.present? %>
-        <%= image_tag current_organization.logo.url, class: "minimap-logo" %>
+        <%= image_tag current_organization.attached_uploader(:logo).path, 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>
         <% end %>
       <% end %>
 
-      <% if current_organization.official_img_header.present? %>
-        <%= image_tag current_organization.official_img_header.url, class: "minimap-official_img_header" %>
+      <% if current_organization.official_img_header.attached? %>
+        <%= image_tag current_organization.attached_uploader(:official_img_header).path, class: "minimap-official_img_header" %>
       <% else %>
         <span class="float-right"><%= t("official_img_header", scope: "activemodel.attributes.organization") %> &gt; </span>
         <%= content_tag :div, nil, { class: "minimap-official_img_header placeholder float-right", style: "width: #{image_width(current_organization, :official_img_header) * size_factor }px; height: #{image_height(current_organization, :official_img_header) * size_factor }px;" } %>
@@ -34,8 +34,8 @@
     <div class="minimap-body"></div>
 
     <div class="minimap-footer">
-      <% if current_organization.official_img_footer.present? %>
-        <%= image_tag current_organization.official_img_footer.url, class: "minimap-official_img_footer" %>
+      <% if current_organization.official_img_footer.attached? %>
+        <%= image_tag current_organization.attached_uploader(:official_img_footer).path, 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>