decidim-budgets 0.29.1 → 0.30.0.rc1

data/app/forms/decidim/budgets/admin/project_form.rb

@@ -5,20 +5,19 @@ module Decidim
     module Admin
       # This class holds a Form to create/update projects from Decidim's admin panel.
       class ProjectForm < Decidim::Form
-        include TranslatableAttributes
-        include AttachmentAttributes
-        include TranslationsHelper
+        include Decidim::TranslatableAttributes
+        include Decidim::HasTaxonomyFormAttributes
+        include Decidim::AttachmentAttributes
+        include Decidim::TranslationsHelper
         include Decidim::ApplicationHelper
 
         translatable_attribute :title, String
-        translatable_attribute :description, String
+        translatable_attribute :description, Decidim::Attributes::RichText
 
         attribute :address, String
         attribute :latitude, Float
         attribute :longitude, Float
         attribute :budget_amount, Integer
-        attribute :decidim_scope_id, Integer
-        attribute :decidim_category_id, Integer
         attribute :proposal_ids, Array[Integer]
         attribute :attachment, AttachmentForm
         attribute :selected, Boolean
@@ -29,22 +28,18 @@ module Decidim
         validates :description, translatable_presence: true
         validates :budget_amount, presence: true, numericality: { greater_than: 0 }
         validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
-        validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
-        validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
-        validates :decidim_scope_id, scope_belongs_to_component: true, if: ->(form) { form.decidim_scope_id.present? }
 
         validate :notify_missing_attachment_if_errored
 
-        delegate :categories, to: :current_component
         alias component current_component
 
         def map_model(model)
           self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
           self.selected = model.selected?
+        end
 
-          return unless model.categorization
-
-          self.decidim_category_id = model.categorization.decidim_category_id
+        def participatory_space_manifest
+          @participatory_space_manifest ||= current_component.participatory_space.manifest.name
         end
 
         def proposals
@@ -72,27 +67,6 @@ module Decidim
           @budget ||= context[:budget]
         end
 
-        # Finds the Category from the decidim_category_id.
-        #
-        # Returns a Decidim::Category
-        def category
-          @category ||= categories.find_by(id: decidim_category_id)
-        end
-
-        # Finds the Scope from the given decidim_scope_id, uses the component scope if missing.
-        #
-        # Returns a Decidim::Scope
-        def scope
-          @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
-        end
-
-        # Scope identifier
-        #
-        # Returns the scope identifier related to the project
-        def decidim_scope_id
-          super || scope&.id
-        end
-
         private
 
         # This method will add an error to the `attachment` field only if there is

data/app/forms/decidim/budgets/admin/project_import_proposals_form.rb

@@ -9,15 +9,12 @@ module Decidim
         mimic :proposals_import
 
         attribute :origin_component_id, Integer
-        attribute :scope_id, Integer
         attribute :default_budget, Integer
         attribute :import_all_accepted_proposals, Boolean
 
         validates :origin_component_id, :origin_component, :current_component, presence: true
         validates :import_all_accepted_proposals, allow_nil: false, acceptance: true
         validates :default_budget, presence: true, numericality: { greater_than: 0 }
-        validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
-        validates :scope_id, scope_belongs_to_component: true, if: ->(form) { form.scope_id.present? }
 
         def origin_component
           @origin_component ||= origin_components.find_by(id: origin_component_id)
@@ -33,14 +30,6 @@ module Decidim
           end
         end
 
-        def scope
-          @scope ||= @scope_id ? current_component.scopes.find_by(id: @scope_id) : current_component.scope
-        end
-
-        def scope_id
-          @scope_id || scope&.id
-        end
-
         def budget
           @budget ||= context[:budget]
         end

data/app/helpers/decidim/budgets/projects_helper.rb

@@ -101,31 +101,6 @@ module Decidim
         %(<strong>#{current_rule_call_for_action_text}</strong>. #{rule_text}).html_safe
       end
 
-      # Serialize a collection of geocoded projects to be used by the dynamic map component
-      #
-      # geocoded_projects - A collection of geocoded projects
-      def projects_data_for_map(geocoded_projects)
-        geocoded_projects.map do |project|
-          project_data_for_map(project)
-        end
-      end
-
-      def project_data_for_map(project)
-        project
-          .slice(:latitude, :longitude, :address)
-          .merge(
-            title: decidim_escape_translated(project.title),
-            link: ::Decidim::ResourceLocatorPresenter.new([project.budget, project]).path,
-            items: cell("decidim/budgets/project_metadata", project).send(:project_items_for_map).to_json
-          )
-      end
-
-      def has_position?(project)
-        return if project.address.blank?
-
-        project.latitude.present? && project.longitude.present?
-      end
-
       def filter_addition_type_values
         return [] if voting_finished?
 
@@ -138,12 +113,12 @@ module Decidim
       def filter_sections
         @filter_sections ||= begin
           items = []
-          items.append(method: :with_any_status, collection: filter_status_values, label_scope: "decidim.budgets.projects.filters", id: "status") if voting_finished?
-          if current_component.has_subscopes?
-            items.append(method: :with_any_scope, collection: resource_filter_scope_values(budget.scope), label_scope: "decidim.budgets.projects.filters", id: "scope")
-          end
-          if current_participatory_space.categories.any?
-            items.append(method: :with_any_category, collection: filter_categories_values, label_scope: "decidim.budgets.projects.filters", id: "category")
+          items.append(method: :with_any_status, collection: filter_status_values, label: t("decidim.budgets.projects.filters.status"), id: "status") if voting_finished?
+          current_component.available_taxonomy_filters.each do |taxonomy_filter|
+            items.append(method: "with_any_taxonomies[#{taxonomy_filter.root_taxonomy_id}]",
+                         collection: filter_taxonomy_values_for(taxonomy_filter),
+                         label: decidim_sanitize_translated(taxonomy_filter.name),
+                         id: "taxonomy-#{taxonomy_filter.root_taxonomy_id}")
           end
         end
 

data/app/models/decidim/budgets/budget.rb

@@ -4,6 +4,7 @@ module Decidim
   module Budgets
     # The data store for a budget in the Decidim::Budgets component.
     class Budget < ApplicationRecord
+      include Decidim::Taxonomizable
       include Decidim::Resourceable
       include Decidim::ScopableResource
       include Decidim::HasComponent
@@ -11,6 +12,7 @@ module Decidim
       include Decidim::Randomable
       include Traceable
       include Loggable
+      include Decidim::SoftDeletable
 
       component_manifest_name "budgets"
 

data/app/models/decidim/budgets/project.rb

@@ -6,6 +6,7 @@ module Decidim
     # title, description and any other useful information to render a custom project.
     class Project < Budgets::ApplicationRecord
       include Decidim::Resourceable
+      include Decidim::Taxonomizable
       include Decidim::ScopableResource
       include Decidim::HasCategory
       include Decidim::HasAttachments
@@ -19,6 +20,7 @@ module Decidim
       include Decidim::Searchable
       include Decidim::TranslatableResource
       include Decidim::FilterableResource
+      include Decidim::SoftDeletable
 
       translatable_fields :title, :description
 
@@ -69,6 +71,12 @@ module Decidim
         Decidim::Budgets::AdminLog::ProjectPresenter
       end
 
+      # Returns the presenter for this project, to be used in the views.
+      # Required by ResourceRenderer.
+      def presenter
+        Decidim::Budgets::ProjectPresenter.new(self)
+      end
+
       def resource_locator
         ::Decidim::ResourceLocatorPresenter.new([budget, self])
       end
@@ -139,7 +147,19 @@ module Decidim
       end
 
       def self.ransackable_scopes(_auth_object = nil)
-        [:with_any_status, :with_any_scope, :with_any_category]
+        [:with_any_status, :with_any_taxonomies]
+      end
+
+      def self.ransackable_attributes(auth_object = nil)
+        base = %w(search_text description title)
+
+        return base unless auth_object&.admin?
+
+        base + %w(id_string id selected selected_at confirmed_orders_count)
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w(taxonomies)
       end
     end
   end

data/app/packs/stylesheets/budgets.scss

@@ -44,8 +44,6 @@
       }
 
       &--meter {
-        background-color: var(--success);
-
         @apply h-2 rounded-s absolute;
       }
     }

data/app/permissions/decidim/budgets/admin/permissions.rb

@@ -14,14 +14,14 @@ module Decidim
               allow!
             when :update
               toggle_allow(budget)
-            when :delete, :publish, :unpublish
+            when :publish, :unpublish
               toggle_allow(budget && budget.projects.empty?)
             end
           when :project, :projects
             case permission_action.action
-            when :create, :import_proposals, :project_category
+            when :create, :import_proposals, :project_taxonomy
               permission_action.allow!
-            when :update, :destroy
+            when :update
               permission_action.allow! if project.present?
             end
           when :order
@@ -29,7 +29,7 @@ module Decidim
             when :remind
               permission_action.allow!
             end
-          when :project_category, :project_scope, :project_selected
+          when :project_taxonomy, :project_selected
             permission_action.allow!
           end
 

data/app/permissions/decidim/budgets/permissions.rb

@@ -18,6 +18,8 @@ module Decidim
             can_vote?(false) if can_vote_project?(project || order&.projects&.first)
           when :report
             permission_action.allow!
+          when :read
+            toggle_allow(project.visible?)
           end
         end
 

data/app/presenters/decidim/budgets/admin_log/budget_presenter.rb

@@ -17,7 +17,7 @@ module Decidim
 
         def action_string
           case action
-          when "create", "delete", "update"
+          when "create", "delete", "update", "soft_delete", "restore"
             "decidim.budgets.admin_log.budget.#{action}"
           else
             super

data/app/presenters/decidim/budgets/admin_log/project_presenter.rb

@@ -17,7 +17,7 @@ module Decidim
 
         def action_string
           case action
-          when "create", "delete", "update"
+          when "create", "delete", "update", "soft_delete", "restore"
             "decidim.budgets.admin_log.project.#{action}"
           else
             super

data/app/presenters/decidim/budgets/project_presenter.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    class ProjectPresenter < Decidim::ResourcePresenter
+      # Renders the title of the project
+      #
+      # @param links [Boolean] Should hashtags in the title be rendered as links? Default is +false+.
+      # @param extras [Boolean] Should extra hashtags be included? Default is +true+.
+      # @param html_escape [Boolean] Should HTML entities within the title be escaped? Default is +false+.
+      # @param all_locales [Boolean] Should the title be returned for all locales? Default is +false+.
+      # @return [String] The title of the project.
+      def title(links: false, extras: true, html_escape: false, all_locales: false)
+        return unless project
+
+        super(project.title, links, html_escape, all_locales, extras:)
+      end
+
+      delegate_missing_to :project
+
+      private
+
+      def project
+        __getobj__
+      end
+    end
+  end
+end

data/app/queries/decidim/budgets/filtered_projects.rb

@@ -28,8 +28,8 @@ module Decidim
       # by a range of dates.
       def query
         projects = Decidim::Budgets::Project.where(budget: budgets)
-        projects = projects.where("created_at >= ?", @start_at) if @start_at.present?
-        projects = projects.where("created_at <= ?", @end_at) if @end_at.present?
+        projects = projects.where(created_at: @start_at..) if @start_at.present?
+        projects = projects.where(created_at: ..@end_at) if @end_at.present?
         projects
       end
 

data/app/queries/decidim/budgets/metrics/budget_followers_metric_measure.rb

@@ -15,10 +15,10 @@ module Decidim
           projects = Decidim::Budgets::Project.where(budget: budgets)
 
           budgets_followers = Decidim::Follow.where(followable: projects).joins(:user)
-                                             .where("decidim_follows.created_at <= ?", end_time)
+                                             .where(decidim_follows: { created_at: ..end_time })
           cumulative_users = budgets_followers.pluck(:decidim_user_id)
 
-          budgets_followers = budgets_followers.where("decidim_follows.created_at >= ?", start_time)
+          budgets_followers = budgets_followers.where(decidim_follows: { created_at: start_time.. })
           quantity_users = budgets_followers.pluck(:decidim_user_id)
 
           {

data/app/queries/decidim/budgets/metrics/budget_participants_metric_measure.rb

@@ -14,11 +14,11 @@ module Decidim
           budgets = Decidim::Budgets::Budget.where(component: @resource)
           orders = Decidim::Budgets::Order.where(budget: budgets)
                                           .finished
-                                          .where("decidim_budgets_orders.checked_out_at <= ?", end_time)
+                                          .where(decidim_budgets_orders: { checked_out_at: ..end_time })
 
           {
             cumulative_users: orders.pluck(:decidim_user_id),
-            quantity_users: orders.where("decidim_budgets_orders.checked_out_at >= ?", start_time).pluck(:decidim_user_id)
+            quantity_users: orders.where(decidim_budgets_orders: { checked_out_at: start_time.. }).pluck(:decidim_user_id)
           }
         end
       end

data/app/serializers/decidim/budgets/download_your_data_budgets_order_serializer.rb

@@ -3,12 +3,12 @@
 module Decidim
   module Budgets
     class DownloadYourDataBudgetsOrderSerializer < Decidim::Exporters::Serializer
-      # Public: Initializes the serializer with a conversation.
+      # Public: Initializes the serializer with a budgets' order.
       def initialize(order)
         @order = order
       end
 
-      # Serializes a Debate for download your data
+      # Serializes a budgets' order for download your data
       def serialize
         {
           id: order.id,

data/app/views/decidim/budgets/admin/budgets/_actions.html.erb

@@ -0,0 +1,21 @@
+<% if view == :deleted %>
+  <% if allowed_to? :restore, :budget, trashable_deleted_resource: budget %>
+    <%= icon_link_to "refresh-line", url_for(action: :restore, id: budget, controller: "budgets"), t("decidim.admin.actions.restore"), method: :patch, class: "action-icon--restore" %>
+  <% end %>
+<% else %>
+  <% if allowed_to? :update, :budget, budget: budget %>
+    <%= icon_link_to "pencil-line", edit_budget_path(budget), t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
+  <% else %>
+    <%= icon "pencil-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.budgets") %>
+  <% end %>
+
+  <%= icon_link_to "list-check", budget_projects_path(budget), t("actions.edit_projects", scope: "decidim.budgets"), class: "action-icon--edit-projects" %>
+
+  <%= icon_link_to "eye-line", resource_locator(budget).path, t("actions.preview", scope: "decidim.budgets"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
+
+  <% if allowed_to? :soft_delete, :budget, trashable_deleted_resource: budget %>
+    <%= icon_link_to "delete-bin-line", soft_delete_budget_path(budget), t("actions.soft_delete", scope: "decidim.admin"), method: :patch, class: "action-icon--remove", data: { confirm: t("actions.confirm_delete_budget", scope: "decidim.budgets") } %>
+  <% else %>
+    <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.soft_delete", scope: "decidim.admin") %>
+  <% end %>
+<% end %>

data/app/views/decidim/budgets/admin/budgets/_budget-tr.html.erb

@@ -0,0 +1,18 @@
+<tr data-id="<%= budget.id %>">
+  <td>
+    <% if allowed_to? :update, :budget, budget: budget %>
+      <%= link_to translated_attribute(budget.title), budget_projects_path(budget) %><br>
+    <% else %>
+      <%= translated_attribute(budget.title) %>
+    <% end %>
+  </td>
+  <td>
+    <%= number_to_currency budget.total_budget, unit: Decidim.currency_unit, precision: 0 %>
+  </td>
+  <td>
+    <%= link_to budget.projects.count, budget_projects_path(budget) %>
+  </td>
+  <td class="table-list__actions">
+    <%= render partial: "decidim/budgets/admin/budgets/actions", locals: { budget:, view: } %>
+  </td>
+</tr>

data/app/views/decidim/budgets/admin/budgets/_budgets-thead.html.erb

@@ -0,0 +1,8 @@
+<thead>
+<tr>
+  <th><%= t("models.budget.fields.name", scope: "decidim.budgets") %></th>
+  <th><%= t("models.budget.fields.total_budget", scope: "decidim.budgets") %></th>
+  <th><%= t("models.budget.fields.projects_count", scope: "decidim.budgets") %></th>
+  <th><%= t("actions.title", scope: "decidim.budgets") %></th>
+</tr>
+</thead>

data/app/views/decidim/budgets/admin/budgets/_form.html.erb

@@ -16,12 +16,6 @@
       <div class="row column">
         <%= form.number_field :total_budget %>
       </div>
-
-      <% if current_component.has_subscopes? %>
-        <div class="row column">
-          <%= scopes_select_field form, :decidim_scope_id, root: current_component.scope %>
-        </div>
-      <% end %>
       </div>
     </div>
   </div>

data/app/views/decidim/budgets/admin/budgets/index.html.erb

@@ -17,58 +17,26 @@
   </div>
   <div class="table-scroll">
     <table class="table-list">
-      <thead>
-        <tr>
-          <th><%= t("models.budget.fields.name", scope: "decidim.budgets") %></th>
-          <th><%= t("models.budget.fields.total_budget", scope: "decidim.budgets") %></th>
-          <th><%= t("models.budget.fields.projects_count", scope: "decidim.budgets") %></th>
-          <% if current_component.has_subscopes? %>
-           <%= th_resource_scope_label %>
-          <% end %>
-          <th><%= t("actions.title", scope: "decidim.budgets") %></th>
-        </tr>
-      </thead>
+      <%= render partial: "budgets-thead" %>
       <tbody>
-        <% budgets.each do |budget| %>
-          <tr data-id="<%= budget.id %>">
-            <td>
-              <% if allowed_to? :update, :budget, budget: budget %>
-                <%= link_to translated_attribute(budget.title), budget_projects_path(budget) %><br>
-              <% else %>
-                <%= translated_attribute(budget.title) %>
-              <% end %>
-            </td>
-            <td>
-              <%= number_to_currency budget.total_budget, unit: Decidim.currency_unit, precision: 0 %>
-            </td>
-            <td>
-              <%= link_to budget.projects.count, budget_projects_path(budget) %>
-            </td>
-            <% if current_component.has_subscopes? %>
-              <%= td_resource_scope_for(budget.scope) %>
-            <% end %>
-            <td class="table-list__actions">
-              <% if allowed_to? :update, :budget, budget: budget %>
-                <%= icon_link_to "pencil-line", edit_budget_path(budget), t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
-              <% else %>
-                <%= icon "pencil-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.budgets") %>
-              <% end %>
-
-              <%= icon_link_to "list-check", budget_projects_path(budget), t("actions.edit_projects", scope: "decidim.budgets"), class: "action-icon--edit-projects" %>
-
-              <%= icon_link_to "eye-line", resource_locator(budget).path, t("actions.preview", scope: "decidim.budgets"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
-
-              <% if allowed_to? :delete, :budget, budget: budget %>
-                <%= icon_link_to "delete-bin-line", budget_path(budget), t("actions.destroy", scope: "decidim.budgets"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } %>
-              <% else %>
-                <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.budgets") %>
-              <% end %>
-            </td>
-          </tr>
-        <% end %>
+        <%= render partial: "decidim/budgets/admin/budgets/budget-tr",
+                   collection: budgets,
+                   as: :budget,
+                   locals: { view: :index } %>
       </tbody>
     </table>
   </div>
+  <% if allowed_to? :manage_trash, :budget, participatory_space: current_participatory_space %>
+    <div class="card-divider mt-4">
+      <%= link_to manage_trash_budgets_path, class: "flex items-center underline text-secondary" do %>
+        <%= icon "delete-bin-2-line", class: "mr-2 fill-current text-secondary", role: "img" %>
+        <%= t("actions.view_deleted_budgets", scope: "decidim.budgets") %>
+        <span class="ml-2">
+          <%= icon_with_tooltip("information-line", t("actions.deleted_budgets_info", scope: "decidim.budgets")) %>
+        </span>
+      <% end %>
+    </div>
+  <% end %>
   <div class="card-divider">
     <strong><%= t ".finished_orders" %>:&nbsp;</strong><span><%= finished_orders.count %></span>
     <span>&nbsp;|&nbsp;</span>

data/app/views/decidim/budgets/admin/budgets/manage_trash.html.erb

@@ -0,0 +1,19 @@
+<% add_decidim_page_title(t(".title")) %>
+<div class="card">
+  <div class="item_show__header">
+    <h1 class="item_show__header-title">
+      <%= t(".title") %>
+    </h1>
+  </div>
+  <div class="table-scroll">
+    <table class="table-list">
+      <%= render partial: "budgets-thead" %>
+      <tbody>
+        <%= render partial: "decidim/budgets/admin/budgets/budget-tr",
+                   collection: trashable_deleted_collection,
+                   as: :budget,
+                   locals: { view: :deleted } %>
+      </tbody>
+    </table>
+  </div>
+</div>

data/app/views/decidim/budgets/admin/projects/_actions.html.erb

@@ -0,0 +1,27 @@
+<% if view == :deleted %>
+  <% if allowed_to? :restore, :project, trashable_deleted_resource: project %>
+    <%= icon_link_to "refresh-line", restore_budget_project_path(project.budget, project), t("decidim.admin.actions.restore"), method: :patch, class: "action-icon--restore" %>
+  <% end %>
+<% else %>
+  <% if allowed_to? :update, :project, project: project %>
+    <%= icon_link_to "pencil-line", resource_locator([budget, project]).edit, t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
+  <% end %>
+
+  <% if allowed_to? :update, :project, project: project %>
+    <%= icon_link_to "folder-line", project_attachment_collections_path(project), t("actions.attachment_collections", scope: "decidim.budgets"), class: "action-icon--attachment_collections" %>
+  <% end %>
+
+  <% if allowed_to? :update, :project, project: project %>
+    <%= icon_link_to "attachment-line", project_attachments_path(project), t("actions.attachments", scope: "decidim.budgets"), class: "action-icon--attachments" %>
+  <% end %>
+
+  <%= icon_link_to "eye-line", resource_locator([budget, project]).path, t("actions.preview", scope: "decidim.budgets"), target: :blank, class: "action-icon--preview", data: { "external-link": false } %>
+
+  <%= resource_permissions_link(project) %>
+
+  <% if allowed_to? :soft_delete, :project, trashable_deleted_resource: project %>
+    <%= icon_link_to "delete-bin-line", soft_delete_budget_project_path(project.budget, project), t("actions.soft_delete", scope: "decidim.admin"), method: :patch, class: "action-icon--delete", data: { confirm: t("actions.confirm_delete_project", scope: "decidim.budgets") } %>
+  <% else %>
+    <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.admin") %>
+  <% end %>
+<% end %>

data/app/views/decidim/budgets/admin/projects/_bulk-actions.html.erb

@@ -2,8 +2,6 @@
   <div class="bulk-actions-budgets">
     <%= render partial: "decidim/budgets/admin/projects/bulk_actions/dropdown" %>
 
-    <%= render partial: "decidim/budgets/admin/projects/bulk_actions/recategorize" %>
-    <%= render partial: "decidim/budgets/admin/projects/bulk_actions/scope-change" %>
     <%= render partial: "decidim/budgets/admin/projects/bulk_actions/change-selected" %>
     <%= render partial: "decidim/budgets/admin/projects/bulk_actions/budget-change" %>
 

data/app/views/decidim/budgets/admin/projects/_form.html.erb

@@ -19,16 +19,14 @@
         </div>
       <% end %>
 
-      <% if current_component.has_subscopes? %>
-        <div class="row column">
-          <%= scopes_select_field form, :decidim_scope_id, root: budget.scope %>
-        </div>
+      <% if @form.taxonomy_filters&.any? %>
+        <% @form.taxonomy_filters.each do |filter| %>
+          <div class="row column">
+            <%= filter_taxonomy_items_select_field form, :taxonomies, filter %>
+          </div>
+        <% end %>
       <% end %>
 
-      <div class="row column">
-        <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: true, disable_parents: false %>
-      </div>
-
     <% if Decidim::Budgets.enable_proposal_linking %>
       <div class="row column">
         <%= render partial: "decidim/proposals/proposals/proposals_picker", locals: { form:, field: :proposals } %>