decidim-core 0.30.0 → 0.30.2

data/config/locales/uk.yml

@@ -345,10 +345,8 @@ uk:
       unsubscribe:
         success: Ви успішно скасували підписку.
         token_error: Строк дії посилання закінчився.
-        unsubscribe: Скасувати підписку
     newsletters_opt_in_mailer:
       notify:
-        body_1: Обробка особистих даних та їх захист стають дедалі важливішими для всіх нас. За новим "Загальним положенням про захист даних" (GDPR) від 25 травня 2018 року люди мають змогу керувати своїми особистими даними. Тому ми потребуємо вашої згоди, щоб продовжувати надсилати вам свіжі новини про діяльність %{organization_name}.
         body_2: 'Як ви можете дати нам свою згоду? Просто натисніть цю кнопку:'
         body_3: Погодившись, ви зможете продовжувати отримувати відомості про послуги нашого майданчику. Якщо ж ми не отримаємо вашої згоди, ми припинимо надсилати вам наші повідомлення. Якщо ви підтвердите, що хочете продовжувати отримувати новини, ви зможете потім в будь-який момент від них відмовитись.
         button: Так, я хочу продовжувати отримувати новини
@@ -396,11 +394,6 @@ uk:
         actions:
           edit_profile: Редагувати профіль
     reported_mailer:
-      hide:
-        hello: Доброго дня, %{name}%!
-        manage_moderations: Керувати діями з модерації
-        report_html: <p>Наступний <a href="%{url}">вміст</a> було автоматично приховано.</p>
-        subject: Ресурс було автоматично приховано
       report:
         hello: Доброго дня, %{name}%!
         report_html: <p>Про наступний <a href="%{url}">вміст</a> було передано скаргу адміністраторам.</p>

data/config/locales/zh-CN.yml

@@ -568,7 +568,6 @@ zh-CN:
       reject_invitation: 拒绝
     group_members:
       actions:
-        are_you_sure: 您确定吗？
         promote_to_admin: 设为管理员
         remove_from_group: Remove participant
       index:
@@ -730,10 +729,8 @@ zh-CN:
       unsubscribe:
         success: 您已成功取消订阅。
         token_error: 链接已过期。
-        unsubscribe: 取消订阅
     newsletters_opt_in_mailer:
       notify:
-        body_1: 个人数据的处理和对数据的保护对我们大家都越来越重要。 根据2018年5月25日新的《一般数据保护条例》，个人可以更好地控制自己的个人数据。 为此原因，我们需要您的“确定”继续发送有关 %{organization_name} 活动的信息。
         body_2: '你如何能够给予我们同意？只需点击下面的按钮：'
         body_3: 如果您同意，您将能够继续接收有关平台服务的信息。 相反，如果我们没有得到你的肯定确认，我们将停止向你发送我们的信息。 如果您确认要随时收到通知，您将随时有取消的选项。
         button: 是的，我想继续收到相关信息
@@ -815,11 +812,6 @@ zh-CN:
           manage_user_group_users: 管理成员
           resend_email_confirmation_instructions: 重新发送电子邮件确认说明
     reported_mailer:
-      hide:
-        hello: 您好 %{name}，
-        manage_moderations: 管理版面
-        report_html: <p>以下 <a href="%{url}">内容</a> 已被自动隐藏。</p>
-        subject: 资源已自动隐藏
       report:
         authors: 作者
         content: 报告的内容

data/config/locales/zh-TW.yml

@@ -546,8 +546,6 @@ zh-TW:
         error: 上傳圖片時發生錯誤.
         success: 圖片上傳成功.
       drag_and_drop_help: 通過拖放或粘貼方式添加圖片。
-    endorsement_buttons_cell:
-      endorse: 喜歡！
     endorsements:
       identities:
         done: 已完成
@@ -816,7 +814,6 @@ zh-TW:
       title: 徽章是什麼？
     group_admins:
       actions:
-        are_you_sure: 確定嗎？這將不會將該參與者從該組中移除。
         demote_admin: 移除管理員
       demote:
         error: 刪除此參與者的管理員名單時發生問題。
@@ -845,7 +842,6 @@ zh-TW:
         error: 加入請求接受時發生問題.
         success: 加入申請已成功接受.
       actions:
-        are_you_sure: 您確定嗎？
         promote_to_admin: 設為管理員
         remove_from_group: 刪除該參與者
       index:
@@ -1058,18 +1054,15 @@ zh-TW:
         main_image: 主圖片
     newsletters:
       unsubscribe:
-        check_subscription: 如果您想更改您的偏好設定，您可以在<a href="%{link}" target="_blank">配置頁面</a>進行更改。
         error: 取消訂閱時發生問題.
         success: 你已經成功取消訂閱
         token_error: 該連結已過期。
-        unsubscribe: 取消訂閱
     newsletters_opt_in:
       update:
         error: 儲存通訊設定時出現問題。
         success: 成功更新電子報設定.
     newsletters_opt_in_mailer:
       notify:
-        body_1: 個人資料的處理和保護對我們所有人來說變得越來越重要。隨著2018年5月25日新的《通用數據保護條例》（GDPR）的出台，個人對其個人資料擁有更好的控制權。因此，我們需要您的「確認」，以繼續向您發送有關 %{organization_name} 活動的相關資訊。
         body_2: '您如何給予我們您的同意？只需點擊下面的按鈕：'
         body_3: 通過此同意，您將能夠繼續接收有關平台服務的資訊。如果您沒有給予積極的確認，我們將停止向您發送訊息。如果您確認希望繼續收到資訊，您隨時可以選擇取消訂閱。
         button: 是的，我希望繼續接收相關資訊。
@@ -1217,11 +1210,6 @@ zh-TW:
         confirmation_instructions_sent: 電子郵件確認指示已發送.
         fill_in_email_to_confirm_it: 請填寫您的群組電子郵件以進行確認.
     reported_mailer:
-      hide:
-        hello: 哈囉，%{name},
-        manage_moderations: 管理版主
-        report_html: <p>以下<a href="%{url}">內容</a>已自動隱藏。</p>
-        subject: 一個資源已被自動隱藏。
       report:
         authors: 作者
         content: 已檢舉內容

data/db/migrate/20171212103803_create_unique_nicknames.rb

@@ -11,7 +11,7 @@ class CreateUniqueNicknames < ActiveRecord::Migration[5.1]
     add_column :decidim_users, :nickname, :string, limit: 20
 
     User.where.not(name: nil).find_each do |user|
-      user.update!(nickname: UserBaseEntity.nicknamize(user.name, decidim_organization_id: user.decidim_organization_id))
+      user.update!(nickname: UserBaseEntity.nicknamize(user.name, user.decidim_organization_id))
     end
 
     add_index :decidim_users,

data/db/migrate/20180221101934_fix_nickname_index.rb

@@ -11,7 +11,7 @@ class FixNicknameIndex < ActiveRecord::Migration[5.1]
     User.where(nickname: nil)
         .where(deleted_at: nil)
         .where(managed: false)
-        .find_each { |u| u.update(nickname: UserBaseEntity.nicknamize(u.name, decidim_organization_id: u.decidim_organization_id)) }
+        .find_each { |u| u.update(nickname: UserBaseEntity.nicknamize(u.name, u.decidim_organization_id)) }
 
     # rubocop:disable Rails/SkipsModelValidations
     User.where(nickname: nil).update_all("nickname = ''")

data/db/migrate/20180706104107_add_nickname_to_managed_users.rb

@@ -7,7 +7,7 @@ class AddNicknameToManagedUsers < ActiveRecord::Migration[5.2]
 
   def up
     User.where(managed: true, nickname: nil).includes(:organization).find_each do |user|
-      user.nickname = UserBaseEntity.nicknamize(user.name, organization: user.organization)
+      user.nickname = UserBaseEntity.nicknamize(user.name, user.decidim_organization_id)
       user.save
     end
   end

data/db/migrate/20181001124950_move_users_groups_to_users_table.rb

@@ -64,7 +64,7 @@ class MoveUsersGroupsToUsersTable < ActiveRecord::Migration[5.2]
         verified_at: old_user_group.verified_at
       }
       new_attributes = clean_attributes.merge(
-        nickname: UserBaseEntity.nicknamize(clean_attributes["name"]),
+        nickname: UserBaseEntity.nicknamize(clean_attributes["name"], old_user_group.decidim_organization_id),
         extended_data:
       )
       new_user_group = NewUserGroup.create!(new_attributes)

data/db/migrate/20190412131728_fix_user_names.rb

@@ -23,7 +23,7 @@ class FixUserNames < ActiveRecord::Migration[5.2]
 
         entity.name = entity.name.delete(characters_to_remove).strip
         sanitized_nickname = entity.nickname.delete(characters_to_remove).strip
-        entity.nickname = UserBaseEntity.nicknamize(sanitized_nickname, organization: entity.organization)
+        entity.nickname = UserBaseEntity.nicknamize(sanitized_nickname, entity.decidim_organization_id)
         entity.save(validate: false)
       end
     end

data/lib/decidim/assets/tailwind/tailwind.config.js.erb

@@ -5,7 +5,7 @@
 // https://docs.decidim.org/en/develop/customize/styles
 //
 
-const { inherit, current, transparent, white } = require("tailwindcss/colors")
+const { inherit, current, transparent, white, neutral } = require("tailwindcss/colors")
 
 const withOpacity =
   (variable) =>
@@ -33,6 +33,7 @@ module.exports = {
       current,
       transparent,
       white,
+      neutral, 
       primary: withOpacity("--primary-rgb"),
       secondary: withOpacity("--secondary-rgb"),
       tertiary: withOpacity("--tertiary-rgb"),

data/lib/decidim/core/test/factories.rb

@@ -127,8 +127,8 @@ FactoryBot.define do
     sequence(:host) { |n| "#{n}.lvh.me" }
     description { generate_localized_description(:organization_description, skip_injection:) }
     favicon { Decidim::Dev.test_file("icon.png", "image/png") }
-    default_locale { Decidim.default_locale }
-    available_locales { Decidim.available_locales }
+    default_locale { "en" }
+    available_locales { %w(en ca es) }
     users_registration_mode { :enabled }
     official_img_footer { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     official_url { Faker::Internet.url }
@@ -932,6 +932,18 @@ FactoryBot.define do
     scopes { "public" }
   end
 
+  factory :private_export, class: "Decidim::PrivateExport" do
+    transient do
+      skip_injection { false }
+      organization { create(:organization) }
+    end
+    expires_at { 1.week.from_now }
+    attached_to { create(:user, organization:, skip_injection:) }
+    export_type { "dummy" }
+    content_type { "application/zip" }
+    file_size { 10.kilobytes }
+  end
+
   factory :searchable_resource, class: "Decidim::SearchableResource" do
     transient do
       skip_injection { false }

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

@@ -14,6 +14,8 @@ shared_examples "manage announcements" do
 
     click_on "Update"
 
+    expect(page).to have_content "The component was updated successfully"
+
     visit main_component_path(current_component)
 
     within page.find("[data-announcement]", match: :first) do
@@ -48,6 +50,8 @@ shared_examples "manage announcements" do
 
       click_on "Update"
 
+      expect(page).to have_content "The component was updated successfully"
+
       visit main_component_path(current_component)
 
       within page.find("[data-announcement]", match: :first) do

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

@@ -181,10 +181,10 @@ shared_examples "comments" do
         click_on "Accept all"
         login_as user, scope: :user
         visit resource_path
-      end
-
-      it "shows the add comment button" do
-        expect(page).to have_content("Add comment")
+        if page.has_content?("Log in")
+          login_as user, scope: :user
+          visit resource_path
+        end
       end
 
       it "does not show a message so user can Log in or create an account" do
@@ -192,7 +192,7 @@ shared_examples "comments" do
       end
 
       it "shows a modal with the comment form" do
-        sleep 1
+        expect(page).to have_content("Add comment")
         click_on "Add comment"
         sleep 1
         expect(page).to have_content("Add comment")
@@ -567,6 +567,8 @@ shared_examples "comments" do
           field.native.send_keys content
           click_on "Publish comment"
         end
+
+        expect(page).to have_content(content)
       end
 
       it "shows comment to the user, updates the comments counter and clears the comment textarea" do

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

@@ -203,8 +203,8 @@ shared_examples "a record with front-end geocoding address field" do |geocoded_m
     # geocoding should be bypassed in this situation which is why these match
     # what was returned by the front-end geocoding. These values are returned by
     # the dummy test geocoding API defined at
-    # `decidim-dev/lib/decidim/dev/test/rspec_support/geocoder.rb`. Search for
-    # `:serves_geocoding_autocomplete`.
+    # `decidim-dev/lib/decidim/dev/test/map_server.rb`. Search for
+    # `serve_autocomplete`.
     expect(page).to have_content("successfully")
     final = if geocoded_record
               geocoded_model.find(geocoded_record.id)

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"
+      "0.30.2"
     end
   end
 end

data/lib/decidim/form_builder.rb

@@ -92,6 +92,20 @@ module Decidim
       safe_join [label_tabs, tabs_content]
     end
 
+    def datetime_field(attribute, opts = {})
+      label = label_for(attribute)
+      opts.reverse_merge!(
+        data: {
+          "date-label": I18n.t("datetime.widget.label.date", label:),
+          "time-label": I18n.t("datetime.widget.label.time", label:),
+          "button-date-label": I18n.t("datetime.widget.picker.date_button", label:),
+          "button-time-label": I18n.t("datetime.widget.picker.time_button", label:)
+        }
+      )
+
+      super
+    end
+
     def password_field(attribute, options = {})
       field attribute, options do |opts|
         opts[:autocomplete] ||= :off

data/lib/decidim/nicknamizable.rb

@@ -27,19 +27,16 @@ module Decidim
       # * Disambiguates it so it is unique.
       #
       # name - the String to nicknamize
-      # scope - a Hash with extra values to scope the nickname to
+      # organization_id - the organization id we are using as scope for the uniqueness
       #
       # Example to nicknamize a user name, scoped to the organization:
       #
-      #    nicknamize(user_name, organization: current_organization)
+      #    nicknamize(user_name, organization_id)
       #
-      def nicknamize(name, scope = {})
+      def nicknamize(name, organization_id)
         return unless name
 
-        disambiguate(
-          name.parameterize(separator: "_")[nickname_length_range],
-          scope
-        )
+        disambiguate(name.parameterize(separator: "_")[nickname_length_range], organization_id)
       end
 
       private
@@ -48,11 +45,11 @@ module Decidim
         (0...nickname_max_length)
       end
 
-      def disambiguate(name, scope)
+      def disambiguate(name, organization_id)
         candidate = name
 
         2.step do |n|
-          return candidate if Decidim::UserBaseEntity.where(nickname: candidate.downcase).where(scope).empty?
+          return candidate if Decidim::UserBaseEntity.where(nickname: candidate.downcase).where(decidim_organization_id: organization_id).empty?
 
           candidate = numbered_variation_of(name, n)
         end

data/lib/decidim/private_download_helper.rb

@@ -2,10 +2,10 @@
 
 module Decidim
   module PrivateDownloadHelper
-    def attach_archive(export_data, name, user)
+    def attach_archive(export_data, file_name, user, export_type = nil)
       private_exports = user.private_exports.build
-      private_exports.export_type = name
-      private_exports.file.attach(io: StringIO.open(FileZipper.new(export_data.filename(name), export_data.read).zip), filename: "#{name}.zip")
+      private_exports.export_type = export_type || file_name
+      private_exports.file.attach(io: StringIO.open(FileZipper.new(export_data.filename(file_name), export_data.read).zip), filename: "#{file_name}.zip")
       private_exports.expires_at = Decidim.download_your_data_expiry_time.from_now
       private_exports.metadata = {}
       private_exports.save!

data/lib/tasks/upgrade/clean.rake

@@ -11,7 +11,8 @@ namespace :decidim do
         :"decidim:upgrade:clean:categories",
         :"decidim:upgrade:clean:action_logs",
         :"decidim:upgrade:clean:clean_deleted_users",
-        :"decidim:upgrade:clean:fix_blocked_user_notification"
+        :"decidim:upgrade:clean:fix_blocked_user_notification",
+        :"decidim:upgrade:clean:invalid_private_exports"
       ]
 
       desc "Remove data from deleted users"
@@ -140,6 +141,13 @@ namespace :decidim do
         logger.info("===== Updated #{blocked_users} blocked users")
       end
 
+      desc "Removes all the invalid records from private downloads"
+      task invalid_private_exports: :environment do
+        invalid_private_exports = Decidim::PrivateExport.where("export_type ~ '^survey_user_answers_[0-9a-f]{64}$'")
+        logger.info("=== Removing #{invalid_private_exports.length} private exports")
+        invalid_private_exports.delete_all
+      end
+
       def logger
         @logger ||= Logger.new($stdout)
       end

data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake

@@ -16,7 +16,7 @@ namespace :decidim do
             has_changed << user.id
           end
         rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
-          update_user_nickname(user, Decidim::UserBaseEntity.nicknamize(user.nickname, organization: user.organization))
+          update_user_nickname(user, Decidim::UserBaseEntity.nicknamize(user.nickname, user.decidim_organization_id))
           has_changed << user.id
         rescue ActiveRecord::RecordInvalid # rubocop:disable Lint/DuplicateRescueException
           logger.warn("User ID (#{user.id}) : #{e}")

data/lib/tasks/upgrade/migrations.rake

@@ -75,7 +75,9 @@ namespace :decidim do
       end
 
       new_source = "#{magic_comments}#{inserted_comment}#{source}"
+
       old_source = File.binread(target_file)
+      old_source = old_source.gsub(/# This file has been modified by `decidim upgrade:migrations` task on (.*)\n/, "")
 
       return if old_source == new_source
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.30.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2025-09-23 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
+        version: 0.30.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.30.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.30.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.30.2
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1606,6 +1606,7 @@ files:
 - app/packs/src/decidim/direct_uploads/upload_modal.js
 - app/packs/src/decidim/direct_uploads/upload_utility.js
 - app/packs/src/decidim/direct_uploads/uploader.js
+- app/packs/src/decidim/dropdown_menu.js
 - app/packs/src/decidim/editor/common/bubble_menu.js
 - app/packs/src/decidim/editor/common/helpers.js
 - app/packs/src/decidim/editor/common/input_dialog.js
@@ -2080,7 +2081,8 @@ files:
 - app/views/decidim/pages/show.html.erb
 - app/views/decidim/participatory_space_private_users/_participatory_space_private_user.html.erb
 - app/views/decidim/profiles/show.html.erb
-- app/views/decidim/reported_mailer/hide.html.erb
+- app/views/decidim/reported_mailer/hidden_automatically.html.erb
+- app/views/decidim/reported_mailer/hidden_manually.html.erb
 - app/views/decidim/reported_mailer/report.html.erb
 - app/views/decidim/searches/_count.html.erb
 - app/views/decidim/searches/_filters.html.erb