decidim-admin 0.20.0 → 0.23.1.rc1

data/config/locales/zh-TW.yml

@@ -0,0 +1 @@
+zh-TW:

data/config/routes.rb

@@ -23,6 +23,7 @@ Decidim::Admin::Engine.routes.draw do
     resources :scopes, except: [:show] do
       resources :scopes, except: [:show]
     end
+    resources :metrics, only: [:index]
     resources :logs, only: [:index]
     resources :area_types, except: [:show]
     resources :areas, except: [:show]
@@ -39,7 +40,9 @@ Decidim::Admin::Engine.routes.draw do
       end
     end
 
-    resources :officializations, only: [:new, :create, :index, :destroy], param: :user_id
+    resources :officializations, only: [:new, :create, :index, :destroy], param: :user_id do
+      get :show_email, on: :member
+    end
 
     resources :impersonatable_users, only: [:index] do
       resources :promotions, controller: "managed_users/promotions", only: [:new, :create]
@@ -51,9 +54,18 @@ Decidim::Admin::Engine.routes.draw do
       end
     end
 
-    resources :newsletters do
+    resources :newsletter_templates, only: [:index, :show] do
+      resources :newsletters, only: [:new, :create]
+
       member do
         get :preview
+      end
+    end
+
+    resources :newsletters, except: [:new, :create] do
+      member do
+        get :recipients_count
+        get :preview
         get :select_recipients_to_deliver
         post :deliver
       end
@@ -71,7 +83,12 @@ Decidim::Admin::Engine.routes.draw do
 
     resource :help_sections, only: [:show, :update]
 
-    resources :oauth_applications
+    namespace :admin_terms do
+      get :show
+      put :accept
+    end
+
+    resources :share_tokens, only: :destroy
 
     root to: "dashboard#show"
   end

data/db/migrate/20191118112040_add_accepted_admin_terms_at_field_to_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddAcceptedAdminTermsAtFieldToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_users, :admin_terms_accepted_at, :datetime
+  end
+end

data/lib/decidim/admin.rb

@@ -11,5 +11,22 @@ module Decidim
   module Admin
     autoload :Components, "decidim/admin/components"
     autoload :FormBuilder, "decidim/admin/form_builder"
+
+    include ActiveSupport::Configurable
+
+    # Public Setting that configures Kaminari configuration options
+    # https://github.com/kaminari/kaminari#general-configuration-options
+
+    # Range of number of results per_page. Defaults to [15, 50, 100].
+    # per_page_range.first sets the default number per page
+    # per_page_range.last sets the default max_per_page
+    config_accessor :per_page_range do
+      [15, 50, 100]
+    end
+
+    Kaminari.configure do |config|
+      config.default_per_page = Decidim::Admin.per_page_range.first
+      config.max_per_page = Decidim::Admin.per_page_range.last
+    end
   end
 end

data/lib/decidim/admin/engine.rb

@@ -54,14 +54,24 @@ module Decidim
                     allowed_to?(:read, :admin_user) ? decidim_admin.users_path : decidim_admin.impersonatable_users_path,
                     icon_name: "person",
                     position: 5,
-                    active: [%w(user_groups users managed_users impersonatable_users authorization_workflows).map { |segment| "/decidim/admin/#{segment}" }, []],
+                    active: [%w(
+                      decidim/admin/users
+                      decidim/admin/user_groups
+                      decidim/admin/user_groups_csv_verifications
+                      decidim/admin/officializations
+                      decidim/admin/impersonatable_users
+                      decidim/admin/managed_users/impersonation_logs
+                      decidim/admin/managed_users/promotions
+                      decidim/admin/authorization_workflows
+                    ), []],
                     if: allowed_to?(:read, :admin_user) || allowed_to?(:read, :managed_user)
 
           menu.item I18n.t("menu.newsletters", scope: "decidim.admin"),
                     decidim_admin.newsletters_path,
                     icon_name: "envelope-closed",
                     position: 6,
-                    active: :inclusive,
+                    active: is_active_link?(decidim_admin.newsletters_path, :inclusive) ||
+                            is_active_link?(decidim_admin.newsletter_templates_path, :inclusive),
                     if: allowed_to?(:index, :newsletter)
 
           menu.item I18n.t("menu.settings", scope: "decidim.admin"),
@@ -88,13 +98,6 @@ module Decidim
                     position: 10,
                     active: [%w(decidim/admin/logs), []],
                     if: allowed_to?(:read, :admin_log)
-
-          menu.item I18n.t("menu.oauth_applications", scope: "decidim.admin"),
-                    decidim_admin.oauth_applications_path,
-                    icon_name: "dashboard",
-                    position: 11,
-                    active: [%w(decidim/admin/oauth_applications), []],
-                    if: allowed_to?(:read, :oauth_application)
         end
       end
 

data/lib/decidim/admin/form_builder.rb

@@ -41,15 +41,15 @@ module Decidim
       #
       def autocomplete_select(attribute, selected = nil, options = {}, prompt_options = {})
         selected = yield(selected) if selected
-
         template = ""
         template += label(attribute, (options[:label] || label_for(attribute)) + required_for_attribute(attribute)) unless options[:label] == false
         template += content_tag(:div, nil, class: options[:class], data: {
                                   autocomplete: {
                                     name: options[:name] || "#{@object_name}[#{attribute}]",
-                                    options: [selected].compact,
+                                    options: (options[:default_options].to_a + [selected]).compact,
                                     placeholder: prompt_options[:placeholder],
                                     searchURL: prompt_options[:url],
+                                    changeURL: prompt_options[:change_url],
                                     selected: selected ? selected[:value] : "",
                                     searchPromptText: options[:search_prompt] || I18n.t("autocomplete.search_prompt", scope: "decidim.admin"),
                                     noResultsText: options[:no_results] || I18n.t("autocomplete.no_results", scope: "decidim.admin")
@@ -60,6 +60,11 @@ module Decidim
         template += error_for(attribute, options) if error?(attribute)
         template.html_safe
       end
+
+      # Calls Decidim::FormBuilder#editor with default options for admin.
+      def editor(name, options = {})
+        super(name, { toolbar: :full, lines: 25 }.merge(options))
+      end
     end
   end
 end

data/lib/decidim/admin/test.rb

@@ -5,3 +5,5 @@ require "decidim/admin/test/manage_attachment_collections_examples"
 require "decidim/admin/test/manage_categories_examples"
 require "decidim/admin/test/manage_component_permissions_examples"
 require "decidim/admin/test/manage_moderations_examples"
+require "decidim/admin/test/manage_paginated_collection_examples"
+require "decidim/admin/test/filterable_examples"

data/lib/decidim/admin/test/filterable_examples.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+shared_context "with filterable context" do
+  let(:factory_name) { model_name.singular_route_key }
+  let(:module_name) { model_name.route_key.camelize }
+  let(:filterable_concern) { "Decidim::#{module_name}::Admin::Filterable".constantize }
+
+  let(:filterable_fake_controller) do
+    FILTERABLE_CONCERN ||= filterable_concern
+    class FilterableFakeController < Decidim::ApplicationController; include FILTERABLE_CONCERN; end
+  end
+
+  def filterable_method(method_name)
+    (@controller ||= filterable_fake_controller.new).send(method_name)
+  end
+
+  def apply_filter(options, filter)
+    within(".filters__section") do
+      find_link("Filter").hover
+      find_link(options).hover
+      click_link(filter, href: /q/)
+    end
+  end
+
+  def remove_applied_filter(filter)
+    within(".label", text: /#{filter}/i) do
+      click_link("Cancel")
+    end
+  end
+
+  def search_by_text(text)
+    within(".filters__section") do
+      fill_in("q[#{filterable_method(:search_field_predicate)}]", with: text)
+      find("*[type=submit]").click
+    end
+  end
+
+  shared_examples "paginating a collection" do
+    unless block_given?
+      let!(:collection) do
+        create_list(factory_name, 50, organization: organization)
+      end
+    end
+
+    it_behaves_like "a paginated collection"
+  end
+
+  shared_examples "searching by text" do
+    before { search_by_text(text) }
+
+    it { expect(page).to have_content(text) }
+
+    after { search_by_text("") }
+  end
+
+  shared_examples "a filtered collection" do |options:, filter:|
+    before { apply_filter(options, filter) }
+
+    it { expect(page).to have_content(in_filter) }
+    it { expect(page).not_to have_content(not_in_filter) }
+
+    it_behaves_like "searching by text" do
+      let(:text) { in_filter }
+    end
+
+    context "when removing applied filter" do
+      before { remove_applied_filter(filter) }
+
+      it { expect(page).to have_content(in_filter) }
+      it { expect(page).to have_content(not_in_filter) }
+
+      it_behaves_like "searching by text" do
+        let(:text) { not_in_filter }
+      end
+    end
+  end
+end
+
+shared_examples "filtering collection by published/unpublished" do
+  include_context "with filterable context"
+
+  unless block_given?
+    let!(:published_space) do
+      create(factory_name, published_at: Time.current, organization: organization)
+    end
+
+    let!(:unpublished_space) do
+      create(factory_name, published_at: nil, organization: organization)
+    end
+  end
+
+  it_behaves_like "a filtered collection", options: "Published", filter: "Published" do
+    let(:in_filter) { translated(published_space.title) }
+    let(:not_in_filter) { translated(unpublished_space.title) }
+  end
+
+  it_behaves_like "a filtered collection", options: "Published", filter: "Unpublished" do
+    let(:in_filter) { translated(unpublished_space.title) }
+    let(:not_in_filter) { translated(published_space.title) }
+  end
+
+  it_behaves_like "paginating a collection"
+end
+
+shared_examples "filtering collection by private/public" do
+  include_context "with filterable context"
+
+  unless block_given?
+    let!(:public_space) do
+      create(factory_name, private_space: false, organization: organization)
+    end
+
+    let!(:private_space) do
+      create(factory_name, private_space: true, organization: organization)
+    end
+  end
+
+  it_behaves_like "a filtered collection", options: "Private", filter: "Public" do
+    let(:in_filter) { translated(public_space.title) }
+    let(:not_in_filter) { translated(private_space.title) }
+  end
+
+  it_behaves_like "a filtered collection", options: "Private", filter: "Private" do
+    let(:in_filter) { translated(private_space.title) }
+    let(:not_in_filter) { translated(public_space.title) }
+  end
+
+  it_behaves_like "paginating a collection"
+end

data/lib/decidim/admin/test/manage_attachment_collections_examples.rb

@@ -82,7 +82,7 @@ shared_examples "manage attachment collections examples" do
   context "when deleting a attachment collection" do
     let!(:attachment_collection2) { create(:attachment_collection, collection_for: collection_for) }
 
-    context "when the attachment collection has no associated content" do
+    context "when the attachment collection has no associated content", :slow do
       before do
         visit current_path
       end

data/lib/decidim/admin/test/manage_component_permissions_examples.rb

@@ -31,7 +31,7 @@ shared_examples "Managing component permissions" do
       within "form.new_component_permissions" do
         within ".foo-permission" do
           check "Example authorization (Direct)"
-          fill_in "Postal code", with: "08002"
+          fill_in "Allowed postal codes", with: "08002"
         end
         find("*[type=submit]").click
       end
@@ -42,7 +42,7 @@ shared_examples "Managing component permissions" do
         include(
           "authorization_handlers" => {
             "dummy_authorization_handler" => {
-              "options" => { "postal_code" => "08002" }
+              "options" => { "allowed_postal_codes" => "08002" }
             }
           }
         )
@@ -61,7 +61,7 @@ shared_examples "Managing component permissions" do
       within "form.new_component_permissions" do
         within ".foo-permission" do
           check "Example authorization (Direct)"
-          fill_in "Postal code", with: "08002"
+          fill_in "Allowed postal codes", with: "08002"
         end
         find("*[type=submit]").click
       end
@@ -79,7 +79,7 @@ shared_examples "Managing component permissions" do
           "foo" => {
             "authorization_handlers" => {
               "dummy_authorization_handler" => {
-                "options" => { "postal_code" => "08002" }
+                "options" => { "allowed_postal_codes" => "08002" }
               }
             }
           }
@@ -114,7 +114,7 @@ shared_examples "Managing component permissions" do
           "foo" => {
             "authorization_handlers" => {
               "dummy_authorization_handler" => {
-                "options" => { "postal_code" => "08002" }
+                "options" => { "allowed_postal_codes" => "08002" }
               }
             }
           }
@@ -166,7 +166,7 @@ shared_examples "Managing component permissions" do
         include(
           "authorization_handlers" => {
             "dummy_authorization_handler" => {
-              "options" => { "postal_code" => "08002" }
+              "options" => { "allowed_postal_codes" => "08002" }
             },
             "another_dummy_authorization_handler" => {
               "options" => { "passport_number" => "AXXXXXXXX" }
@@ -201,7 +201,7 @@ shared_examples "Managing component permissions" do
     end
 
     it "shows the resource permissions settings" do
-      expect(page).to have_content(resource.title)
+      expect(page).to have_content(translated(resource.title))
     end
 
     context "when resources permissions are disabled" do
@@ -217,7 +217,7 @@ shared_examples "Managing component permissions" do
         within "form.new_component_permissions" do
           within ".foo-permission" do
             check "Example authorization (Direct)"
-            fill_in "Postal code", with: "08002"
+            fill_in "Allowed postal codes", with: "08002"
           end
           find("*[type=submit]").click
         end
@@ -228,7 +228,7 @@ shared_examples "Managing component permissions" do
           include(
             "authorization_handlers" => {
               "dummy_authorization_handler" => {
-                "options" => { "postal_code" => "08002" }
+                "options" => { "allowed_postal_codes" => "08002" }
               }
             }
           )
@@ -244,7 +244,7 @@ shared_examples "Managing component permissions" do
             "foo" => {
               "authorization_handlers" => {
                 "dummy_authorization_handler" => {
-                  "options" => { "postal_code" => "08002" }
+                  "options" => { "allowed_postal_codes" => "08002" }
                 }
               }
             }
@@ -277,7 +277,7 @@ shared_examples "Managing component permissions" do
             "foo" => {
               "authorization_handlers" => {
                 "dummy_authorization_handler" => {
-                  "options" => { "postal_code" => "08002" }
+                  "options" => { "allowed_postal_codes" => "08002" }
                 }
               }
             }
@@ -327,7 +327,7 @@ shared_examples "Managing component permissions" do
           include(
             "authorization_handlers" => {
               "dummy_authorization_handler" => {
-                "options" => { "postal_code" => "08002" }
+                "options" => { "allowed_postal_codes" => "08002" }
               },
               "another_dummy_authorization_handler" => {
                 "options" => { "passport_number" => "AXXXXXXXX" }
@@ -345,7 +345,7 @@ shared_examples "Managing component permissions" do
             "foo" => {
               "authorization_handlers" => {
                 "dummy_authorization_handler" => {
-                  "options" => { "postal_code" => "08002" }
+                  "options" => { "allowed_postal_codes" => "08002" }
                 }
               }
             }
@@ -395,7 +395,7 @@ shared_examples "Managing component permissions" do
           include(
             "authorization_handlers" => {
               "dummy_authorization_handler" => {
-                "options" => { "postal_code" => "08002" }
+                "options" => { "allowed_postal_codes" => "08002" }
               },
               "another_dummy_authorization_handler" => {
                 "options" => { "passport_number" => "AXXXXXXXX" }
@@ -413,7 +413,7 @@ shared_examples "Managing component permissions" do
             "foo" => {
               "authorization_handlers" => {
                 "dummy_authorization_handler" => {
-                  "options" => { "postal_code" => "08002" }
+                  "options" => { "allowed_postal_codes" => "08002" }
                 }
               }
             }

data/lib/decidim/admin/test/manage_paginated_collection_examples.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+shared_examples "a paginated collection" do
+  before do
+    visit current_path
+  end
+
+  describe "Number of results per page" do
+    it "lists 15 resources per page by default" do
+      expect(page).to have_css(".table-list tbody tr", count: 15)
+    end
+
+    it "changes the number of results per page" do
+      within ".results-per-page__dropdown" do
+        page.find("a", text: "15").click
+        click_link "50"
+      end
+
+      expect(page).to have_selector(".table-list tbody tr", count: 50)
+    end
+  end
+end