decidim-admin 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccb5adade7b808ed78ddf5a2230949499ecf89ac3caa8137c33f101d102b491c
-  data.tar.gz: 91ea633c81dd2158de271b848cb7488451f9e172528793be0be5c179cbbda441
+  metadata.gz: 6169801bdd623d709157b8d278ccf08d493303fc5d01876a3920d86b724d7648
+  data.tar.gz: 507ccab28d2bfe28c66381572b38dccc7c04bc35360db85bbdd7ac1383c545d6
 SHA512:
-  metadata.gz: 3b44337705c7eb4b16ad43d66232d751100ec59fcc61bf31e21c6bd8724ffee56e192294056b12e6746b37491a54896d0fae6aa686d4f4c6528a0488a4c556d3
-  data.tar.gz: c6bc808309559c6e8b1ac7947cd5752d84f56c91093e8a98ee601cc4ffadfbbef43d82ed194d363e2bb7eee1c2d668a5a3775faf889f885aabf243dcab7bed91
+  metadata.gz: f2ebfe6737abc8c78cbf70ae9f6055a0f6a4f6ae755856d9e48fea09b3fbe10209f8ac133caee837f3bf0a4349e2c0ea05c86e2428f942c444faee2eb2447806
+  data.tar.gz: 3a3f72ed03709b39e91424887f1ef29606982ac15f27d7f5ef70336c607cc3f054b3b3608dd7741d00f87a14080d56727565a15b0205e27685b4a66884c0e107

data/app/assets/javascripts/decidim/admin/application.js.es6

@@ -1,4 +1,4 @@
-// = require jquery
+// = require jquery3
 // = require foundation
 // = require rails-ujs
 // = require ./tab_focus
@@ -19,6 +19,7 @@
 // = require ./sortable
 // = require decidim/input_tags
 // = require decidim/input_hashtags
+// = require decidim/input_mentions
 // = require_self
 
 window.Decidim = window.Decidim || {};

data/app/commands/decidim/admin/create_category.rb

@@ -35,6 +35,7 @@ module Decidim
       def create_category
         Category.create!(
           name: form.name,
+          weight: form.weight,
           description: form.description,
           parent_id: form.parent_id,
           participatory_space: @participatory_space

data/app/commands/decidim/admin/update_category.rb

@@ -40,6 +40,7 @@ module Decidim
       def attributes
         {
           name: form.name,
+          weight: form.weight,
           parent_id: form.parent_id,
           description: form.description
         }

data/app/controllers/concerns/decidim/admin/participatory_space_export.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ParticipatorySpaceExport
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :exportable_space
+
+        def create
+          enforce_permission_to :create, :export_space, participatory_space: exportable_space
+
+          ExportParticipatorySpaceJob.perform_later(current_user, exportable_space, "participatory_processes", default_format)
+
+          flash[:notice] = t("decidim.admin.exports.notice")
+
+          redirect_back(fallback_location: after_export_path)
+        end
+
+        # Public: The only method to be implemented at the controller. You need to
+        # return the space that will be exported.
+        def exportable_space
+          raise NotImplementedError
+        end
+
+        # Public: Returns a String or Object that will be passed to `redirect_to` after
+        # exporing a space. By default it redirects to the root_path.
+        #
+        # It can be redefined at controller level if you need to redirect elsewhere.
+        def after_export_path
+          decidim.root_path
+        end
+
+        private
+
+        def default_format
+          "JSON"
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/admin/component_permissions_controller.rb

@@ -27,6 +27,7 @@ module Decidim
           end
 
           on(:invalid) do
+            flash.now[:alert] = t("component_permissions.update.error", scope: "decidim.admin")
             render action: :edit
           end
         end

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

@@ -8,6 +8,7 @@ module Decidim
       include TranslatableAttributes
 
       translatable_attribute :name, String
+      attribute :weight, Integer, default: 0
       translatable_attribute :description, String
       attribute :parent_id, Integer
 

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

@@ -12,7 +12,7 @@ module Decidim
       end
 
       def authorization_handler_options(handler_name)
-        find_handler(handler_name)[:options]
+        find_handler(handler_name)&.dig("options") || {}
       end
 
       def manifest(handler_name)
@@ -20,7 +20,7 @@ module Decidim
       end
 
       def options_schema(handler_name)
-        options_manifest(handler_name).schema.new(find_handler(handler_name)["options"] || {})
+        options_manifest(handler_name).schema.new(authorization_handler_options(handler_name))
       end
 
       def options_attributes(handler_name)

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

@@ -9,7 +9,12 @@ module Decidim
 
       attribute :permissions, Hash[String => PermissionForm]
 
-      def valid?
+      private
+
+      # Overriding Rectify::Form#form_attributes_valid? to preserve errors from custom method validations.
+      def form_attributes_valid?
+        return false unless errors.empty? && permissions.each_value.map(&:errors).all?(&:empty?)
+
         super && permissions.values.all?(&:valid?)
       end
     end

data/app/views/decidim/admin/categories/_form.html.erb

@@ -8,6 +8,10 @@
       <%= form.translated :text_field, :name, autofocus: true %>
     </div>
 
+    <div class="row column">
+      <%= form.number_field :weight %>
+    </div>
+
     <div class="row column">
       <%= form.translated :editor, :description %>
     </div>

data/app/views/decidim/admin/resource_permissions/_options_form.html.erb

@@ -17,3 +17,5 @@
     <% end %>
   <% end %>
 <% end %>
+<br>
+<%= form.error_for(:base) %>

data/config/locales/en.yml

@@ -237,6 +237,7 @@ en:
           success: Category updated successfully.
       component_permissions:
         update:
+          error: There was a problem updating the permissions of this component.
           success: Permissions updated successfully.
       components:
         create:

data/lib/decidim/admin/test.rb

@@ -2,5 +2,6 @@
 
 require "decidim/admin/test/manage_attachments_examples"
 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"

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

@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+shared_examples "manage categories examples" do
+  it "lists all the categories for the process" do
+    within "#categories table" do
+      expect(page).to have_content(translated(category.name, locale: :en))
+    end
+  end
+
+  it "can view a category detail" do
+    within "#categories table" do
+      click_link translated(category.name, locale: :en)
+    end
+
+    expect(page).to have_selector("input#category_name_en[value='#{translated(category.name, locale: :en)}']")
+    expect(page).to have_selector("input#category_weight[value='#{category.weight}']")
+    within ".editor .editor-container" do
+      expect(page).to have_content(strip_tags(translated(category.description, locale: :en)))
+    end
+
+    expect(page).to have_selector("select#category_parent_id")
+  end
+
+  it "creates a new category" do
+    find(".card-title a.new").click
+
+    within ".new_category" do
+      fill_in_i18n(
+        :category_name,
+        "#category-name-tabs",
+        en: "My category",
+        es: "Mi categoría",
+        ca: "La meva categoria"
+      )
+      fill_in_i18n_editor(
+        :category_description,
+        "#category-description-tabs",
+        en: "Description",
+        es: "Descripción",
+        ca: "Descripció"
+      )
+
+      find("*[type=submit]").click
+    end
+
+    expect(page).to have_admin_callout("successfully")
+
+    within "#categories table" do
+      expect(page).to have_content("My category")
+    end
+  end
+
+  it "updates a category" do
+    within "#categories" do
+      within find("tr", text: translated(category.name)) do
+        click_link "Edit"
+      end
+    end
+
+    within ".edit_category" do
+      fill_in_i18n(
+        :category_name,
+        "#category-name-tabs",
+        en: "My new name",
+        es: "Mi nuevo nombre",
+        ca: "El meu nou nom"
+      )
+
+      find("*[type=submit]").click
+    end
+
+    expect(page).to have_admin_callout("successfully")
+
+    within "#categories table" do
+      expect(page).to have_content("My new name")
+    end
+  end
+
+  context "when deleting a category" do
+    let!(:category2) { create(:category, participatory_space: participatory_space) }
+
+    context "when the category has no associated content" do
+      context "when the category has no subcategories" do
+        before do
+          visit current_path
+        end
+
+        it "deletes a category" do
+          within find("tr", text: translated(category2.name)) do
+            accept_confirm { click_link "Delete" }
+          end
+
+          expect(page).to have_admin_callout("successfully")
+
+          within "#categories table" do
+            expect(page).to have_no_content(translated(category2.name))
+          end
+        end
+      end
+
+      context "when the category has some subcategories" do
+        let!(:subcategory) { create(:subcategory, parent: category2) }
+
+        before do
+          visit current_path
+        end
+
+        it "deletes a category" do
+          within find("tr", text: translated(category2.name)) do
+            accept_confirm { click_link "Delete" }
+          end
+
+          expect(page).to have_admin_callout("problem deleting")
+
+          within "#categories table" do
+            expect(page).to have_content(translated(category2.name))
+          end
+        end
+      end
+    end
+
+    context "when the category has associated content" do
+      let!(:component) { create(:component, participatory_space: participatory_space) }
+      let!(:dummy_resource) { create(:dummy_resource, component: component, category: category) }
+
+      it "cannot delete it" do
+        visit current_path
+
+        within find("tr", text: translated(category.name)) do
+          expect(page).to have_no_selector("a.action-icon--remove")
+        end
+      end
+    end
+  end
+end

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

@@ -50,6 +50,28 @@ shared_examples "Managing component permissions" do
     end
   end
 
+  context "when failing to set permissions" do
+    before do
+      # rubocop:disable RSpec/AnyInstance
+      allow_any_instance_of(Decidim::Admin::PermissionsForm).to receive(:valid?).and_return(false)
+      # rubocop:enable RSpec/AnyInstance
+      within ".component-#{component.id}" do
+        click_link "Permissions"
+      end
+      within "form.new_component_permissions" do
+        within ".foo-permission" do
+          check "Example authorization (Direct)"
+          fill_in "Postal code", with: "08002"
+        end
+        find("*[type=submit]").click
+      end
+    end
+
+    it "renders the form again" do
+      expect(page).to have_content("problem")
+    end
+  end
+
   context "when unsetting permissions" do
     before do
       component.update!(

data/lib/decidim/admin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-01-08 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.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -136,28 +136,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -328,6 +328,7 @@ files:
 - app/commands/decidim/admin/verify_user_group.rb
 - app/constraints/decidim/admin/organization_dashboard_constraint.rb
 - app/controllers/concerns/decidim/admin/participatory_space_admin_context.rb
+- app/controllers/concerns/decidim/admin/participatory_space_export.rb
 - app/controllers/concerns/decidim/admin/user_groups.rb
 - app/controllers/decidim/admin/application_controller.rb
 - app/controllers/decidim/admin/area_types_controller.rb
@@ -579,6 +580,7 @@ files:
 - lib/decidim/admin/test/forms/category_form_examples.rb
 - lib/decidim/admin/test/manage_attachment_collections_examples.rb
 - lib/decidim/admin/test/manage_attachments_examples.rb
+- lib/decidim/admin/test/manage_categories_examples.rb
 - lib/decidim/admin/test/manage_component_permissions_examples.rb
 - lib/decidim/admin/test/manage_moderations_examples.rb
 - lib/decidim/admin/version.rb