decidim-initiatives 0.27.5 → 0.28.0.rc4

data/app/commands/decidim/initiatives/create_initiative.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
+require "decidim/components/namer"
+
 module Decidim
   module Initiatives
     # A command with all the business logic that creates a new initiative.
     class CreateInitiative < Decidim::Command
       include CurrentLocale
       include ::Decidim::MultipleAttachmentsMethods
+      include ::Decidim::GalleryMethods
 
       # Public: Initializes the command.
       #
@@ -19,7 +22,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call
@@ -30,6 +33,11 @@ module Decidim
           return broadcast(:invalid) if attachments_invalid?
         end
 
+        if process_gallery?
+          build_gallery
+          return broadcast(:invalid) if gallery_invalid?
+        end
+
         initiative = create_initiative
 
         if initiative.persisted?
@@ -50,8 +58,10 @@ module Decidim
 
         initiative.transaction do
           initiative.save!
+
           @attached_to = initiative
           create_attachments if process_attachments?
+          create_gallery if process_gallery?
 
           create_components_for(initiative)
           send_notification(initiative)
@@ -68,21 +78,16 @@ module Decidim
           title: { current_locale => form.title },
           description: { current_locale => form.description },
           author: current_user,
+          scoped_type:,
+          signature_type: form.type.signature_type,
           decidim_user_group_id: form.decidim_user_group_id,
-          scoped_type: scoped_type,
-          area: area,
-          signature_type: form.signature_type,
-          signature_end_date: signature_end_date,
-          state: "created",
-          hashtag: form.hashtag
+          decidim_area_id: form.area_id,
+          state: "created"
         )
       end
 
       def scoped_type
-        InitiativesTypeScope.find_by(
-          type: form.initiative_type,
-          scope: form.scope
-        )
+        InitiativesTypeScope.order(:id).find_by(type: form.type)
       end
 
       def signature_end_date
@@ -112,7 +117,7 @@ module Decidim
 
       def initialize_pages(component)
         Decidim::Pages::CreatePage.call(component) do
-          on(:invalid) { raise "Can't create page" }
+          on(:invalid) { raise "Cannot create page" }
         end
       end
 
@@ -130,7 +135,7 @@ module Decidim
                .from_params(followable_gid: initiative.to_signed_global_id.to_s)
                .with_context(
                  current_organization: initiative.organization,
-                 current_user: current_user
+                 current_user:
                )
 
         Decidim::CreateFollow.new(form, current_user).call
@@ -141,7 +146,7 @@ module Decidim
                .from_params(initiative_id: initiative.id, user_id: initiative.decidim_author_id, state: "accepted")
                .with_context(
                  current_organization: initiative.organization,
-                 current_user: current_user
+                 current_user:
                )
 
         Decidim::Initiatives::SpawnCommitteeRequest.new(form, current_user).call

data/app/commands/decidim/initiatives/send_initiative_to_technical_validation.rb

@@ -17,7 +17,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call
@@ -46,7 +46,7 @@ module Decidim
           event: "decidim.events.initiatives.initiative_sent_to_technical_validation",
           event_class: Decidim::Initiatives::InitiativeSentToTechnicalValidationEvent,
           resource: initiative,
-          affected_users: affected_users,
+          affected_users:,
           force_send: true
         }
 

data/app/commands/decidim/initiatives/spawn_committee_request.rb

@@ -17,7 +17,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

data/app/commands/decidim/initiatives/unvote_initiative.rb

@@ -16,7 +16,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the initiative.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

data/app/commands/decidim/initiatives/update_initiative.rb

@@ -23,7 +23,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call
@@ -34,6 +34,11 @@ module Decidim
           return broadcast(:invalid) if attachments_invalid?
         end
 
+        if process_gallery?
+          build_gallery
+          return broadcast(:invalid) if gallery_invalid?
+        end
+
         @initiative = Decidim.traceability.update!(
           initiative,
           current_user,
@@ -43,6 +48,7 @@ module Decidim
         photo_cleanup!
         document_cleanup!
         create_attachments if process_attachments?
+        create_gallery if process_gallery?
 
         broadcast(:ok, initiative)
       rescue ActiveRecord::RecordInvalid
@@ -57,7 +63,8 @@ module Decidim
         attrs = {
           title: { current_locale => form.title },
           description: { current_locale => form.description },
-          hashtag: form.hashtag
+          hashtag: form.hashtag,
+          decidim_user_group_id: form.decidim_user_group_id
         }
 
         if form.signature_type_updatable?

data/app/commands/decidim/initiatives/validate_mobile_phone.rb

@@ -18,9 +18,9 @@ module Decidim
       #
       # - :ok when everything is valid. Returns the verification metadata of
       #       the form.
-      # - :invalid if the user doesn't have an authorization for sms in ok
+      # - :invalid if the user does not have an authorization for sms in ok
       #            status or the phone number associated with its
-      #            authorization doesn't match the form number.
+      #            authorization does not match the form number.
       def call
         return broadcast(:invalid) unless authorized? && phone_match?
 

data/app/commands/decidim/initiatives/vote_initiative.rb

@@ -14,7 +14,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the proposal vote.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call
@@ -48,9 +48,9 @@ module Decidim
           initiative.votes.create!(
             author: form.signer,
             encrypted_metadata: form.encrypted_metadata,
-            timestamp: timestamp,
+            timestamp:,
             hash_id: form.hash_id,
-            scope: scope
+            scope:
           )
         end
       end
@@ -88,13 +88,13 @@ module Decidim
           affected_users: [initiative.author],
           followers: initiative.followers - [initiative.author],
           extra: {
-            percentage: percentage
+            percentage:
           }
         )
       end
 
       def notify_support_threshold_reached(before, after)
-        # Don't need to notify if threshold has already been reached
+        # Do not need to notify if threshold has already been reached
         return if before == after || after != 100
 
         Decidim::EventsManager.publish(

data/app/constraints/decidim/initiatives/current_initiative.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Initiatives
-    # This class infers the current initiative we're scoped to by
+    # This class infers the current initiative we are scoped to by
     # looking at the request parameters and the organization in the request
     # environment, and injects it into the environment.
     class CurrentInitiative

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

@@ -38,11 +38,11 @@ module Decidim
           end
 
           def translated_type_id_eq(id)
-            translated_attribute(Decidim::InitiativesType.find_by(id: id).title[I18n.locale.to_s])
+            translated_attribute(Decidim::InitiativesType.find_by(id:).title[I18n.locale.to_s])
           end
 
           def translated_decidim_area_id_eq(id)
-            translated_attribute(Decidim::Area.find_by(id: id).name[I18n.locale.to_s])
+            translated_attribute(Decidim::Area.find_by(id:).name[I18n.locale.to_s])
           end
         end
       end

data/app/controllers/concerns/decidim/initiatives/needs_initiative.rb

@@ -4,7 +4,7 @@ require "active_support/concern"
 
 module Decidim
   module Initiatives
-    # This module, when injected into a controller, ensures there's an
+    # This module, when injected into a controller, ensures there is an
     # initiative available and deducts it from the context.
     module NeedsInitiative
       extend ActiveSupport::Concern

data/app/controllers/decidim/initiatives/admin/answers_controller.rb

@@ -6,6 +6,9 @@ module Decidim
       # Controller used to manage the initiatives answers
       class AnswersController < Decidim::Initiatives::Admin::ApplicationController
         include Decidim::Initiatives::NeedsInitiative
+        include Decidim::Admin::ParticipatorySpaceAdminBreadcrumb
+
+        add_breadcrumb_item_from_menu :admin_initiative_actions_menu
 
         helper Decidim::Initiatives::InitiativeHelper
         layout "decidim/admin/initiatives"

data/app/controllers/decidim/initiatives/admin/committee_requests_controller.rb

@@ -7,6 +7,8 @@ module Decidim
       class CommitteeRequestsController < Decidim::Initiatives::Admin::ApplicationController
         include InitiativeAdmin
 
+        add_breadcrumb_item_from_menu :admin_initiative_actions_menu
+
         # GET /admin/initiatives/:initiative_id/committee_requests
         def index
           enforce_permission_to :index, :initiative_committee_member

data/app/controllers/decidim/initiatives/admin/components_controller.rb

@@ -9,6 +9,9 @@ module Decidim
         layout "decidim/admin/initiative"
 
         include NeedsInitiative
+        include Decidim::Admin::ParticipatorySpaceAdminBreadcrumb
+
+        add_breadcrumb_item_from_menu :admin_initiative_menu
       end
     end
   end

data/app/controllers/decidim/initiatives/admin/initiative_attachments_controller.rb

@@ -8,6 +8,8 @@ module Decidim
         include InitiativeAdmin
         include Decidim::Admin::Concerns::HasAttachments
 
+        add_breadcrumb_item_from_menu :admin_initiative_menu
+
         def after_destroy_path
           initiative_attachments_path(current_initiative)
         end

data/app/controllers/decidim/initiatives/admin/initiatives_controller.rb

@@ -11,6 +11,7 @@ module Decidim
         include Decidim::Initiatives::SingleInitiativeType
         include Decidim::Initiatives::TypeSelectorOptions
         include Decidim::Initiatives::Admin::Filterable
+        include Decidim::Admin::ParticipatorySpaceAdminBreadcrumb
 
         helper ::Decidim::Admin::ResourcePermissionsHelper
         helper Decidim::Initiatives::InitiativeHelper
@@ -83,22 +84,31 @@ module Decidim
         # DELETE /admin/initiatives/:id/discard
         def discard
           enforce_permission_to :discard, :initiative, initiative: current_initiative
-          current_initiative.discarded!
-          redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
+          DiscardInitiative.call(current_initiative, current_user) do
+            on(:ok) do
+              redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
+            end
+          end
         end
 
         # POST /admin/initiatives/:id/accept
         def accept
           enforce_permission_to :accept, :initiative, initiative: current_initiative
-          current_initiative.accepted!
-          redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
+          AcceptInitiative.call(current_initiative, current_user) do
+            on(:ok) do
+              redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
+            end
+          end
         end
 
         # DELETE /admin/initiatives/:id/reject
         def reject
           enforce_permission_to :reject, :initiative, initiative: current_initiative
-          current_initiative.rejected!
-          redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
+          RejectInitiative.call(current_initiative, current_user) do
+            on(:ok) do
+              redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
+            end
+          end
         end
 
         # GET /admin/initiatives/:id/send_to_technical_validation
@@ -167,6 +177,7 @@ module Decidim
             format.pdf do
               send_data(output, filename: "votes_#{current_initiative.id}.pdf", type: "application/pdf")
             end
+            format.html
           end
         end
 

data/app/controllers/decidim/initiatives/admin/initiatives_permissions_controller.rb

@@ -7,6 +7,9 @@ module Decidim
       # permissions in the admin panel.
       class InitiativesPermissionsController < Decidim::Admin::ResourcePermissionsController
         include Decidim::Initiatives::NeedsInitiative
+        include Decidim::Admin::ParticipatorySpaceAdminBreadcrumb
+
+        add_breadcrumb_item_from_menu :admin_initiative_actions_menu
 
         layout "decidim/admin/initiatives"
 

data/app/controllers/decidim/initiatives/admin/initiatives_settings_controller.rb

@@ -8,6 +8,8 @@ module Decidim
       class InitiativesSettingsController < Decidim::Initiatives::Admin::ApplicationController
         layout "decidim/admin/initiatives"
 
+        add_breadcrumb_item_from_menu :admin_initiatives_menu
+
         # GET /admin/initiatives_settings/edit
         def edit
           enforce_permission_to :update, :initiatives_settings, initiatives_settings: current_initiatives_settings

data/app/controllers/decidim/initiatives/admin/initiatives_type_scopes_controller.rb

@@ -5,6 +5,11 @@ module Decidim
     module Admin
       # Controller used to manage the available initiative type scopes
       class InitiativesTypeScopesController < Decidim::Initiatives::Admin::ApplicationController
+        include Decidim::TranslatableAttributes
+
+        before_action :set_controller_breadcrumb
+        add_breadcrumb_item_from_menu :admin_initiatives_menu
+
         helper_method :current_initiative_type_scope
 
         # GET /admin/initiatives_types/:initiatives_type_id/initiatives_type_scopes/new
@@ -68,10 +73,35 @@ module Decidim
 
         private
 
+        def set_controller_breadcrumb
+          controller_breadcrumb_items.append(
+            {
+              label: translated_attribute(current_initiative_type.title),
+              url: edit_initiatives_type_path(current_initiative_type),
+              active: false
+            },
+            {
+              label: t("initiative_type_scopes", scope: "decidim.admin.menu"),
+              active: true
+            }
+          )
+
+          if params[:id].present?
+            controller_breadcrumb_items << {
+              label: translated_attribute(current_initiative_type_scope.scope_name),
+              active: true
+            }
+          end
+        end
+
         def current_initiative_type_scope
           @current_initiative_type_scope ||= InitiativesTypeScope.joins(:type).where(decidim_initiatives_types: { organization: current_organization }).find(params[:id])
         end
 
+        def current_initiative_type
+          @current_initiative_type ||= InitiativesType.find(params[:initiatives_type_id])
+        end
+
         def initiative_type_scope_form
           form(Decidim::Initiatives::Admin::InitiativeTypeScopeForm)
         end

data/app/controllers/decidim/initiatives/admin/initiatives_types_controller.rb

@@ -6,6 +6,11 @@ module Decidim
       # Controller used to manage the available initiative types for the current
       # organization.
       class InitiativesTypesController < Decidim::Initiatives::Admin::ApplicationController
+        include Decidim::TranslatableAttributes
+        before_action :set_controller_breadcrumb, except: [:index, :new, :create]
+
+        add_breadcrumb_item_from_menu :admin_initiatives_menu
+
         helper ::Decidim::Admin::ResourcePermissionsHelper
         helper_method :current_initiative_type
 
@@ -83,6 +88,15 @@ module Decidim
 
         private
 
+        def set_controller_breadcrumb
+          controller_breadcrumb_items <<
+            {
+              label: translated_attribute(current_initiative_type.title),
+              url: edit_initiatives_type_path(current_initiative_type),
+              active: true
+            }
+        end
+
         def current_initiative_type
           @current_initiative_type ||= InitiativesType.where(organization: current_organization).find(params[:id])
         end

data/app/controllers/decidim/initiatives/admin/initiatives_types_permissions_controller.rb

@@ -6,6 +6,11 @@ module Decidim
       # Controller that allows managing initiatives types
       # permissions in the admin panel.
       class InitiativesTypesPermissionsController < Decidim::Admin::ResourcePermissionsController
+        include Decidim::TranslatableAttributes
+
+        before_action :set_controller_breadcrumb
+        add_breadcrumb_item_from_menu :admin_initiatives_menu
+
         layout "decidim/admin/initiatives"
 
         register_permissions(::Decidim::Initiatives::Admin::InitiativesTypesPermissionsController,
@@ -15,6 +20,22 @@ module Decidim
         def permission_class_chain
           ::Decidim.permissions_registry.chain_for(::Decidim::Initiatives::Admin::InitiativesTypesPermissionsController)
         end
+
+        private
+
+        def set_controller_breadcrumb
+          controller_breadcrumb_items.append(
+            {
+              label: translated_attribute(resource.title),
+              url: edit_initiatives_type_path(resource),
+              active: false
+            },
+            {
+              label: t("permissions", scope: "decidim.admin.actions"),
+              active: true
+            }
+          )
+        end
       end
     end
   end

data/app/controllers/decidim/initiatives/admin/moderations/reports_controller.rb

@@ -4,12 +4,12 @@ module Decidim
   module Initiatives
     module Admin
       module Moderations
-        # This controller allows admins to manage moderation reports in an conference.
+        # This controller allows admins to manage moderation reports in an initiative.
         class ReportsController < Decidim::Admin::Moderations::ReportsController
           include InitiativeAdmin
 
           def permissions_context
-            super.merge(current_participatory_space: current_participatory_space)
+            super.merge(current_participatory_space:)
           end
         end
       end

data/app/controllers/decidim/initiatives/admin/moderations_controller.rb

@@ -3,12 +3,14 @@
 module Decidim
   module Initiatives
     module Admin
-      # This controller allows admins to manage moderations in an conference.
+      # This controller allows admins to manage moderations in an initiative.
       class ModerationsController < Decidim::Admin::ModerationsController
         include InitiativeAdmin
 
+        add_breadcrumb_item_from_menu :admin_initiative_menu
+
         def permissions_context
-          super.merge(current_participatory_space: current_participatory_space)
+          super.merge(current_participatory_space:)
         end
       end
     end

data/app/controllers/decidim/initiatives/application_controller.rb

@@ -5,7 +5,6 @@ module Decidim
     # The main admin application controller for initiatives
     class ApplicationController < Decidim::ApplicationController
       include NeedsPermission
-
       register_permissions(::Decidim::Initiatives::ApplicationController,
                            ::Decidim::Initiatives::Permissions,
                            ::Decidim::Admin::Permissions,

data/app/controllers/decidim/initiatives/authorization_create_modals_controller.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    class AuthorizationCreateModalsController < Decidim::Initiatives::ApplicationController
+      helper_method :authorizations, :authorize_action_path
+      layout false
+
+      def show
+        @initiative_type = Decidim::InitiativesType.find_by(id: params[:slug], organization: current_organization)
+        render template: "decidim/authorization_modals/show"
+      end
+
+      def authorize_action_path(handler_name)
+        authorizations.status_for(handler_name).current_path(redirect_url: URI(request.referer).path)
+      end
+
+      private
+
+      def authorizations
+        @authorizations ||= action_authorized_to("create", permissions_holder: @initiative_type)
+      end
+    end
+  end
+end

data/app/controllers/decidim/initiatives/authorization_sign_modals_controller.rb

@@ -12,12 +12,12 @@ module Decidim
         render template: "decidim/authorization_modals/show"
       end
 
-      private
-
       def authorize_action_path(handler_name)
         authorizations.status_for(handler_name).current_path(redirect_url: URI(request.referer).path)
       end
 
+      private
+
       def authorizations
         @authorizations ||= action_authorized_to("vote", resource: current_initiative, permissions_holder: current_initiative.type)
       end

data/app/controllers/decidim/initiatives/committee_requests_controller.rb

@@ -9,8 +9,6 @@ module Decidim
       helper InitiativeHelper
       helper Decidim::ActionAuthorizationHelper
 
-      layout "layouts/decidim/application"
-
       # GET /initiatives/:initiative_id/committee_requests/new
       def new
         enforce_permission_to :request_membership, :initiative, initiative: current_initiative