decidim-budgets 0.28.3 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aac359f916ac5cadc2e72ba36ce01126bb5fb7c27a06c42a2464224a93fb678
-  data.tar.gz: 20d57613164ce76a6d9a84470d7c9f17ee3e26dccbae486706c6810da2ec8cd9
+  metadata.gz: 240b6ab72430080143780dd027d5835db4014f03099e6c824fadb6b1efd75946
+  data.tar.gz: c21175ea1e8a905957bb74c6b9e964b0caac9c9b17400bc6c73ef37b39abbe18
 SHA512:
-  metadata.gz: 6819234f06d41d5c562b4a1a904e6d9382cea910b11033c195eecd4e216c65c14d1cb41beeeccefe63c54433242c741dabf5e9d4f01e13414d4810aa4cd09eb2
-  data.tar.gz: 0e166dd444bcd08a844c9f020ee0a0f2e073319a70d4249f1187070604798094c3253f88d183ddc86ec65a70302775d163e7c24db7b69bd38d07195cd3409aeb
+  metadata.gz: f6e289beaf9d39920f70a1860bc5b73da56acf017d70367143fc95b4a4bab42884c7dde260ae056f74fbd2aa981c8baf66febe5a4b8ba17ce7936d2e9a05e705
+  data.tar.gz: 1f5557dd4c8a82dc39ce66e8e3c5238536a69d2a84aeaa45b46fac7a07f8dd5518faca25a8c63191c900000ddd7d90220155c2f9f396511dc09228b235b7c922

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

@@ -4,8 +4,6 @@ module Decidim
   module Budgets
     # This cell has the commons for the budgets cells
     class BaseCell < Decidim::ViewModel
-      include Decidim::LayoutHelper
-      include Decidim::SanitizeHelper
       include Decidim::ComponentPathHelper
       include Decidim::Budgets::Engine.routes.url_helpers
 

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

@@ -4,9 +4,6 @@ module Decidim
   module Budgets
     # This cell renders the budget item list in the budgets list
     class BudgetListItemCell < BaseCell
-      include Decidim::SanitizeHelper
-      include Decidim::ApplicationHelper
-      include ActiveSupport::NumberHelper
       include Decidim::Budgets::ProjectsHelper
 
       delegate :highlighted, to: :current_workflow

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

@@ -13,7 +13,7 @@ module Decidim
       end
 
       def resource_link_text
-        decidim_html_escape(translated_attribute(budget.title))
+        decidim_escape_translated(budget.title)
       end
 
       private

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

@@ -7,7 +7,6 @@ module Decidim
     # This cell renders the List (:l) project card
     # for an instance of a Project
     class ProjectLCell < Decidim::CardLCell
-      include ActiveSupport::NumberHelper
       include Decidim::Budgets::ProjectsHelper
 
       alias project model

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

@@ -5,7 +5,6 @@ module Decidim
     # This cell renders an authorized_action button
     # to vote a given instance of a Project in a budget list
     class ProjectVoteButtonCell < Decidim::ViewModel
-      include Decidim::ActionAuthorizationHelper
       include Decidim::Budgets::ProjectsHelper
       include Decidim::Budgets::Engine.routes.url_helpers
 

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

@@ -4,8 +4,6 @@ module Decidim
   module Budgets
     # This cell renders a checkmark with a text.
     class ProjectVotedHintCell < BaseCell
-      include Decidim::IconHelper
-
       delegate :voted_for?, :current_order, to: :controller
 
       def show

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

@@ -5,8 +5,6 @@ module Decidim
     # This cell renders the vote count.
     # Two possible layouts: One or two lines
     class ProjectVotesCountCell < Decidim::ViewModel
-      include Decidim::IconHelper
-
       def show
         return unless show_votes_count?
 

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

@@ -5,43 +5,14 @@ module Decidim
     module Admin
       # This command is executed when the user creates an Budget
       # from the admin panel.
-      class CreateBudget < Decidim::Command
-        def initialize(form)
-          @form = form
-        end
-
-        # Creates the budget if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          create_budget!
-
-          broadcast(:ok, budget)
-        end
+      class CreateBudget < Decidim::Commands::CreateResource
+        fetch_form_attributes :component, :scope, :title, :weight, :description, :total_budget
 
         private
 
-        attr_reader :form, :budget
-
-        def create_budget!
-          attributes = {
-            component: form.current_component,
-            scope: form.scope,
-            title: form.title,
-            weight: form.weight,
-            description: form.description,
-            total_budget: form.total_budget
-          }
+        def extra_params = { visibility: "all" }
 
-          @budget = Decidim.traceability.create!(
-            Budget,
-            form.current_user,
-            attributes,
-            visibility: "all"
-          )
-        end
+        def resource_class = Decidim::Budgets::Budget
       end
     end
   end

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

@@ -3,8 +3,10 @@
 module Decidim
   module Budgets
     module Admin
-      # This command is executed when admin sends vote reminders.
+      # This command is executed when an admin sends vote reminders.
       class CreateOrderReminders < Decidim::Command
+        delegate :current_component, :voting_enabled?, :voting_ends_soon?, :minimum_interval_between_reminders, to: :form
+
         def initialize(form)
           @form = form
         end
@@ -29,8 +31,8 @@ module Decidim
               next if %w(active pending).exclude? record.state
 
               record.state = begin
-                if record.remindable.created_at > minimum_time_between_reminders ||
-                   (reminder.deliveries.present? && reminder.deliveries.last.created_at > minimum_time_between_reminders)
+                if record.remindable.created_at > minimum_interval_between_reminders.ago ||
+                   (reminder.deliveries.present? && reminder.deliveries.last.created_at > minimum_interval_between_reminders.ago)
                   "pending"
                 else
                   "active"
@@ -41,25 +43,9 @@ module Decidim
           end
         end
 
-        def minimum_time_between_reminders
-          form.minimum_interval_between_reminders.ago
-        end
-
         def generator
           @generator ||= Decidim::Budgets::OrderReminderGenerator.new
         end
-
-        def current_component
-          form.current_component
-        end
-
-        def voting_enabled?
-          form.voting_enabled?
-        end
-
-        def voting_ends_soon?
-          form.voting_ends_soon?
-        end
       end
     end
   end

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

@@ -5,65 +5,39 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Project from the admin
       # panel.
-      class CreateProject < Decidim::Command
+      class CreateProject < Decidim::Commands::CreateResource
         include ::Decidim::GalleryMethods
+        fetch_form_attributes :budget, :scope, :category, :title, :description, :budget_amount, :address, :latitude, :longitude
 
-        def initialize(form)
-          @form = form
-        end
-
-        # Creates the project if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if @form.invalid?
-
-          if process_gallery?
-            build_gallery
-            return broadcast(:invalid) if gallery_invalid?
-          end
+        private
 
-          transaction do
-            create_project!
-            link_proposals
-            create_gallery if process_gallery?
-          end
+        attr_reader :gallery
 
-          broadcast(:ok)
+        def run_after_hooks
+          @attached_to = resource
+          link_proposals
+          create_gallery if process_gallery?
         end
 
-        private
-
-        attr_reader :form, :project, :gallery
+        def run_before_hooks
+          return unless process_gallery?
 
-        def create_project!
-          attributes = {
-            budget: form.budget,
-            scope: form.scope,
-            category: form.category,
-            title: form.title,
-            description: form.description,
-            budget_amount: form.budget_amount,
-            address: form.address,
-            latitude: form.latitude,
-            longitude: form.longitude
-          }
+          build_gallery
+          raise Decidim::Commands::HookError if gallery_invalid?
+        end
 
-          @project = Decidim.traceability.create!(
-            Project,
-            form.current_user,
-            attributes,
-            visibility: "all"
-          )
-          @attached_to = @project
+        def extra_params
+          { visibility: "all" }
         end
 
+        def resource_class = Decidim::Budgets::Project
+
         def proposals
-          @proposals ||= project.sibling_scope(:proposals).where(id: form.proposal_ids)
+          @proposals ||= resource.sibling_scope(:proposals).where(id: form.proposal_ids)
         end
 
         def link_proposals
-          project.link_resources(proposals, "included_proposals")
+          resource.link_resources(proposals, "included_proposals")
         end
       end
     end

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

@@ -5,37 +5,12 @@ module Decidim
     module Admin
       # This command is executed when the user destroys a Budget
       # from the admin panel.
-      class DestroyBudget < Decidim::Command
-        def initialize(budget, current_user)
-          @budget = budget
-          @current_user = current_user
-        end
-
-        # Destroys the budget if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if budget.projects.present?
-
-          destroy_budget!
-
-          broadcast(:ok, budget)
-        end
-
+      class DestroyBudget < Decidim::Commands::DestroyResource
         private
 
-        attr_reader :budget, :current_user
+        def invalid? = resource.projects.present?
 
-        def destroy_budget!
-          Decidim.traceability.perform_action!(
-            :delete,
-            budget,
-            current_user,
-            visibility: "all"
-          ) do
-            budget.destroy!
-          end
-        end
+        def extra_params = { visibility: "all" }
       end
     end
   end

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

@@ -75,8 +75,7 @@ module Decidim
         end
 
         def all_proposals
-          Decidim::Proposals::Proposal.where(component: origin_component)
-                                      .where(state: :accepted)
+          Decidim::Proposals::Proposal.where(component: origin_component).accepted
         end
 
         def origin_component

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

@@ -5,43 +5,12 @@ module Decidim
     module Admin
       # This command is executed when the user updates a Budget
       # from the admin panel.
-      class UpdateBudget < Decidim::Command
-        def initialize(form, budget)
-          @form = form
-          @budget = budget
-        end
+      class UpdateBudget < Decidim::Commands::UpdateResource
+        fetch_form_attributes :scope, :title, :weight, :description, :total_budget
 
-        # Updates the budget if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
+        protected
 
-          update_budget!
-
-          broadcast(:ok, budget)
-        end
-
-        private
-
-        attr_reader :form, :budget
-
-        def update_budget!
-          attributes = {
-            scope: form.scope,
-            title: form.title,
-            weight: form.weight,
-            description: form.description,
-            total_budget: form.total_budget
-          }
-
-          Decidim.traceability.update!(
-            budget,
-            form.current_user,
-            attributes,
-            visibility: "all"
-          )
-        end
+        def extra_params = { visibility: "all" }
       end
     end
   end

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

@@ -5,66 +5,40 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Project from the admin
       # panel.
-      class UpdateProject < Decidim::Command
+      class UpdateProject < Decidim::Commands::UpdateResource
         include ::Decidim::GalleryMethods
+        fetch_form_attributes :scope, :category, :title, :description, :budget_amount, :address, :latitude, :longitude
 
-        # Initializes an UpdateProject Command.
-        #
-        # form - The form from which to get the data.
-        # project - The current instance of the project to be updated.
         def initialize(form, project)
-          @form = form
-          @project = project
+          super(form, project)
           @attached_to = project
         end
 
-        # Updates the project if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          if process_gallery?
-            build_gallery
-            return broadcast(:invalid) if gallery_invalid?
-          end
-
-          transaction do
-            update_project
-            link_proposals
-            create_gallery if process_gallery?
-            photo_cleanup!
-          end
+        private
 
-          broadcast(:ok)
+        def run_after_hooks
+          link_proposals
+          create_gallery if process_gallery?
+          photo_cleanup!
         end
 
-        private
+        def run_before_hooks
+          return unless process_gallery?
 
-        attr_reader :project, :form, :gallery
+          build_gallery
+          raise Decidim::Commands::HookError if gallery_invalid?
+        end
 
-        def update_project
-          Decidim.traceability.update!(
-            project,
-            form.current_user,
-            scope: form.scope,
-            category: form.category,
-            title: form.title,
-            description: form.description,
-            budget_amount: form.budget_amount,
-            selected_at:,
-            address: form.address,
-            latitude: form.latitude,
-            longitude: form.longitude
-          )
+        def attributes
+          super.merge({ selected_at: })
         end
 
         def proposals
-          @proposals ||= project.sibling_scope(:proposals).where(id: form.proposal_ids)
+          @proposals ||= resource.sibling_scope(:proposals).where(id: form.proposal_ids)
         end
 
         def link_proposals
-          project.link_resources(proposals, "included_proposals")
+          resource.link_resources(proposals, "included_proposals")
         end
 
         def selected_at

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

@@ -9,7 +9,7 @@ module Decidim
       # Note that it inherits from `Decidim::Components::BaseController`, which
       # override its layout and provide all kinds of useful methods.
       class ApplicationController < Decidim::Admin::Components::BaseController
-        helper_method :budget, :projects, :project
+        helper_method :budget, :projects, :project, :maps_enabled?
 
         def budget
           @budget ||= Budget.where(component: current_component).includes(:projects).find_by(id: params[:budget_id])
@@ -24,6 +24,10 @@ module Decidim
         def project
           @project ||= projects.find(params[:id])
         end
+
+        def maps_enabled?
+          @maps_enabled ||= current_component.settings.geocoding_enabled?
+        end
       end
     end
   end

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

@@ -68,7 +68,7 @@ module Decidim
         def destroy
           enforce_permission_to(:destroy, :project, project:)
 
-          DestroyProject.call(project, current_user) do
+          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)

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

@@ -21,7 +21,7 @@ module Decidim
         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 compoenent scope if missing.
+        # Finds the Scope from the given decidim_scope_id, uses the component scope if missing.
         #
         # Returns a Decidim::Scope
         def scope

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

@@ -46,7 +46,7 @@ module Decidim
 
       # Returns false if the current order does not have a rule for minimum budget
       # Returns false if the current order has not reached the minimum budget
-      # Otherwhise returns true
+      # Otherwise returns true
       def current_order_minimum_reached?
         return false if current_order.minimum_budget.zero?
 
@@ -114,7 +114,7 @@ module Decidim
         project
           .slice(:latitude, :longitude, :address)
           .merge(
-            title: decidim_html_escape(translated_attribute(project.title)),
+            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
           )

data/app/packs/src/decidim/budgets/admin/projects.js

@@ -78,7 +78,7 @@ $(() => {
 
       if (action) {
         $(`#js-form-${action}`).on("submit", () => {
-          $(".layout-content > .callout-wrapper").html("");
+          $(".layout-content > div[data-callout-wrapper]").html("");
         })
 
         $(`#js-${action}-actions`).removeClass("hide");

data/app/packs/stylesheets/budgets.scss

@@ -4,12 +4,8 @@
   }
 
   &-summary {
-    @apply bg-tertiary;
-
-    box-shadow: 0 4px 6px 0 rgba(211, 211, 211, 0.25);
-
     &__content {
-      @apply p-4 md:p-0;
+      @apply bg-tertiary p-4 md:h-full md:p-0;
     }
 
     &__container {
@@ -21,7 +17,7 @@
     }
 
     &__content__header {
-      @apply col-span-2 text-2xl mb-2;
+      @apply col-span-2 text-2xl pb-2 mb-2;
 
       .ql-editor {
         @apply inline-block text-2xl;
@@ -37,24 +33,20 @@
     }
 
     &__progressbar {
-      @apply my-4 relative;
+      @apply my-0 lg:my-4 relative;
 
       .budget-progress {
-        @apply bg-white rounded;
+        @apply bg-white rounded h-2;
       }
 
       &--minimum {
-        @apply absolute;
-
-        .progress-meter--minimum-mark {
-          @apply h-[20px] ml-auto w-[2px] bg-black block;
-        }
+        @apply absolute h-2 bg-gray-3 rounded-s;
       }
 
       &--meter {
         background-color: var(--success);
 
-        @apply h-[20px] rounded;
+        @apply h-2 rounded-s absolute;
       }
     }
 
@@ -71,11 +63,11 @@
     }
 
     &__progressbar-legend {
-      @apply text-sm block;
+      @apply text-xs md:text-sm block;
     }
 
     &__progressbar-legend-strong {
-      @apply font-bold block;
+      @apply font-semibold block text-[10px] md:text-sm text-nowrap;
     }
   }
 
@@ -231,7 +223,23 @@
 }
 
 .budget-summary__button-modal {
-  @apply col-span-12 mb-4 pb-4;
+  @apply hidden lg:text-secondary lg:block lg:col-span-12 lg:mb-4 lg:pb-4;
+}
+
+.budget-summary__button-dropdown {
+  @apply col-span-12 text-secondary lg:hidden;
+
+  &_text {
+    @apply flex gap-4 justify-start;
+
+    svg {
+      @apply w-5 h-5;
+    }
+  }
+
+  p {
+    @apply text-gray-4 font-normal text-[13px];
+  }
 }
 
 .progressbox-fixed-wrapper {
@@ -262,7 +270,11 @@
   }
 
   .budget-summary__button-modal {
-    @apply col-span-10 col-start-2 justify-start;
+    @apply hidden lg:text-secondary lg:block lg:col-span-10 lg:col-start-2 lg:justify-start;
+  }
+
+  .budget-summary__button-dropdown {
+    @apply block text-secondary col-span-10 col-start-2 justify-start lg:hidden;
   }
 
   .progressbox-fixed-wrapper {

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

@@ -25,7 +25,7 @@
           <% if current_component.has_subscopes? %>
            <%= th_resource_scope_label %>
           <% end %>
-          <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
+          <th><%= t("actions.title", scope: "decidim.budgets") %></th>
         </tr>
       </thead>
       <tbody>

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

@@ -12,11 +12,9 @@
     <% end %>
     <% if allowed_to? :import_proposals, :project %>
       <%= import_dropdown do %>
-        <%= link_to new_budget_proposals_import_path(budget) do %>
-          <li class="imports--component">
-            <%= t("actions.import", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")) %>
-          </li>
-        <% end %>
+        <li class="imports--component">
+          <%= link_to t("actions.import", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_budget_proposals_import_path(budget) %>
+        </li>
       <% end %>
     <% end %>
     <%= link_to t("actions.new_project", scope: "decidim.budgets"), new_budget_project_path, class: "button button__sm button__secondary new" if allowed_to? :create, :project %>

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

@@ -30,6 +30,11 @@
       <%= content_tag :strong, t("no", scope: "decidim.budgets.admin.projects.index.selected_options"), class: "label" %>
     <% end %>
   </td>
+  <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
+    <td>
+      <%= static_map_link(project, {}, { class: "static-map__admin" }) %>
+    </td>
+  <% end %>
   <td class="table-list__actions">
     <% 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" %>