decidim-admin 0.26.10 → 0.27.0.rc1

data/config/routes.rb

@@ -36,8 +36,6 @@ Decidim::Admin::Engine.routes.draw do
       mount manifest.admin_engine, at: "/#{manifest.name}", as: "decidim_admin_#{manifest.name}"
     end
 
-    mount Decidim::Templates::AdminEngine, at: "/templates", as: "decidim_admin_templates" if Decidim.module_installed?(:templates)
-
     resources :users, except: [:edit, :update], controller: "users" do
       member do
         post :resend_invitation, to: "users#resend_invitation"

data/lib/decidim/admin/engine.rb

@@ -7,7 +7,6 @@ require "devise"
 require "devise-i18n"
 require "decidim/core"
 require "foundation_rails_helper"
-require "rectify"
 require "doorkeeper"
 require "doorkeeper-i18n"
 require "hashdiff"
@@ -174,10 +173,7 @@ module Decidim
                         decidim_admin.root_path,
                         icon_name: "dashboard",
                         position: 1,
-                        active: [%w(
-                          decidim/admin/dashboard
-                          decidim/admin/metrics
-                        ), []]
+                        active: ["decidim/admin/dashboard" => :show]
 
           menu.add_item :moderations,
                         I18n.t("menu.moderation", scope: "decidim.admin"),
@@ -212,15 +208,10 @@ module Decidim
                           decidim/admin/user_groups_csv_verifications
                           decidim/admin/officializations
                           decidim/admin/impersonatable_users
-                          decidim/admin/conflicts
                           decidim/admin/moderated_users
                           decidim/admin/managed_users/impersonation_logs
                           decidim/admin/managed_users/promotions
                           decidim/admin/authorization_workflows
-                          decidim/verifications/id_documents/admin/pending_authorizations
-                          decidim/verifications/id_documents/admin/config
-                          decidim/verifications/postal_letter/admin/pending_authorizations
-                          decidim/verifications/csv_census/admin/census
                         ), []],
                         if: allowed_to?(:read, :admin_user) || allowed_to?(:read, :managed_user)
 
@@ -247,8 +238,6 @@ module Decidim
                             decidim/admin/scopes
                             decidim/admin/scope_types
                             decidim/admin/areas decidim/admin/area_types
-                            decidim/admin/help_sections
-                            decidim/admin/organization_external_domain_whitelist
                           ),
                           []
                         ],

data/lib/decidim/admin/form_builder.rb

@@ -67,7 +67,8 @@ module Decidim
           name,
           {
             toolbar: :full,
-            lines: 25
+            lines: 25,
+            editor_images: true
           }.merge(options)
         )
       end

data/lib/decidim/admin/import/importer.rb

@@ -10,6 +10,8 @@ module Decidim
       # You can also use the ImporterFactory class to create an Importer
       # instance.
       class Importer
+        include Decidim::ProcessesFileLocally
+
         delegate :errors, to: :verifier
 
         # Public: Initializes an Importer.
@@ -72,15 +74,15 @@ module Decidim
           return @collection_data if @collection_data
 
           @collection_data = []
-          reader.new(file).read_rows do |rowdata, index|
-            if index.zero?
-              @data_headers = rowdata.map { |d| d.to_s.to_sym }
-            else
-              @collection_data << Hash[
-                rowdata.each_with_index.map do |val, ind|
+          process_file_locally(file) do |file_path|
+            reader.new(file_path).read_rows do |rowdata, index|
+              if index.zero?
+                @data_headers = rowdata.map { |d| d.to_s.to_sym }
+              else
+                @collection_data << rowdata.each_with_index.to_h do |val, ind|
                   [@data_headers[ind], val]
                 end
-              ]
+              end
             end
           end
 

data/lib/decidim/admin/import/readers/json.rb

@@ -39,7 +39,7 @@ module Decidim
             columns = data.shift
             json_data = data.map do |row|
               deep_hash(
-                columns.each_with_index.map { |col, ind| [col, row[ind]] }.to_h
+                columns.each_with_index.to_h { |col, ind| [col, row[ind]] }
               )
             end
 

data/lib/decidim/admin/test/commands/create_attachment_collection_examples.rb

@@ -7,6 +7,7 @@ module Decidim
     shared_examples_for "CreateAttachmentCollection command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:form_params) do
           {
             "attachment_collection" => {
@@ -27,11 +28,11 @@ module Decidim
             current_organization: organization
           )
         end
-        let(:command) { described_class.new(form, collection_for) }
+        let(:command) { described_class.new(form, collection_for, user) }
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -55,6 +56,18 @@ module Decidim
               command.call
             end.to change(collection_for.attachment_collections, :count).by(1)
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:create, Decidim::AttachmentCollection, user, {})
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("create")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end

data/lib/decidim/admin/test/commands/create_category_examples.rb

@@ -7,15 +7,13 @@ module Decidim
     shared_examples_for "CreateCategory command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:form_params) do
           {
             "category" => {
               "name_en" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
               "name_es" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
-              "name_ca" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
-              "description_en" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
-              "description_es" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
-              "description_ca" => Decidim::Faker::Localized.paragraph(sentence_count: 3)
+              "name_ca" => Decidim::Faker::Localized.paragraph(sentence_count: 3)
             }
           }
         end
@@ -27,11 +25,11 @@ module Decidim
             current_organization: organization
           )
         end
-        let(:command) { described_class.new(form, participatory_space) }
+        let(:command) { described_class.new(form, participatory_space, user) }
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -55,6 +53,18 @@ module Decidim
               command.call
             end.to change(participatory_space.categories, :count).by(1)
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:create, Decidim::Category, user, {})
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("create")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end

data/lib/decidim/admin/test/commands/destroy_category_examples.rb

@@ -7,8 +7,9 @@ module Decidim
     shared_examples_for "DestroyCategory command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:category) { create(:category, participatory_space: participatory_space) }
-        let(:command) { described_class.new(category) }
+        let(:command) { described_class.new(category, user) }
 
         describe "when the category is not present" do
           let(:category) { nil }
@@ -28,6 +29,21 @@ module Decidim
           end
         end
 
+        context "when the category is a subcategory" do
+          let!(:parent_category) { create :category, participatory_space: participatory_space }
+
+          before do
+            category.parent = parent_category
+          end
+
+          it "destroy the category" do
+            category
+            expect do
+              command.call
+            end.to change(Category, :count).by(-1)
+          end
+        end
+
         describe "when the data is valid" do
           it "broadcasts ok" do
             expect { command.call }.to broadcast(:ok)
@@ -39,6 +55,18 @@ module Decidim
               command.call
             end.to change(Category, :count).by(-1)
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:delete, category, user)
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("delete")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end

data/lib/decidim/admin/test/commands/update_attachment_collection_examples.rb

@@ -7,6 +7,7 @@ module Decidim
     shared_examples_for "UpdateAttachmentCollection command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:attachment_collection) { create(:attachment_collection, collection_for: collection_for) }
         let(:form_params) do
           {
@@ -28,11 +29,11 @@ module Decidim
             current_organization: organization
           )
         end
-        let(:command) { described_class.new(attachment_collection, form) }
+        let(:command) { described_class.new(attachment_collection, form, user) }
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -58,6 +59,18 @@ module Decidim
 
             expect(translated(attachment_collection.name)).to eq("New title")
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:update, Decidim::AttachmentCollection, user, {})
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("update")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end

data/lib/decidim/admin/test/commands/update_category_examples.rb

@@ -7,16 +7,14 @@ module Decidim
     shared_examples_for "UpdateCategory command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:category) { create(:category, participatory_space: participatory_space) }
         let(:form_params) do
           {
             "category" => {
               "name_en" => "New title",
               "name_es" => "Title",
-              "name_ca" => "Title",
-              "description_en" => "Description",
-              "description_es" => "Description",
-              "description_ca" => "Description"
+              "name_ca" => "Title"
             }
           }
         end
@@ -28,11 +26,11 @@ module Decidim
             current_organization: organization
           )
         end
-        let(:command) { described_class.new(category, form) }
+        let(:command) { described_class.new(category, form, user) }
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -58,6 +56,18 @@ module Decidim
 
             expect(translated(category.name)).to eq("New title")
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:update, Decidim::Category, user, {})
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("update")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end

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

@@ -99,7 +99,7 @@ shared_examples "filterable participatory space user roles" do
         apply_filter("Invite accepted", "Yes")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_2.name)
+          expect(page).to have_content(invited_user2.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -110,7 +110,7 @@ shared_examples "filterable participatory space user roles" do
         apply_filter("Invite accepted", "No")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_1.name)
+          expect(page).to have_content(invited_user1.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -123,7 +123,7 @@ shared_examples "filterable participatory space user roles" do
         apply_filter("Ever logged in", "Yes")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_2.name)
+          expect(page).to have_content(invited_user2.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -134,7 +134,7 @@ shared_examples "filterable participatory space user roles" do
         apply_filter("Ever logged in", "No")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_1.name)
+          expect(page).to have_content(invited_user1.name)
           expect(page).to have_css("tr", count: 1)
         end
       end

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

@@ -7,7 +7,7 @@ shared_examples "filterable participatory space users" do
         apply_filter("Invitation sent", "Not sent")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_2.name)
+          expect(page).to have_content(invited_user2.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -18,7 +18,7 @@ shared_examples "filterable participatory space users" do
         apply_filter("Invitation sent", "Sent")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_1.name)
+          expect(page).to have_content(invited_user1.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -31,7 +31,7 @@ shared_examples "filterable participatory space users" do
         apply_filter("Invitation accepted", "Not accepted")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_2.name)
+          expect(page).to have_content(invited_user2.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -42,7 +42,7 @@ shared_examples "filterable participatory space users" do
         apply_filter("Invitation accepted", "Accepted")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_1.name)
+          expect(page).to have_content(invited_user1.name)
           expect(page).to have_css("tr", count: 1)
         end
       end

data/lib/decidim/admin/test/forms/category_form_examples.rb

@@ -21,13 +21,6 @@ module Decidim
           ca: "Nom"
         }
       end
-      let(:description) do
-        {
-          en: "Description",
-          es: "Descripción",
-          ca: "Descripció"
-        }
-      end
       let(:parent_id) { nil }
       let(:attributes) do
         {
@@ -35,10 +28,7 @@ module Decidim
             "name_en" => name[:en],
             "name_es" => name[:es],
             "name_ca" => name[:ca],
-            "parent_id" => parent_id,
-            "description_en" => description[:en],
-            "description_es" => description[:es],
-            "description_ca" => description[:ca]
+            "parent_id" => parent_id
           }
         }
       end
@@ -59,16 +49,6 @@ module Decidim
         it { is_expected.to be_invalid }
       end
 
-      context "when some language in description is missing" do
-        let(:description) do
-          {
-            ca: "Descripció"
-          }
-        end
-
-        it { is_expected.to be_invalid }
-      end
-
       context "when the parent_id is set" do
         let!(:category) { create :category, participatory_space: participatory_space }
 

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

@@ -48,8 +48,11 @@ shared_examples "manage attachments examples" do
           es: "Este documento contiene información importante",
           ca: "Aquest document conté informació important"
         )
+      end
+
+      dynamically_attach_file(:attachment_file, Decidim::Dev.asset("Exampledocument.pdf"))
 
-        attach_file :attachment_file, Decidim::Dev.asset("Exampledocument.pdf")
+      within ".new_attachment" do
         find("*[type=submit]").click
       end
 
@@ -81,7 +84,11 @@ shared_examples "manage attachments examples" do
         )
 
         select translated(attachment_collection.name, locale: :en), from: "attachment_attachment_collection_id"
-        attach_file :attachment_file, Decidim::Dev.asset("Exampledocument.pdf")
+      end
+
+      dynamically_attach_file(:attachment_file, Decidim::Dev.asset("Exampledocument.pdf"))
+
+      within ".new_attachment" do
         find("*[type=submit]").click
       end
 

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

@@ -14,9 +14,6 @@ shared_examples "manage categories examples" do
 
     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
@@ -32,13 +29,6 @@ shared_examples "manage categories examples" do
         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

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

@@ -52,9 +52,7 @@ shared_examples "Managing component permissions" do
 
   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

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

@@ -1,5 +1,31 @@
 # frozen_string_literal: true
 
+shared_examples "sorted moderations" do
+  let!(:moderations) do
+    reportables.first(reportables.length - 1).map do |reportable|
+      moderation = create(:moderation, reportable: reportable, report_count: 1, reported_content: reportable.reported_searchable_content_text)
+      create(:report, moderation: moderation)
+      moderation
+    end
+  end
+  let!(:moderation) { moderations.first }
+  let(:moderations_link_text) { "Moderations" }
+
+  before do
+    visit participatory_space_path
+    click_link moderations_link_text
+  end
+
+  it "sorts the most recent first" do
+    within ".pagination" do
+      click_link "Last"
+    end
+    all("tbody tr").each_with_index do |row, _index|
+      expect(row.find("td:first-child")).to have_content(reportables.first.id)
+    end
+  end
+end
+
 shared_examples "manage moderations" do
   let!(:moderations) do
     reportables.first(reportables.length - 1).map do |reportable|
@@ -110,53 +136,14 @@ shared_examples "manage moderations" do
         expect(page).to have_no_selector("tr[data-id=\"#{moderation.id}\"]")
       end
     end
-
-    context "when the user changes language" do
-      around do |example|
-        previous_backend = I18n.backend
-        I18n.backend = I18n::Backend::Simple.new
-        example.run
-        I18n.backend = previous_backend
-      end
-
-      before do
-        I18n.backend.store_translations(
-          :ca,
-          activerecord: {
-            models: {
-              moderation.reportable.class.name.underscore.to_sym => {
-                one: "Objecte informable",
-                other: "Objectes informables"
-              }
-            }
-          }
-        )
-
-        within_language_menu do
-          click_link "Català"
-        end
-      end
-
-      it "renders the reportable types in the selected language" do
-        within "tr[data-id=\"#{moderation.id}\"]" do
-          expect(page).to have_content("Objecte informable")
-        end
-      end
-    end
   end
 
   context "when listing hidden resources" do
-    before do
+    it "user can review them" do
       within ".card-title" do
         click_link "Hidden"
       end
-    end
 
-    it "user can't unreport them" do
-      expect(page).not_to have_css(".action-icon--unreport")
-    end
-
-    it "user can review them" do
       hidden_moderations.each do |moderation|
         within "tr[data-id=\"#{moderation.id}\"]" do
           expect(page).to have_css("a[href='#{moderation.reportable.reported_content_url}']")
@@ -164,43 +151,4 @@ shared_examples "manage moderations" do
       end
     end
   end
-
-  context "when listing comments for deleted resources" do
-    let(:comments) do
-      reportables.first(reportables.length - 1).map do |resource|
-        create(:comment, commentable: resource)
-      end
-    end
-    let!(:moderations) do
-      comments.map do |reportable|
-        space = reportable.is_a?(Decidim::Participable) ? reportable : reportable.participatory_space
-        moderation = create(:moderation, reportable: reportable, report_count: 1, participatory_space: space, reported_content: reportable.reported_searchable_content_text)
-        create(:report, moderation: moderation)
-
-        reportable.root_commentable.destroy!
-        reportable.reload
-
-        moderation
-      end
-    end
-
-    it "user can review them" do
-      moderations.each do |moderation|
-        within "tr[data-id=\"#{moderation.id}\"]" do
-          expect(page).to have_content "Deleted resource"
-          expect(page).to have_content "Spam"
-        end
-      end
-    end
-
-    it "user can hide them" do
-      moderation_id = moderations.first.id
-      within "tr[data-id=\"#{moderation_id}\"]" do
-        click_link "Hide"
-      end
-
-      expect(page).to have_admin_callout("Resource successfully hidden")
-      expect(page).not_to have_selector("tr[data-id=\"#{moderation_id}\"]")
-    end
-  end
 end

data/lib/decidim/admin/test.rb

@@ -9,4 +9,3 @@ require "decidim/admin/test/manage_paginated_collection_examples"
 require "decidim/admin/test/filterable_examples"
 require "decidim/admin/test/filters_participatory_space_users_examples"
 require "decidim/admin/test/filters_participatory_space_user_roles_examples"
-require "decidim/admin/test/needs_admin_tos_accepted_examples"

data/lib/decidim/admin/version.rb

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