decidim-conferences 0.27.5 → 0.28.0.rc4

data/app/commands/decidim/conferences/admin/create_conference.rb

@@ -16,7 +16,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
@@ -26,7 +26,6 @@ module Decidim
             add_admins_as_followers(conference)
             link_participatory_processes
             link_assemblies
-            link_consultations
 
             broadcast(:ok, conference)
           else
@@ -48,6 +47,7 @@ module Decidim
             title: form.title,
             slogan: form.slogan,
             slug: form.slug,
+            weight: form.weight,
             hashtag: form.hashtag,
             description: form.description,
             short_description: form.short_description,
@@ -95,15 +95,6 @@ module Decidim
         def link_assemblies
           conference.link_participatory_space_resources(assemblies, "included_assemblies")
         end
-
-        def consultations
-          @consultations ||= conference.participatory_space_sibling_scope(:consultations)
-                                       .where(id: @form.consultations_ids)
-        end
-
-        def link_consultations
-          conference.link_participatory_space_resources(consultations, "included_consultations")
-        end
       end
     end
   end

data/app/commands/decidim/conferences/admin/create_conference_speaker.rb

@@ -21,7 +21,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
@@ -62,7 +62,7 @@ module Decidim
             "short_bio"
           ).symbolize_keys.merge(
             decidim_conference_id: conference.id,
-            conference: conference,
+            conference:,
             user: form.user
           ).merge(
             attachment_attributes(:avatar)

data/app/commands/decidim/conferences/admin/create_media_link.rb

@@ -19,7 +19,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
@@ -55,7 +55,7 @@ module Decidim
               "weight",
               "date"
             ).symbolize_keys.merge(
-              conference: conference
+              conference:
             ),
             log_info
           )

data/app/commands/decidim/conferences/admin/create_partner.rb

@@ -19,7 +19,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
@@ -70,7 +70,7 @@ module Decidim
         end
 
         def attributes
-          { conference: conference }.merge(
+          { conference: }.merge(
             form.attributes.slice(
               "name",
               "weight",

data/app/commands/decidim/conferences/admin/create_registration_type.rb

@@ -20,7 +20,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
@@ -57,7 +57,7 @@ module Decidim
               "price",
               "weight"
             ).symbolize_keys.merge(
-              conference: conference
+              conference:
             ),
             log_info
           )

data/app/commands/decidim/conferences/admin/destroy_conference_speaker.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     module Admin
-      # A command with all the business logic when destroying an conference
+      # A command with all the business logic when destroying a conference
       # speaker in the system.
       class DestroyConferenceSpeaker < Decidim::Command
         # Public: Initializes the command.
@@ -18,7 +18,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/conferences/admin/destroy_media_link.rb

@@ -18,7 +18,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/conferences/admin/destroy_partner.rb

@@ -3,8 +3,8 @@
 module Decidim
   module Conferences
     module Admin
-      # A command with all the business logic when destroying an conference
-      # partner in the system.
+      # A command with all the business logic when destroying a conference
+      # Partner in the system.
       class DestroyPartner < Decidim::Command
         # Public: Initializes the command.
         #
@@ -18,7 +18,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/conferences/admin/destroy_registration_type.rb

@@ -18,7 +18,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/conferences/admin/invite_user_to_join_conference.rb

@@ -20,7 +20,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
@@ -37,7 +37,7 @@ module Decidim
 
         def already_invited?
           return false unless user.persisted?
-          return false unless conference.conference_invites.exists?(user: user)
+          return false unless conference.conference_invites.exists?(user:)
 
           form.errors.add(:email, :already_invited)
           true
@@ -57,8 +57,8 @@ module Decidim
             Decidim::Conferences::ConferenceInvite,
             invited_by,
             {
-              user: user,
-              conference: conference,
+              user:,
+              conference:,
               registration_type: form.registration_type,
               sent_at: Time.current
             },
@@ -98,7 +98,7 @@ module Decidim
 
         def invite_user_to_sign_up
           user.skip_reconfirmation!
-          user.invite!(invited_by, invitation_instructions: "join_conference", conference: conference, registration_type: form.registration_type)
+          user.invite!(invited_by, invitation_instructions: "join_conference", conference:, registration_type: form.registration_type)
         end
       end
     end

data/app/commands/decidim/conferences/admin/publish_conference.rb

@@ -3,46 +3,29 @@
 module Decidim
   module Conferences
     module Admin
-      # A command that sets an conference as published.
-      class PublishConference < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # conference - A Conference that will be published
-        # current_user - the user performing the action
-        def initialize(conference, current_user)
-          @conference = conference
-          @current_user = current_user
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the data wasn't valid and we couldn't proceed.
-        #
-        # Returns nothing.
+      # A command that sets a Conference as published.
+      class PublishConference < Decidim::Admin::ParticipatorySpace::Publish
         def call
-          return broadcast(:invalid) if conference.nil? || conference.published?
+          return broadcast(:invalid) if participatory_space.nil? || participatory_space.published?
 
-          Decidim.traceability.perform_action!("publish", conference, current_user) do
-            conference.publish!
+          Decidim.traceability.perform_action!(:publish, participatory_space, user, **default_options) do
+            participatory_space.publish!
           end
 
-          broadcast(:ok)
           send_notification
+          broadcast(:ok, participatory_space)
         end
 
         private
 
-        attr_reader :conference, :current_user
-
         def send_notification
-          return unless conference.registrations_enabled?
+          return unless participatory_space.registrations_enabled?
 
           Decidim::EventsManager.publish(
             event: "decidim.events.conferences.registrations_enabled",
             event_class: Decidim::Conferences::ConferenceRegistrationsEnabledEvent,
-            resource: conference,
-            followers: conference.followers
+            resource: participatory_space,
+            followers: participatory_space.followers
           )
         end
       end

data/app/commands/decidim/conferences/admin/send_conference_diplomas.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/conferences/admin/update_conference.rb

@@ -20,7 +20,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
@@ -29,7 +29,6 @@ module Decidim
           update_conference
           link_participatory_processes
           link_assemblies
-          link_consultations
 
           if @conference.valid?
             broadcast(:ok, @conference)
@@ -76,6 +75,7 @@ module Decidim
             title: form.title,
             slogan: form.slogan,
             slug: form.slug,
+            weight: form.weight,
             hashtag: form.hashtag,
             description: form.description,
             short_description: form.short_description,
@@ -152,15 +152,6 @@ module Decidim
         def link_assemblies
           @conference.link_participatory_space_resources(assemblies, "included_assemblies")
         end
-
-        def consultations
-          @consultations ||= @conference.participatory_space_sibling_scope(:consultations)
-                                        .where(id: @form.consultations_ids)
-        end
-
-        def link_consultations
-          @conference.link_participatory_space_resources(consultations, "included_consultations")
-        end
       end
     end
   end

data/app/commands/decidim/conferences/admin/update_conference_speaker.rb

@@ -20,7 +20,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/conferences/admin/update_media_link.rb

@@ -18,7 +18,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/conferences/admin/update_partner.rb

@@ -20,7 +20,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/conferences/admin/update_registration_type.rb

@@ -18,7 +18,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/conferences/decline_invitation.rb

@@ -38,7 +38,7 @@ module Decidim
       end
 
       def invitation
-        @invitation ||= conference.conference_invites.find_by(user: user)
+        @invitation ||= conference.conference_invites.find_by(user:)
       end
     end
   end

data/app/commands/decidim/conferences/join_conference.rb

@@ -39,11 +39,11 @@ module Decidim
       attr_reader :conference, :user
 
       def accept_invitation
-        conference.conference_invites.find_by(user: user)&.accept!
+        conference.conference_invites.find_by(user:)&.accept!
       end
 
       def create_registration
-        Decidim::Conferences::ConferenceRegistration.create!(conference: conference, user: user, registration_type: @registration_type)
+        Decidim::Conferences::ConferenceRegistration.create!(conference:, user:, registration_type: @registration_type)
       end
 
       def create_meetings_registrations
@@ -51,7 +51,7 @@ module Decidim
         meetings = Decidim::Meetings::Meeting.where(component: published_meeting_components).where(id: @registration_type.conference_meetings.pluck(:id))
 
         meetings.each do |meeting|
-          Decidim::Meetings::Registration.create!(meeting: meeting, user: user)
+          Decidim::Meetings::Registration.create!(meeting:, user:)
         end
       end
 
@@ -60,7 +60,7 @@ module Decidim
       end
 
       def already_joined_conference?
-        conference.conference_registrations.where(user: user).any?
+        conference.conference_registrations.where(user:).any?
       end
 
       def send_email_pending_validation
@@ -94,7 +94,7 @@ module Decidim
           resource: @conference,
           followers: participatory_space_admins,
           extra: {
-            percentage: percentage
+            percentage:
           }
         )
       end

data/app/constraints/decidim/conferences/current_component.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Conferences
-    # This class infers the current component on an conference context
+    # This class infers the current component on a conference context
     # request parameters and injects it into the environment.
     class CurrentComponent
       # Public: Initializes the class.
@@ -17,7 +17,7 @@ module Decidim
       #
       # request - The request that holds the current component relevant information.
       #
-      # Returns a true if the request matches an conference and a
+      # Returns a true if the request matches a conference and a
       # component belonging to that conference, false otherwise
       def matches?(request)
         CurrentConference.new.matches?(request) &&

data/app/constraints/decidim/conferences/current_conference.rb

@@ -2,11 +2,11 @@
 
 module Decidim
   module Conferences
-    # This class infers the current conference we're scoped to by
+    # This class infers the current conference we are scoped to by
     # looking at the request parameters and the organization in the request
     # environment, and injects it into the environment.
     class CurrentConference
-      # Public: Matches the request against an conference and injects it
+      # Public: Matches the request against a conference and injects it
       #         into the environment.
       #
       # request - The request that holds the conference relevant

data/app/controllers/concerns/decidim/conferences/admin/conference_context.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     module Admin
-      # This module, when injected into a controller, ensures there's a
+      # This module, when injected into a controller, ensures there is a
       # Conference available and deducts it from the context.
       module ConferenceContext
         def self.extended(base)

data/app/controllers/decidim/conferences/admin/concerns/conference_admin.rb

@@ -7,7 +7,7 @@ module Decidim
     module Admin
       module Concerns
         # This concern is meant to be included in all controllers that are scoped
-        # into an conference's admin panel. It will override the layout so it shows
+        # into a conference's admin panel. It will override the layout so it shows
         # the sidebar, preload the conference, etc.
         module ConferenceAdmin
           extend ActiveSupport::Concern
@@ -36,7 +36,7 @@ module Decidim
             end
 
             def permissions_context
-              super.merge(current_participatory_space: current_participatory_space)
+              super.merge(current_participatory_space:)
             end
 
             def permission_class_chain

data/app/controllers/decidim/conferences/admin/conference_attachment_collections_controller.rb

@@ -3,11 +3,12 @@
 module Decidim
   module Conferences
     module Admin
-      # Controller that allows managing all the attachment collections for an conference.
+      # Controller that allows managing all the attachment collections for a Conference.
       #
       class ConferenceAttachmentCollectionsController < Decidim::Conferences::Admin::ApplicationController
         include Concerns::ConferenceAdmin
         include Decidim::Admin::Concerns::HasAttachmentCollections
+        include Decidim::Admin::Concerns::HasTabbedMenu
 
         def after_destroy_path
           conference_attachment_collections_path(current_conference)
@@ -20,6 +21,10 @@ module Decidim
         def authorization_object
           @attachment_collection || AttachmentCollection
         end
+
+        private
+
+        def tab_menu_name = :conferences_admin_attachments_menu
       end
     end
   end

data/app/controllers/decidim/conferences/admin/conference_attachments_controller.rb

@@ -9,6 +9,7 @@ module Decidim
       class ConferenceAttachmentsController < Decidim::Conferences::Admin::ApplicationController
         include Concerns::ConferenceAdmin
         include Decidim::Admin::Concerns::HasAttachments
+        include Decidim::Admin::Concerns::HasTabbedMenu
 
         def after_destroy_path
           conference_attachments_path(current_conference)
@@ -21,6 +22,10 @@ module Decidim
         def authorization_object
           @attachment || Attachment
         end
+
+        private
+
+        def tab_menu_name = :conferences_admin_attachments_menu
       end
     end
   end

data/app/controllers/decidim/conferences/admin/conference_invites_controller.rb

@@ -7,6 +7,7 @@ module Decidim
       #
       class ConferenceInvitesController < Decidim::Conferences::Admin::ApplicationController
         include Concerns::ConferenceAdmin
+        include Decidim::Paginable
 
         helper_method :conference
 
@@ -17,7 +18,7 @@ module Decidim
 
           @query = params[:q]
           @status = params[:status]
-          @conference_invites = Decidim::Conferences::Admin::ConferenceInvites.for(current_participatory_space.conference_invites, @query, @status).page(params[:page]).per(15)
+          @conference_invites = Decidim::Admin::Invites.for(current_participatory_space.conference_invites, @query, @status).page(params[:page]).per(15)
         end
 
         def new

data/app/controllers/decidim/conferences/admin/conference_publications_controller.rb

@@ -5,40 +5,22 @@ module Decidim
     module Admin
       # Controller that allows managing conference publications.
       #
-      class ConferencePublicationsController < Decidim::Conferences::Admin::ApplicationController
+      # i18n-tasks-use t('decidim.admin.conference_publications.create.error')
+      # i18n-tasks-use t('decidim.admin.conference_publications.create.success')
+      # i18n-tasks-use t('decidim.admin.conference_publications.destroy.error')
+      # i18n-tasks-use t('decidim.admin.conference_publications.destroy.success')
+      class ConferencePublicationsController < Decidim::Admin::SpacePublicationsController
         include Concerns::ConferenceAdmin
 
-        def create
-          enforce_permission_to :publish, :conference, conference: current_conference
+        private
 
-          PublishConference.call(current_conference, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("conference_publications.create.success", scope: "decidim.admin")
-            end
+        def enforce_permission_to_publish = enforce_permission_to(:publish, :conference, conference: current_conference)
 
-            on(:invalid) do
-              flash.now[:alert] = I18n.t("conference_publications.create.error", scope: "decidim.admin")
-            end
+        def publish_command = PublishConference
 
-            redirect_back(fallback_location: conferences_path)
-          end
-        end
+        def i18n_scope = "decidim.admin.conference_publications"
 
-        def destroy
-          enforce_permission_to :publish, :conference, conference: current_conference
-
-          UnpublishConference.call(current_conference, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("conference_publications.destroy.success", scope: "decidim.admin")
-            end
-
-            on(:invalid) do
-              flash.now[:alert] = I18n.t("conference_publications.destroy.error", scope: "decidim.admin")
-            end
-
-            redirect_back(fallback_location: conferences_path)
-          end
-        end
+        def fallback_location = conferences_path
       end
     end
   end

data/app/controllers/decidim/conferences/admin/conference_registrations_controller.rb

@@ -30,7 +30,7 @@ module Decidim
         end
 
         def confirm
-          enforce_permission_to(:confirm, :conference_registration, conference_registration: conference_registration)
+          enforce_permission_to(:confirm, :conference_registration, conference_registration:)
 
           ConfirmConferenceRegistration.call(conference_registration, current_user) do
             on(:ok) do