decidim-admin 0.26.5 → 0.27.0.rc1

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.26.5
+  version: 0.27.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2022-06-27 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.26.5
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -88,28 +88,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.27.0.rc1
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -121,6 +121,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- app/cells/decidim/admin/attachments_privacy_warning/show.erb
+- app/cells/decidim/admin/attachments_privacy_warning_cell.rb
 - app/cells/decidim/admin/content_block/show.erb
 - app/cells/decidim/admin/content_block_cell.rb
 - app/cells/decidim/admin/results_per_page/show.erb
@@ -243,6 +245,7 @@ files:
 - app/controllers/decidim/admin/organization_external_domain_whitelist_controller.rb
 - app/controllers/decidim/admin/organization_homepage_content_blocks_controller.rb
 - app/controllers/decidim/admin/organization_homepage_controller.rb
+- app/controllers/decidim/admin/reminders_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
@@ -303,6 +306,7 @@ files:
 - app/helpers/decidim/admin/moderations_helper.rb
 - app/helpers/decidim/admin/newsletters_helper.rb
 - app/helpers/decidim/admin/paginable/per_page_helper.rb
+- app/helpers/decidim/admin/reminders_helper.rb
 - app/helpers/decidim/admin/resource_permissions_helper.rb
 - app/helpers/decidim/admin/resource_scope_helper.rb
 - app/helpers/decidim/admin/scopes_helper.rb
@@ -320,11 +324,10 @@ files:
 - app/models/decidim/admin/fake_newsletter.rb
 - app/packs/entrypoints/decidim_admin.js
 - app/packs/entrypoints/decidim_admin.scss
+- app/packs/src/decidim/admin/admin_autocomplete.js
 - app/packs/src/decidim/admin/application.js
 - app/packs/src/decidim/admin/auto_buttons_by_position.component.js
 - app/packs/src/decidim/admin/auto_label_by_position.component.js
-- app/packs/src/decidim/admin/autocomplete.component.js
-- app/packs/src/decidim/admin/autocomplete.component.test.js
 - app/packs/src/decidim/admin/budget_rule_toggler.component.js
 - app/packs/src/decidim/admin/choose_language.js
 - app/packs/src/decidim/admin/draggable-list.js
@@ -351,7 +354,6 @@ files:
 - app/packs/stylesheets/decidim/admin/application.scss
 - app/packs/stylesheets/decidim/admin/bundle.scss
 - app/packs/stylesheets/decidim/admin/components/_accordion.scss
-- app/packs/stylesheets/decidim/admin/components/_autocomplete_select.component.scss
 - app/packs/stylesheets/decidim/admin/components/_dropdown-menu.scss
 - app/packs/stylesheets/decidim/admin/components/_sortable.scss
 - app/packs/stylesheets/decidim/admin/extra/_action-icon.scss
@@ -373,6 +375,7 @@ files:
 - app/packs/stylesheets/decidim/admin/extra/_title_bar.scss
 - app/packs/stylesheets/decidim/admin/modules/_action-icon.scss
 - app/packs/stylesheets/decidim/admin/modules/_agenda.scss
+- app/packs/stylesheets/decidim/admin/modules/_autocomplete.scss
 - app/packs/stylesheets/decidim/admin/modules/_buttons.scss
 - app/packs/stylesheets/decidim/admin/modules/_callouts.scss
 - app/packs/stylesheets/decidim/admin/modules/_card-grid.scss
@@ -384,6 +387,7 @@ files:
 - app/packs/stylesheets/decidim/admin/modules/_filters.scss
 - app/packs/stylesheets/decidim/admin/modules/_forms.scss
 - app/packs/stylesheets/decidim/admin/modules/_icons.scss
+- app/packs/stylesheets/decidim/admin/modules/_import_result.scss
 - app/packs/stylesheets/decidim/admin/modules/_layout.scss
 - app/packs/stylesheets/decidim/admin/modules/_loading-spinner.scss
 - app/packs/stylesheets/decidim/admin/modules/_main-nav.scss
@@ -397,6 +401,7 @@ files:
 - app/packs/stylesheets/decidim/admin/modules/_tabs.scss
 - app/packs/stylesheets/decidim/admin/modules/_title-bar.scss
 - app/packs/stylesheets/decidim/admin/modules/_typography.scss
+- app/packs/stylesheets/decidim/admin/modules/_upload_modal.scss
 - app/packs/stylesheets/decidim/admin/modules/_user-login.scss
 - app/packs/stylesheets/decidim/admin/modules/_users_statistics.scss
 - app/packs/stylesheets/decidim/admin/plugins/_foundation-datepicker.scss
@@ -528,6 +533,7 @@ files:
 - 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/participatory_space_private_users_csv_imports/new.html.erb
+- app/views/decidim/admin/reminders/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
@@ -541,6 +547,7 @@ files:
 - app/views/decidim/admin/share_tokens/_share_tokens.html.erb
 - app/views/decidim/admin/shared/_filters.html.erb
 - app/views/decidim/admin/shared/_gallery.html.erb
+- app/views/decidim/admin/shared/_js-callout.html.erb
 - app/views/decidim/admin/shared/landing_page/edit.html.erb
 - app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
 - app/views/decidim/admin/static_page_topics/_form.html.erb
@@ -605,7 +612,6 @@ files:
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
-- config/locales/gn-PY.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -614,12 +620,10 @@ files:
 - config/locales/is.yml
 - config/locales/it.yml
 - config/locales/ja.yml
-- config/locales/ka-GE.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
 - config/locales/lb.yml
-- config/locales/lo-LA.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -627,7 +631,6 @@ files:
 - config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
-- config/locales/oc-FR.yml
 - config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
@@ -701,14 +704,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim organization administration