decidim-budgets 0.29.6 → 0.30.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0648621c360cb9cb39fde337d46d906c570eefbc84c726fd0a79b5842ca36ad3'
-  data.tar.gz: ed13835a41ffdca4c93d9febffc6a0e70baefe74adae81e40d4faaade49ed86e
+  metadata.gz: 4f61ddb38528d8de7d2ea618510e38483a886412fee3c2f04892ca2b770cd144
+  data.tar.gz: 9835b3844b8eaeda38554afc8cc0d9b9c596bddec33685ded1f1cc65ea7ac4c1
 SHA512:
-  metadata.gz: b1a708d404d3be31c0e5cf8f9d25c4c7616186bcd2a00242e582388b549c046e6aad70f896c1084f4d9079f66e063c8cab2c269de832a4100f093c46ac33306c
-  data.tar.gz: 1353bab627437dd55cfc9e4271ceb8ed09b341846fea7f328f8c9da7ac793029ec2dd72065ec323601bd02371008af9be94e37e41ecd28826614e2e857f6adc4
+  metadata.gz: 2c48bcf67002f20c9f2aa2cf64b0003fe7f240ca8a1f71b42078e2f84c4ea0d37558806e2171eca052b3120986ffdb925753baa0e316127de87cf031401acc6c
+  data.tar.gz: bc01dd9c572d4446395801bb570f4bd2486811f1b4a4363031f6aeb2c175654fd2b0dc12cadbc29fda17ca7d27167a0da0d2f0c85e33e72438dde540a1cd1b32

data/app/cells/decidim/budgets/budget_list_item/vote_action.erb

@@ -5,8 +5,8 @@
         class: "pl-4",
         data: { confirm: t(:are_you_sure, scope: "decidim.budgets.projects.budget_summary") }
       ) do %>
-      <%= icon "delete-bin-line", class: "inline-block align-middle text-gray fill-current" %>
-      <span class="inline-block align-middle underline text-alert">
+      <%= icon "delete-bin-line", class: "inline-block align-middle text-gray fill-secondary" %>
+      <span class="inline-block align-middle underline text-secondary">
         <%= t("cancel_order", scope: "decidim.budgets.projects.budget_summary") %>
       </span>
   <% end %>

data/app/cells/decidim/budgets/budgets_list/main_list.erb

@@ -1,5 +1,5 @@
 <h2 class="h5 md:h3 decorator"><%= t(:count, scope: i18n_scope, count: budgets.length) %></h2>
 
-  <%= render partial: "decidim/shared/orders", formats: [:html], locals: { orders: AVAILABLE_ORDERS, i18n_scope: "decidim.budgets.budgets_list.orders", css_class: "items-start ml-6", b_css_class: "!justify-start pb-0 pl-0" } %>
+<%= render partial: "decidim/shared/orders", formats: [:html], locals: { orders: AVAILABLE_ORDERS, i18n_scope: "decidim.budgets.budgets_list.orders" } %>
 
 <%= render :card_list %>

data/app/cells/decidim/budgets/budgets_list/show.erb

@@ -7,7 +7,7 @@
 <% end %>
 
 <% if budgets.where.not(id: voted.map(&:id)).exists? %>
-  <div id="budgets" class="card__list-list !space-y-5 w-full">
+  <div id="budgets" class="card__list-list">
     <%= main_list %>
   </div>
 <% end %>

data/app/cells/decidim/budgets/project_history_cell.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    # This cell is used to render the project history panel of a resource
+    # inside a tab of a show view
+    #
+    # The `model` must be a project's budget resource to get the history from.
+    #
+    # Example:
+    #
+    #   cell(
+    #     "decidim/project_history",
+    #     budget
+    #   )
+    class ProjectHistoryCell < Decidim::ResourceHistoryCell
+      def linked_resources_items
+        [
+          {
+            resources: @model.linked_resources(:proposals, "included_proposals"),
+            link_name: "included_proposals",
+            text_key: "decidim.proposals.proposal.budget_text",
+            icon_key: "Decidim::Proposals::Proposal"
+          },
+          {
+            resources: @model.linked_resources(:results, "included_projects"),
+            link_name: "included_projects",
+            text_key: "decidim.accountability.result.budget_text",
+            icon_key: "Decidim::Accountability::Result"
+          }
+        ]
+      end
+
+      def creation_item
+        {
+          id: "budget_creation",
+          date: @model.created_at,
+          text: t("decidim.budgets.creation.text"),
+          icon: resource_type_icon_key("Decidim::Budgets::Project")
+        }
+      end
+
+      def history_cell_id
+        "budget"
+      end
+    end
+  end
+end

data/app/cells/decidim/budgets/project_metadata_cell.rb

@@ -19,11 +19,11 @@ module Decidim
       private
 
       def project_items
-        [voted_item, category_item, scope_item, status_item]
+        [voted_item] + taxonomy_items + [status_item]
       end
 
-      def project_items_for_map
-        [voted_item_for_map, category_item, scope_item].compact_blank.map do |item|
+      def items_for_map
+        ([voted_item_for_map] + taxonomy_items).compact_blank.map do |item|
           {
             text: item[:text].to_s.html_safe,
             icon: item[:icon].present? ? icon(item[:icon]).html_safe : nil

data/app/cells/decidim/budgets/project_vote_button/show.erb

@@ -2,14 +2,16 @@
                                 budget_order_line_item_path(model.budget, project_id: model, show_only_added: options[:show_only_added]),
                                 method: vote_button_method,
                                 remote: true,
-                                class: "button w-full #{vote_button_classes}",
+                                resource: model,
+                                class: "button #{vote_button_classes}",
                                 id: "project-vote-button-#{model.id}",
                                 data: {
                                   add: !resource_added?,
                                   disable: true,
                                   budget: model.budget_amount,
                                   allocation: resource_allocation,
-                                  "redirect-url": resource_path
+                                  "redirect-url": resource_path,
+                                  onboarding_redirect_path: resource_index_path
                                 },
                                 disabled: vote_button_disabled?,
                                 title: vote_button_label do %>

data/app/cells/decidim/budgets/project_vote_button_cell.rb

@@ -20,6 +20,10 @@ module Decidim
         resource_locator([model.budget, model]).path
       end
 
+      def resource_index_path
+        resource_locator(model.budget).path
+      end
+
       def resource_title
         translated_attribute model.title
       end

data/app/commands/decidim/budgets/admin/create_budget.rb

@@ -6,7 +6,7 @@ module Decidim
       # This command is executed when the user creates an Budget
       # from the admin panel.
       class CreateBudget < Decidim::Commands::CreateResource
-        fetch_form_attributes :component, :scope, :title, :weight, :description, :total_budget
+        fetch_form_attributes :component, :title, :weight, :description, :total_budget
 
         private
 

data/app/commands/decidim/budgets/admin/create_project.rb

@@ -7,7 +7,7 @@ module Decidim
       # panel.
       class CreateProject < Decidim::Commands::CreateResource
         include ::Decidim::GalleryMethods
-        fetch_form_attributes :budget, :scope, :category, :title, :description, :budget_amount, :address, :latitude, :longitude
+        fetch_form_attributes :budget, :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
 
         private
 

data/app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb

@@ -47,8 +47,7 @@ module Decidim
             title: original_proposal.title,
             description: original_proposal.body,
             budget_amount: budget_for(original_proposal),
-            category: original_proposal.category,
-            scope: original_proposal.scope,
+            taxonomies: original_proposal.taxonomies,
             address: original_proposal.address,
             latitude: original_proposal.latitude,
             longitude: original_proposal.longitude
@@ -69,12 +68,6 @@ module Decidim
         end
 
         def proposals
-          return all_proposals if form.scope_id.blank?
-
-          all_proposals.where(decidim_scope_id: form.scope_id)
-        end
-
-        def all_proposals
           Decidim::Proposals::Proposal.where(component: origin_component).published.not_hidden.not_withdrawn.accepted.order(:published_at)
         end
 

data/app/commands/decidim/budgets/admin/update_budget.rb

@@ -6,7 +6,7 @@ module Decidim
       # This command is executed when the user updates a Budget
       # from the admin panel.
       class UpdateBudget < Decidim::Commands::UpdateResource
-        fetch_form_attributes :scope, :title, :weight, :description, :total_budget
+        fetch_form_attributes :title, :weight, :description, :total_budget
 
         protected
 

data/app/commands/decidim/budgets/admin/update_project.rb

@@ -7,10 +7,10 @@ module Decidim
       # panel.
       class UpdateProject < Decidim::Commands::UpdateResource
         include ::Decidim::GalleryMethods
-        fetch_form_attributes :scope, :category, :title, :description, :budget_amount, :address, :latitude, :longitude
+        fetch_form_attributes :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
 
         def initialize(form, project)
-          super(form, project)
+          super
           @attached_to = project
         end
 

data/app/commands/decidim/budgets/admin/update_project_selection.rb

@@ -24,7 +24,7 @@ module Decidim
 
           update_projects_selection
 
-          broadcast(:update_projects_selection, @response)
+          broadcast(:update_projects_selection, @response, @selection)
         end
 
         private

data/app/controllers/concerns/decidim/budgets/admin/filterable.rb

@@ -16,7 +16,11 @@ module Decidim
           private
 
           def base_query
-            collection
+            return collection unless taxonomy_order_or_search?
+
+            # this is a trick to avoid duplicates when using search in associations as suggested in:
+            # https://activerecord-hackery.github.io/ransack/going-further/other-notes/#problem-with-distinct-selects
+            collection.includes(:taxonomies).joins(:taxonomies)
           end
 
           def search_field_predicate
@@ -25,25 +29,17 @@ module Decidim
 
           def filters
             [
-              :scope_id_eq,
-              :category_id_eq,
+              :taxonomies_part_of_contains,
               :selected_at_null
             ]
           end
 
           def filters_with_values
             {
-              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),
               selected_at_null: [true, false]
             }
           end
-
-          # Cannot user `super` here, because it does not belong to a superclass
-          # but to a concern.
-          def dynamically_translated_filters
-            [:scope_id_eq, :category_id_eq]
-          end
         end
       end
     end

data/app/controllers/decidim/budgets/admin/budgets_controller.rb

@@ -5,6 +5,7 @@ module Decidim
     module Admin
       # This controller allows the create or update a budget.
       class BudgetsController < Admin::ApplicationController
+        include Decidim::Admin::HasTrashableResources
         helper_method :budgets, :budget, :finished_orders, :pending_orders,
                       :users_with_pending_orders, :users_with_finished_orders
 
@@ -52,30 +53,26 @@ module Decidim
           end
         end
 
-        def destroy
-          enforce_permission_to(:delete, :budget, budget:)
-
-          DestroyBudget.call(budget, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("budgets.destroy.success", scope: "decidim.budgets.admin")
-            end
-
-            on(:invalid) do
-              flash.now[:alert] = I18n.t("budgets.destroy.invalid", scope: "decidim.budgets.admin")
-            end
-          end
+        private
 
-          redirect_to budgets_path
+        def trashable_deleted_resource_type
+          :budget
         end
 
-        private
+        def trashable_deleted_collection
+          @trashable_deleted_collection ||= Budget.where(component: current_component).only_deleted.deleted_at_desc
+        end
 
         def budgets
           @budgets ||= Budget.where(component: current_component).order(weight: :asc)
         end
 
         def budget
-          @budget ||= budgets.find_by(id: params[:id])
+          @budget ||= Budget.where(component: current_component).find_by(id: params[:id])
+        end
+
+        def trashable_deleted_resource
+          @trashable_deleted_resource ||= Budget.with_deleted.find_by(component: current_component, id: params[:id])
         end
 
         def orders

data/app/controllers/decidim/budgets/admin/projects_controller.rb

@@ -6,6 +6,8 @@ module Decidim
       # This controller allows an admin to manage projects from a Participatory Process
       class ProjectsController < Admin::ApplicationController
         include Decidim::ApplicationHelper
+        include Decidim::Admin::HasTrashableResources
+        include Decidim::Admin::ComponentTaxonomiesHelper
         include Decidim::Budgets::Admin::Filterable
         helper Decidim::Budgets::Admin::ProjectBulkActionsHelper
         helper Decidim::Budgets::ProjectsHelper
@@ -65,73 +67,37 @@ module Decidim
           end
         end
 
-        def destroy
-          enforce_permission_to(:destroy, :project, project:)
+        def update_taxonomies
+          enforce_permission_to :update, :project_taxonomy
 
-          Decidim::Commands::DestroyResource.call(project, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("projects.destroy.success", scope: "decidim.budgets.admin")
-              redirect_to budget_projects_path(budget)
-            end
-          end
-        end
-
-        def update_category
-          enforce_permission_to :update, :project_category
-
-          ::Decidim::Budgets::Admin::UpdateProjectCategory.call(params[:category][:id], project_ids) do
-            on(:invalid_category) do
-              flash.now[:error] = I18n.t(
-                "projects.update_category.select_a_category",
-                scope: "decidim.budgets.admin"
-              )
-            end
-
-            on(:invalid_project_ids) do
-              flash.now[:alert] = I18n.t(
-                "projects.update_category.select_a_project",
+          UpdateResourcesTaxonomies.call(params[:taxonomies], Decidim::Budgets::Project.where(id: project_ids), current_organization) do
+            on(:invalid_taxonomies) do
+              flash[:error] = I18n.t(
+                "projects.update_taxonomies.select_a_taxonomy",
                 scope: "decidim.budgets.admin"
               )
             end
 
-            on(:update_projects_category) do
-              flash.now[:notice] = update_projects_bulk_response_successful(@response, :category)
-              flash.now[:alert] = update_projects_bulk_response_errored(@response, :category)
-            end
-          end
-
-          respond_to do |format|
-            format.js { render :update_attribute, locals: { form_selector: "#js-form-recategorize-projects", attribute_selector: "#category_id" } }
-          end
-        end
-
-        def update_scope
-          enforce_permission_to :update, :project_scope
-
-          ::Decidim::Budgets::Admin::UpdateProjectScope.call(params[:scope_id], project_ids) do
-            on(:invalid_scope) do
-              flash.now[:error] = t(
-                "projects.update_scope.select_a_scope",
+            on(:invalid_resources) do
+              flash[:alert] = I18n.t(
+                "projects.update_taxonomies.select_a_project",
                 scope: "decidim.budgets.admin"
               )
             end
 
-            on(:invalid_project_ids) do
-              flash.now[:alert] = t(
-                "projects.update_scope.select_a_project",
-                scope: "decidim.budgets.admin"
-              )
-            end
+            on(:update_resources_taxonomies) do |response|
+              interpolations = {
+                successful: response[:successful].map { |resource| decidim_escape_translated(resource.title) }.to_sentence,
+                errored: response[:errored].map { |resource| decidim_escape_translated(resource.title) }.to_sentence,
+                taxonomies: response[:taxonomies].map { |taxonomy| decidim_escape_translated(taxonomy.name) }.to_sentence
+              }
 
-            on(:update_projects_scope) do
-              flash.now[:notice] = update_projects_bulk_response_successful(@response, :scope)
-              flash.now[:alert] = update_projects_bulk_response_errored(@response, :scope)
+              flash[:notice] = update_projects_bulk_response_successful(interpolations, :taxonomy) if response[:successful].any?
+              flash[:alert] = update_projects_bulk_response_errored(interpolations, :taxonomy) if response[:errored].any?
             end
           end
 
-          respond_to do |format|
-            format.js { render :update_attribute, locals: { form_selector: "#js-form-scope-change-projects", attribute_selector: "#scope_id" } }
-          end
+          redirect_to budget_projects_path
         end
 
         def update_selected
@@ -152,9 +118,15 @@ module Decidim
               )
             end
 
-            on(:update_projects_selection) do
-              flash.now[:notice] = update_projects_bulk_response_successful(@response, :selected, selection: @selection)
-              flash.now[:alert] = update_projects_bulk_response_errored(@response, :selected, selection: @selection)
+            on(:update_projects_selection) do |response, selection|
+              interpolations = {
+                subject_name: response[:subject_name],
+                successful: response[:successful].to_sentence,
+                errored: response[:errored].to_sentence
+              }
+
+              flash.now[:notice] = update_projects_bulk_response_successful(interpolations, :selected, selection:) if response[:successful].any?
+              flash.now[:alert] = update_projects_bulk_response_errored(interpolations, :selected, selection:) if response[:errored].any?
             end
           end
 
@@ -170,10 +142,16 @@ module Decidim
               flash.now[:alert] = t("projects.update_budget.select_a_project", scope: "decidim.budgets.admin")
             end
 
-            on(:update_projects_budget) do
-              moved_items(@response)
-              flash.now[:notice] = update_projects_bulk_response_successful(@response, :budget)
-              flash.now[:alert] = update_projects_bulk_response_errored(@response, :budget)
+            on(:update_projects_budget) do |response|
+              moved_items(response)
+              interpolations = {
+                subject_name: response[:subject_name],
+                successful: response[:successful].to_sentence,
+                errored: response[:errored].to_sentence
+              }
+
+              flash.now[:notice] = update_projects_bulk_response_successful(interpolations, :budget) if response[:successful].any?
+              flash.now[:alert] = update_projects_bulk_response_errored(interpolations, :budget) if response[:errored].any?
             end
           end
 
@@ -184,6 +162,18 @@ module Decidim
 
         private
 
+        def trashable_deleted_resource_type
+          :project
+        end
+
+        def trashable_deleted_collection
+          @trashable_deleted_collection ||= filtered_collection.only_deleted.deleted_at_desc
+        end
+
+        def find_parent_resource
+          @find_parent_resource ||= budget
+        end
+
         def projects
           @projects ||= filtered_collection
         end
@@ -217,22 +207,17 @@ module Decidim
         end
 
         def project
-          @project ||= projects.find(params[:id])
+          @project ||= filtered_collection.find_by(id: params[:id])
         end
 
-        def update_projects_bulk_response_successful(response, subject, extra = {})
-          return if response[:successful].blank?
-
-          interpolations = {
-            subject_name: response[:subject_name],
-            projects: response[:successful].to_sentence
-          }
+        def trashable_deleted_resource
+          @trashable_deleted_resource ||= filtered_collection.with_deleted.find_by(id: params[:id])
+        end
 
+        def update_projects_bulk_response_successful(interpolations, subject, extra = {})
           case subject
-          when :category
-            t("projects.update_category.success", scope: "decidim.budgets.admin", **interpolations)
-          when :scope
-            t("projects.update_scope.success", scope: "decidim.budgets.admin", **interpolations)
+          when :taxonomy
+            t("projects.update_taxonomies.success", scope: "decidim.budgets.admin", **interpolations)
           when :budget
             t("projects.update_budget.success", scope: "decidim.budgets.admin", **interpolations)
           when :selected
@@ -244,19 +229,10 @@ module Decidim
           end
         end
 
-        def update_projects_bulk_response_errored(response, subject, extra = {})
-          return if response[:errored].blank?
-
-          interpolations = {
-            subject_name: response[:subject_name],
-            projects: response[:errored].to_sentence
-          }
-
+        def update_projects_bulk_response_errored(interpolations, subject, extra = {})
           case subject
-          when :category
-            t("projects.update_category.invalid", scope: "decidim.budgets.admin", **interpolations)
-          when :scope
-            t("projects.update_scope.invalid", scope: "decidim.budgets.admin", **interpolations)
+          when :taxonomy
+            t("projects.update_taxonomies.invalid", scope: "decidim.budgets.admin", **interpolations)
           when :budget
             t("projects.update_budget.invalid", scope: "decidim.budgets.admin", **interpolations)
           when :selected

data/app/controllers/decidim/budgets/orders_controller.rb

@@ -6,14 +6,14 @@ module Decidim
     class OrdersController < Decidim::Budgets::ApplicationController
       include NeedsCurrentOrder
 
+      helper_method :pending_to_vote_budgets
+
       def checkout
         enforce_permission_to :vote, :project, order: current_order, budget:, workflow: current_workflow
 
         Checkout.call(current_order) do
           on(:ok) do
-            i18n_key = pending_to_vote_budgets.any? ? "success_html" : "success_no_left_budgets_html"
-            flash[:notice] = I18n.t(i18n_key, scope: "decidim.orders.checkout", rest_of_budgets_link: "#budgets")
-            redirect_to budgets_path
+            redirect_to status_budget_order_path(budget)
           end
 
           on(:invalid) do
@@ -37,6 +37,10 @@ module Decidim
         end
       end
 
+      def status
+        redirect_to redirect_path unless current_order.persisted?
+      end
+
       private
 
       def budget

data/app/controllers/decidim/budgets/projects_controller.rb

@@ -42,15 +42,14 @@ module Decidim
       end
 
       def search_collection
-        budget.projects.includes([:scope, :component, :attachments, :category]).with_order(filter_params[:addition_type] == "added" ? current_order : nil)
+        budget.projects.includes([:component, :attachments, :taxonomies]).with_order(filter_params[:addition_type] == "added" ? current_order : nil)
       end
 
       def default_filter_params
         {
           search_text_cont: "",
           with_any_status: default_filter_status_params,
-          with_any_scope: nil,
-          with_any_category: nil,
+          with_any_taxonomies: nil,
           addition_type: "all"
         }
       end
@@ -74,20 +73,12 @@ module Decidim
       def items
         @items ||= [
           {
-            enabled: @project.linked_resources(:proposals, "included_proposals").present?,
-            id: "included_proposals",
-            text: t("decidim/proposals/proposal", scope: "activerecord.models", count: 2),
-            icon: resource_type_icon_key("Decidim::Budgets::Project"),
+            enabled: ProjectHistoryCell.new(@project).render?,
+            id: "included_history",
+            text: t("decidim.history", scope: "activerecord.models", count: 2),
+            icon: resource_type_icon_key("history"),
             method: :cell,
-            args: ["decidim/linked_resources_for", @project, { type: :proposals, link_name: "included_proposals" }]
-          },
-          {
-            enabled: @project.linked_resources(:results, "included_projects").present?,
-            id: "included_results",
-            text: t("decidim/accountability/result", scope: "activerecord.models", count: 2),
-            icon: resource_type_icon_key("Decidim::Accountability::Result"),
-            method: :cell,
-            args: ["decidim/linked_resources_for", @project, { type: :results, link_name: "included_projects" }]
+            args: ["decidim/budgets/project_history", @project]
           },
           {
             enabled: @project.photos.present?,

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

@@ -13,27 +13,10 @@ module Decidim
         attribute :weight, Integer, default: 0
         translatable_attribute :description, Decidim::Attributes::RichText
         attribute :total_budget, Integer, default: 0
-        attribute :decidim_scope_id, Integer
 
         validates :title, translatable_presence: true
         validates :weight, numericality: { greater_than_or_equal_to: 0 }
         validates :total_budget, numericality: { greater_than: 0 }
-        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? }
-
-        # 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 meeting
-        def decidim_scope_id
-          super || scope&.id
-        end
       end
     end
   end

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

@@ -26,12 +26,11 @@ module Decidim
         def voting_ends_soon?
           return false unless participatory_space.respond_to? :active_step
           return false if participatory_space.active_step.blank?
-          return false unless participatory_space.active_step[:end_date]
 
           time_zone = current_organization.time_zone
           return false if time_zone.blank?
 
-          end_time = participatory_space.active_step[:end_date].in_time_zone(time_zone).end_of_day
+          end_time = current_component.participatory_space.active_step[:end_date].in_time_zone(time_zone).end_of_day
 
           6.hours.from_now >= end_time
         end