decidim-core 0.30.0.rc1 → 0.30.0.rc2

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

@@ -59,6 +59,56 @@ shared_examples "higher user role hides" do
   end
 end
 
+shared_examples "higher user role hides resource with comments" do
+  context "and the admin hides a resource with comments" do
+    let!(:comments) { create_list(:comment, 2, body: "Dummy comment", commentable: reportable, author: user) }
+
+    before do
+      login_as user, scope: :user
+      Decidim::Ai::SpamDetection.create_reporting_user!
+    end
+    around do |example|
+      previous = Capybara.raise_server_errors
+
+      # Disabling server errors to that we can test page not found error.
+      Capybara.raise_server_errors = false
+      example.run
+      Capybara.raise_server_errors = previous
+    end
+
+    it "hides the resource" do
+      visit decidim.search_path
+      expect(page).to have_content(translated(comments.first.body))
+      expect(page).to have_content(translated(comments.second.body))
+
+      visit reportable_path
+
+      expect(page).to have_content(translated(comments.first.body))
+      expect(page).to have_content(translated(comments.second.body))
+
+      find("#dropdown-trigger-resource-#{reportable.id}").click
+      expect(page).to have_css(%(button[data-dialog-open="flagModal"]))
+      find(%(button[data-dialog-open="flagModal"])).click
+      expect(page).to have_css(".flag-modal", visible: :visible)
+
+      within ".flag-modal" do
+        find(:css, "input[name='report[hide]']").set(true)
+        click_on "Hide"
+      end
+
+      perform_enqueued_jobs
+
+      expect(reportable.reload).to be_hidden
+      expect(comments.first.reload).to be_hidden
+      expect(comments.second.reload).to be_hidden
+
+      visit decidim.search_path
+      expect(page).to have_no_content(translated(comments.first.body))
+      expect(page).to have_no_content(translated(comments.second.body))
+    end
+  end
+end
+
 shared_examples "higher user role does not have hide" do
   context "and the admin reports" do
     before do
@@ -124,6 +174,7 @@ shared_examples "reports by user type" do
     let!(:user) { create(:user, :admin, :confirmed, organization:) }
     include_examples "higher user role reports"
     include_examples "higher user role hides"
+    include_examples "higher user role hides resource with comments"
   end
   context "When reporting user is process admin" do
     let!(:user) { create(:process_admin, :confirmed, participatory_process:) }

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

@@ -23,3 +23,24 @@ shared_examples "a social share meta tag" do |image|
     expect(find('meta[property="og:image"]', visible: false)[:content]).to end_with(image)
   end
 end
+
+shared_examples "a social share widget" do
+  it "has the social share button" do
+    visit_resource
+
+    expect(page).to have_css('button[data-dialog-open="socialShare"]')
+  end
+
+  it "lists all the expected social share providers" do
+    visit_resource
+    click_on "Share"
+
+    within "#socialShare" do
+      expect(page).to have_css('a[title="Share to X"]')
+      expect(page).to have_css('a[title="Share to Facebook"]')
+      expect(page).to have_css('a[title="Share to WhatsApp"]')
+      expect(page).to have_css('a[title="Share to Telegram"]')
+      expect(page).to have_css(".share-modal__input")
+    end
+  end
+end

data/lib/decidim/core/version.rb

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

data/lib/decidim/maintenance/import_models/category.rb

@@ -24,6 +24,14 @@ module Decidim
           false
         end
 
+        def full_name
+          return @full_name if defined?(@full_name)
+
+          @full_name = name.dup
+          @full_name[I18n.locale.to_s] = "#{parent.name[I18n.locale.to_s]} > #{@full_name[I18n.locale.to_s]}" if parent && parent.parent_id
+          @full_name
+        end
+
         def resources
           categorizations.filter_map do |categorization|
             next if invalid_categorization?(categorization)
@@ -36,16 +44,34 @@ module Decidim
           {
             name:,
             origin: to_global_id.to_s,
-            children: subcategories.to_h do |subcategory|
-              [
-                subcategory.name[I18n.locale.to_s],
-                subcategory.taxonomies
-              ]
-            end,
+            children: sub_taxonomy_children,
             resources:
           }
         end
 
+        # original categories are allowed one level more than the current taxonomies
+        def sub_taxonomy_children
+          subcategories.each_with_object({}) do |subcategory, hash|
+            hash[subcategory.name[I18n.locale.to_s]] = {
+              name: subcategory.name,
+              origin: subcategory.to_global_id.to_s,
+              resources: subcategory.resources,
+              children: {}
+            }
+
+            next unless subcategory.subcategories.any?
+
+            subcategory.subcategories.each do |last_category|
+              hash[last_category.full_name[I18n.locale.to_s]] = {
+                name: last_category.full_name,
+                origin: last_category.to_global_id.to_s,
+                resources: last_category.resources,
+                children: {}
+              }
+            end
+          end
+        end
+
         def self.children_taxonomies(participatory_space)
           Category.where(participatory_space:, parent_id: nil).to_h do |category|
             [
@@ -92,8 +118,14 @@ module Decidim
                 internal_name: name,
                 items: Category.where(participatory_space:).map do |category|
                   names = [name]
-                  names << category.parent.name[I18n.locale.to_s] if category.parent
-                  names << category.name[I18n.locale.to_s]
+                  if category.parent
+                    names << if category.parent.parent
+                               category.parent.parent.name[I18n.locale.to_s]
+                             else
+                               category.parent.name[I18n.locale.to_s]
+                             end
+                  end
+                  names << category.full_name[I18n.locale.to_s]
                   names
                 end,
                 components:

data/lib/decidim/maintenance/taxonomy_importer.rb

@@ -38,6 +38,8 @@ module Decidim
         item["children"].each do |child_name, child|
           import_taxonomy_item(taxonomy, child_name, child)
         end
+      rescue ActiveRecord::RecordInvalid => e
+        abort "Error importing taxonomy item #{name} with parent #{parent.name} (#{e.message})"
       end
 
       def apply_taxonomy_to_resource(object_id, taxonomy)
@@ -61,6 +63,8 @@ module Decidim
         end
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       def import_filter(root, data)
         filter = find_taxonomy_filter!(root, data)
 
@@ -91,7 +95,11 @@ module Decidim
             result[:failed_components] << component_id
           end
         end
+      rescue ActiveRecord::RecordInvalid => e
+        abort "Error importing filter #{data} for root taxonomy #{root.name} (#{e.message})"
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
 
       def find_taxonomy(association, name)
         association.find_by("name->>? = ?", organization.default_locale, name)
@@ -105,6 +113,8 @@ module Decidim
         association.create!(name: { organization.default_locale => name }, organization:) do
           result[:taxonomies_created] << name
         end
+      rescue ActiveRecord::RecordInvalid => e
+        abort "Error creating taxonomy #{name} with parent #{association.new.parent.name[organization.default_locale]} (#{e.message})"
       end
 
       def find_taxonomy_filter!(root_taxonomy, data)

data/lib/decidim/map/provider/dynamic_map/here.rb

@@ -49,46 +49,7 @@ module Decidim
           private
 
           def language_code
-            primary = I18n.locale.to_s
-            secondary = primary.split("-")[0]
-            available_language_codes[primary] || available_language_codes[secondary] || ""
-          end
-
-          def available_language_codes
-            @available_language_codes ||= {
-              "ar" => "ara", # Arabic
-              "eu" => "baq", # Basque
-              "ca" => "cat", # Catalan
-              "zh" => "chi", # Chinese (simplified)
-              # "" => "cht", # Chinese (traditional)
-              "cs" => "cze", # Czech
-              "da" => "dan", # Danish
-              "nl" => "dut", # Dutch
-              "en" => "eng", # English
-              "fi" => "fin", # Finnish
-              "fr" => "fre", # French
-              "de" => "ger", # German
-              "ga" => "gle", # Gaelic
-              "el" => "gre", # Greek
-              "he" => "heb", # Hebrew
-              "hi" => "hin", # Hindi
-              "id" => "ind", # Indonesian
-              "it" => "ita", # Italian
-              "no" => "nor", # Norwegian
-              "fa" => "per", # Persian
-              "pl" => "pol", # Polish
-              "pt" => "por", # Portuguese
-              "ru" => "rus", # Russian
-              "si" => "sin", # Sinhalese
-              "es" => "spa", # Spanish
-              "sv" => "swe", # Swedish
-              "th" => "tha", # Thai
-              "tr" => "tur", # Turkish
-              "uk" => "ukr", # Ukrainian
-              "ur" => "urd", # Urdu
-              "vi" => "vie", # Vietnamese
-              "cy" => "wel" # Welsh
-            }
+            I18n.locale.to_s
           end
         end
       end

data/lib/decidim/moderation_tools.rb

@@ -58,6 +58,8 @@ module Decidim
 
     # Public: Broadcasts a notification to the author of the resource that has been hidden
     def send_notification_to_author
+      return if affected_users.blank?
+
       data = {
         event: "decidim.events.reports.resource_hidden",
         event_class: Decidim::ResourceHiddenEvent,
@@ -65,13 +67,12 @@ module Decidim
         extra: {
           report_reasons:
         },
-        affected_users: @reportable.try(:authors) || [@reportable.try(:normalized_author)]
+        affected_users:
       }
 
       Decidim::EventsManager.publish(**data)
     end
 
-    # Public: hides the resource
     def hide_with_admin_log!
       Decidim.traceability.perform_action!(
         "hide",
@@ -91,10 +92,22 @@ module Decidim
         @reportable.moderation.update!(hidden_at: Time.current)
         @reportable.try(:touch)
       end
+
+      if @reportable.is_a?(Decidim::Comments::Commentable)
+        @reportable.comment_threads.each do |comment|
+          Decidim::HideChildResourcesJob.perform_later(comment, @current_user.id)
+        end
+      end
+
+      send_notification_to_author
     end
 
     private
 
+    def affected_users
+      @affected_users ||= (@reportable.try(:authors) || [@reportable.try(:normalized_author)]).select { |author| author.is_a?(Decidim::User) }
+    end
+
     def report_reasons
       @reportable.moderation.reports.pluck(:reason).uniq
     end

data/lib/tasks/decidim_taxonomies.rake

@@ -82,6 +82,7 @@ namespace :decidim do
     task :import_all_plans, [] => :environment do |_task, _args|
       Rails.root.glob("tmp/taxonomies/*_plan.json").each do |file|
         log.info "Importing plan from #{file}"
+        Rake::Task["decidim:taxonomies:import_plan"].reenable
         Rake::Task["decidim:taxonomies:import_plan"].invoke(file)
       end
     end
@@ -93,7 +94,10 @@ namespace :decidim do
 
       data = JSON.parse(File.read(file))
       taxonomies = data["taxonomy_map"]
-      abort "No taxonomies found in the file" unless taxonomies && taxonomies&.any?
+      unless taxonomies && taxonomies&.any?
+        log.warn "No metric (categories) taxonomies found in the file"
+        next
+      end
 
       total = taxonomies.count
       taxonomies.each_with_index do |(id, object_id), index|
@@ -112,6 +116,7 @@ namespace :decidim do
     task :update_all_metrics, [] => :environment do |_task, _args|
       Rails.root.glob("tmp/taxonomies/*_result.json").each do |file|
         log.info "Processing metrics from #{file}"
+        Rake::Task["decidim:taxonomies:update_metrics"].reenable
         Rake::Task["decidim:taxonomies:update_metrics"].invoke(file)
       end
     end

data/lib/tasks/upgrade/clean_hidden_resources.rake

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    namespace :clean do
+      desc "Removes all related resources from hidden resource"
+      task hidden_resources: :environment do
+        logger.info("Removing child resources for hidden parents...")
+        Decidim::Moderation.hidden.find_each do |moderation_for_hidden_resource|
+          reportable = moderation_for_hidden_resource.reportable
+
+          current_user = if Decidim.module_installed?(:ai)
+                           reportable.organization.users.find_by!(email: Decidim::Ai::SpamDetection.reporting_user_email)
+                         else
+                           reportable.organization.admins.first
+                         end
+
+          tool = Decidim::ModerationTools.new(reportable, current_user)
+          tool.hide!
+        rescue NameError => e
+          log_error "Could not hide child resources for reportable id #{moderation_for_hidden_resource.id} because: #{e.message}"
+        end
+      end
+
+      private
+
+      def log_error(msg)
+        puts msg
+        Rails.logger.error(msg)
+      end
+    end
+  end
+end

data/lib/tasks/upgrade/migrations.rake

@@ -81,7 +81,10 @@ namespace :decidim do
 
       logger.warn("[Patch migration] Replacing content of #{File.basename(target_file)}")
 
-      File.binwrite(target_file, new_source)
+      additional_comment = "# This file has been modified by `decidim upgrade:migrations` task on #{Time.now.utc}\n"
+      source = new_source.gsub(inserted_comment, "#{inserted_comment}#{additional_comment}")
+
+      File.binwrite(target_file, source)
     end
 
     def logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.30.0.rc1
+  version: 0.30.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -780,28 +780,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc1
+        version: 0.30.0.rc2
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1416,6 +1416,7 @@ files:
 - app/jobs/decidim/export_participatory_space_job.rb
 - app/jobs/decidim/find_and_update_descendants_job.rb
 - app/jobs/decidim/hide_all_created_by_author_job.rb
+- app/jobs/decidim/hide_child_resources_job.rb
 - app/jobs/decidim/machine_translation_fields_job.rb
 - app/jobs/decidim/machine_translation_resource_job.rb
 - app/jobs/decidim/machine_translation_save_job.rb
@@ -1732,7 +1733,6 @@ files:
 - app/packs/src/decidim/utilities/dom.js
 - app/packs/src/decidim/utilities/text.js
 - app/packs/src/decidim/vendor/jquery-tmpl.js
-- app/packs/src/decidim/vendor/leaflet-tilelayer-here.js
 - app/packs/src/decidim/vendor/tribute.js
 - app/packs/src/decidim/vizzs/areachart.js
 - app/packs/src/decidim/vizzs/index.js
@@ -1759,6 +1759,7 @@ files:
 - app/packs/stylesheets/decidim/_fonts.scss
 - app/packs/stylesheets/decidim/_footer.scss
 - app/packs/stylesheets/decidim/_forms.scss
+- app/packs/stylesheets/decidim/_hashtags.scss
 - app/packs/stylesheets/decidim/_header.scss
 - app/packs/stylesheets/decidim/_hero.scss
 - app/packs/stylesheets/decidim/_home.scss
@@ -3080,6 +3081,7 @@ files:
 - lib/tasks/decidim_taxonomies.rake
 - lib/tasks/decidim_webpacker_tasks.rake
 - lib/tasks/upgrade/clean.rake
+- lib/tasks/upgrade/clean_hidden_resources.rake
 - lib/tasks/upgrade/decidim_active_storage_migration_tasks.rake
 - lib/tasks/upgrade/decidim_attachments.rake
 - lib/tasks/upgrade/decidim_content_blocks_tasks.rake

data/app/packs/src/decidim/vendor/leaflet-tilelayer-here.js

@@ -1,212 +0,0 @@
-/* eslint-disable */
-
-// 🍂class TileLayer.HERE
-// Tile layer for HERE maps tiles.
-L.TileLayer.HERE = L.TileLayer.extend({
-
-  options: {
-    subdomains: '1234',
-    minZoom: 2,
-    maxZoom: 18,
-
-    // 🍂option scheme: String = 'normal.day'
-    // The "map scheme", as documented in the HERE API.
-    scheme: 'normal.day',
-
-    // 🍂option resource: String = 'maptile'
-    // The "map resource", as documented in the HERE API.
-    resource: 'maptile',
-
-    // 🍂option mapId: String = 'newest'
-    // Version of the map tiles to be used, or a hash of an unique map
-    mapId: 'newest',
-
-    // 🍂option format: String = 'png8'
-    // Image format to be used (`png8`, `png`, or `jpg`)
-    format: 'png8',
-
-    // 🍂option appId: String = ''
-    // Required option. The `app_id` provided as part of the HERE credentials
-    appId: '',
-
-    // 🍂option appCode: String = ''
-    // Required option. The `app_code` provided as part of the HERE credentials
-    appCode: '',
-
-    // 🍂option useCIT: boolean = false
-    // Whether to use the CIT when loading the here-maptiles
-    useCIT: false,
-
-    // 🍂option useHTTPS: boolean = true
-    // Whether to use HTTPS when loading the here-maptiles
-    useHTTPS: true,
-
-    // 🍂option language: String = ''
-    // The language of the descriptions on the maps that are loaded
-    language: '',
-
-    // 🍂option language: String = ''
-    // The second language of the descriptions on the maps that are loaded
-    language2: '',
-  },
-
-
-  initialize: function initialize(options) {
-    options = L.setOptions(this, options);
-
-    // Decide if this scheme uses the aerial servers or the basemap servers
-    var schemeStart = options.scheme.split('.')[0];
-    options.tileResolution = 256;
-
-    // {Base URL}{Path}/{resource (tile type)}/{map id}/{scheme}/{zoom}/{column}/{row}/{size}/{format}
-    // ?apiKey={YOUR_API_KEY}
-    // &{param}={value}
-
-    var params = [
-      'apiKey=' + encodeURIComponent(options.apiKey)
-    ];
-    // Fallback to old app_id,app_code if no apiKey passed
-    if(!options.apiKey) {
-      params = [
-        'app_id=' + encodeURIComponent(options.appId),
-        'app_code=' + encodeURIComponent(options.appCode),
-      ];
-    }
-    if(options.language) {
-      params.push('lg=' + encodeURIComponent(options.language));
-    }
-    if(options.language2) {
-      params.push('lg2=' + encodeURIComponent(options.language2));
-    }
-    var urlQuery = '?' + params.join('&');
-
-    var path = '/maptile/2.1/{resource}/{mapId}/{scheme}/{z}/{x}/{y}/{tileResolution}/{format}' + urlQuery;
-    var attributionPath = '/maptile/2.1/copyright/{mapId}?apiKey={apiKey}';
-
-    var baseUrl = 'maps.ls.hereapi.com';
-
-    // Old style with apiId/apiCode for compatibility
-    if(!options.apiKey) {
-      // make sure the CIT-url can be used
-      baseUrl = 'maps' + (options.useCIT ? '.cit' : '') + '.api.here.com';
-      attributionPath = '/maptile/2.1/copyright/{mapId}?app_id={appId}&app_code={appCode}';
-    }
-
-    var tileServer = 'base.' + baseUrl;
-    if (schemeStart == 'satellite' || schemeStart == 'terrain' || schemeStart == 'hybrid') {
-      tileServer = 'aerial.' + baseUrl;
-    }
-    if (options.scheme.indexOf('.traffic.') !== -1) {
-      tileServer = 'traffic' + baseUrl;
-    }
-
-    var protocol = 'http' + (options.useHTTPS ? 's' : '');
-    var tileUrl = protocol + '://{s}.' + tileServer + path;
-
-    this._attributionUrl = L.Util.template(protocol + '://1.' + tileServer + attributionPath, this.options);
-
-    L.TileLayer.prototype.initialize.call(this, tileUrl, options);
-
-    this._attributionText = '';
-
-  },
-
-  onAdd: function onAdd(map) {
-    L.TileLayer.prototype.onAdd.call(this, map);
-
-    if (!this._attributionBBoxes) {
-      this._fetchAttributionBBoxes();
-    }
-  },
-
-  onRemove: function onRemove(map) {
-    //
-    // Remove the attribution text, and clear the cached text so it will be recalculated
-    // if/when we are shown again.
-    //
-    this._map.attributionControl.removeAttribution(this._attributionText);
-    this._attributionText = '';
-
-    this._map.off('moveend zoomend resetview', this._findCopyrightBBox, this);
-
-    //
-    // Call the prototype last, once we have tidied up our own changes
-    //
-    L.TileLayer.prototype.onRemove.call(this, map);
-  },
-
-  _fetchAttributionBBoxes: function _onMapMove() {
-    var xmlhttp = new XMLHttpRequest();
-    xmlhttp.onreadystatechange = L.bind(function(){
-      if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
-        this._parseAttributionBBoxes(JSON.parse(xmlhttp.responseText));
-      }
-    }, this);
-    xmlhttp.open("GET", this._attributionUrl, true);
-    xmlhttp.send();
-  },
-
-  _parseAttributionBBoxes: function _parseAttributionBBoxes(json) {
-    if (!this._map) { return; }
-    var providers = json[this.options.scheme.split('.')[0]] || json.normal;
-    for (var i=0; i<providers.length; i++) {
-      if (providers[i].boxes) {
-        for (var j=0; j<providers[i].boxes.length; j++) {
-          var box = providers[i].boxes[j];
-          providers[i].boxes[j] = L.latLngBounds( [ [box[0], box[1]], [box[2], box[3]] ]);
-        }
-      }
-    }
-
-    this._map.on('moveend zoomend resetview', this._findCopyrightBBox, this);
-
-    this._attributionProviders = providers;
-
-    this._findCopyrightBBox();
-  },
-
-  _findCopyrightBBox: function _findCopyrightBBox() {
-    if (!this._map) { return; }
-    var providers = this._attributionProviders;
-    var visibleProviders = [];
-    var zoom = this._map.getZoom();
-    var visibleBounds = this._map.getBounds();
-
-    for (var i=0; i<providers.length; i++) {
-      if (providers[i].minLevel <= zoom && providers[i].maxLevel >= zoom) {
-
-        if (!providers[i].boxes) {
-          // No boxes = attribution always visible
-          visibleProviders.push(providers[i]);
-        } else {
-          for (var j=0; j<providers[i].boxes.length; j++) {
-            var box = providers[i].boxes[j];
-            if (visibleBounds.intersects(box)) {
-              visibleProviders.push(providers[i]);
-              break;
-            }
-          }
-        }
-      }
-    }
-
-    var attributions = ['<a href="https://legal.here.com/en-gb/terms" target="_blank" rel="noopener noreferrer">HERE maps</a>'];
-    for (var i=0; i<visibleProviders.length; i++) {
-      var provider = visibleProviders[i];
-      attributions.push('<abbr title="' + provider.alt + '">' + provider.label + '</abbr>');
-    }
-
-    var attributionText = '© ' + attributions.join(', ') + '. ';
-
-    if (attributionText !== this._attributionText) {
-      this._map.attributionControl.removeAttribution(this._attributionText);
-      this._map.attributionControl.addAttribution(this._attributionText = attributionText);
-    }
-  },
-
-});
-
-
-L.tileLayer.here = function(opts){
-  return new L.TileLayer.HERE(opts);
-}