decidim-admin 0.16.1 → 0.17.0

data/config/locales/uk.yml

@@ -203,10 +203,6 @@ uk:
           error: При спробі оновити цю категорію сталася помилка.
           success: Категорію успішно оновлено.
       component_permissions:
-        edit:
-          everyone: Будь-хто
-          submit: Зберегти права доступу
-          title: Редагувати права доступу
         update:
           success: Права доступу успішно оновлено.
       components:
@@ -508,6 +504,9 @@ uk:
         new:
           create: Додати
           title: Додати приватного учасника простору співучасті.
+      resource_permissions:
+        edit:
+          title: Редагувати права доступу
       scope_types:
         create:
           error: При спробі створити новий різновид обсягу сталася помилка.
@@ -564,8 +563,6 @@ uk:
         areas: Дільниці
         authorization_workflows: Методи підтвердження особи
         dashboard: Приладна дошка
-        impersonatable_users: Учасники, в ролі яких можна виступати
-        impersonations: Виступи в ролі учасника
         scope_types: Різновиди обсягу
         scopes: Обсяги
         static_pages: Сторінки

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

@@ -30,8 +30,8 @@ shared_examples "Managing component permissions" do
     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"
+          check "Example authorization (Direct)"
+          fill_in "Postal code", with: "08002"
         end
         find("*[type=submit]").click
       end
@@ -40,8 +40,11 @@ shared_examples "Managing component permissions" do
 
       expect(component.reload.permissions["foo"]).to(
         include(
-          "authorization_handler_name" => "dummy_authorization_handler",
-          "options" => { "postal_code" => "08002" }
+          "authorization_handlers" => {
+            "dummy_authorization_handler" => {
+              "options" => { "postal_code" => "08002" }
+            }
+          }
         )
       )
     end
@@ -52,8 +55,11 @@ shared_examples "Managing component permissions" do
       component.update!(
         permissions: {
           "foo" => {
-            "authorization_handler_name" => "dummy_authorization_handler",
-            "options" => { "postal_code" => "08002" }
+            "authorization_handlers" => {
+              "dummy_authorization_handler" => {
+                "options" => { "postal_code" => "08002" }
+              }
+            }
           }
         }
       )
@@ -66,7 +72,8 @@ shared_examples "Managing component permissions" do
     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"
+          uncheck "Example authorization (Direct)"
+          uncheck "Another example authorization (Direct)"
         end
 
         find("*[type=submit]").click
@@ -83,8 +90,11 @@ shared_examples "Managing component permissions" do
       component.update!(
         permissions: {
           "foo" => {
-            "authorization_handler_name" => "dummy_authorization_handler",
-            "options" => { "postal_code" => "08002" }
+            "authorization_handlers" => {
+              "dummy_authorization_handler" => {
+                "options" => { "postal_code" => "08002" }
+              }
+            }
           }
         }
       )
@@ -97,8 +107,32 @@ shared_examples "Managing component permissions" do
     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"
+          uncheck "Example authorization (Direct)"
+          check "Another example authorization (Direct)"
+          fill_in "Passport number", with: "AXXXXXXXX"
+        end
+
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_content("successfully")
+
+      expect(component.reload.permissions["foo"]).to(
+        include(
+          "authorization_handlers" => {
+            "another_dummy_authorization_handler" => {
+              "options" => { "passport_number" => "AXXXXXXXX" }
+            }
+          }
+        )
+      )
+    end
+
+    it "adds an authorization to the configured action in the component permissions hash" do
+      within "form.new_component_permissions" do
+        within ".foo-permission" do
+          check "Another example authorization (Direct)"
+          fill_in "Passport number", with: "AXXXXXXXX"
         end
 
         find("*[type=submit]").click
@@ -108,8 +142,14 @@ shared_examples "Managing component permissions" do
 
       expect(component.reload.permissions["foo"]).to(
         include(
-          "authorization_handler_name" => "another_dummy_authorization_handler",
-          "options" => { "passport_number" => "AXXXXXXXX" }
+          "authorization_handlers" => {
+            "dummy_authorization_handler" => {
+              "options" => { "postal_code" => "08002" }
+            },
+            "another_dummy_authorization_handler" => {
+              "options" => { "passport_number" => "AXXXXXXXX" }
+            }
+          }
         )
       )
     end
@@ -154,8 +194,8 @@ shared_examples "Managing component permissions" do
       it "saves permission settings for the resource" 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"
+            check "Example authorization (Direct)"
+            fill_in "Postal code", with: "08002"
           end
           find("*[type=submit]").click
         end
@@ -164,8 +204,11 @@ shared_examples "Managing component permissions" do
 
         expect(resource.reload.permissions["foo"]).to(
           include(
-            "authorization_handler_name" => "dummy_authorization_handler",
-            "options" => { "postal_code" => "08002" }
+            "authorization_handlers" => {
+              "dummy_authorization_handler" => {
+                "options" => { "postal_code" => "08002" }
+              }
+            }
           )
         )
         expect(component.reload.permissions).to be_nil
@@ -177,8 +220,11 @@ shared_examples "Managing component permissions" do
         resource.create_resource_permission(
           permissions: {
             "foo" => {
-              "authorization_handler_name" => "dummy_authorization_handler",
-              "options" => { "postal_code" => "08002" }
+              "authorization_handlers" => {
+                "dummy_authorization_handler" => {
+                  "options" => { "postal_code" => "08002" }
+                }
+              }
             }
           }
         )
@@ -189,7 +235,8 @@ shared_examples "Managing component permissions" do
       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"
+            uncheck "Example authorization (Direct)"
+            uncheck "Another example authorization (Direct)"
           end
 
           find("*[type=submit]").click
@@ -206,8 +253,11 @@ shared_examples "Managing component permissions" do
         resource.create_resource_permission(
           permissions: {
             "foo" => {
-              "authorization_handler_name" => "dummy_authorization_handler",
-              "options" => { "postal_code" => "08002" }
+              "authorization_handlers" => {
+                "dummy_authorization_handler" => {
+                  "options" => { "postal_code" => "08002" }
+                }
+              }
             }
           }
         )
@@ -218,8 +268,32 @@ shared_examples "Managing component permissions" do
       it "changes the configured action in the resource 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"
+            uncheck "Example authorization (Direct)"
+            check "Another example authorization (Direct)"
+            fill_in "Passport number", with: "AXXXXXXXX"
+          end
+
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_content("DUMMY ADMIN ENGINE")
+
+        expect(resource.reload.permissions["foo"]).to(
+          include(
+            "authorization_handlers" => {
+              "another_dummy_authorization_handler" => {
+                "options" => { "passport_number" => "AXXXXXXXX" }
+              }
+            }
+          )
+        )
+      end
+
+      it "adds an authorization to the configured action in the resource permissions hash" do
+        within "form.new_component_permissions" do
+          within ".foo-permission" do
+            check "Another example authorization (Direct)"
+            fill_in "Passport number", with: "AXXXXXXXX"
           end
 
           find("*[type=submit]").click
@@ -229,8 +303,14 @@ shared_examples "Managing component permissions" do
 
         expect(resource.reload.permissions["foo"]).to(
           include(
-            "authorization_handler_name" => "another_dummy_authorization_handler",
-            "options" => { "passport_number" => "AXXXXXXXX" }
+            "authorization_handlers" => {
+              "dummy_authorization_handler" => {
+                "options" => { "postal_code" => "08002" }
+              },
+              "another_dummy_authorization_handler" => {
+                "options" => { "passport_number" => "AXXXXXXXX" }
+              }
+            }
           )
         )
       end
@@ -241,8 +321,11 @@ shared_examples "Managing component permissions" do
         component.update!(
           permissions: {
             "foo" => {
-              "authorization_handler_name" => "dummy_authorization_handler",
-              "options" => { "postal_code" => "08002" }
+              "authorization_handlers" => {
+                "dummy_authorization_handler" => {
+                  "options" => { "postal_code" => "08002" }
+                }
+              }
             }
           }
         )
@@ -253,8 +336,9 @@ shared_examples "Managing component permissions" do
       it "changes the configured action in the resource 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"
+            uncheck "Example authorization (Direct)"
+            check "Another example authorization (Direct)"
+            fill_in "Passport number", with: "AXXXXXXXX"
           end
 
           find("*[type=submit]").click
@@ -264,15 +348,37 @@ shared_examples "Managing component permissions" do
 
         expect(resource.reload.permissions["foo"]).to(
           include(
-            "authorization_handler_name" => "another_dummy_authorization_handler",
-            "options" => { "passport_number" => "AXXXXXXXX" }
+            "authorization_handlers" => {
+              "another_dummy_authorization_handler" => {
+                "options" => { "passport_number" => "AXXXXXXXX" }
+              }
+            }
           )
         )
+      end
+
+      it "adds an authorization to the configured action in the resource permissions hash" do
+        within "form.new_component_permissions" do
+          within ".foo-permission" do
+            check "Another example authorization (Direct)"
+            fill_in "Passport number", with: "AXXXXXXXX"
+          end
 
-        expect(component.reload.permissions["foo"]).to(
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_content("DUMMY ADMIN ENGINE")
+
+        expect(resource.reload.permissions["foo"]).to(
           include(
-            "authorization_handler_name" => "dummy_authorization_handler",
-            "options" => { "postal_code" => "08002" }
+            "authorization_handlers" => {
+              "dummy_authorization_handler" => {
+                "options" => { "postal_code" => "08002" }
+              },
+              "another_dummy_authorization_handler" => {
+                "options" => { "passport_number" => "AXXXXXXXX" }
+              }
+            }
           )
         )
       end
@@ -283,8 +389,11 @@ shared_examples "Managing component permissions" do
         component.update!(
           permissions: {
             "foo" => {
-              "authorization_handler_name" => "dummy_authorization_handler",
-              "options" => { "postal_code" => "08002" }
+              "authorization_handlers" => {
+                "dummy_authorization_handler" => {
+                  "options" => { "postal_code" => "08002" }
+                }
+              }
             }
           }
         )
@@ -294,7 +403,8 @@ shared_examples "Managing component permissions" do
       it "saves the action from the permissions hash as an empty hash" do
         within "form.new_component_permissions" do
           within ".foo-permission" do
-            select "Everyone", from: "component_permissions_permissions_foo_authorization_handler_name"
+            uncheck "Example authorization (Direct)"
+            uncheck "Another example authorization (Direct)"
           end
 
           find("*[type=submit]").click

data/lib/decidim/admin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -136,28 +136,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -175,13 +175,14 @@ files:
 - 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/draggable-list.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
+- app/assets/javascripts/decidim/admin/resources_permissions.js.es6
 - app/assets/javascripts/decidim/admin/sort_list.component.js.es6
 - app/assets/javascripts/decidim/admin/sortable.js.es6
+- app/assets/javascripts/decidim/admin/subform_multi_toggler.component.js.es6
 - app/assets/javascripts/decidim/admin/subform_toggler.component.js.es6
 - app/assets/javascripts/decidim/admin/tab_focus.js.es6
 - app/assets/javascripts/decidim/admin/toggle_nav.js.es6
@@ -297,6 +298,7 @@ files:
 - app/commands/decidim/admin/reject_user_group.rb
 - app/commands/decidim/admin/remove_admin.rb
 - app/commands/decidim/admin/reorder_content_blocks.rb
+- app/commands/decidim/admin/unhide_resource.rb
 - app/commands/decidim/admin/unofficialize_user.rb
 - app/commands/decidim/admin/unpublish_component.rb
 - app/commands/decidim/admin/unreport_resource.rb
@@ -314,6 +316,7 @@ files:
 - 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_resource_permissions.rb
 - app/commands/decidim/admin/update_scope.rb
 - app/commands/decidim/admin/update_scope_type.rb
 - app/commands/decidim/admin/update_static_page.rb
@@ -350,6 +353,7 @@ files:
 - app/controllers/decidim/admin/organization_controller.rb
 - app/controllers/decidim/admin/organization_homepage_content_blocks_controller.rb
 - app/controllers/decidim/admin/organization_homepage_controller.rb
+- app/controllers/decidim/admin/resource_permissions_controller.rb
 - app/controllers/decidim/admin/scope_types_controller.rb
 - app/controllers/decidim/admin/scopes_controller.rb
 - app/controllers/decidim/admin/static_page_topics_controller.rb
@@ -432,8 +436,6 @@ 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
 - app/views/decidim/admin/components/_settings_fields.html.erb
@@ -479,6 +481,8 @@ files:
 - app/views/decidim/admin/participatory_space_private_users/_form.html.erb
 - app/views/decidim/admin/participatory_space_private_users/index.html.erb
 - app/views/decidim/admin/participatory_space_private_users/new.html.erb
+- app/views/decidim/admin/resource_permissions/_options_form.html.erb
+- app/views/decidim/admin/resource_permissions/edit.html.erb
 - app/views/decidim/admin/scope_types/_form.html.erb
 - app/views/decidim/admin/scope_types/edit.html.erb
 - app/views/decidim/admin/scope_types/index.html.erb
@@ -517,6 +521,7 @@ files:
 - config/locales/ar-SA.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
+- config/locales/cs.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es-MX.yml
@@ -524,6 +529,7 @@ files:
 - config/locales/es.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
+- config/locales/fi-plain.yml
 - config/locales/fi.yml
 - config/locales/fr.yml
 - config/locales/gl.yml
@@ -577,7 +583,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="