decidim-core 0.29.1 → 0.30.0.rc1

data/lib/decidim/core/test/shared_examples/softdeleteable_components_examples.rb

@@ -0,0 +1,173 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples "a soft-deletable resource" do |resource_name:, resource_path:, trash_path:|
+  let(:deletable_resource) { send(resource_name) }
+  let(:route_params) { defined?(additional_params) ? additional_params : {} }
+  let(:resource_params) { { id: deletable_resource.id }.merge(route_params) }
+
+  describe "PATCH soft_delete" do
+    it "soft deletes the #{resource_name}" do
+      expect(Decidim::Commands::SoftDeleteResource).to receive(:call).with(deletable_resource, current_user).and_call_original
+
+      patch :soft_delete, params: resource_params
+
+      expect(response).to redirect_to Decidim::EngineRouter.admin_proxy(deletable_resource.component).send(resource_path, *route_params.values)
+      expect(flash[:notice]).to be_present
+      expect(deletable_resource.reload.deleted_at).not_to be_nil
+    end
+  end
+
+  describe "PATCH restore" do
+    before { deletable_resource.destroy! }
+
+    it "restores the #{resource_name}" do
+      expect(Decidim::Commands::RestoreResource).to receive(:call).with(deletable_resource, current_user).and_call_original
+
+      patch :restore, params: resource_params
+
+      expect(response).to redirect_to Decidim::EngineRouter.admin_proxy(deletable_resource.component).send(trash_path, *route_params.values)
+      expect(flash[:notice]).to be_present
+      expect(deletable_resource.reload.deleted_at).to be_nil
+    end
+  end
+
+  describe "GET manage_trash" do
+    let!(:active_resource) { create(resource_name, component:) }
+    let(:deleted_items) { controller.view_context.trashable_deleted_collection }
+
+    before do
+      deletable_resource.destroy!
+    end
+
+    it "lists only deleted #{resource_name.to_s.pluralize}" do
+      get :manage_trash, params: route_params
+
+      expect(response).to have_http_status(:ok)
+      expect(deleted_items).to include(deletable_resource)
+      expect(deleted_items).not_to include(active_resource)
+    end
+
+    it "renders the deleted #{resource_name.to_s.pluralize} template" do
+      get :manage_trash, params: route_params
+
+      expect(response).to render_template(:manage_trash)
+    end
+  end
+end
+
+shared_examples "a soft-deletable component" do |component_name:, space_name:, component_path:, trash_path:|
+  let(:soft_deletable_component) { send(component_name) }
+  let(:space) { send(space_name) }
+  let(:component_params) { { "#{space_name}_slug" => space.slug, :id => soft_deletable_component.id } }
+
+  before do
+    allow(controller).to receive(:current_participatory_process).and_return(space_name)
+  end
+
+  describe "PATCH soft_delete" do
+    it "soft deletes the #{component_name}" do
+      expect(Decidim::Commands::SoftDeleteResource).to receive(:call).with(soft_deletable_component, current_user).and_call_original
+
+      patch :soft_delete, params: component_params
+
+      expect(response).to redirect_to send(component_path)
+      expect(flash[:notice]).to be_present
+      expect(soft_deletable_component.reload.deleted_at).not_to be_nil
+    end
+  end
+
+  describe "PATCH restore" do
+    before { soft_deletable_component.update!(deleted_at: Time.current) }
+
+    it "restores the #{component_name}" do
+      expect(Decidim::Commands::RestoreResource).to receive(:call).with(soft_deletable_component, current_user).and_call_original
+
+      patch :restore, params: component_params
+
+      expect(response).to redirect_to send(trash_path)
+      expect(flash[:notice]).to be_present
+      expect(soft_deletable_component.reload.deleted_at).to be_nil
+    end
+  end
+
+  describe "GET manage_trash" do
+    let!(:deleted_component) { create(component_name, participatory_space: space, deleted_at: Time.current) }
+    let!(:active_component) { create(component_name, participatory_space: space) }
+    let(:deleted_items) { controller.view_context.trashable_deleted_collection }
+
+    it "lists only deleted #{component_name.to_s.pluralize}" do
+      get :manage_trash, params: component_params.except(:id)
+
+      expect(response).to have_http_status(:ok)
+      expect(deleted_items).to include(deleted_component)
+      expect(deleted_items).not_to include(active_component)
+    end
+
+    it "renders the deleted #{component_name.to_s.pluralize} template" do
+      get :manage_trash, params: component_params.except(:id)
+
+      expect(response).to render_template(:manage_trash)
+    end
+  end
+end
+
+shared_examples "a soft-deletable space" do |space_name:, space_path:, trash_path:|
+  let(:soft_deletable_space) { send(space_name) }
+  let(:deletion_params) { { slug: soft_deletable_space.slug } }
+
+  before do
+    request.env["decidim.current_organization"] = soft_deletable_space.organization
+  end
+
+  describe "PATCH soft_delete" do
+    it "soft deletes the #{space_name}" do
+      expect(Decidim::Commands::SoftDeleteResource).to receive(:call).with(soft_deletable_space, current_user).and_call_original
+
+      patch :soft_delete, params: deletion_params
+
+      expect(response).to redirect_to send(space_path)
+      expect(flash[:notice]).to be_present
+      expect(soft_deletable_space.reload.deleted_at).not_to be_nil
+    end
+  end
+
+  describe "PATCH restore" do
+    before { soft_deletable_space.destroy! }
+
+    it "restores the #{space_name}" do
+      expect(Decidim::Commands::RestoreResource).to receive(:call).with(soft_deletable_space, current_user).and_call_original
+
+      patch :restore, params: deletion_params
+
+      expect(response).to redirect_to send(trash_path)
+      expect(flash[:notice]).to be_present
+      expect(soft_deletable_space.reload.deleted_at).to be_nil
+    end
+  end
+
+  describe "GET manage_trash" do
+    let!(:deleted_space) { create(space_name, organization: soft_deletable_space.organization, deleted_at: Time.current) }
+    let!(:active_space) { create(space_name, organization: soft_deletable_space.organization) }
+    let(:deleted_items) { controller.view_context.trashable_deleted_collection }
+
+    before do
+      request.env["decidim.current_participatory_process"] = soft_deletable_space
+    end
+
+    it "lists only deleted #{space_name.to_s.pluralize}" do
+      get :manage_trash
+
+      expect(response).to have_http_status(:ok)
+      expect(deleted_items).to include(deleted_space)
+      expect(deleted_items).not_to include(active_space)
+    end
+
+    it "renders the deleted #{space_name.to_s.pluralize} template" do
+      get :manage_trash
+
+      expect(response).to render_template(:manage_trash)
+    end
+  end
+end

data/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb

@@ -79,7 +79,24 @@ shared_examples "Endorse resource system specs" do
           visit_resource
           within "#resource-#{resource.id}-endorsement-block" do
             click_on "Like"
-            expect(page).to have_button("Dislike")
+            expect(page).to have_button("Like")
+            expect(page).to have_css('svg use[href*="ri-heart-fill"]')
+            expect(page).to have_css('#endorsement-button[aria-label="Undo the like"]')
+          end
+        end
+
+        it "has endorsements from other users" do
+          author = create(:user, :confirmed, organization: resource.organization)
+          create(:endorsement, resource:, author:)
+          visit_resource
+          within "#endorser-list-#{resource.id}" do
+            expect(page).to have_content("Liked by #{author.name}")
+            click_on author.name
+          end
+          expect(page).to have_content("Liked by")
+          within "#endorsersModal-#{resource.id}" do
+            expect(page).to have_content(author.name)
+            expect(page).to have_no_content(user.name)
           end
         end
       end
@@ -90,18 +107,35 @@ shared_examples "Endorse resource system specs" do
         it "is not able to endorse it again" do
           visit_resource
           within "#resource-#{resource.id}-endorsement-block" do
-            expect(page).to have_button("Dislike")
-            expect(page).to have_no_button("Like")
+            expect(page).to have_css('svg use[href*="ri-heart-fill"]')
+            expect(page).to have_css('#endorsement-button[aria-label="Undo the like"]')
+            expect(page).to have_no_css('svg use[href*="ri-heart-line"]')
           end
         end
 
         it "is able to undo the endorsement" do
           visit_resource
           within "#resource-#{resource.id}-endorsement-block" do
-            click_on "Dislike"
+            expect(page).to have_css('svg use[href*="ri-heart-fill"]')
+            expect(page).to have_css('#endorsement-button[aria-label="Undo the like"]')
+            click_on "Like"
+            expect(page).to have_css('svg use[href*="ri-heart-line"]')
+            expect(page).to have_css('#endorsement-button[aria-label="Like"]')
             expect(page).to have_button("Like")
           end
         end
+
+        it "can show the endorsements pop-up" do
+          visit_resource
+          within "#endorser-list-#{resource.id}" do
+            expect(page).to have_content("Liked by you")
+            click_on "you"
+          end
+          expect(page).to have_content("Liked by")
+          within "#endorsersModal-#{resource.id}" do
+            expect(page).to have_content(user.name)
+          end
+        end
       end
 
       context "when verification is required" do
@@ -143,9 +177,13 @@ shared_examples "Endorse resource system specs" do
           it "IS able to endorse", :slow do
             visit_resource
             within "#resource-#{resource.id}-endorsement-block" do
+              expect(page).to have_css('svg use[href*="ri-heart-line"]')
+              expect(page).to have_css('#endorsement-button[aria-label="Like"]')
               click_on "Like"
+              expect(page).to have_button("Like")
+              expect(page).to have_css('#endorsement-button[aria-label="Undo the like"]')
+              expect(page).to have_css('svg use[href*="ri-heart-fill"]')
             end
-            expect(page).to have_button("Dislike")
           end
         end
       end
@@ -176,7 +214,9 @@ shared_examples "Endorse resource system specs" do
           it "is able to endorse the resource" do
             within "#resource-#{resource.id}-endorsement-block" do
               click_on "Like"
-              expect(page).to have_button("Dislike")
+              expect(page).to have_button("Like")
+              expect(page).to have_css('svg use[href*="ri-heart-fill"]')
+              expect(page).to have_css('#endorsement-button[aria-label="Undo the like"]')
             end
           end
         end
@@ -199,7 +239,7 @@ shared_examples "Endorse resource system specs" do
               click_on "Done"
             end
             visit_resource
-            click_on "Dislike"
+            click_on "Like"
           end
 
           context "when both identities picked" do
@@ -217,6 +257,8 @@ shared_examples "Endorse resource system specs" do
               add_likes
               find(".is-selected", match: :first).click
               click_on "Done"
+              expect(page).to have_css('svg use[href*="ri-heart-line"]')
+              expect(page).to have_css('#select-identity-button[aria-label="Like"]')
               visit current_path
               click_on "Like"
 
@@ -234,8 +276,12 @@ shared_examples "Endorse resource system specs" do
               add_likes
               page.all(".is-selected")[1].click
               click_on "Done"
+              expect(page).to have_css('svg use[href*="ri-heart-fill"]')
+              expect(page).to have_css('#select-identity-button[aria-label="Undo the like"]')
               visit current_path
-              click_on "Dislike"
+              expect(page).to have_css('svg use[href*="ri-heart-fill"]')
+              expect(page).to have_css('#select-identity-button[aria-label="Undo the like"]')
+              click_on "Like"
 
               within ".identities-modal__list" do
                 expect(page).to have_css(".is-selected", count: 1)

data/lib/decidim/core/test/shared_examples/taxonomizable_interface_examples.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples_for "taxonomizable interface" do
+  let!(:root_taxonomy) { create(:taxonomy, organization:) }
+  let!(:taxonomy) { create(:taxonomy, parent: root_taxonomy, organization:) }
+
+  before do
+    model.update(taxonomies: [taxonomy])
+  end
+
+  describe "taxonomies" do
+    let(:query) { "{ taxonomies { id } }" }
+
+    it "has taxonomies" do
+      expect(response).to include("taxonomies" => [{ "id" => taxonomy.id.to_s }])
+    end
+  end
+end

data/lib/decidim/core/test/shared_examples/taxonomizable_resource_examples.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+shared_examples_for "a taxonomizable resource" do
+  let(:root_taxonomy) { create(:taxonomy, organization:) }
+  let(:taxonomy) { create(:taxonomy, parent: root_taxonomy, organization:) }
+  let(:taxonomy_filter) { create(:taxonomy_filter, root_taxonomy:, participatory_space_manifests: [participatory_space.manifest.name]) }
+  let(:taxonomy_filters) { [taxonomy_filter.id] }
+
+  before do
+    current_component.update!(settings: { taxonomy_filters: })
+  end
+
+  context "when the taxonomies exists" do
+    let(:taxonomies) { [taxonomy.id] }
+
+    it { is_expected.to be_valid }
+    it { expect(form.taxonomizations.first).to be_kind_of(Decidim::Taxonomization) }
+  end
+
+  context "when the taxonomy filter does not exist" do
+    let(:taxonomy_filters) { [3456] }
+
+    it { expect(form.taxonomizations).to be_empty }
+  end
+
+  context "when the taxonomies are from another organization" do
+    let(:taxonomy) { create(:taxonomy) }
+
+    it { expect(form.taxonomizations).to be_empty }
+  end
+
+  context "when the taxonomy is a root taxonomy" do
+    let(:taxonomy) { create(:taxonomy, organization:) }
+
+    it { expect(form.taxonomizations).to be_empty }
+  end
+end

data/lib/decidim/core/test/shared_examples/taxonomy_settings.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples_for "taxonomy settings" do
+  describe "available_taxonomy_filters" do
+    let(:organization) { create(:organization) }
+    let(:participatory_space) { create(:participatory_process, organization:) }
+    let!(:component) do
+      create(:component,
+             manifest_name: "dummy",
+             participatory_space:,
+             settings: {
+               taxonomy_filters:
+             })
+    end
+    let(:taxonomy_filters) { [] }
+
+    it "is blank" do
+      expect(subject.available_taxonomy_filters).to eq([])
+    end
+
+    context "when component does not respond to taxonomy_filters" do
+      before do
+        allow(subject.settings).to receive(:respond_to?).with(:taxonomy_filters).and_return(false)
+      end
+
+      it "is blank" do
+        expect(subject.available_taxonomy_filters).to be_blank
+        expect(subject.available_root_taxonomies).to be_blank
+        expect(subject.available_taxonomy_ids).to eq([])
+      end
+    end
+
+    context "when filters exist" do
+      let(:root_taxonomy) { create(:taxonomy, organization:) }
+      let(:taxonomy) { create(:taxonomy, parent: root_taxonomy, organization:) }
+      let(:taxonomy_filter) { create(:taxonomy_filter, root_taxonomy:) }
+      let!(:taxonomy_filter_item) { create(:taxonomy_filter_item, taxonomy_filter:, taxonomy_item: taxonomy) }
+      let(:taxonomy_filters) { [taxonomy_filter.id, rand(1..100)] }
+
+      it "returns the filters" do
+        expect(subject.available_taxonomy_filters).to eq([taxonomy_filter])
+        expect(subject.available_root_taxonomies).to eq([root_taxonomy])
+        expect(subject.available_taxonomy_ids).to eq([taxonomy.id])
+      end
+    end
+  end
+end

data/lib/decidim/core/test/shared_examples/translated_event_examples.rb

@@ -26,7 +26,7 @@ shared_examples_for "a translated event" do
   end
 
   context "when is machine translated" do
-    let(:user) { create :user, organization:, locale: "ca" }
+    let(:user) { create(:user, organization:, locale: "ca") }
 
     around do |example|
       I18n.with_locale(user.locale) { example.run }

data/lib/decidim/core/test/shared_examples/versions_controller_examples.rb

@@ -5,9 +5,9 @@ require "spec_helper"
 shared_examples "versions controller" do
   let(:base_params) do
     if resource.is_a?(Decidim::Participable)
-      { "#{resource.model_name.singular_route_key}_slug".to_sym => resource.slug }
+      { :"#{resource.model_name.singular_route_key}_slug" => resource.slug }
     else
-      { "#{resource.model_name.singular_route_key}_id".to_sym => resource.id }
+      { :"#{resource.model_name.singular_route_key}_id" => resource.id }
     end
   end
 

data/lib/decidim/core/test/shared_examples/with_endorsable_permissions_examples.rb

@@ -5,7 +5,7 @@ require "spec_helper"
 # users of this test should declare the `subject` variable.
 shared_examples "with endorsable permissions can perform actions related to endorsable" do
   let(:action_subject) { :endorsement }
-  let(:resource) { create :dummy_resource, component: }
+  let(:resource) { create(:dummy_resource, component:) }
   before do
     context[:current_settings] = double(current_settings)
     context[:resource] = resource

data/lib/decidim/core/test.rb

@@ -13,8 +13,7 @@ require "decidim/core/test/shared_examples/logo_email"
 require "decidim/core/test/shared_examples/has_attachments"
 require "decidim/core/test/shared_examples/has_attachment_collections"
 require "decidim/core/test/shared_examples/has_component"
-require "decidim/core/test/shared_examples/has_scope"
-require "decidim/core/test/shared_examples/has_category"
+require "decidim/core/test/shared_examples/has_taxonomies"
 require "decidim/core/test/shared_examples/has_reference"
 require "decidim/core/test/shared_examples/comments_examples"
 require "decidim/core/test/shared_examples/counts_commentators_as_newsletter_participants"
@@ -23,12 +22,14 @@ require "decidim/core/test/shared_examples/process_announcements_examples"
 require "decidim/core/test/shared_examples/reportable"
 require "decidim/core/test/shared_examples/reports_examples"
 require "decidim/core/test/shared_examples/comments_reports_examples"
+require "decidim/core/test/shared_examples/components_controller_reorder_shared_examples"
+require "decidim/core/test/shared_examples/components_controller_hide_shared_examples"
 require "decidim/core/test/shared_examples/paginated_resource_examples"
 require "decidim/core/test/shared_examples/errors"
-require "decidim/core/test/shared_examples/scope_helper_examples"
 require "decidim/core/test/shared_examples/follows_examples"
 require "decidim/core/test/shared_examples/simple_event"
 require "decidim/core/test/shared_examples/component_type"
+require "decidim/core/test/shared_examples/taxonomizable_resource_examples"
 require "decidim/core/test/shared_examples/scopable_resource_examples"
 require "decidim/core/test/shared_examples/fingerprint_examples"
 require "decidim/core/test/shared_examples/searchable_results_examples"
@@ -46,6 +47,7 @@ require "decidim/core/test/shared_examples/amendable/promote_amendment_examples"
 require "decidim/core/test/shared_examples/amendable/amendment_form_examples"
 require "decidim/core/test/shared_examples/amendable/accept_amendment_examples"
 require "decidim/core/test/shared_examples/resourceable"
+require "decidim/core/test/shared_examples/taxonomy_settings"
 require "decidim/core/test/shared_examples/amendable/amendment_created_event_examples"
 require "decidim/core/test/shared_examples/amendable/amendment_event_examples"
 require "decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples"
@@ -59,10 +61,11 @@ require "decidim/core/test/shared_examples/rich_text_editor_examples"
 require "decidim/core/test/shared_examples/permissions"
 require "decidim/core/test/shared_examples/admin_resource_gallery_examples"
 require "decidim/core/test/shared_examples/map_examples"
-require "decidim/core/test/shared_examples/preview_component_with_share_token_examples"
-require "decidim/core/test/shared_examples/manage_component_share_tokens"
+require "decidim/core/test/shared_examples/preview_with_share_token_examples"
+require "decidim/core/test/shared_examples/manage_share_tokens_examples"
 require "decidim/core/test/shared_examples/metric_manage_shared_context"
 require "decidim/core/test/shared_examples/resource_search_examples"
+require "decidim/core/test/shared_examples/participatory_space_search_examples"
 require "decidim/core/test/shared_examples/static_pages_examples"
 require "decidim/core/test/shared_examples/controller_render_views"
 require "decidim/core/test/shared_examples/share_link_examples"
@@ -78,3 +81,4 @@ require "decidim/core/test/shared_examples/hideable_resource_examples"
 require "decidim/core/test/shared_examples/active_support_examples"
 require "decidim/core/test/shared_examples/statistics_cell_examples"
 require "decidim/core/test/shared_examples/resource_locator_presenter_examples"
+require "decidim/core/test/shared_examples/etiquette_validator_examples"

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.29.1"
+      "0.30.0.rc1"
     end
   end
 end

data/lib/decidim/core.rb

@@ -13,6 +13,7 @@ module Decidim
   autoload :TranslatableAttributes, "decidim/translatable_attributes"
   autoload :TranslatableResource, "decidim/translatable_resource"
   autoload :JsonbAttributes, "decidim/jsonb_attributes"
+  autoload :LegacyFormBuilder, "decidim/legacy_form_builder"
   autoload :FormBuilder, "decidim/form_builder"
   autoload :AuthorizationFormBuilder, "decidim/authorization_form_builder"
   autoload :FilterFormBuilder, "decidim/filter_form_builder"
@@ -29,6 +30,7 @@ module Decidim
   autoload :Coauthorable, "decidim/coauthorable"
   autoload :Participable, "decidim/participable"
   autoload :Publicable, "decidim/publicable"
+  autoload :Taxonomizable, "decidim/taxonomizable"
   autoload :Scopable, "decidim/scopable"
   autoload :ScopableParticipatorySpace, "decidim/scopable_participatory_space"
   autoload :ScopableComponent, "decidim/scopable_component"
@@ -41,6 +43,7 @@ module Decidim
   autoload :HasAttachments, "decidim/has_attachments"
   autoload :ComponentValidator, "decidim/component_validator"
   autoload :HasSettings, "decidim/has_settings"
+  autoload :HasTaxonomySettings, "decidim/has_taxonomy_settings"
   autoload :HasComponent, "decidim/has_component"
   autoload :HasCategory, "decidim/has_category"
   autoload :Followable, "decidim/followable"
@@ -124,6 +127,8 @@ module Decidim
   autoload :ContentSecurityPolicy, "decidim/content_security_policy"
   autoload :IconRegistry, "decidim/icon_registry"
   autoload :HasConversations, "decidim/has_conversations"
+  autoload :SoftDeletable, "decidim/soft_deletable"
+  autoload :PrivateDownloadHelper, "decidim/private_download_helper"
 
   module Commands
     autoload :CreateResource, "decidim/commands/create_resource"
@@ -131,6 +136,8 @@ module Decidim
     autoload :DestroyResource, "decidim/commands/destroy_resource"
     autoload :ResourceHandler, "decidim/commands/resource_handler"
     autoload :HookError, "decidim/commands/hook_error"
+    autoload :SoftDeleteResource, "decidim/commands/soft_delete_resource"
+    autoload :RestoreResource, "decidim/commands/restore_resource"
   end
 
   include ActiveSupport::Configurable
@@ -584,6 +591,51 @@ module Decidim
     {}
   end
 
+  CoreDataManifest = Data.define(:name, :collection, :serializer, :include_in_open_data)
+
+  def self.open_data_manifests
+    [
+      CoreDataManifest.new(
+        name: :moderated_users,
+        collection: lambda { |organization|
+                      Decidim::UserModeration.joins(:user).where(decidim_users: { decidim_organization_id: organization.id }).where.not(decidim_users: { blocked_at: nil })
+                    },
+        serializer: Decidim::Exporters::OpenDataBlockedUserSerializer,
+        include_in_open_data: true
+      ),
+      CoreDataManifest.new(
+        name: :moderations,
+        collection: ->(organization) { Decidim::Moderation.where(participatory_space: organization.participatory_spaces).includes(:reports).hidden },
+        serializer: Decidim::Exporters::OpenDataModerationSerializer,
+        include_in_open_data: true
+      ),
+      CoreDataManifest.new(
+        name: :users,
+        collection: ->(organization) { Decidim::User.where(organization:).confirmed.not_blocked.includes(avatar_attachment: :blob) },
+        serializer: Decidim::Exporters::OpenDataUserSerializer,
+        include_in_open_data: true
+      ),
+      CoreDataManifest.new(
+        name: :user_groups,
+        collection: ->(organization) { Decidim::UserGroup.where(organization:).confirmed.not_blocked.includes(avatar_attachment: :blob) },
+        serializer: Decidim::Exporters::OpenDataUserGroupSerializer,
+        include_in_open_data: true
+      ),
+      CoreDataManifest.new(
+        name: :metrics,
+        collection: ->(organization) { Decidim::Metric.where(organization:) },
+        serializer: Decidim::Exporters::OpenDataMetricSerializer,
+        include_in_open_data: true
+      ),
+      CoreDataManifest.new(
+        name: :taxonomies,
+        collection: ->(organization) { Decidim::Taxonomy.where(organization:) },
+        serializer: Decidim::Exporters::OpenDataTaxonomySerializer,
+        include_in_open_data: true
+      )
+    ]
+  end
+
   # Public: Registers a global engine. This method is intended to be used
   # by component engines that also offer unscoped functionality
   #
@@ -843,6 +895,12 @@ module Decidim
     0.seconds
   end
 
+  # The etiquette validator is applied to the create and edit forms of Proposals, Meetings,
+  # and Debates for both regular and admin users.
+  config_accessor :enable_etiquette_validator do
+    true
+  end
+
   def self.machine_translation_service_klass
     return unless Decidim.enable_machine_translations
 

data/lib/decidim/diffy_extension.rb

@@ -13,6 +13,24 @@ module Decidim
         str = wrap_lines(@diff.map { |line| wrap_line(line) })
         ActionView::Base.new(ActionView::LookupContext.new(nil), {}, nil).sanitize(str, tags: TAGS)
       end
+
+      private
+
+      def wrap_line(line)
+        cleaned = clean_line(line)
+        case line
+        when /^(---|\+\+\+|\\\\)/
+          "    <li class=\"diff-comment\"><div>#{line.chomp}</div></li>"
+        when /^\+/
+          "    <li class=\"ins\"><ins>#{cleaned}</ins></li>"
+        when /^-/
+          "    <li class=\"del\"><del>#{cleaned}</del></li>"
+        when /^ /
+          "    <li class=\"unchanged\"><div>#{cleaned}</div></li>"
+        when /^@@/
+          "    <li class=\"diff-block-info\"><div>#{line.chomp}</div></li>"
+        end
+      end
     end
 
     # Adding a new method to Diffy::Format so we can pass the

data/lib/decidim/download_your_data_serializers/download_your_data_identity_serializer.rb

@@ -12,10 +12,6 @@ module Decidim
           id: resource.id,
           provider: resource.provider,
           uid: resource.uid,
-          user: {
-            id: resource.user.id,
-            name: resource.user.name
-          },
           created_at: resource.created_at,
           updated_at: resource.updated_at
         }

data/lib/decidim/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer.rb

@@ -17,7 +17,9 @@ module Decidim
             slug: resource.privatable_to.slug
           },
           created_at: resource.created_at,
-          updated_at: resource.updated_at
+          updated_at: resource.updated_at,
+          role: resource.role,
+          published: resource.published
         }
       end
     end

data/lib/decidim/download_your_data_serializers/download_your_data_report_serializer.rb

@@ -28,7 +28,8 @@ module Decidim
           reason: resource.reason,
           details: resource.details,
           created_at: resource.created_at,
-          updated_at: resource.updated_at
+          updated_at: resource.updated_at,
+          locale: resource.locale
         }
       end
     end