decidim-admin 0.26.0 → 0.27.0.rc1

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

@@ -0,0 +1,82 @@
+import AutoComplete from "src/decidim/autocomplete";
+
+/**
+ * This function can be used to create an autocomplete input automatically
+ * from the following kind of div:
+ *   <div data-autocomplete="{...}"></div>
+ *
+ * The data-autocomplete attribute should contain the following configuration
+ * as an encoded JSON, which is used to generate the AutoComplete options:
+ * - name: assembly_member[user_id],
+ * - options: [],
+ * - placeholder: "Select a participant",
+ * - searchURL: "http://..."
+ * - selected: "",
+ *
+ * @param {HTMLElement} el The element to generate the autocomplete for.
+ * @returns {AutoComplete} An instance of the AutoComplete class.
+ */
+const autoConfigure = (el) => {
+  const config = JSON.parse(el.dataset.autocomplete);
+  const textInput = document.createElement("input");
+  textInput.type = "text";
+  textInput.className = "autocomplete-input";
+  el.appendChild(textInput);
+  let mode = config.mode || "sticky"
+  let selected = null;
+  if (config.selected) {
+    switch (mode) {
+    case "multi":
+      selected = config.selected.map((item) => (
+        {
+          key: "label",
+          value: {
+            value: item.value,
+            label: item.label
+          }
+        }
+      ));
+      break;
+    case "sticky":
+      selected = { key: "label", value: config.options[config.options.length - 1] };
+      break;
+    default:
+      selected = config.selected;
+    }
+  }
+
+  const dataSource = (query, callback) => {
+    const params = new URLSearchParams({ term: query });
+    fetch(`${config.searchURL}?${params.toString()}`, {
+      method: "GET",
+      headers: { "Content-Type": "application/json" }
+    }).then((response) => response.json()).then((data) => {
+      callback(data)
+    });
+  };
+
+  const ac = new AutoComplete(textInput, {
+    name: config.name,
+    placeholder: config.placeholder,
+    selected: selected,
+    mode: mode,
+    searchPrompt: true,
+    searchPromptText: config.searchPromptText,
+    threshold: 3,
+    dataMatchKeys: ["label"],
+    dataSource
+  });
+
+  return ac;
+}
+
+$(() => {
+  const $autocompleteDiv = $("[data-autocomplete]");
+  if ($autocompleteDiv.length < 1) {
+    return;
+  }
+
+  $autocompleteDiv.each((_index, element) => {
+    autoConfigure(element);
+  })
+})

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

@@ -1,13 +1,10 @@
 /* eslint-disable no-invalid-this */
 
-import * as React from "react";
-import * as ReactDOM from "react-dom";
 import toggleNav from "src/decidim/admin/toggle_nav"
 import createSortList from "src/decidim/admin/sort_list.component"
 import createQuillEditor from "src/decidim/editor"
 import formDatePicker from "src/decidim/form_datepicker"
 import DataPicker from "src/decidim/data_picker"
-import Autocomplete from "src/decidim/admin/autocomplete.component";
 import FormFilterComponent from "src/decidim/form_filter"
 import Configuration from "src/decidim/configuration"
 import InputCharacterCounter from "src/decidim/input_character_counter"
@@ -18,17 +15,6 @@ window.Decidim.managedUsersForm = managedUsersForm
 window.Decidim.config = new Configuration()
 window.Decidim.InputCharacterCounter = InputCharacterCounter;
 
-const renderAutocompleteSelects = (nodeSelector) => {
-  window.$(nodeSelector).each((index, node) => {
-    const props = { ...window.$(node).data("autocomplete") };
-
-    ReactDOM.render(
-      React.createElement(Autocomplete, props),
-      node
-    );
-  });
-};
-
 $(() => {
   window.theDataPicker = new DataPicker($(".data-picker"));
 
@@ -36,8 +22,6 @@ $(() => {
 
   toggleNav();
 
-  renderAutocompleteSelects('[data-plugin="autocomplete"]');
-
   createSortList("#steps tbody", {
     placeholder: $('<tr style="border-style: dashed; border-color: #000"><td colspan="4">&nbsp;</td></tr>')[0],
     onSortUpdate: ($children) => {

data/app/packs/stylesheets/decidim/admin/_decidim.scss

@@ -17,7 +17,6 @@
 @import "stylesheets/decidim/admin/modules/modules";
 @import "stylesheets/decidim/admin/plugins/jquery.auto-complete";
 @import "stylesheets/decidim/admin/components/accordion";
-@import "stylesheets/decidim/admin/components/autocomplete_select.component";
 @import "stylesheets/decidim/admin/components/dropdown-menu";
 @import "stylesheets/decidim/admin/components/sortable";
 @import "stylesheets/decidim/vizzs";

data/app/packs/stylesheets/decidim/admin/modules/_autocomplete.scss

@@ -0,0 +1,5 @@
+@import "stylesheets/decidim/modules/autocomplete";
+
+.autoComplete_wrapper{
+  margin-bottom: 1.5rem;
+}

data/app/packs/stylesheets/decidim/admin/modules/_modules.scss

@@ -4,6 +4,7 @@
 @import "stylesheets/decidim/admin/modules/buttons";
 @import "stylesheets/decidim/admin/modules/forms";
 @import "stylesheets/decidim/admin/modules/tabs";
+@import "stylesheets/decidim/admin/modules/autocomplete";
 
 //General layout
 @import "stylesheets/decidim/admin/modules/layout";
@@ -31,6 +32,7 @@
 @import "stylesheets/decidim/admin/modules/loading-spinner";
 @import "stylesheets/decidim/admin/modules/import_result";
 @import "stylesheets/decidim/admin/modules/reveal";
+@import "stylesheets/decidim/admin/modules/upload_modal";
 
 // mentions__container
 @import "stylesheets/decidim/modules/tags";

data/app/packs/stylesheets/decidim/admin/modules/_upload_modal.scss

@@ -0,0 +1,42 @@
+@import "stylesheets/decidim/modules/upload_modal";
+
+.upload-modal{
+  button{
+    cursor: pointer;
+  }
+
+  .upload-items{
+    .upload-item-first-row{
+      display: flex;
+
+      .file-name-span{
+        flex: 4 1 0;
+      }
+
+      .title-container{
+        flex: 3.5 1 0;
+      }
+    }
+
+    .upload-item-second-row{
+      display: flex;
+
+      .progress-bar-wrapper{
+        flex: 4 1 0;
+        margin-right: 1rem;
+
+        .progress-bar-border{
+          border: 1px solid map-get($foundation-palette, primary);
+
+          .progress-bar{
+            background-color: map-get($foundation-palette, primary);
+          }
+        }
+      }
+
+      .remove-upload-item{
+        flex: 1 1 0;
+      }
+    }
+  }
+}

data/app/permissions/decidim/admin/permissions.rb

@@ -56,6 +56,7 @@ module Decidim
           allow! if permission_action.subject == :static_page_topic
           allow! if permission_action.subject == :help_sections
           allow! if permission_action.subject == :share_token
+          allow! if permission_action.subject == :reminder
         end
 
         permission_action

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

@@ -3,7 +3,9 @@
 module Decidim
   module Admin
     class DashboardMetricChartsPresenter < Decidim::MetricChartsPresenter
-      attribute :summary, Boolean
+      def summary?
+        __getobj__.fetch(:summary)
+      end
 
       def render_not_highlighted(metrics)
         safe_join(

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # Counts active users making a distinction between whether they are admins or participants
-    class ActiveUsersCounter < Rectify::Query
+    class ActiveUsersCounter < Decidim::Query
       # Initializes the class.
       #
       # @param organization [Organization] Current organization

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

@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A class used to find the recipients of the
     # Newsletter depending on the params of the form
-    class NewsletterRecipients < Rectify::Query
+    class NewsletterRecipients < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # form - params to filter the query
@@ -51,11 +51,12 @@ module Decidim
         @spaces ||= @form.participatory_space_types.map do |type|
           next if type.ids.blank?
 
-          object_class = "Decidim::#{type.manifest_name.classify}"
+          object_class = Decidim.participatory_space_registry.find(type.manifest_name).model_class_name.constantize
+
           if type.ids.include?("all")
-            object_class.constantize.where(organization: @organization)
+            object_class.where(organization: @organization)
           else
-            object_class.constantize.where(id: type.ids.reject(&:blank?))
+            object_class.where(id: type.ids.compact_blank)
           end
         end.flatten.compact
       end

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

@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A class used to filter users by whitelisted scope or searches on their
     # name
-    class UserFilter < Rectify::Query
+    class UserFilter < Decidim::Query
       WHITELISTED_STATE_SCOPES = %w(
         officialized
         not_officialized

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A class used to find the UserGroup's by their evaluation state.
-    class UserGroupsEvaluation < Rectify::Query
+    class UserGroupsEvaluation < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user_groups - the initial User Group relation that needs to be filtered.

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

@@ -9,6 +9,7 @@
   </div>
 
   <div class="card-section">
+    <%= cell("decidim/admin/attachments_privacy_warning", attached_to.attachments) %>
     <% if attached_to.attachments.any? %>
       <div class="table-scroll">
         <table class="table-list">

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

@@ -12,10 +12,6 @@
       <%= form.number_field :weight %>
     </div>
 
-    <div class="row column">
-      <%= form.translated :editor, :description %>
-    </div>
-
     <div class="row column">
       <%= form.label :parent_id %>
       <%= select :category, :parent_id, @form.parent_categories.collect { |c| [c.name[current_organization.default_locale], c.id] }, include_blank: true %>

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

@@ -8,6 +8,5 @@
 
 <dl>
   <%= display_for @category,
-    :name,
-    :description %>
+    :name %>
 </dl>

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

@@ -2,13 +2,13 @@
   <div class="card-divider">
     <h2 class="card-title"><%= t ".colors_title" %></h2>
   </div>
-  <div class="callout warning">
-    <p>
-      <%= icon "warning" %>
-      <%= t ".colors_warning_html", link: "https://webaim.org/resources/contrastchecker" %>
-    </p>
-  </div>
   <div class="card-section">
+    <div class="callout warning">
+      <p>
+        <%= icon "warning" %>
+        <%= t ".colors_warning_html", link: "https://webaim.org/resources/contrastchecker" %>
+      </p>
+    </div>
     <div class="organization-colors">
       <%= form.color_field :primary_color, value: current_organization.colors["primary"] %>
       <%= form.color_field :secondary_color, value: current_organization.colors["secondary"] %>

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

@@ -14,7 +14,8 @@
         <%= form.upload(
               :favicon,
               dimensions_info: current_organization.attached_uploader(:favicon).dimensions_info,
-              extension_allowlist: current_organization.attached_uploader(:favicon).extension_allowlist
+              extension_allowlist: current_organization.attached_uploader(:favicon).extension_allowlist,
+              help_i18n_scope: "decidim.forms.file_help.icon"
             ) %>
       </div>
 
@@ -22,7 +23,7 @@
         <%= form.upload(
               :logo,
               dimensions_info: current_organization.attached_uploader(:logo).dimensions_info,
-              extension_allowlist: current_organization.attached_uploader(:favicon).extension_allowlist
+              extension_allowlist: current_organization.attached_uploader(:logo).extension_allowlist
             ) %>
       </div>
 
@@ -30,7 +31,7 @@
         <%= 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
+              extension_allowlist: current_organization.attached_uploader(:official_img_header).extension_allowlist
             ) %>
       </div>
 
@@ -38,7 +39,7 @@
         <%= 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
+              extension_allowlist: current_organization.attached_uploader(:official_img_footer).extension_allowlist
             ) %>
       </div>
     </div>

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

@@ -3,7 +3,7 @@
     <h2 class="card-title">
       <%= t(".title") %>
       <% if allowed_to? :create, :space_private_user %>
-        <%= link_to t(".import_via_csv"), new_participatory_space_private_users_csv_import_path, class: "button tiny button--title import" %>
+        <%= link_to t(".import_via_csv"), new_participatory_space_private_users_csv_imports_path, class: "button tiny button--title import" %>
         <%= link_to t("actions.participatory_space_private_user.new", scope: "decidim.admin"), url_for(action: :new), class: "button tiny button--title new" %>
       <% end %>
     </h2>

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

@@ -1,3 +1,22 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".destroy.title") %>
+    </h2>
+  </div>
+  <div class="card-section">
+    <% if @count != 0 %>
+      <p><%= t(".destroy.explanation", count: @count) %></p>
+      <%= link_to t(".destroy.button"),
+                  destroy_all_participatory_space_private_users_csv_imports_path,
+                  method: :delete,
+                  class: "button alert",
+                  data: { confirm: t(".destroy.confirm") } %>
+    <% else %>
+      <p><%= t(".destroy.empty") %></p>
+    <% end %>
+  </div>
+</div>
 <div class="card" id='user-groups'>
   <div class="card-divider">
     <h2 class="card-title">
@@ -5,7 +24,7 @@
     </h2>
   </div>
   <div class="card-section">
-    <%= decidim_form_for(@form, url: participatory_space_private_users_csv_import_path, html: { class: "form" }) do |form| %>
+    <%= decidim_form_for(@form, url: participatory_space_private_users_csv_imports_path, html: { class: "form" }) do |form| %>
       <p><%= t(".explanation") %></p>
       <div class="row column">
         <%= form.upload :file, optional: false %>

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

@@ -0,0 +1,21 @@
+<%= decidim_form_for(@form, url: component_reminders_path(name: reminder_manifest.name), class: "form grid-container") do |form| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title flex--sbc">
+        <%= reminder_manifest.message(:title, count: @form.try(:reminder_amount)) %>
+      </h2>
+    </div>
+    <div class="card-section">
+      <div class="row">
+        <div class="columns small-12">
+          <p><%= reminder_manifest.message(:description) %></p>
+        </div>
+      </div>
+      <div class="row">
+        <div class="columns small-12 text-center">
+          <%= form.submit t(".submit") %>
+        </div>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/decidim/admin/shared/_gallery.html.erb

@@ -15,7 +15,12 @@
     <% end %>
 
     <div class="row column">
-      <%= form.file_field :add_photos, multiple: true, label: t(".add_images") %>
+      <%= form.attachment :photos,
+        multiple: true,
+        label: t(".add_images"),
+        button_label: t(".add_images"),
+        button_edit_label: t(".edit_images"),
+        help_i18n_scope: "decidim.forms.file_help.image" %>
     </div>
   </fieldset>
 </div>

data/app/views/decidim/admin/shared/_js-callout.html.erb

@@ -0,0 +1,6 @@
+<div class="callout callout--full <%= css %>" data-closable>
+  <%= text %>
+  <button class="close-button" type="button" data-close="">
+    <span aria-hidden="true">×</span>
+  </button>
+</div>

data/app/views/decidim/admin/users_statistics/_users_count.html.erb

@@ -24,13 +24,13 @@
           <td class="title"><%= t(".participants") %></td>
           <td><%= result[:total_participants_last_month] %></td>
           <td><%= result[:total_participants_last_week] %></td>
-          <td><%= result[:total_participants_last_24] %></td>
+          <td><%= result[:total_participants_last_day] %></td>
         </tr>
         <tr>
           <td class="title"><%= t(".admins") %></td>
           <td><%= result[:total_admins_last_month] %></td>
           <td><%= result[:total_admins_last_week] %></td>
-          <td><%= result[:total_admins_last_24] %></td>
+          <td><%= result[:total_admins_last_day] %></td>
         </tr>
       </tbody>
     </table>

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

@@ -29,5 +29,7 @@
     <%= render partial: "decidim/shared/confirm_modal" %>
     <%= render partial: "layouts/decidim/admin/js_configuration" %>
     <%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>
+
+    <%= snippets.display(:foot) %>
   </body>
 </html>

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am: