decidim-admin 0.20.1 → 0.23.1

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

@@ -12,6 +12,7 @@ module Decidim
 
       attribute :name, String
       attribute :reference_prefix, String
+      attribute :time_zone, String
       attribute :twitter_handler, String
       attribute :facebook_handler, String
       attribute :instagram_handler, String
@@ -20,6 +21,10 @@ module Decidim
       attribute :default_locale, String
       attribute :badges_enabled, Boolean
       attribute :user_groups_enabled, Boolean
+      attribute :comments_max_length, Integer
+      attribute :rich_text_editor_in_public_views, Boolean
+      attribute :enable_machine_translations, Boolean
+      attribute :machine_translation_display_priority, String
 
       attribute :send_welcome_notification, Boolean
       attribute :customize_welcome_notification, Boolean
@@ -27,17 +32,39 @@ module Decidim
       translatable_attribute :welcome_notification_subject, String
       translatable_attribute :welcome_notification_body, String
 
+      translatable_attribute :admin_terms_of_use_body, String
+
       validates :welcome_notification_subject, :welcome_notification_body, translatable_presence: true, if: proc { |form| form.customize_welcome_notification }
 
       validates :name, presence: true
+      validates :time_zone, presence: true
+      validates :time_zone, time_zone: true
       validates :default_locale, :reference_prefix, presence: true
       validates :default_locale, inclusion: { in: :available_locales }
+      validates :admin_terms_of_use_body, translatable_presence: true
+      validates :comments_max_length, numericality: { greater_than: 0 }, if: ->(form) { form.comments_max_length.present? }
+      validates :machine_translation_display_priority,
+                inclusion: { in: Decidim::Organization::AVAILABLE_MACHINE_TRANSLATION_DISPLAY_PRIORITIES },
+                if: :machine_translation_enabled?
+
+      def machine_translation_priorities
+        Decidim::Organization::AVAILABLE_MACHINE_TRANSLATION_DISPLAY_PRIORITIES.map do |priority|
+          [
+            priority,
+            I18n.t("activemodel.attributes.organization.machine_translation_display_priority_#{priority}")
+          ]
+        end
+      end
 
       private
 
       def available_locales
         current_organization.available_locales
       end
+
+      def machine_translation_enabled?
+        Decidim.config.enable_machine_translations
+      end
     end
   end
 end

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

@@ -1,13 +1,27 @@
 # frozen_string_literal: true
 
+require "csv"
+
 module Decidim
   module Admin
     # A form object used to upload CSV to batch participatory space private users.
     #
     class ParticipatorySpacePrivateUserCsvImportForm < Form
       attribute :file
+      attribute :user_name, String
+      attribute :email, String
 
       validates :file, presence: true
+      validate :validate_csv
+
+      def validate_csv
+        if file.present?
+          CSV.foreach(file.path) do |email, user_name|
+            errors.add(:user_name, :invalid) unless user_name.match?(UserBaseEntity::REGEXP_NAME)
+            errors.add(:email, :taken) if context && context.current_organization && context.current_organization.admins.where(email: email).exists?
+          end
+        end
+      end
     end
   end
 end

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

@@ -11,8 +11,14 @@ module Decidim
       attribute :name, String
       attribute :email, String
 
-      validates :email, presence: true
-      validates :name, presence: true
+      validates :name, :email, presence: true
+
+      validates :name, format: { with: UserBaseEntity::REGEXP_NAME }
+      validate :admin_uniqueness
+
+      def admin_uniqueness
+        errors.add(:email, :taken) if context && context.current_organization && context.current_organization.admins.where(email: email).exists?
+      end
     end
   end
 end

data/app/frontend/components/autocomplete.component.test.tsx

@@ -11,9 +11,10 @@ describe("<Autocomplete />", () => {
   const noResultsText = "No results found";
   const searchPromptText = "Type to search";
   const searchURL = "/some/url";
+  const changeURL = "/some/other/url";
 
   it("renders a div of Select", () => {
-    const wrapper = shallow(<Autocomplete name={name} selected={selected} options={options} noResultsText={noResultsText} placeholder={placeholder} searchPromptText={searchPromptText} searchURL={searchURL} />);
+    const wrapper = shallow(<Autocomplete name={name} selected={selected} options={options} noResultsText={noResultsText} placeholder={placeholder} searchPromptText={searchPromptText} searchURL={searchURL} changeURL={changeURL} />);
     expect(wrapper.find(".autocomplete-field").exists()).toBeTruthy();
   });
 });

data/app/frontend/components/autocomplete.component.tsx

@@ -43,6 +43,10 @@ export interface AutocompleteProps {
    * The URL where fetch content
    */
   searchURL: string;
+  /**
+   * The URL to call when selected option changes
+   */
+  changeURL: string;
 }
 
 interface AutocompleteState {
@@ -112,6 +116,31 @@ export class Autocomplete extends React.Component<AutocompleteProps, Autocomplet
 
   private handleChange = (selectedOption: any) => {
     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: any) => {
+        if (axios.isCancel(error)) {
+          // console.log("Request canceled", error.message);
+        } else {
+          //
+        }
+      });
+    }
   }
 
   private filterOptions = (options: any, filter: any, excludeOptions: any) => {

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This module includes helpers to show Admin Terms of Use
+    module AdminTermsHelper
+      def admin_terms_of_use_body
+        current_organization.admin_terms_of_use_body.symbolize_keys[I18n.locale].html_safe
+      end
+
+      def admin_terms_announcement_args
+        {
+          callout_class: current_user.admin_terms_accepted? ? "success" : "warning",
+          announcement: announcement_body
+        }
+      end
+
+      def announcement_body
+        if current_user.admin_terms_accepted?
+          t("accept.success", scope: "decidim.admin.admin_terms_of_use")
+        else
+          t("required_review.callout", scope: "decidim.admin.admin_terms_of_use")
+        end
+      end
+
+      def button_to_accept_admin_terms
+        button_to(
+          t("decidim.admin.admin_terms_of_use.actions.accept"),
+          admin_terms_accept_path,
+          class: "button success",
+          method: :put
+        )
+      end
+
+      def button_to_refuse_admin_terms
+        link_to(
+          t("decidim.admin.admin_terms_of_use.actions.refuse"),
+          decidim.root_path,
+          class: "button clear",
+          data: {
+            confirm: t("actions.are_you_sure", scope: "decidim.admin.admin_terms_of_use")
+          }
+        )
+      end
+    end
+  end
+end

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

@@ -12,6 +12,8 @@ module Decidim
       include Decidim::MetaTagsHelper
       include Decidim::MapHelper
       include Decidim::Admin::LogRenderHelper
+      include Decidim::Admin::UserRolesHelper
+      include Decidim::Admin::ResourceScopeHelper
 
       def title
         current_organization.name

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This module includes helpers to be used in the admin dashboard, including helper methods to show the Admin Terms of Use.
+    module DashboardHelper
+      def admin_terms_announcement_args
+        {
+          callout_class: "warning",
+          announcement: announcement_body
+        }
+      end
+
+      def announcement_body
+        body = t("required_review.callout", scope: "decidim.admin.admin_terms_of_use")
+        body += " "
+        body += link_to(
+          t("required_review.cta", scope: "decidim.admin.admin_terms_of_use"),
+          admin_terms_show_path
+        )
+        body
+      end
+    end
+  end
+end

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

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Helper that provides methods related to Decidim::Admin::Filterable concern.
+    module FilterableHelper
+      # Renders the filters selector with tags in the admin panel.
+      def admin_filter_selector(i18n_ctx = nil)
+        render partial: "decidim/admin/shared/filters", locals: { i18n_ctx: i18n_ctx }
+      end
+
+      # Builds a tree of links from Decidim::Admin::Filterable::filters_with_values
+      def submenu_options_tree(i18n_ctx = nil)
+        i18n_scope = filterable_i18n_scope_from_ctx(i18n_ctx)
+
+        filters_with_values.each_with_object({}) do |(filter, values), hash|
+          link = filter_link_label(filter, i18n_scope)
+          hash[link] = if values.is_a?(Array)
+                         build_submenu_options_tree_from_array(filter, values, i18n_scope)
+                       elsif values.is_a?(Hash)
+                         build_submenu_options_tree_from_hash(filter, values, i18n_scope)
+                       end
+        end
+      end
+
+      # Builds a tree of links from an array. The tree will have only one level.
+      def build_submenu_options_tree_from_array(filter, values, i18n_scope)
+        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 }
+      end
+
+      # To be overriden. Useful for adding links that do not match with the filter.
+      # Must return an Array.
+      def extra_dropdown_submenu_options_items(_filter, _i18n_scope)
+        []
+      end
+
+      # Builds a tree of links from an Hash. The tree can have many levels.
+      def build_submenu_options_tree_from_hash(filter, values, i18n_scope)
+        values.each_with_object({}) do |(key, value), hash|
+          link = filter_link_value(filter, key, i18n_scope)
+          hash[link] = if value.nil?
+                         nil
+                       elsif value.is_a?(Hash)
+                         build_submenu_options_tree_from_hash(filter, value, i18n_scope)
+                       end
+        end
+      end
+
+      # Produces the html for the dropdown submenu from the options tree.
+      # Returns a ActiveSupport::SafeBuffer.
+      def dropdown_submenu(options)
+        content_tag(:ul, class: "vertical menu") do
+          options.map do |key, value|
+            if value.nil?
+              content_tag(:li, key)
+            elsif value.is_a?(Hash)
+              content_tag(:li, class: "is-dropdown-submenu-parent") do
+                key + dropdown_submenu(value)
+              end
+            end
+          end.join.html_safe
+        end
+      end
+
+      def filter_link_label(filter, i18n_scope)
+        link_to(i18n_filter_label(filter, i18n_scope), href: "#")
+      end
+
+      def filter_link_value(filter, value, i18n_scope)
+        link_to(i18n_filter_value(filter, value, i18n_scope), query_params_with(filter => value))
+      end
+
+      def i18n_filter_label(filter, i18n_scope)
+        t("#{i18n_scope}.#{filter}.label")
+      end
+
+      def i18n_filter_value(filter, value, i18n_scope)
+        if I18n.exists?("#{i18n_scope}.#{filter}.values.#{value}")
+          t(value, scope: "#{i18n_scope}.#{filter}.values")
+        else
+          find_dynamic_translation(filter, value)
+        end
+      end
+
+      def applied_filters_hidden_field_tags
+        html = []
+        html += ransack_params.slice(*filters, *extra_filters).map do |filter, value|
+          hidden_field_tag("q[#{filter}]", value)
+        end
+        html += query_params.slice(*extra_allowed_params).map do |filter, value|
+          hidden_field_tag(filter, value)
+        end
+        html.join.html_safe
+      end
+
+      def applied_filters_tags(i18n_ctx)
+        ransack_params.slice(*filters).map do |filter, value|
+          applied_filter_tag(filter, value, filterable_i18n_scope_from_ctx(i18n_ctx))
+        end.join.html_safe
+      end
+
+      def applied_filter_tag(filter, value, i18n_scope)
+        content_tag(:span, class: "label secondary") do
+          concat "#{i18n_filter_label(filter, i18n_scope)}: "
+          concat i18n_filter_value(filter, value, i18n_scope)
+          concat remove_filter_icon_link(filter)
+        end
+      end
+
+      def remove_filter_icon_link(filter)
+        icon_link_to(
+          "circle-x",
+          url_for(query_params_without(filter)),
+          t("decidim.admin.actions.cancel"),
+          class: "action-icon--remove"
+        )
+      end
+
+      def filterable_i18n_scope_from_ctx(i18n_ctx)
+        i18n_scope = "decidim.admin.filters"
+        i18n_scope += ".#{i18n_ctx}" if i18n_ctx
+        i18n_scope
+      end
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ module Decidim
                 target: options[:target]) do
           content_tag(:span, data: { tooltip: true, disable_hover: false, click_open: false },
                              title: title) do
-            icon(icon_name)
+            icon(icon_name, aria_label: title, role: "img")
           end
         end
       end

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

@@ -130,6 +130,26 @@ module Decidim
           { class: space.try(:closed?) ? "red" : "green", title: translated_attribute(space.title).to_s }
         ]
       end
+
+      def newsletter_attention_callout_args
+        {
+          announcement: {
+            body: t("warning", scope: "decidim.admin.newsletters.select_recipients_to_deliver").html_safe
+          },
+          callout_class: "warning"
+        }
+      end
+
+      def newsletter_recipients_count_callout_args
+        spinner = "<span id='recipients_count_spinner' class='loading-spinner hide'></span>"
+        body = "#{t("recipients_count", scope: "decidim.admin.newsletters.select_recipients_to_deliver", count: recipients_count_query)} #{spinner}"
+        {
+          announcement: {
+            body: body
+          },
+          callout_class: "warning"
+        }
+      end
     end
   end
 end

data/app/helpers/decidim/admin/paginable/per_page_helper.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module Paginable
+      # This module includes helpers the :per_page cell's option
+      module PerPageHelper
+        def per_page_options
+          OpenStruct.new(
+            per_page: per_page,
+            per_page_range: Decidim::Admin.per_page_range
+          )
+        end
+
+        # Renders the pagination dropdown menu in the admin panel.
+        def admin_filters_pagination
+          cell("decidim/admin/results_per_page", per_page_options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This module includes helpers to show scopes in admin
+    module ResourceScopeHelper
+      # Public: This helper shows the th with the scope label.
+      #
+      # scope_label - I18n translation to show
+      #
+      def th_resource_scope_label(scope_label = t("decidim.admin.resources.index.headers.scope"))
+        return unless resource_with_scopes_enabled?
+
+        content_tag(:th, scope_label)
+      end
+
+      # Public: This helper shows the td for the given scope.
+      #
+      # current_scope - Scope object to show
+      #
+      def td_resource_scope_for(current_scope)
+        return unless resource_with_scopes_enabled?
+
+        scope_name = if current_scope
+                       translated_attribute(current_scope.name)
+                     else
+                       t("decidim.scopes.global")
+                     end
+        content_tag(:td, scope_name)
+      end
+
+      private
+
+      def resource_with_scopes_enabled?
+        if defined? current_component
+          current_component.scopes_enabled? || current_participatory_space.scopes_enabled?
+        else
+          current_participatory_space.scopes_enabled?
+        end
+      end
+    end
+  end
+end