decidim-admin 0.26.5 → 0.27.0.rc1

data/app/helpers/decidim/admin/moderations/reports_helper.rb

@@ -6,22 +6,31 @@ module Decidim
       # This module includes helpers to show moderation reports in admin
       module ReportsHelper
         include Decidim::Messaging::ConversationHelper
+        include Decidim::ResourceHelper
+        include Decidim::TranslationsHelper
 
         # Public: Returns the reportable's author names separated by commas.
         def reportable_author_name(reportable)
           reportable_authors = reportable.try(:authors) || [reportable.try(:normalized_author)]
           content_tag :ul, class: "reportable-authors" do
             reportable_authors.select(&:present?).map do |author|
-              if author.is_a? User
+              case author
+              when User
                 content_tag :li do
                   link_to current_or_new_conversation_path_with(author), target: "_blank", rel: "noopener" do
                     "#{author.name} #{icon "envelope-closed"}".html_safe
                   end
                 end
+              when Decidim::Meetings::Meeting
+                content_tag :li do
+                  link_to resource_locator(author).path, target: "_blank", rel: "noopener" do
+                    translated_attribute(author.title)
+                  end
+                end
               else
                 content_tag(:li, author.name)
               end
-            end.join("").html_safe
+            end.join.html_safe
           end
         end
 

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module RemindersHelper
+      # Route to the correct reminder for a component.
+      def admin_reminders_path(component, options = {})
+        EngineRouter.admin_proxy(component.participatory_space).new_component_reminder_path(options.merge(component_id: component))
+      end
+    end
+  end
+end

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

@@ -18,19 +18,16 @@ module Decidim
         time: :datetime_field
       }.freeze
 
-      # Renders a form field that matches a settings attribute's type.
-      # Besides the field itself, it also renders all the metadata (like the labels and help texts)
+      # Public: Renders a form field that matches a settings attribute's
+      # type.
       #
-      # @param form [Decidim::Admin::FormBuilder] The form in which to render the field
-      # @param attribute [Decidim::SettingsManifest::Attribute] The Settings::Attribute instance with the
-      #   description of the attribute.
-      # @param name [Symbol] The name of the field.
-      # @param i18n_scope [String] The scope where it'll find all the texts for the internationalization (locales)
-      # @param options [Hash] Extra options to be passed to the field helper.
-      # @option options [String] :tabs_prefix The type of the setting.
-      #   It can be "global-settings" or "step-N-settings", where N is the number of the step.
-      # @option options [nil, Boolean] :readonly True if the input is readonly.
-      # @return [ActiveSupport::SafeBuffer] Rendered form field.
+      # form      - The form in which to render the field.
+      # attribute - The Settings::Attribute instance with the
+      #             description of the attribute.
+      # name      - The name of the field.
+      # options   - Extra options to be passed to the field helper.
+      #
+      # Returns a rendered form field.
       def settings_attribute_input(form, attribute, name, i18n_scope, options = {})
         form_method = form_method_for_attribute(attribute)
 
@@ -65,18 +62,6 @@ module Decidim
 
       private
 
-      # Renders a select field collection input for the given attribute
-      #
-      # @param form (see #settings_attribute_input)
-      # @param attribute (see #settings_attribute_input)
-      # @param name (see #settings_attribute_input)
-      # @param i18n_scope (see #settings_attribute_input)
-      # @param options (see #settings_attribute_input)
-      # @option :tabs_prefix (see #settings_attribute_input)
-      # @option :readonly (see #settings_attribute_input)
-      # @option options [String] :label The label that this field has
-      # @option options [String] :help_text The help text shown after the input field
-      # @return (see #settings_attribute_input)
       def render_select_form_field(form, attribute, name, i18n_scope, options)
         html = form.select(
           name,
@@ -88,17 +73,6 @@ module Decidim
       end
 
       # Returns a radio buttons collection input for the given attribute
-      #
-      # @param form (see #settings_attribute_input)
-      # @param attribute (see #settings_attribute_input)
-      # @param name (see #settings_attribute_input)
-      # @param i18n_scope (see #settings_attribute_input)
-      # @param options (see #settings_attribute_input)
-      # @option :tabs_prefix (see #settings_attribute_input)
-      # @option :readonly (see #settings_attribute_input)
-      # @option :label (see #render_select_form_field)
-      # @option :help_text (see #render_select_form_field)
-      # @return (see #settings_attribute_input)
       def render_enum_form_field(form, attribute, name, i18n_scope, options)
         html = label_tag(name) do
           concat options[:label]
@@ -114,25 +88,13 @@ module Decidim
         html
       end
 
-      # Get the translation for a given attribute
       # Returns a translation or nil. If nil, ZURB Foundation won't add the help_text.
-      #
-      # @param name (see #settings_attribute_input)
-      # @param suffix [String] What suffix the i18n key has
-      # @param i18n_scope (see #settings_attribute_input)
-      # @return [String, nil]
       def text_for_setting(name, suffix, i18n_scope)
-        html_key = "#{i18n_scope}.#{name}_#{suffix}_html"
-        return t(html_key) if I18n.exists?(html_key)
-
         key = "#{i18n_scope}.#{name}_#{suffix}"
         return t(key) if I18n.exists?(key)
       end
 
-      # Which form method is being used for this attribute
-      #
-      # @param attribute [Decidim::SettingsManifest::Attribute]
-      # @return [Symbol] The FormBuilder's method used to render
+      # Returns the FormBuilder's method used to render
       def form_method_for_attribute(attribute)
         return :editor if attribute.type.to_sym == :text && attribute.editor?
 
@@ -140,9 +102,7 @@ module Decidim
       end
 
       # Handles special cases.
-      #
-      # @param input_type [Symbol]
-      # @return [Hash] Empty Hash or a Hash with extra HTML options.
+      # Returns an empty Hash or a Hash with extra HTML options.
       def extra_options_for_type(input_type)
         case input_type
         when :text_area
@@ -153,12 +113,6 @@ module Decidim
       end
 
       # Build options for enum attributes
-      # Get the translation for a given attribute of type choice
-      #
-      # @param name (see #settings_attribute_input)
-      # @param i18n_scope (see #settings_attribute_input)
-      # @param choices [Array<Symbol>]
-      # @return [Array<Array<String>>]
       def build_enum_choices(name, i18n_scope, choices)
         choices.map do |choice|
           [t("#{name}_choices.#{choice}", scope: i18n_scope), choice]

data/app/models/decidim/admin/fake_newsletter.rb

@@ -41,26 +41,6 @@ module Decidim
         nil
       end
 
-      def draft?
-        true
-      end
-
-      def url(**_)
-        "#"
-      end
-
-      def notifications_settings_url(**_)
-        "#"
-      end
-
-      def unsubscribe_newsletters_url(**_)
-        "#"
-      end
-
-      def organization_official_url
-        "#"
-      end
-
       private
 
       attr_reader :organization, :manifest

data/app/packs/entrypoints/decidim_admin.js

@@ -10,11 +10,10 @@ import Rails from "@rails/ujs"
 import "foundation-sites"
 import "src/decidim/vendor/foundation-datepicker"
 import "src/decidim/foundation_datepicker_locales"
-import "jquery.autocomplete"
 import "jquery-serializejson"
 
 import "src/decidim/admin/tab_focus"
-import initLanguageChangeSelect from "src/decidim/admin/choose_language"
+import "src/decidim/admin/choose_language"
 import "src/decidim/admin/application"
 import "src/decidim/admin/resources_permissions"
 import "src/decidim/admin/welcome_notification"
@@ -34,13 +33,11 @@ import "src/decidim/ajax_modals"
 import "src/decidim/admin/officializations"
 import "src/decidim/session_timeouter"
 import "src/decidim/slug_form"
+import "src/decidim/direct_uploads/upload_field"
+import "src/decidim/admin/admin_autocomplete"
 
 // CSS
 import "entrypoints/decidim_admin.scss";
 
 // This needs to be loaded after confirm dialog to bind properly
 Rails.start()
-
-window.addEventListener("DOMContentLoaded", () => {
-  initLanguageChangeSelect(document.querySelectorAll("select.language-change"));
-});

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/src/decidim/admin/choose_language.js

@@ -1,14 +1,12 @@
 /* eslint-disable no-invalid-this */
-/* eslint-disable require-jsdoc */
 
-export default function initLanguageChangeSelect(elements) {
-  elements.forEach((select) => {
-    select.addEventListener("change", () => {
-      let targetTabPaneSelector = select.value;
-      let tabsContent = select.parentElement.parentElement.nextElementSibling;
+$(() => {
+  $("select.language-change").change(function () {
+    let $select = $(this);
+    let targetTabPaneSelector = $select.val();
+    let $tabsContent = $select.parent().parent().siblings();
 
-      tabsContent.querySelector(".is-active").classList.remove("is-active");
-      tabsContent.querySelector(targetTabPaneSelector).classList.add("is-active");
-    })
-  });
-}
+    $tabsContent.children(".is-active").removeClass("is-active");
+    $tabsContent.children(targetTabPaneSelector).addClass("is-active");
+  })
+});

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

@@ -70,7 +70,6 @@ class DynamicFieldsComponent {
       $(this).replaceAttribute("for", placeholder, value);
       $(this).replaceAttribute("tabs_id", placeholder, value);
       $(this).replaceAttribute("href", placeholder, value);
-      $(this).replaceAttribute("value", placeholder, value);
 
       return this;
     }

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/_forms.scss

@@ -116,12 +116,6 @@ label,
   margin-bottom: $input-margin;
 }
 
-.form-input-extra-before{
-  margin-bottom: $form-spacing * 1.5;
-  display: block;
-  margin-top: $form-spacing * -1;
-}
-
 .custom-error{
   @extend .form-error;
 }

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

@@ -0,0 +1,10 @@
+.new_import .import-process-info{
+  margin-top: 1em;
+  font-style: italic;
+
+  span.attribute-name{
+    background-color: lightgrey;
+    font-style: normal;
+    padding: 1px 4px;
+  }
+}

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";
@@ -29,7 +30,9 @@
 @import "stylesheets/decidim/admin/modules/agenda";
 @import "stylesheets/decidim/admin/modules/draggable-list";
 @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

@@ -29,14 +29,12 @@ module Decidim
         read_admin_dashboard_action?
         apply_newsletter_permissions_for_admin!
 
-        apply_global_moderations_permission_for_admin!
+        allow! if permission_action.subject == :global_moderation
 
         if user.admin? && admin_terms_accepted?
           allow! if read_admin_log_action?
-          allow! if read_user_statistics_action?
           allow! if read_metrics_action?
           allow! if static_page_action?
-          allow! if templates_action?
           allow! if organization_action?
           allow! if user_action?
 
@@ -58,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
@@ -78,23 +77,6 @@ module Decidim
         toggle_allow(user.admin? || space_allows_admin_access_to_current_action?)
       end
 
-      def apply_global_moderations_permission_for_admin!
-        return unless admin_terms_accepted?
-        return unless permission_action.subject == :global_moderation
-        return allow! if user.admin?
-
-        return allow! if Decidim.participatory_space_manifests.flat_map.any? do |manifest|
-          Decidim
-                         .find_participatory_space_manifest(manifest.name)
-                         .participatory_spaces
-                         .call(user.organization)&.any? do |space|
-            space.respond_to?(:user_roles) && space.user_roles(:admin).where(user: user).or(space.user_roles(:moderator).where(user: user)).any?
-          end
-        end
-
-        disallow!
-      end
-
       def apply_newsletter_permissions_for_admin!
         return unless admin_terms_accepted?
         return unless permission_action.subject == :newsletter
@@ -120,11 +102,6 @@ module Decidim
         end
       end
 
-      def read_user_statistics_action?
-        permission_action.subject == :users_statistics &&
-          permission_action.action == :read
-      end
-
       def read_metrics_action?
         permission_action.subject == :metrics &&
           permission_action.action == :read
@@ -152,11 +129,6 @@ module Decidim
         end
       end
 
-      def templates_action?
-        permission_action.subject == :templates &&
-          permission_action.action == :read
-      end
-
       def organization_action?
         return unless permission_action.subject == :organization
         return unless permission_action.action == :update
@@ -168,7 +140,6 @@ module Decidim
         return unless permission_action.subject == :managed_user
         return user_manager_permissions if user_manager?
         return unless user&.admin?
-        return unless user&.admin_terms_accepted?
 
         case permission_action.action
         when :create
@@ -213,7 +184,7 @@ module Decidim
 
       def space_allows_admin_access_to_current_action?(require_admin_terms_accepted: false)
         Decidim.participatory_space_manifests.any? do |manifest|
-          next if require_admin_terms_accepted && !admin_terms_accepted?
+          next if manifest.name != :initiatives && require_admin_terms_accepted && !admin_terms_accepted?
 
           new_permission_action = Decidim::PermissionAction.new(
             action: permission_action.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
@@ -56,7 +56,7 @@ module Decidim
           if type.ids.include?("all")
             object_class.where(organization: @organization)
           else
-            object_class.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/dashboard/show.html.erb

@@ -12,7 +12,7 @@
   <% end %>
 
   <div class="grid-x grid-margin-x">
-    <% if allowed_to? :read, :users_statistics %>
+    <% if current_user.admin? && current_user.organization&.id == current_organization.id %>
       <div class="cell small-12 medium-6 large-4">
         <%= render(
           partial: "decidim/admin/users_statistics/users_count",