decidim-assemblies 0.29.5 → 0.30.0.rc1

data/config/locales/zh-CN.yml

@@ -2,8 +2,6 @@
 zh-CN:
   activemodel:
     attributes:
-      assemblies_type:
-        title: 标题
       assembly:
         area_id: 区域
         assembly_type: 程序集类型
@@ -19,7 +17,6 @@ zh-CN:
         created_by_other: 由其他人创建
         creation_date: 创建日期
         decidim_area_id: 区域
-        decidim_assemblies_type_id: 程序集类型
         decidim_scope_id: 范围
         description: 描述
         developer_group: 促销者组
@@ -31,7 +28,6 @@ zh-CN:
         hero_image: 首页图像
         included_at: 包含于
         instagram: Instagram
-        internal_organisation: 内部组织
         is_transparent: 是否透明度
         local_area: 组织区域
         meta_scope: 范围元数据
@@ -43,8 +39,6 @@ zh-CN:
         promoted: 高亮
         published_at: 发布于
         purpose_of_action: 行动的目的
-        scope_id: 范围
-        scopes_enabled: 范围已启用
         short_description: 简短描述
         slug: URL 名称
         special_features: 特殊功能
@@ -77,11 +71,9 @@ zh-CN:
       actions:
         import_assembly: 导入
         new_assembly: 新建程序集
-        new_assembly_type: 新装配体类型
       assemblies:
         create:
           error: 创建新议会时出现问题。
-          success: 程序集创建成功。
         edit:
           update: 更新
         index:
@@ -94,21 +86,15 @@ zh-CN:
         update:
           error: 更新这个组件时出现问题。
           success: 程序更新成功。
-      assemblies_types:
+      assemblies_copies:
         create:
-          error: 创建新组装类型时出现问题。
-          success: 程序集类型创建成功。
-        destroy:
-          success: 程序集类型已成功删除。
-        new:
-          create: 创建
-          title: 新装配体类型
-        update:
-          error: 更新此组装类型时出现问题。
-          success: 程序类型已成功更新。
+          error: 复制这个组件时出现问题。
+          success: 已成功复制组合。
       assembly_copies:
         new:
           copy: 复制
+          select: 选择要重复的数据
+          title: 复制程序集
       assembly_imports:
         create:
           error: 导入此组件时出现问题。
@@ -117,21 +103,6 @@ zh-CN:
           import: 导入
           select: 选择您想要导入的数据
           title: 导入程序集
-      assembly_members:
-        create:
-          error: 在为这个会议添加成员时出现问题。
-          success: 会员已成功创建此程序集。
-        destroy:
-          success: 成功删除此组件的会员。
-        edit:
-          update: 更新
-        index:
-          assembly_members_title: 大会成员
-        new:
-          create: 创建
-        update:
-          error: 更新这个会议的成员时出现问题。
-          success: 会员已成功更新此程序集。
       assembly_publications:
         create:
           error: 发布这个组件时出现问题。
@@ -154,26 +125,16 @@ zh-CN:
         update:
           error: 更新这个会议的管理员时出现问题。
           success: 管理员已成功更新此程序集。
-      filters:
-        decidim_assemblies_type_id_eq:
-          label: 程序集类型
       menu:
         assemblies: 程序集
         assemblies_submenu:
           assembly_admins: 集合管理员
-          assembly_members: 成员
           attachment_collections: 文件夹
           attachment_files: 文件
           attachments: 附件
-          categories: 类别管理
           components: 组件
           moderations: 版面
-        assemblies_types: 程序集类型
       models:
-        assemblies_types:
-          fields:
-            created_at: 创建于
-            title: 标题
         assembly:
           fields:
             created_at: 创建于
@@ -183,11 +144,6 @@ zh-CN:
             title: 标题
           name: 程序集
         assembly_member:
-          fields:
-            ceased_date: 缓存日期
-            designation_date: 指定日期
-            full_name: 名称
-            position: 位置
           name: 成员
           positions:
             other: 其他
@@ -235,26 +191,13 @@ zh-CN:
           form:
             duration: 期限
             duration_help: 如果这个程序集的持续时间有限，请选择结束日期。否则，它将显示为无限期。
-            filters: 筛选器
             images: 图像
             metadata: 元数据
             other: 其他
             select_a_created_by: 选择创建者：
-            select_an_area: 选择区域
-            select_an_assembly_type: 选择程序集类型
             select_parent_assembly: 选择父程序集
             social_handlers: 社交活动
             title: 一般信息
-        assemblies_types:
-          form:
-            title: 标题
-        assembly_members:
-          form:
-            existing_user: 现有参与者
-            non_user: Non participant
-            select_a_position: 选择一个位置
-            select_user: 选择一名参与者
-            user_type: 参与者类型
         content_blocks:
           highlighted_assemblies:
             max_results: 显示元素的最大数量
@@ -265,14 +208,6 @@ zh-CN:
       assembly_members:
         index:
           members: 成员
-      assembly_types:
-        commission: 加密的
-        consultative_advisory: 咨询/咨询
-        executive: 行政机构
-        government: 政府
-        others: 其 他
-        participatory: 参与
-        working_group: 工作组
       content_blocks:
         highlighted_assemblies:
           name: 突出显示的会议
@@ -297,12 +232,9 @@ zh-CN:
           member_of:
             member_of: 成员
       show:
-        assembly_type: 程序集类型
         duration: 期限
         private_space: 这是一个私人装饰
     assembly_members:
-      assembly_member:
-        designated_on: 指定于
       index:
         title: 成员
     events:

data/config/locales/zh-TW.yml

@@ -2,8 +2,6 @@
 zh-TW:
   activemodel:
     attributes:
-      assemblies_type:
-        title: 標題
       assembly:
         announcement: 公告
         area_id: 區域
@@ -20,7 +18,6 @@ zh-TW:
         created_by_other: 由其他人創建
         creation_date: 創建日期
         decidim_area_id: 區域
-        decidim_assemblies_type_id: 大會類型
         decidim_scope_id: 範圍
         description: 說明
         developer_group: 促銷團隊
@@ -36,7 +33,6 @@ zh-TW:
         import_components: 導入組件
         included_at: 包含於
         instagram: Instagram
-        internal_organisation: 內部組織
         is_transparent: 透明
         local_area: 組織區域
         meta_scope: 元數據範圍
@@ -48,8 +44,6 @@ zh-TW:
         promoted: 重點顯示
         published_at: 發佈於
         purpose_of_action: 行動目的
-        scope_id: 範圍
-        scopes_enabled: 啟用範圍
         short_description: 簡短說明
         slug: URL名稱
         special_features: 特殊功能
@@ -92,11 +86,9 @@ zh-TW:
       actions:
         import_assembly: 匯入
         new_assembly: 新大會
-        new_assembly_type: 新大會類型
       assemblies:
         create:
           error: 建立新大會時發生問題
-          success: 大會創建成功
         edit:
           update: 更新
         index:
@@ -109,21 +101,15 @@ zh-TW:
         update:
           error: 更新此大會時出現問題
           success: 此大會成功更新
-      assemblies_types:
+      assemblies_copies:
         create:
-          error: 創建新大會類型時出現問題
-          success: 大會類型創建成功
-        destroy:
-          success: 集會類型已成功刪除
-        new:
-          create: 創建
-          title: 新大會類型
-        update:
-          error: 更新此大會時出現問題
-          success: 大會類型已成功更新
+          error: 複製此大會時出現問題
+          success: 大會已成功複製
       assembly_copies:
         new:
           copy: 複製
+          select: 請選擇您想要複製的資料
+          title: 複製大會
       assembly_imports:
         create:
           error: 這個大會匯入時發生了問題
@@ -132,21 +118,6 @@ zh-TW:
           import: 匯入
           select: 請選擇您想匯入的資料
           title: 匯入大會
-      assembly_members:
-        create:
-          error: 這個大會中添加成員時出現了問題
-          success: 已成功建立此大會的成員
-        destroy:
-          success: 該大會的成員已成功刪除
-        edit:
-          update: 更新
-        index:
-          assembly_members_title: 大會成員
-        new:
-          create: 創建
-        update:
-          error: 更新此大會的成員時出現問題。
-          success: 此大會的成員已成功更新。
       assembly_publications:
         create:
           error: 發布此大會時出現問題。
@@ -169,26 +140,16 @@ zh-TW:
         update:
           error: 更新此大會的管理員時出現問題
           success: 此大會的管理員已成功更新。
-      filters:
-        decidim_assemblies_type_id_eq:
-          label: 大會類型
       menu:
         assemblies: 大會
         assemblies_submenu:
           assembly_admins: 大會管理員
-          assembly_members: 成員
           attachment_collections: 資料夾
           attachment_files: 檔案
           attachments: 附件
-          categories: 類別
           components: 元件
           moderations: 版主
-        assemblies_types: 大會類型
       models:
-        assemblies_types:
-          fields:
-            created_at: 建立於
-            title: 標題
         assembly:
           fields:
             created_at: 建立於
@@ -198,11 +159,6 @@ zh-TW:
             title: 標題
           name: 大會
         assembly_member:
-          fields:
-            ceased_date: 終止日期
-            designation_date: 指定日期
-            full_name: 姓名
-            position: 位置
           name: 成員
           positions:
             other: 其他
@@ -255,29 +211,18 @@ zh-TW:
             announcement_help: 您在此處輸入的文字將顯示至使用者的正下方大會信息
             duration: 持續時間
             duration_help: 如果此大會的持續時間有限，請選擇結束日期。 否則，它將顯示為不確定。
-            filters: 篩選條件
             images: 圖片
             included_at_help: 選擇此大會添加到平台的日期。 它不一定必須與創建日期相同。
             metadata: 元資料
             other: 其他
             select_a_created_by: 選擇一位創建者
-            select_an_area: 選擇一個地區
-            select_an_assembly_type: 選擇一個大會類型
             select_parent_assembly: 選擇父組件
             social_handlers: 社群
             title: 基本資訊
-        assemblies_types:
-          form:
-            title: 標題
         assembly_members:
           form:
-            existing_user: 現有參與者
             explanation: '圖像的指導'
-            non_user: 非參與者
             non_user_avatar_help: 在發佈他們為會員之前，您應該徵得他們的同意
-            select_a_position: 選擇一個位置
-            select_user: 選擇與會者：
-            user_type: 參與者類型
         content_blocks:
           highlighted_assemblies:
             max_results: 顯示的最大元素數量
@@ -293,14 +238,6 @@ zh-TW:
       assembly_members:
         index:
           members: 成員
-      assembly_types:
-        commission: 手續費
-        consultative_advisory: 諮詢/顧問
-        executive: 管理人員
-        government: 政府
-        others: 其他
-        participatory: 參與式
-        working_group: 工作群組
       content_blocks:
         highlighted_assemblies:
           name: 關注的大會
@@ -327,13 +264,10 @@ zh-TW:
           member_of:
             member_of: 的成員
       show:
-        assembly_type: 大會類型
         duration: 持續時間
         private_space: 這是一個私人大會
         social_networks_title: 訪問大會
     assembly_members:
-      assembly_member:
-        designated_on: 指定於
       index:
         title: 成員
     events:

data/db/migrate/20190215093700_reset_negative_children_count_counters.rb

@@ -2,7 +2,7 @@
 
 class ResetNegativeChildrenCountCounters < ActiveRecord::Migration[5.2]
   def change
-    ids = Decidim::Assembly.where("children_count < 0").pluck(:id)
-    ids.each { |id| Decidim::Assembly.reset_counters(id, :children_count) }
+    ids = Decidim::Assembly.unscoped.where("children_count < 0").pluck(:id)
+    ids.each { |id| Decidim::Assembly.unscoped.reset_counters(id, :children_count) }
   end
 end

data/db/migrate/20210310120444_add_followable_counter_cache_to_assemblies.rb

@@ -7,7 +7,7 @@ class AddFollowableCounterCacheToAssemblies < ActiveRecord::Migration[5.2]
     reversible do |dir|
       dir.up do
         Decidim::Assembly.reset_column_information
-        Decidim::Assembly.find_each do |record|
+        Decidim::Assembly.unscoped.find_each do |record|
           record.class.reset_counters(record.id, :follows)
         end
       end

data/db/migrate/20240822161222_add_deleted_at_to_decidim_assemblies.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddDeletedAtToDecidimAssemblies < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_assemblies, :deleted_at, :datetime
+    add_index :decidim_assemblies, :deleted_at
+  end
+end

data/db/migrate/20241016101151_migrate_assembly_members_to_private_users.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class MigrateAssemblyMembersToPrivateUsers < ActiveRecord::Migration[7.0]
+  class AssemblyMember < ApplicationRecord
+    self.table_name = :decidim_assembly_members
+  end
+
+  class ParticipatorySpacePrivateUser < ApplicationRecord
+    self.table_name = :decidim_participatory_space_private_users
+  end
+
+  def up
+    AssemblyMember.find_each do |assembly_member|
+      next if assembly_member.ceased_date
+      next unless assembly_member.decidim_user_id
+
+      attrs = {
+        privatable_to_id: assembly_member.decidim_assembly_id,
+        privatable_to_type: "Decidim::Assembly",
+        decidim_user_id: assembly_member.decidim_user_id
+      }
+
+      next if ParticipatorySpacePrivateUser.find_by(attrs)
+
+      role = case assembly_member.position
+             when "president"
+               translated_role("decidim.admin.models.assembly_member.positions.president")
+             when "vice_president"
+               translated_role("decidim.admin.models.assembly_member.positions.vice_president")
+             when "secretary"
+               translated_role("decidim.admin.models.assembly_member.positions.secretary")
+             when "other"
+               { I18n.locale.to_s => assembly_member.position_other }
+             end
+
+      Rails.logger.debug { "Migrating assembly member #{assembly_member.id} to private user" }
+
+      ParticipatorySpacePrivateUser.create!(attrs.merge(role:))
+    end
+  end
+
+  def down; end
+
+  private
+
+  def translated_role(key)
+    I18n.available_locales.each_with_object({}) do |locale, hash|
+      I18n.with_locale(locale) do
+        hash[locale.to_s] = I18n.t(key)
+      end
+    end
+  end
+end

data/db/migrate/20241108141651_remove_column_show_statistics_from_assemblies.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveColumnShowStatisticsFromAssemblies < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :decidim_assemblies, :show_statistics, :string
+  end
+end

data/decidim-assemblies.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.2.0"
+  s.required_ruby_version = "~> 3.3.0"
 
   s.name = "decidim-assemblies"
   s.summary = "Decidim assemblies module"

data/lib/decidim/api/assemblies_type_type.rb

@@ -6,11 +6,11 @@ module Decidim
     class AssembliesTypeType < Decidim::Api::Types::BaseObject
       description "An assemblies type"
 
+      field :assemblies, [Decidim::Assemblies::AssemblyType, { null: true }], "Assemblies with this assemblies type", null: false
+      field :created_at, Decidim::Core::DateTimeType, "The time this assemblies type was created", null: false
       field :id, GraphQL::Types::ID, "The assemblies type's unique ID", null: false
       field :title, Decidim::Core::TranslatedFieldType, "The title of this assemblies type.", null: false
-      field :created_at, Decidim::Core::DateTimeType, "The time this assemblies type was created", null: false
       field :updated_at, Decidim::Core::DateTimeType, "The time this assemblies type was updated", null: false
-      field :assemblies, [Decidim::Assemblies::AssemblyType, { null: true }], "Assemblies with this assemblies type", null: false
     end
   end
 end

data/lib/decidim/api/assembly_type.rb

@@ -7,57 +7,55 @@ module Decidim
       implements Decidim::Core::ParticipatorySpaceInterface
       implements Decidim::Core::AttachableInterface
       implements Decidim::Core::ParticipatorySpaceResourceableInterface
+      implements Decidim::Core::TaxonomizableInterface
       implements Decidim::Core::CategoriesContainerInterface
+      implements Decidim::Core::TimestampsInterface
 
       description "An assembly"
 
-      field :id, ID, "The internal ID for this assembly", null: false
-      field :subtitle, Decidim::Core::TranslatedFieldType, "The subtitle of this assembly", null: true
-      field :short_description, Decidim::Core::TranslatedFieldType, "The sort description of this assembly", null: true
-      field :description, Decidim::Core::TranslatedFieldType, "The description of this assembly", null: true
-      field :slug, String, "The slug of this assembly", null: false
-      field :hashtag, String, "The hashtag for this assembly", null: true
-      field :created_at, Decidim::Core::DateTimeType, "The time this assembly was created", null: false
-      field :updated_at, Decidim::Core::DateTimeType, "The time this assembly was updated", null: false
-      field :published_at, Decidim::Core::DateTimeType, "The time this assembly was published", null: false
-      field :reference, String, "Reference for this assembly", null: false
-
-      field :hero_image, String, "The hero image for this assembly", null: true
-      field :banner_image, String, "The banner image for this assembly", null: true
-      field :promoted, Boolean, "If this assembly is promoted (therefore in the homepage)", null: true
-      field :developer_group, Decidim::Core::TranslatedFieldType, "The promoter group of this assembly", null: true
-      field :meta_scope, Decidim::Core::TranslatedFieldType, "The scope metadata of this assembly", null: true
-      field :local_area, Decidim::Core::TranslatedFieldType, "The organization area of this assembly", null: true
-      field :target, Decidim::Core::TranslatedFieldType, "Who participates in this assembly", null: true
-      field :participatory_scope, Decidim::Core::TranslatedFieldType, "What is decided on this assembly", null: true
-      field :participatory_structure, Decidim::Core::TranslatedFieldType, "How it is decided on this assembly", null: true
-      field :scopes_enabled, Boolean, "If this assembly has scopes enabled", null: true
-      field :private_space, Boolean, "If this assembly is a private space", null: true
+      field :announcement, Decidim::Core::TranslatedFieldType, "Highlighted announcement for this assembly", null: true
       field :area, Decidim::Core::AreaApiType, "Area of this assembly", null: true
-      field :parent, Decidim::Assemblies::AssemblyType, "The parent assembly of this assembly", null: true
-      field :parents_path, String, "Assembly hierarchy representation", null: true
+      field :assembly_type, Decidim::Assemblies::AssembliesTypeType, "Type of the assembly", null: true
+      field :banner_image, String, "The banner image for this assembly", null: true
       field :children_count, Integer, "Number of children assemblies", null: true
-      field :purpose_of_action, Decidim::Core::TranslatedFieldType, "Purpose of action", null: true
+      field :closing_date, Decidim::Core::DateType, "Closing date of the assembly", null: true
+      field :closing_date_reason, Decidim::Core::TranslatedFieldType, "Closing date reason of this assembly", null: true
       field :composition, Decidim::Core::TranslatedFieldType, "Composition of this assembly", null: true
-      field :assembly_type, Decidim::Assemblies::AssembliesTypeType, "Type of the assembly", null: true
-      field :creation_date, Decidim::Core::DateType, "Creation date of this assembly", null: true
       field :created_by, String, "The creator of this assembly", null: true
       field :created_by_other, Decidim::Core::TranslatedFieldType, "Custom creator", null: true
+      field :creation_date, Decidim::Core::DateType, "Creation date of this assembly", null: true
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this assembly", null: true
+      field :developer_group, Decidim::Core::TranslatedFieldType, "The promoter group of this assembly", null: true
       field :duration, Decidim::Core::DateType, "Duration of this assembly", null: true
+      field :facebook_handler, String, "Facebook handler", null: true
+      field :github_handler, String, "GitHub handler", null: true
+      field :hashtag, String, "The hashtag for this assembly", null: true
+      field :hero_image, String, "The hero image for this assembly", null: true
+      field :id, ID, "The internal ID for this assembly", null: false
       field :included_at, Decidim::Core::DateType, "Included at", null: true
-      field :closing_date, Decidim::Core::DateType, "Closing date of the assembly", null: true
-      field :closing_date_reason, Decidim::Core::TranslatedFieldType, "Closing date reason of this assembly", null: true
+      field :instagram_handler, String, "Instagram handler", null: true
       field :internal_organisation, Decidim::Core::TranslatedFieldType, "Internal organisation of this assembly", null: true
       field :is_transparent, Boolean, "If this assembly is transparent", null: true
+      field :local_area, Decidim::Core::TranslatedFieldType, "The organization area of this assembly", null: true
+      field :meta_scope, Decidim::Core::TranslatedFieldType, "The scope metadata of this assembly", null: true
+      field :parent, Decidim::Assemblies::AssemblyType, "The parent assembly of this assembly", null: true
+      field :parents_path, String, "Assembly hierarchy representation", null: true
+      field :participatory_scope, Decidim::Core::TranslatedFieldType, "What is decided on this assembly", null: true
+      field :participatory_structure, Decidim::Core::TranslatedFieldType, "How it is decided on this assembly", null: true
+      field :private_space, Boolean, "If this assembly is a private space", null: true
+      field :promoted, Boolean, "If this assembly is promoted (therefore in the homepage)", null: true
+      field :published_at, Decidim::Core::DateTimeType, "The time this assembly was published", null: false
+      field :purpose_of_action, Decidim::Core::TranslatedFieldType, "Purpose of action", null: true
+      field :reference, String, "Reference for this assembly", null: false
+      field :scopes_enabled, Boolean, "If this assembly has scopes enabled", null: true
+      field :short_description, Decidim::Core::TranslatedFieldType, "The sort description of this assembly", null: true
+      field :slug, String, "The slug of this assembly", null: false
       field :special_features, Decidim::Core::TranslatedFieldType, "Special features of this assembly", null: true
+      field :subtitle, Decidim::Core::TranslatedFieldType, "The subtitle of this assembly", null: true
+      field :target, Decidim::Core::TranslatedFieldType, "Who participates in this assembly", null: true
       field :twitter_handler, String, "Twitter handler", null: true
-      field :instagram_handler, String, "Instagram handler", null: true
-      field :facebook_handler, String, "Facebook handler", null: true
       field :youtube_handler, String, "YouTube handler", null: true
-      field :github_handler, String, "GitHub handler", null: true
-      field :announcement, Decidim::Core::TranslatedFieldType, "Highlighted announcement for this assembly", null: true
 
-      field :members, [Decidim::Assemblies::AssemblyMemberType, { null: true }], "Members of this assembly", null: false
       field :children, [Decidim::Assemblies::AssemblyType, { null: true }], "Children of this assembly", null: false
 
       def hero_image