decidim-admin 0.11.2 → 0.12.0.pre

data/lib/decidim/admin/form_builder.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This custom FormBuilder extends the FormBuilder present in core with
+    # fields only used in admin.
+    class FormBuilder < Decidim::FormBuilder
+      # Generates a select field with autocompletion using ajax
+      #
+      # @param [Symbol] attribute
+      #   The name of the object's attribute (usually something like user_id)
+      # @param [Object] selected
+      #   An instance of the selected value
+      # @param [Hash] options
+      #   A optional set of options to render the field:
+      #   - :label (boolean|string) (optional) You can disable the creation of the input label passing false,
+      #       or override the default label passing a string (default: name of the input)
+      #   - :name (string) You can provide a custom name for the field to be submitted
+      # @param [Hash] prompt_options
+      #   Prompt configuration. A hash with options:
+      #   - :url (String) The url where the ajax endpoint to fill the select
+      #   - :placeholder (String) Text to use as placeholder
+      #   - :no_results (String) (optional) Text to use when there are no matching results (default: No results found)
+      #   - :search_prompt (String) (optional) Text to prompt for search input (default: Type at least three characters to search)
+      #
+      # @yield [resource]
+      #   It should receive a block that returns a Hash for the selected option with:
+      #   - value: This will be the value of the option select.
+      #   - label: This will be the label of the option select.
+      #
+      # @example How to use it
+      #   <% prompt_options = { url: users_url, text: t(".select_user") }
+      #      options = { label: t(".user") } %>
+      #   <%= form.autocomplete_select(:user_id, form.object.user.presence, options, prompt_options) do |user|
+      #      { value: user.id, label: "#{user.name} (#{user.nickname})" }
+      #    end %>
+      #
+      # @return [String]
+      #   The HTML ready to output in the view
+      #
+      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, data: {
+                                  autocomplete: {
+                                    name: options[:name] || "#{@object_name}[#{attribute}]",
+                                    options: [selected].compact,
+                                    placeholder: prompt_options[:placeholder],
+                                    searchURL: prompt_options[: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")
+                                  },
+                                  autocomplete_for: attribute,
+                                  plugin: "autocomplete"
+                                })
+        template += error_for(attribute, options) if error?(attribute)
+        template.html_safe
+      end
+    end
+  end
+end

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

@@ -3,7 +3,12 @@
 require "spec_helper"
 
 shared_examples "Managing component permissions" do
-  let(:organization) { create(:organization, available_authorizations: ["dummy_authorization_handler"]) }
+  let(:organization) do
+    create(
+      :organization,
+      available_authorizations: %w(dummy_authorization_handler another_dummy_authorization_handler)
+    )
+  end
 
   let!(:component) do
     create(:component, participatory_space: participatory_space)
@@ -13,28 +18,100 @@ shared_examples "Managing component permissions" do
     switch_to_host(organization.host)
     login_as user, scope: :user
     visit participatory_space_engine.components_path(participatory_space)
+  end
 
-    within ".component-#{component.id}" do
-      click_link "Permissions"
+  context "when setting permissions" do
+    before do
+      within ".component-#{component.id}" do
+        click_link "Permissions"
+      end
+    end
+
+    it "saves permission settings in the component" do
+      within "form.new_component_permissions" do
+        within ".foo-permission" do
+          select "Example authorization", from: "component_permissions_permissions_foo_authorization_handler_name"
+          fill_in "component_permissions_permissions_foo_options_postal_code", with: "08002"
+        end
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_content("successfully")
+
+      expect(component.reload.permissions["foo"]).to(
+        include(
+          "authorization_handler_name" => "dummy_authorization_handler",
+          "options" => { "postal_code" => "08002" }
+        )
+      )
     end
   end
 
-  it "allows setting permissions with json options" do
-    within "form.new_component_permissions" do
-      within ".foo-permission" do
-        select "Example authorization", from: "component_permissions_permissions_foo_authorization_handler_name"
-        fill_in "component_permissions_permissions_foo_options", with: '{ "foo": 123 }'
+  context "when unsetting permissions" do
+    before do
+      component.update!(
+        permissions: {
+          "foo" => {
+            "authorization_handler_name" => "dummy_authorization_handler",
+            "options" => { "postal_code" => "08002" }
+          }
+        }
+      )
+
+      within ".component-#{component.id}" do
+        click_link "Permissions"
       end
-      find("*[type=submit]").click
     end
 
-    expect(page).to have_content("successfully")
+    it "removes the action from the permissions hash" do
+      within "form.new_component_permissions" do
+        within ".foo-permission" do
+          select "Everyone", from: "component_permissions_permissions_foo_authorization_handler_name"
+        end
+
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_content("successfully")
 
-    expect(component.reload.permissions["foo"]).to(
-      include(
-        "authorization_handler_name" => "dummy_authorization_handler",
-        "options" => { "foo" => 123 }
+      expect(component.reload.permissions["foo"]).to be_nil
+    end
+  end
+
+  context "when changing existing permissions" do
+    before do
+      component.update!(
+        permissions: {
+          "foo" => {
+            "authorization_handler_name" => "dummy_authorization_handler",
+            "options" => { "postal_code" => "08002" }
+          }
+        }
       )
-    )
+
+      within ".component-#{component.id}" do
+        click_link "Permissions"
+      end
+    end
+
+    it "changes the configured action in the permissions hash" do
+      within "form.new_component_permissions" do
+        within ".foo-permission" do
+          select "Another example authorization", from: "component_permissions_permissions_foo_authorization_handler_name"
+          fill_in "component_permissions_permissions_foo_options_passport_number", with: "AXXXXXXXX"
+        end
+
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_content("successfully")
+
+      expect(component.reload.permissions["foo"]).to(
+        include(
+          "authorization_handler_name" => "another_dummy_authorization_handler",
+          "options" => { "passport_number" => "AXXXXXXXX" }
+        )
+      )
+    end
   end
 end

data/lib/decidim/admin/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.11.2"
+      "0.12.0.pre"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0.pre
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -116,28 +116,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -153,6 +153,9 @@ files:
 - app/assets/javascripts/decidim/admin/application.js.es6
 - app/assets/javascripts/decidim/admin/auto_buttons_by_position.component.js.es6
 - app/assets/javascripts/decidim/admin/auto_label_by_position.component.js.es6
+- app/assets/javascripts/decidim/admin/bundle.js
+- app/assets/javascripts/decidim/admin/bundle.js.map
+- app/assets/javascripts/decidim/admin/component_permissions.js.es6
 - app/assets/javascripts/decidim/admin/dynamic_fields.component.js.es6
 - app/assets/javascripts/decidim/admin/field_dependent_inputs.component.js.es6
 - app/assets/javascripts/decidim/admin/managed_users.js.es6
@@ -163,6 +166,8 @@ files:
 - app/assets/stylesheets/decidim/admin/_decidim.scss
 - app/assets/stylesheets/decidim/admin/_variables.scss
 - app/assets/stylesheets/decidim/admin/application.scss.erb
+- app/assets/stylesheets/decidim/admin/bundle.scss
+- app/assets/stylesheets/decidim/admin/components/_autocomplete_select.component.scss
 - app/assets/stylesheets/decidim/admin/extra/_action-icon.scss
 - app/assets/stylesheets/decidim/admin/extra/_cards.scss
 - app/assets/stylesheets/decidim/admin/extra/_categories.scss
@@ -272,6 +277,7 @@ files:
 - app/commands/decidim/admin/update_oauth_application.rb
 - app/commands/decidim/admin/update_organization.rb
 - app/commands/decidim/admin/update_organization_appearance.rb
+- app/commands/decidim/admin/update_organization_tos_version.rb
 - app/commands/decidim/admin/update_scope.rb
 - app/commands/decidim/admin/update_scope_type.rb
 - app/commands/decidim/admin/update_static_page.rb
@@ -331,6 +337,10 @@ files:
 - app/forms/decidim/admin/scope_form.rb
 - app/forms/decidim/admin/scope_type_form.rb
 - app/forms/decidim/admin/static_page_form.rb
+- app/frontend/components/autocomplete.component.test.tsx
+- app/frontend/components/autocomplete.component.tsx
+- app/frontend/entry.ts
+- app/frontend/entry_test.ts
 - app/helpers/decidim/admin/application_helper.rb
 - app/helpers/decidim/admin/areas_helper.rb
 - app/helpers/decidim/admin/attributes_display_helper.rb
@@ -346,13 +356,8 @@ files:
 - app/jobs/decidim/admin/newsletter_delivery_job.rb
 - app/jobs/decidim/admin/newsletter_job.rb
 - app/mailers/decidim/admin/application_mailer.rb
-- app/models/decidim/admin/abilities/admin_ability.rb
-- app/models/decidim/admin/abilities/base_ability.rb
-- app/models/decidim/admin/abilities/participatory_process_admin_ability.rb
-- app/models/decidim/admin/abilities/participatory_process_collaborator_ability.rb
-- app/models/decidim/admin/abilities/participatory_process_moderator_ability.rb
-- app/models/decidim/admin/abilities/user_manager_ability.rb
-- app/models/decidim/admin/application_record.rb
+- app/permissions/decidim/admin/permissions.rb
+- app/permissions/decidim/admin/user_manager_permissions.rb
 - app/queries/decidim/admin/user_filter.rb
 - app/queries/decidim/admin/user_groups_evaluation.rb
 - app/views/decidim/admin/area_types/_form.html.erb
@@ -381,6 +386,7 @@ files:
 - app/views/decidim/admin/categories/index.html.erb
 - app/views/decidim/admin/categories/new.html.erb
 - app/views/decidim/admin/categories/show.html.erb
+- app/views/decidim/admin/component_permissions/_options_form.html.erb
 - app/views/decidim/admin/component_permissions/edit.html.erb
 - app/views/decidim/admin/components/_component.html.erb
 - app/views/decidim/admin/components/_form.html.erb
@@ -431,6 +437,7 @@ files:
 - app/views/decidim/admin/scopes/index.html.erb
 - app/views/decidim/admin/scopes/new.html.erb
 - app/views/decidim/admin/static_pages/_form.html.erb
+- app/views/decidim/admin/static_pages/_form_notable_changes.html.erb
 - app/views/decidim/admin/static_pages/edit.html.erb
 - app/views/decidim/admin/static_pages/index.html.erb
 - app/views/decidim/admin/static_pages/new.html.erb
@@ -475,6 +482,7 @@ files:
 - lib/decidim/admin.rb
 - lib/decidim/admin/components.rb
 - lib/decidim/admin/engine.rb
+- lib/decidim/admin/form_builder.rb
 - lib/decidim/admin/test.rb
 - lib/decidim/admin/test/commands/create_attachment_collection_examples.rb
 - lib/decidim/admin/test/commands/create_category_examples.rb
@@ -508,9 +516,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6

data/app/models/decidim/admin/abilities/admin_ability.rb

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    module Abilities
-      # Defines the abilities for a user in the admin section. Intended to be
-      # used with `cancancan`.
-      class AdminAbility < Decidim::Abilities::AdminAbility
-        def define_abilities
-          super
-
-          can :read, :admin_log
-
-          can :manage, Category
-          can :manage, ParticipatoryProcessUserRole
-
-          can [:create, :update, :index, :new, :read], StaticPage
-
-          can([:update_slug, :destroy], [StaticPage, StaticPageForm]) do |page|
-            !StaticPage.default?(page.slug)
-          end
-
-          can([:read, :update], Decidim::Organization) do |organization|
-            organization == user.organization
-          end
-
-          can :manage, Component
-          can :manage, :admin_users
-
-          can :read, :impersonatable_users
-
-          can(:impersonate, Decidim::User) do |user_to_impersonate|
-            available_authorization_handlers? &&
-              !user_to_impersonate.admin? &&
-              user_to_impersonate.roles.empty? &&
-              Decidim::ImpersonationLog.active.where(admin: user).empty?
-          end
-
-          can(:promote, Decidim::User) do |user_to_promote|
-            user_to_promote.managed? && Decidim::ImpersonationLog.active.where(admin: user).empty?
-          end
-
-          can :manage, Moderation
-          can :manage, Attachment
-          can :manage, AttachmentCollection
-          can :manage, Scope
-          can :manage, ScopeType
-          can :manage, Area
-          can :manage, AreaType
-          can :manage, Newsletter
-          can :manage, :oauth_applications
-          can :manage, OAuthApplication
-
-          can [:create, :index, :new, :read, :invite], User
-
-          can([:destroy], [User]) do |user_to_destroy|
-            user != user_to_destroy
-          end
-
-          can [:index, :verify, :reject], UserGroup
-          can [:index, :new, :create, :destroy], :officializations
-
-          can :index, :authorization_workflows
-
-          can [:index, :update], Authorization
-        end
-
-        private
-
-        def available_authorization_handlers?
-          user.organization.available_authorization_handlers.any?
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/admin/abilities/base_ability.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    module Abilities
-      # Defines the abilities for a user in the admin section. Intended to be
-      # used with `cancancan`. Extended by both the base `Decidim::Ability`
-      # class and other engine-only abilities, like the
-      # `ParticipatoryProcessAdmin` ability class.
-      class BaseAbility
-        include CanCan::Ability
-
-        def initialize(user, context)
-          Decidim.admin_abilities.each do |ability|
-            merge ability.constantize.new(user, context)
-          end
-        end
-      end
-    end
-  end
-end