decidim-proposals 0.29.3 → 0.30.0.rc1

data/config/locales/zh-TW.yml

@@ -5,7 +5,6 @@ zh-TW:
       collaborative_draft:
         address: 地址
         body: 內容
-        category_id: 類別
         decidim_scope_id: 範圍
         has_address: 有地址
         scope_id: 範圍
@@ -18,7 +17,6 @@ zh-TW:
         answered_at: 回答
         automatic_hashtags: 已自動添加標籤
         body: 內容
-        category_id: 類別
         decidim_scope_id: 範圍
         has_address: 有地址
         scope_id: 範圍
@@ -67,8 +65,6 @@ zh-TW:
             base:
               not_official: 非正式
     models:
-      decidim/proposals/admin/update_proposal_category_event: 提案類別已更改
-      decidim/proposals/admin/update_proposal_scope_event: 提案範圍已更改
       decidim/proposals/creation_enabled_event: 建立提案已啟用
       decidim/proposals/endorsing_enabled_event: 提案連署功能已啟用
       decidim/proposals/proposal_mentioned_event: 提案已被提及
@@ -86,15 +82,11 @@ zh-TW:
     admin:
       filters:
         proposals:
-          category_id_eq:
-            label: 類別
           is_emendation_true:
             label: 類別
             values:
               'false': 提案
               'true': 修正案
-          scope_id_eq:
-            label: 範圍
           state_eq:
             label: 狀態
             values:
@@ -113,7 +105,6 @@ zh-TW:
         actions:
           amend: 修訂
           comment: 評論
-          create: 建立
           endorse: 連署
           vote_comment: 投票評論
           withdraw: 撤回
@@ -136,7 +127,6 @@ zh-TW:
               random: 隨機
               recent: 最近
               with_more_authors: 有更多作者
-            geocoding_enabled: 地理編碼已啟用
             new_proposal_body_template: 新提案正文樣板
             new_proposal_body_template_help: 您可以定義新提案預先填寫的文字
             new_proposal_help_text: 新提案幫助文本
@@ -144,7 +134,6 @@ zh-TW:
             participatory_texts_enabled: 參與式文字已啟用
             participatory_texts_enabled_readonly: 如果已經存在提案，則無法與此設置互動。如果您想要啟用此功能，請創建一個新的“提案組件”，或者如果要禁用此功能，請在“參與式文字”選單中放棄所有已匯入的提案。
             proposal_answering_enabled: 提案回答已啟用
-            proposal_edit_before_minutes: 在幾分鐘後，作者可以編輯提案
             proposal_edit_time: 編輯提案
             proposal_edit_time_choices:
               infinite: 允許無限時間編輯提案
@@ -153,8 +142,6 @@ zh-TW:
             proposal_limit: 參與者可提出提案的上限
             proposal_wizard_step_1_help_text: 提案向導「創建」步驟說明文字
             resources_permissions_enabled: 每個提案都可以設定行動權限
-            scope_id: 範圍
-            scopes_enabled: 啟用範圍
             threshold_per_proposal: 每個提案的門檻
           step:
             amendment_creation_enabled: 創建修正案已啟用
@@ -192,10 +179,8 @@ zh-TW:
       proposals:
         admin:
           proposal_note_created:
-            email_intro: 有人在提案「%{resource_title}」上留了一則留言。在<a href="%{admin_proposal_info_url}">管理員面板</a>檢查它。
             email_outro: 您收到此通知，因為您可以對提案進行評估。
             email_subject: 有人在提案 %{resource_title} 上留下了一則註記。
-            notification_title: 有人在提案「<a href="%{resource_path}">%{resource_title}</a>」上留了一則留言。請至<a href="%{admin_proposal_info_path}">管理面板</a>查看。
         collaborative_draft_access_accepted:
           email_intro: '%{requester_name} 已經被接受成為 <a href="%{resource_url}">%{resource_title}</a> 協作草稿的貢獻者。'
           email_outro: 您收到此通知，是因為您是 <a href="%{resource_url}">%{resource_title}</a> 的協作者。
@@ -252,22 +237,14 @@ zh-TW:
           email_subject: 新增提案「%{resource_title}」至「%{participatory_space_title}」。
           notification_title: '%{author} 將提案<a href="%{resource_path}">%{resource_title}</a>新增至%{participatory_space_title}.'
           notification_title_official: 官方提案 <a href="%{resource_path}">%{resource_title}</a> 已經被添加到 %{participatory_space_title}.
-        proposal_update_category:
-          email_intro: '管理員已更新您的提案 "%{resource_title}" 的分類，請前往此頁面查看：'
-          email_subject: '「%{resource_title}」提案的分類已更新'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> 提案類別已由管理員更新。
-        proposal_update_scope:
-          email_intro: '一位管理員已更新您的提案"%{resource_title}" 的範圍，您可以在此頁面檢查：'
-          email_subject: '%{resource_title} 提案範圍已更新'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> 提案範圍已由管理員更新。
         voting_enabled:
           email_outro: 你收到此通知是因為你正在追蹤 %{participatory_space_title}。你可以透過前面的連結停止接收通知。
     gamification:
       badges:
         accepted_proposals:
           conditions:
-            - 選擇您有興趣的參與空間並啟用提交提案功能
-            - 嘗試提出可以實現的提案，這樣它們更有可能被接受。
+          - 選擇您有興趣的參與空間並啟用提交提案功能
+          - 嘗試提出可以實現的提案，這樣它們更有可能被接受。
           description: 這個徽章是當你積極參與提出新的提案並且這些提案被接受時授予的。
           description_another: 這個參與者有 %{score} 個被接受的提案。
           description_own: 您有 %{score} 個提案被接受。
@@ -277,12 +254,12 @@ zh-TW:
           unearned_own: 你尚未有任何提案被接受。
         proposal_votes:
           conditions:
-            - 瀏覽並花些時間閱讀其他人的提案
-            - 
+          - 瀏覽並花些時間閱讀其他人的提案
+          - 
         proposals:
           conditions:
-            - 選擇您有興趣的參與空間並啟用提交提案功能
-            - 提出新的提案
+          - 選擇您有興趣的參與空間並啟用提交提案功能
+          - 提出新的提案
           description: 當您積極參與新提案時，將獲得此徽章。
           description_another: 這個參與者已經創建了 %{score} 個提案。
           description_own: 您已經建立了 %{score} 個提案。
@@ -303,8 +280,6 @@ zh-TW:
         description: 提案總數
         object: 提案
         title: 提案
-      votes:
-        title: 投票
     participatory_spaces:
       highlighted_proposals:
         see_all: 檢視所有提案
@@ -324,24 +299,6 @@ zh-TW:
           proposal_comments: 評論
           proposals: 提案
         imports:
-          help:
-            answers: |
-              匯入文件如果是 CSV 或 Excel 檔案，應包含以下列名，如果是 JSON 檔案，則應包含以下名稱：
-
-              <ul>
-              <li><b>id：</b>要回答的提案的 ID</li>
-              <li><b>state：</b>狀態之一，可以是 "接受"、"評估中" 或 "拒絕"</li>
-              <li><b>answer/en：</b>英文語言的答案。這將取決於您平台的語言設置。</li>
-              </ul>
-            proposals: |
-              在 CSV 或 Excel 文件的情況下，或在 JSON 文件的情況下，文件必須具有以下列名稱：
-
-              <ul>
-              <li><b>title/en：</b>英文標題，這取決於您平台的語言配置。</li>
-              <li><b>body/en：</b>英文正文，這取決於您平台的語言配置。</li>
-              <li><b>scope/id：</b>範圍的 ID。</li>
-              <li><b>category/id：</b>類別的 ID。</li>
-              </ul>
           label:
             answers: 從檔案匯入回覆
             proposals: 從檔案匯入提案
@@ -396,30 +353,23 @@ zh-TW:
           form:
             note: 附註
             submit: 提交
-          leave_your_note: 留下您的註記
           title: 私有注解
         proposals:
           answer:
-            invalid: 回答這個提案時出現了問題.
             success: 提案回覆成功.
           create:
-            invalid: 創建提案時發生問題.
             success: 提案已成功建立.
           edit:
             title: 更新提案
             update: 更新
           form:
-            attachment_legend: "(可選) 新增附件"
             created_in_meeting: 這個提案來自會議
-            delete_attachment: 刪除附件
-            select_a_category: 選擇一個類別
             select_a_meeting: 選擇一個會議
           index:
             actions: 操作
             assign_to_valuator: 分配給評估人員
+            assign_to_valuator_button: 指派
             cancel: 取消
-            change_category: 變更類別
-            change_scope: 變更範圍
             merge: 合併為新提案
             merge_button: 合併
             publish: 發布
@@ -430,8 +380,8 @@ zh-TW:
             split_button: 拆分
             title: 提案
             unassign_from_valuator: 取消分派給評估者
+            unassign_from_valuator_button: 取消分配
             update: 更新
-            update_scope_button: 更新範圍
           new:
             create: 建立
             title: 建立提案
@@ -453,19 +403,10 @@ zh-TW:
             remove_assignment: 移除指派
             remove_assignment_confirmation: 您確定要將評估者從此提案中移除嗎？
             valuators: 評估者
-          update_category:
-            invalid: '這些提案已經擁有 %{subject_name} 類別: %{proposals}。'
-            select_a_category: 請選擇一個類別。
-            select_a_proposal: 請選擇一個提案。
-            success: '已成功將以下提案更新至 %{subject_name} 類別: %{proposals}。'
-          update_scope:
-            invalid: '這些提案已經有了 %{subject_name} 的範圍: %{proposals}。'
-            select_a_proposal: 請選擇一個提案。
-            select_a_scope: 請選擇一個範圍。
-            success: '成功將提案更新到 %{subject_name} 的範圍內： %{proposals}。'
         proposals_imports:
           create:
             invalid: 匯入提案時發生問題.
+            success: "%{number} 個提案成功匯入."
           new:
             create: 匯入提案
             no_components: 這個參與空間中沒有其他的提案元件可以匯入提案。
@@ -473,18 +414,14 @@ zh-TW:
             select_states: 檢查要匯入的提案狀態。
         proposals_merges:
           create:
-            invalid: '由於其中一些提案存在問題，因此無法合併所選提案：'
             success: 已成功合併提案成為新的提案。
         proposals_splits:
           create:
-            invalid: '由於其中一些提案存在問題，因此無法分割所選提案：'
             success: 成功將提案拆分為新的提案。
         valuation_assignments:
           create:
-            invalid: 有一個錯誤在指定提案給評估者。
             success: 提案已成功分配給評估人員.
           delete:
-            invalid: 取消指派建議書給評估人員時發生錯誤.
             success: 評估員已成功取消分配提案.
       admin_log:
         proposal:
@@ -539,19 +476,15 @@ zh-TW:
           error: 建立協作草稿時發生問題。
           success: 協作草稿建立成功。
         edit:
-          attachment_legend: "(可選) 新增附件"
           back: 返回
-          select_a_category: 請選擇一個類別
           send: 發送
           title: 編輯協作草稿
         filters:
           all: 全部
           amendment: 修正案
-          category: 類別
           open: 開啟
           published: 已發佈
           related_to: 相關於
-          scope: 範圍
           search: 搜尋
           state: 狀態
           withdrawn: 已撤回
@@ -589,7 +522,6 @@ zh-TW:
             error: 無法拒絕作為合作者，請稍後再試。
             success: "@%{user} 已被成功拒絕成為協作者。"
         show:
-          edit: 編輯協作草稿
           final_proposal: 最終提案
           final_proposal_help_text: 此草案已完成。請查看最終提案。
           hidden_authors_count:
@@ -624,14 +556,12 @@ zh-TW:
       models:
         proposal:
           fields:
-            category: 類別
             comments: 評論
             id: ID
             notes: 備註
             official_proposal: 正式提案
             published_answer: 已發布的回答
             published_at: 發佈於
-            scope: 範圍
             state: 狀態
             title: 標題
             valuator: 評估者
@@ -649,11 +579,7 @@ zh-TW:
           description: 當點擊“預覽”按鈕時，座標將會更新，但地址不會更改。
           instructions: 您可以在地圖上移動點。
         edit:
-          add_documents: 新增文件
-          attachment_legend: "(可選) 新增附件"
           back: 返回
-          edit_documents: 編輯文件
-          select_a_category: 請選擇一個類別
           send: 發送
           title: 編輯提案
         edit_draft:
@@ -664,7 +590,6 @@ zh-TW:
           activity: 我的活動
           all: 全部
           amendment_type: 類別
-          category: 分類
           my_proposals: 我的提案
           origin: 起源
           related_to: 相關於
@@ -683,6 +608,7 @@ zh-TW:
           text_banner: 您正在查看由其作者撤回的提案列表。%{go_back_link}。
         new:
           send: 繼續
+          title: 創建你的提案
         orders:
           label: '依順序排序提案：'
           most_commented: 最多評論
@@ -707,7 +633,6 @@ zh-TW:
         show:
           answer: 回答
           changes_at_title: 修正案 "%{title}"
-          edit_proposal: 編輯提案
           estimated_cost: 預估成本
           hidden_endorsers_count:
             other: "one\n以及其他 %{count} 個人\n\nOther\n以及其他 %{count} 個人"
@@ -721,12 +646,13 @@ zh-TW:
           proposal_in_evaluation_reason: 這個提案正在被評估中
           proposal_rejected_reason: '這個提案被拒絕了，因為：'
           withdraw_confirmation_html: 您確定要撤回此提案嗎？<br><br><strong>此操作無法取消！</strong>
-          withdraw_proposal: 撤回提案
         update:
           title: 更新提案
         voting_rules:
           proposal_limit:
             description: 您最多可以創建 %{limit} 個提案。
+          vote_limit:
+            description: 您最多可以支持 %{limit} 個提案。
         wizard_aside:
           back: 返回
           back_from_step_1: 返回提案

data/db/migrate/20171220084719_add_published_at_to_proposals.rb

@@ -4,7 +4,7 @@ class AddPublishedAtToProposals < ActiveRecord::Migration[5.1]
   def up
     add_column :decidim_proposals_proposals, :published_at, :datetime, index: true
     # rubocop:disable Rails/SkipsModelValidations
-    Decidim::Proposals::Proposal.update_all("published_at = updated_at")
+    Decidim::Proposals::Proposal.unscoped.update_all("published_at = updated_at")
     # rubocop:enable Rails/SkipsModelValidations
   end
 

data/db/migrate/20181016132225_add_organization_as_author.rb

@@ -2,7 +2,7 @@
 
 class AddOrganizationAsAuthor < ActiveRecord::Migration[5.2]
   def change
-    official_proposals = Decidim::Proposals::Proposal.find_each.select do |proposal|
+    official_proposals = Decidim::Proposals::Proposal.unscoped.find_each.select do |proposal|
       proposal.coauthorships.count.zero?
     end
 

data/db/migrate/20200120215928_move_proposal_endorsements_to_core_endorsements.rb

@@ -26,7 +26,7 @@ class MoveProposalEndorsementsToCoreEndorsements < ActiveRecord::Migration[5.2]
       )
     end
     # update new `decidim_proposals_proposal.endorsements_count` counter cache
-    Decidim::Proposals::Proposal.select(:id).all.find_each do |proposal|
+    Decidim::Proposals::Proposal.unscoped.select(:id).all.find_each do |proposal|
       Decidim::Proposals::Proposal.reset_counters(proposal.id, :endorsements)
     end
   end

data/db/migrate/20200827154156_add_commentable_counter_cache_to_proposals.rb

@@ -5,8 +5,8 @@ class AddCommentableCounterCacheToProposals < ActiveRecord::Migration[5.2]
     add_column :decidim_proposals_proposals, :comments_count, :integer, null: false, default: 0, index: true
     add_column :decidim_proposals_collaborative_drafts, :comments_count, :integer, null: false, default: 0, index: true
     Decidim::Proposals::Proposal.reset_column_information
-    Decidim::Proposals::Proposal.find_each(&:update_comments_count)
-    Decidim::Proposals::CollaborativeDraft.reset_column_information
-    Decidim::Proposals::CollaborativeDraft.find_each(&:update_comments_count)
+    Decidim::Proposals::Proposal.unscoped.find_each(&:update_comments_count)
+    Decidim::Proposals::CollaborativeDraft.unscoped.reset_column_information
+    Decidim::Proposals::CollaborativeDraft.unscoped.find_each(&:update_comments_count)
   end
 end

data/db/migrate/20210310102839_add_followable_counter_cache_to_proposals.rb

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

data/db/migrate/20240110203504_create_default_proposal_states.rb

@@ -16,7 +16,7 @@ class CreateDefaultProposalStates < ActiveRecord::Migration[6.1]
   def up
     CustomProposal.reset_column_information
     Decidim::Proposals::ProposalState.reset_column_information
-    Decidim::Component.where(manifest_name: "proposals").find_each do |component|
+    Decidim::Component.unscoped.where(manifest_name: "proposals").find_each do |component|
       admin_user = component.organization.admins.first
       default_states = Decidim::Proposals.create_default_states!(component, admin_user)
 

data/db/migrate/20240404202756_add_valuation_assignments_count_to_decidim_proposals_proposals.rb

@@ -7,7 +7,7 @@ class AddValuationAssignmentsCountToDecidimProposalsProposals < ActiveRecord::Mi
     reversible do |dir|
       dir.up do
         Decidim::Proposals::Proposal.reset_column_information
-        Decidim::Proposals::Proposal.find_each do |record|
+        Decidim::Proposals::Proposal.unscoped.find_each do |record|
           Decidim::Proposals::Proposal.reset_counters(record.id, :valuation_assignments)
         end
       end

data/db/migrate/20240617091140_add_email_on_assigned_proposals_to_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddEmailOnAssignedProposalsToUsers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_users, :email_on_assigned_proposals, :boolean, default: true
+  end
+end

data/db/migrate/20240617170052_add_parent_relation_to_decidim_proposal_notes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddParentRelationToDecidimProposalNotes < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :decidim_proposals_proposal_notes, :parent, index: { name: :decidim_proposals_proposal_notes_on_parent_id }
+  end
+end

data/db/migrate/20240828103755_add_deleted_at_to_decidim_proposals_proposals.rb

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

data/decidim-proposals.gemspec

@@ -19,7 +19,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-proposals"
   s.summary = "Decidim proposals module"

data/lib/decidim/api/functions/proposal_finder_helper.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalFinderHelper < Decidim::Core::ComponentFinderBase
+      # only querying published proposals
+      def query_scope
+        super.published
+      end
+    end
+  end
+end

data/lib/decidim/api/functions/proposal_list_helper.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalListHelper < Decidim::Core::ComponentListBase
+      # only querying published proposals
+      def query_scope
+        super.published
+      end
+    end
+  end
+end

data/lib/decidim/api/proposal_type.rb

@@ -7,8 +7,7 @@ module Decidim
 
       implements Decidim::Comments::CommentableInterface
       implements Decidim::Core::CoauthorableInterface
-      implements Decidim::Core::CategorizableInterface
-      implements Decidim::Core::ScopableInterface
+      implements Decidim::Core::TaxonomizableInterface
       implements Decidim::Core::AttachableInterface
       implements Decidim::Core::FingerprintInterface
       implements Decidim::Core::AmendableInterface
@@ -17,40 +16,33 @@ module Decidim
       implements Decidim::Core::EndorsableInterface
       implements Decidim::Core::TimestampsInterface
 
-      field :id, GraphQL::Types::ID, null: false
-      field :title, Decidim::Core::TranslatedFieldType, "The title for this title", null: true
-      field :body, Decidim::Core::TranslatedFieldType, "The description for this body", null: true
       field :address, GraphQL::Types::String, "The physical address (location) of this proposal", null: true
-      field :coordinates, Decidim::Core::CoordinatesType, "Physical coordinates for this proposal", null: true
-
-      def coordinates
-        [object.latitude, object.longitude]
-      end
-
-      field :reference, GraphQL::Types::String, "This proposal's unique reference", null: true
-      field :state, GraphQL::Types::String, "The answer status in which proposal is in", null: true
       field :answer, Decidim::Core::TranslatedFieldType, "The answer feedback for the status for this proposal", null: true
-
       field :answered_at, Decidim::Core::DateTimeType, description: "The date and time this proposal was answered", null: true
-
-      field :published_at, Decidim::Core::DateTimeType, description: "The date and time this proposal was published", null: true
-
-      field :participatory_text_level, GraphQL::Types::String, description: "If it is a participatory text, the level indicates the type of paragraph", null: true
-      field :position, GraphQL::Types::Int, "Position of this proposal in the participatory text", null: true
-
-      field :official, GraphQL::Types::Boolean, "Whether this proposal is official or not", method: :official?, null: true
+      field :body, Decidim::Core::TranslatedFieldType, "The description for this body", null: true
+      field :coordinates, Decidim::Core::CoordinatesType, "Physical coordinates for this proposal", null: true
       field :created_in_meeting, GraphQL::Types::Boolean, "Whether this proposal comes from a meeting or not", method: :official_meeting?, null: true
+      field :id, GraphQL::Types::ID, "The id of the Proposal", null: false
       field :meeting, Decidim::Meetings::MeetingType, description: "If the proposal comes from a meeting, the related meeting", null: true
-
-      field :withdrawn_at, Decidim::Core::DateTimeType, description: "The date and time this proposal was withdrawn", null: true
+      field :official, GraphQL::Types::Boolean, "Whether this proposal is official or not", method: :official?, null: true
+      field :participatory_text_level, GraphQL::Types::String, description: "If it is a participatory text, the level indicates the type of paragraph", null: true
+      field :position, GraphQL::Types::Int, "Position of this proposal in the participatory text", null: true
+      field :published_at, Decidim::Core::DateTimeType, description: "The date and time this proposal was published", null: true
+      field :reference, GraphQL::Types::String, "This proposal's unique reference", null: true
+      field :state, GraphQL::Types::String, "The answer status in which proposal is in", null: true
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this title", null: true
+      field :vote_count, GraphQL::Types::Int, description: "The total amount of votes the proposal has received", null: true
       field :withdrawn, GraphQL::Types::Boolean, "Whether this proposal has been withdrawn or not", method: :withdrawn?, null: true
+      field :withdrawn_at, Decidim::Core::DateTimeType, description: "The date and time this proposal was withdrawn", null: true
+
+      def coordinates
+        [object.latitude, object.longitude]
+      end
 
       def meeting
         object.authors.first if object.official_meeting?
       end
 
-      field :vote_count, GraphQL::Types::Int, description: "The total amount of votes the proposal has received", null: true
-
       def vote_count
         current_component = object.component
         object.proposal_votes_count unless current_component.current_settings.votes_hidden?

data/lib/decidim/api/proposals_type.rb

@@ -2,32 +2,17 @@
 
 module Decidim
   module Proposals
-    class ProposalListHelper < Decidim::Core::ComponentListBase
-      # only querying published posts
-      def query_scope
-        super.published
-      end
-    end
-
-    class ProposalFinderHelper < Decidim::Core::ComponentFinderBase
-      # only querying published posts
-      def query_scope
-        super.published
-      end
-    end
-
     class ProposalsType < Decidim::Core::ComponentType
       graphql_name "Proposals"
       description "A proposals component of a participatory space."
 
-      field :proposals, type: Decidim::Proposals::ProposalType.connection_type, description: "List all proposals", connection: true, null: true do
-        argument :order, Decidim::Proposals::ProposalInputSort, "Provides several methods to order the results", required: false
-        argument :filter, Decidim::Proposals::ProposalInputFilter, "Provides several methods to filter the results", required: false
-      end
-
       field :proposal, type: Decidim::Proposals::ProposalType, description: "Finds one proposal", null: true do
         argument :id, GraphQL::Types::ID, "The ID of the proposal", required: true
       end
+      field :proposals, type: Decidim::Proposals::ProposalType.connection_type, description: "List all proposals", connection: true, null: true do
+        argument :filter, Decidim::Proposals::ProposalInputFilter, "Provides several methods to filter the results", required: false
+        argument :order, Decidim::Proposals::ProposalInputSort, "Provides several methods to order the results", required: false
+      end
 
       def proposals(filter: {}, order: {})
         Decidim::Proposals::ProposalListHelper.new(model_class: Proposal).call(object, { filter:, order: }, context)

data/lib/decidim/proposals/admin_engine.rb

@@ -14,17 +14,26 @@ module Decidim
       routes do
         resources :proposals, only: [:show, :index, :new, :create, :edit, :update] do
           resources :valuation_assignments, only: [:destroy]
+          member do
+            patch :soft_delete
+            patch :restore
+          end
           collection do
-            post :update_category
+            post :update_taxonomies
             post :publish_answers
-            post :update_scope
+            post :update_multiple_answers, controller: "proposal_answers"
+            get :manage_trash, controller: "proposals"
             resource :proposals_import, only: [:new, :create]
             resource :proposals_merge, only: [:create]
             resource :proposals_split, only: [:create]
             resource :valuation_assignment, only: [:create, :destroy]
           end
           resources :proposal_answers, only: [:edit, :update]
-          resources :proposal_notes, only: [:create]
+          resources :proposal_notes, only: [:create] do
+            member do
+              post :reply
+            end
+          end
         end
 
         resources :proposal_states

data/lib/decidim/proposals/admin_filter.rb

@@ -9,8 +9,7 @@ module Decidim
             :is_emendation_true,
             :state_eq,
             :with_any_state,
-            :scope_id_eq,
-            :category_id_eq,
+            :taxonomies_part_of_contains,
             :valuator_role_ids_has
           )
 
@@ -18,16 +17,14 @@ module Decidim
             is_emendation_true: %w(true false),
             state_eq: state_eq_values,
             with_any_state: %w(state_published state_not_published),
-            scope_id_eq: scope_ids_hash(scopes.top_level),
-            category_id_eq: category_ids_hash(categories.first_class),
+            taxonomies_part_of_contains: taxonomy_ids_hash(available_root_taxonomies),
             valuator_role_ids_has: valuator_role_ids
           )
 
           configuration.add_dynamically_translated_filters(
-            :scope_id_eq,
-            :category_id_eq,
             :valuator_role_ids_has,
             :proposal_state_id_eq,
+            :taxonomies_part_of_contains,
             :state_eq
           )
         end

data/lib/decidim/proposals/component.rb

@@ -29,14 +29,13 @@ Decidim.register_component(:proposals) do |component|
   POSSIBLE_SORT_ORDERS = %w(automatic random recent most_endorsed most_voted most_commented most_followed with_more_authors).freeze
 
   component.settings(:global) do |settings|
-    settings.attribute :scopes_enabled, type: :boolean, default: false
-    settings.attribute :scope_id, type: :scope
+    settings.attribute :taxonomy_filters, type: :taxonomy_filters
     settings.attribute :vote_limit, type: :integer, default: 0, required: true
     settings.attribute :minimum_votes_per_user, type: :integer, default: 0, required: true
     settings.attribute :proposal_limit, type: :integer, default: 0, required: true
     settings.attribute :proposal_length, type: :integer, default: 500
-    settings.attribute :proposal_edit_time, type: :enum, default: "limited", choices: -> { %w(limited infinite) }
-    settings.attribute :proposal_edit_before_minutes, type: :integer, default: 5, required: true
+    settings.attribute :proposal_edit_time, type: :enum, default: "limited", choices: -> { %w(infinite limited) }
+    settings.attribute :edit_time, type: :integer_with_units, default: [5, "minutes"], required: true, units: %w(minutes hours days)
     settings.attribute :threshold_per_proposal, type: :integer, default: 0, required: true
     settings.attribute :can_accumulate_votes_beyond_threshold, type: :boolean, default: false
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
@@ -137,7 +136,7 @@ Decidim.register_component(:proposals) do |component|
                    .published
                    .not_hidden
                    .where(component: component_instance)
-                   .includes(:scope, :category, :component)
+                   .includes(:taxonomies, :component)
 
       if space.user_roles(:valuator).where(user:).any?
         collection.with_valuation_assigned_to(user, space)