decidim-admin 0.24.3 → 0.25.0.rc1

data/app/forms/decidim/admin/organization_external_domain_whitelist_form.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class OrganizationExternalDomainWhitelistForm < Form
+      attribute :external_domains, Array[Decidim::Admin::ExternalDomainForm]
+
+      validate :external_domains_validator
+
+      def map_model(model)
+        self.external_domains = model.external_domain_whitelist.map do |external_domain|
+          ExternalDomainForm.new(value: external_domain)
+        end
+      end
+
+      def external_domains_validator
+        @external_domains_validator ||= external_domains.reject(&:deleted).each do |domain|
+          errors.add(:external_domains, I18n.t("decidim.admin.domain_whitelist.form.domain_too_short")) if domain.value.length <= 3
+        end.map(&:value).uniq
+      end
+    end
+  end
+end

data/app/forms/decidim/admin/organization_form.rb

@@ -25,6 +25,7 @@ module Decidim
       attribute :rich_text_editor_in_public_views, Boolean
       attribute :enable_machine_translations, Boolean
       attribute :machine_translation_display_priority, String
+      attribute :enable_participatory_space_filters, Boolean
 
       attribute :send_welcome_notification, Boolean
       attribute :customize_welcome_notification, Boolean

data/app/forms/decidim/admin/participatory_space_private_user_csv_import_form.rb

@@ -7,6 +7,8 @@ module Decidim
     # A form object used to upload CSV to batch participatory space private users.
     #
     class ParticipatorySpacePrivateUserCsvImportForm < Form
+      include Decidim::HasUploadValidations
+
       attribute :file
       attribute :user_name, String
       attribute :email, String

data/app/forms/decidim/admin/user_group_csv_verification_form.rb

@@ -5,6 +5,8 @@ module Decidim
     # A form object used to upload CSV to batch verify user groups.
     #
     class UserGroupCsvVerificationForm < Form
+      include Decidim::HasUploadValidations
+
       attribute :file
 
       validates :file, presence: true

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

@@ -29,7 +29,7 @@ module Decidim
         links = []
         links += extra_dropdown_submenu_options_items(filter, i18n_scope)
         links += values.map { |value| filter_link_value(filter, value, i18n_scope) }
-        links.each_with_object({}) { |link, hash| hash[link] = nil }
+        links.index_with { nil }
       end
 
       # To be overriden. Useful for adding links that do not match with the filter.

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

@@ -4,23 +4,23 @@ module Decidim
   module Admin
     # This module includes helpers to manage menus in admin layout
     module MenuHelper
-      include Decidim::Admin::SidebarMenuHelper
-
       # Public: Returns the main menu presenter object
       def main_menu
         @main_menu ||= ::Decidim::MenuPresenter.new(
           :admin_menu,
           self,
-          active_class: "is-active"
+          active_class: "is-active",
+          label: t("layouts.decidim.header.main_menu")
         )
       end
 
-      def global_moderation_menu
-        @global_moderation_menu ||= sidebar_menu(:admin_global_moderation_menu)
+      def sidebar_menu(target_menu)
+        ::Decidim::Admin::SecondaryMenuPresenter.new(target_menu, self, active_class: "is-active")
       end
 
-      def organization_settings_menu
-        @organization_settings_menu ||= sidebar_menu(:admin_settings_menu)
+      def simple_menu(target_menu:, options: {})
+        options = { active_class: "is-active" }.merge(options)
+        ::Decidim::Admin::SimpleMenuPresenter.new(target_menu, self, options)
       end
     end
   end

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

@@ -12,7 +12,8 @@ module Decidim
       #
       # Returns an integer array with [width, height]
       def image_dimensions(model, image_name)
-        versions = model.send(image_name).dimensions_info
+        uploader = model.attached_uploader(image_name) || model.send(image_name)
+        versions = uploader.dimensions_info
         [:small, :medium, :default].map { |v| versions.dig(v, :dimensions) }.compact.first
       end
 

data/app/jobs/decidim/admin/expire_impersonation_job.rb

@@ -9,8 +9,7 @@ module Decidim
         impersonation_log = Decidim::ImpersonationLog.where(admin: current_user, user: user).active.first
         return unless impersonation_log
 
-        impersonation_log.expired_at = Time.current
-        impersonation_log.save!
+        impersonation_log.expire!
       end
     end
   end

data/app/jobs/decidim/admin/import_participatory_space_private_user_csv_job.rb

@@ -5,7 +5,7 @@ module Decidim
     # Custom ApplicationJob scoped to the admin panel.
     #
     class ImportParticipatorySpacePrivateUserCsvJob < ApplicationJob
-      queue_as :default
+      queue_as :exports
 
       def perform(email, user_name, privatable_to, current_user)
         return if email.blank? || user_name.blank?

data/app/packs/entrypoints/decidim_admin.js

@@ -0,0 +1,43 @@
+/* eslint no-unused-vars: 0 */
+/* eslint id-length: ["error", { "exceptions": ["$"] }] */
+
+import "core-js/stable";
+import "regenerator-runtime/runtime";
+import $ from "jquery"
+import Quill from "quill"
+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 "src/decidim/admin/choose_language"
+import "src/decidim/admin/application"
+import "src/decidim/admin/resources_permissions"
+import "src/decidim/admin/welcome_notification"
+import "src/decidim/admin/newsletters"
+import "src/decidim/admin/form"
+import "src/decidim/admin/import_guidance"
+import "src/decidim/admin/external_domain_whitelist"
+import "src/decidim/confirm"
+import "src/decidim/admin/draggable-list"
+import "src/decidim/admin/sortable"
+import "src/decidim/gallery"
+import "src/decidim/admin/moderations"
+import "src/decidim/input_tags"
+import "src/decidim/input_hashtags"
+import "src/decidim/input_mentions"
+import "src/decidim/vizzs"
+import "src/decidim/ajax_modals"
+import "src/decidim/admin/officializations"
+import "src/decidim/session_timeouter"
+import "src/decidim/slug_form"
+
+// CSS
+import "entrypoints/decidim_admin.scss";
+
+// This needs to be loaded after confirm dialog to bind properly
+Rails.start()

data/app/packs/entrypoints/decidim_admin.scss

@@ -0,0 +1 @@
+@import "stylesheets/decidim/admin/application.scss"

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

@@ -0,0 +1,68 @@
+/* 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"
+import managedUsersForm from "src/decidim/admin/managed_users"
+
+window.Decidim = window.Decidim || {};
+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"));
+
+  $(document).foundation();
+
+  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) => {
+      const sortUrl = $("#steps tbody").data("sort-url")
+      const order = $children.map((index, child) => $(child).data("id")).toArray();
+
+      $.ajax({
+        method: "POST",
+        url: sortUrl,
+        contentType: "application/json",
+        data: JSON.stringify({ items_ids: order }) }, // eslint-disable-line camelcase
+      );
+    }
+  })
+
+  formDatePicker();
+
+  $(".editor-container").each((_idx, container) => {
+    createQuillEditor(container);
+  });
+
+  $("form.new_filter").each(function () {
+    const formFilter = new FormFilterComponent($(this));
+
+    formFilter.mountComponent();
+  })
+});
+

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

@@ -0,0 +1,37 @@
+export default class AutoButtonsByPositionComponent {
+  constructor(options = {}) {
+    this.listSelector = options.listSelector;
+    this.hideOnFirstSelector = options.hideOnFirstSelector;
+    this.hideOnLastSelector = options.hideOnLastSelector;
+
+    this.run();
+  }
+
+  run() {
+    const $list = $(this.listSelector);
+    const hideOnFirst = this.hideOnFirstSelector;
+    const hideOnLast = this.hideOnLastSelector;
+
+    if ($list.length === 1) {
+      const $item = $list.first();
+
+      $item.find(hideOnFirst).hide();
+      $item.find(hideOnLast).hide();
+    } else {
+      $list.each((idx, el) => {
+        if (el.id === $list.first().attr("id")) {
+          $(el).find(hideOnFirst).hide();
+          $(el).find(hideOnLast).show();
+        }
+        else if (el.id === $list.last().attr("id")) {
+          $(el).find(hideOnLast).hide();
+          $(el).find(hideOnFirst).show();
+        }
+        else {
+          $(el).find(hideOnLast).show();
+          $(el).find(hideOnFirst).show();
+        }
+      });
+    }
+  }
+}

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

@@ -0,0 +1,28 @@
+export default class AutoLabelByPositionComponent {
+  constructor(options = {}) {
+    this.listSelector = options.listSelector;
+    this.labelSelector = options.labelSelector;
+    this.onPositionComputed = options.onPositionComputed;
+
+    this.run();
+  }
+
+  run() {
+    const $list = $(this.listSelector);
+
+    $list.each((idx, el) => {
+      const $label = $(el).find(this.labelSelector);
+      const labelContent = $label.html();
+
+      if (labelContent.match(/#(\d+)/)) {
+        $label.html(labelContent.replace(/#(\d+)/, `#${idx + 1}`));
+      } else {
+        $label.html(`${labelContent} #${idx + 1}`);
+      }
+
+      if (this.onPositionComputed) {
+        this.onPositionComputed(el, idx);
+      }
+    });
+  }
+}

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

@@ -0,0 +1,146 @@
+/* eslint no-unused-vars: 0 */
+/* eslint consistent-return: 0 */
+
+import axios from "axios";
+import * as React from "react";
+import { Async as AsyncSelect } from "react-select";
+import "react-select/scss/default.scss";
+import PropTypes from "prop-types";
+
+export class Autocomplete extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.minCharactersToSearch = 3;
+
+    this.handleChange = (selectedOption) => {
+      this.setState({ selectedOption });
+      if (this.props.changeURL) {
+        axios.get(this.props.changeURL, {
+          headers: {
+            Accept: "text/javascript"
+          },
+          withCredentials: true,
+          params: {
+            id: selectedOption.value
+          }
+        }).
+          then((response) => {
+            const script = document.createElement("script");
+            script.type = "text/javascript";
+            script.innerHTML = response.data;
+            document.getElementsByTagName("head")[0].appendChild(script);
+          }).
+          catch((error) => {
+            if (axios.isCancel(error)) {
+              // console.log("Request canceled", error.message);
+            }
+            else {
+              //
+            }
+          });
+      }
+    };
+
+    this.filterOptions = (options, filter, excludeOptions) => {
+      // Do no filtering, just return all options because
+      // we return a filtered set from server
+      return options;
+    };
+
+    this.onInputChange = (query) => {
+      if (query.length < this.minCharactersToSearch) {
+        this.setState({ noResultsText: this.props.searchPromptText });
+      }
+      else {
+        this.setState({ noResultsText: this.props.noResultsText });
+      }
+    };
+
+    this.loadOptions = (query, callback) => {
+      const lowerQuery = query.toLowerCase();
+
+      if (this.cancelTokenSource) {
+        this.cancelTokenSource.cancel();
+      }
+
+      if (lowerQuery.length < this.minCharactersToSearch) {
+        return callback(null, { options: [], complete: false });
+      }
+
+      this.cancelTokenSource = axios.CancelToken.source();
+      axios.get(this.props.searchURL, {
+        cancelToken: this.cancelTokenSource.token,
+        headers: {
+          Accept: "application/json"
+        },
+        withCredentials: true,
+        params: {
+          term: lowerQuery
+        }
+      }).
+        then((response) => {
+          // CAREFUL! Only set complete to true when there are no more options,
+          // or more specific queries will not be sent to the server.
+          return callback(null, { options: response.data, complete: true });
+        }).
+        catch((error) => {
+          if (!axios.isCancel(error)) {
+            return callback(error, { options: [], complete: false });
+          }
+        });
+    };
+
+    this.state = {
+      options: props.options,
+      selectedOption: props.selected,
+      searchPromptText: props.searchPromptText,
+      noResultsText: props.noResultsText
+    };
+  }
+
+  render() {
+    const { autoload, name, placeholder } = this.props;
+    const { selectedOption, options, searchPromptText, noResultsText } = this.state;
+
+    return (
+      React.createElement("div", { className: "autocomplete-field" },
+        React.createElement(AsyncSelect, {
+          cache: false,
+          name: name,
+          value: selectedOption,
+          options: options,
+          placeholder: placeholder,
+          searchPromptText: searchPromptText,
+          noResultsText: noResultsText,
+          onChange: this.handleChange,
+          onInputChange: this.onInputChange,
+          loadOptions: this.loadOptions,
+          filterOptions: this.filterOptions,
+          autoload: autoload,
+          removeSelected: true,
+          escapeClearsValue: false,
+          onCloseResetsInput: false
+        })
+      )
+    );
+  }
+}
+
+Autocomplete.defaultProps = {
+  autoload: false
+};
+
+Autocomplete.propTypes = {
+  changeURL: PropTypes.string,
+  searchPromptText: PropTypes.string,
+  noResultsText: PropTypes.string,
+  searchURL: PropTypes.string,
+  selected: PropTypes.string,
+  options: PropTypes.array,
+  autoload: PropTypes.bool,
+  name: PropTypes.string,
+  placeholder: PropTypes.string
+}
+
+export default Autocomplete;