decidim-conferences 0.27.10 → 0.28.0.rc4

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

@@ -5,104 +5,22 @@ module Decidim
     module Admin
       # Controller that allows managing conference user roles.
       #
-      class ConferenceUserRolesController < Decidim::Conferences::Admin::ApplicationController
+      class ConferenceUserRolesController < Decidim::Admin::ParticipatorySpace::UserRoleController
         include Concerns::ConferenceAdmin
-        include Decidim::Admin::Officializations::Filterable
 
-        def index
-          enforce_permission_to :index, :conference_user_role
-          @conference_user_roles = filtered_collection
-        end
+        def authorization_scope = :conference_user_role
 
-        def new
-          enforce_permission_to :create, :conference_user_role
-          @form = form(ConferenceUserRoleForm).instance
-        end
+        def resource_form = form(ConferenceUserRoleForm)
 
-        def create
-          enforce_permission_to :create, :conference_user_role
-          @form = form(ConferenceUserRoleForm).from_params(params)
+        def space_index_path = conference_user_roles_path(current_participatory_space)
 
-          CreateConferenceAdmin.call(@form, current_user, current_conference) do
-            on(:ok) do
-              flash[:notice] = I18n.t("conference_user_roles.create.success", scope: "decidim.admin")
-            end
+        def i18n_scope = "decidim.admin.conference_user_roles"
 
-            on(:invalid) do
-              flash[:alert] = I18n.t("conference_user_roles.create.error", scope: "decidim.admin")
-            end
-            redirect_to conference_user_roles_path(current_conference)
-          end
-        end
+        def role_class = Decidim::ConferenceUserRole
 
-        def edit
-          @user_role = collection.find(params[:id])
-          enforce_permission_to :update, :conference_user_role, user_role: @user_role
-          @form = form(ConferenceUserRoleForm).from_model(@user_role.user)
-        end
+        def event = "decidim.events.conferences.role_assigned"
 
-        def update
-          @user_role = collection.find(params[:id])
-          enforce_permission_to :update, :conference_user_role, user_role: @user_role
-          @form = form(ConferenceUserRoleForm).from_params(params)
-
-          UpdateConferenceAdmin.call(@form, @user_role) do
-            on(:ok) do
-              flash[:notice] = I18n.t("conference_user_roles.update.success", scope: "decidim.admin")
-              redirect_to conference_user_roles_path(current_conference)
-            end
-
-            on(:invalid) do
-              flash.now[:alert] = I18n.t("conference_user_roles.update.error", scope: "decidim.admin")
-              render :edit
-            end
-          end
-        end
-
-        def destroy
-          @conference_user_role = collection.find(params[:id])
-          enforce_permission_to :destroy, :conference_user_role, user_role: @conference_user_role
-
-          DestroyConferenceAdmin.call(@conference_user_role, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("conference_user_roles.destroy.success", scope: "decidim.admin")
-              redirect_to conference_user_roles_path(current_conference)
-            end
-          end
-        end
-
-        def resend_invitation
-          @user_role = collection.find(params[:id])
-          enforce_permission_to :invite, :conference_user_role, user_role: @user_role
-
-          InviteUserAgain.call(@user_role.user, "invite_admin") do
-            on(:ok) do
-              flash[:notice] = I18n.t("users.resend_invitation.success", scope: "decidim.admin")
-            end
-
-            on(:invalid) do
-              flash[:alert] = I18n.t("users.resend_invitation.error", scope: "decidim.admin")
-            end
-          end
-
-          redirect_to conference_user_roles_path(current_conference)
-        end
-
-        private
-
-        def search_field_predicate
-          :name_or_nickname_or_email_cont
-        end
-
-        def filters
-          [:invitation_accepted_at_present, :last_sign_in_at_present]
-        end
-
-        def collection
-          @collection ||= Decidim::ConferenceUserRole
-                          .joins(:user)
-                          .where(conference: current_conference)
-        end
+        def event_class = Decidim::Conferences::ConferenceRoleAssignedEvent
       end
     end
   end

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

@@ -6,6 +6,8 @@ module Decidim
       # Controller that allows managing conferences.
       #
       class ConferencesController < Decidim::Conferences::Admin::ApplicationController
+        include Decidim::Admin::ParticipatorySpaceAdminBreadcrumb
+
         helper_method :current_conference, :current_participatory_space
         layout "decidim/admin/conferences"
         include Decidim::Conferences::Admin::Filterable

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

@@ -16,7 +16,7 @@ module Decidim
         def update
           enforce_permission_to :update, :conference, conference: current_conference
 
-          @form = form(DiplomaForm).from_params(diploma_params).with_context(conference: current_conference, current_organization: current_organization)
+          @form = form(DiplomaForm).from_params(diploma_params).with_context(conference: current_conference, current_organization:)
 
           UpdateDiploma.call(@form, current_conference) do
             on(:ok) do

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This controller allows exporting things.
       # It is targeted for customizations for exporting things that lives under
-      # an conference.
+      # a conference.
       class ExportsController < Decidim::Admin::ExportsController
         include Concerns::ConferenceAdmin
       end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This controller allows importing things.
       # It is targeted for customizations for importing things that lives under
-      # an conference.
+      # a conference.
       class ImportsController < Decidim::Admin::ImportsController
         include Concerns::ConferenceAdmin
       end

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

@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       module Moderations
-        # This controller allows admins to manage moderation reports in an conference.
+        # This controller allows admins to manage moderation reports in a conference.
         class ReportsController < Decidim::Admin::Moderations::ReportsController
           include Concerns::ConferenceAdmin
         end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     module Admin
-      # This controller allows admins to manage moderations in an conference.
+      # This controller allows admins to manage moderations in a conference.
       class ModerationsController < Decidim::Admin::ModerationsController
         include Concerns::ConferenceAdmin
       end

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

@@ -10,6 +10,8 @@ module Decidim
 
       include NeedsPermission
 
+      layout "layouts/decidim/conferences/application"
+
       register_permissions(::Decidim::Conferences::ApplicationController,
                            Decidim::Conferences::Permissions,
                            Decidim::Admin::Permissions,
@@ -17,6 +19,10 @@ module Decidim
 
       private
 
+      def fallback_layout
+        "layouts/decidim/conferences/application"
+      end
+
       def permissions_context
         super.merge(
           current_participatory_space: try(:current_participatory_space)

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

@@ -7,7 +7,7 @@ module Decidim
       before_action :ensure_signed_in
 
       def create
-        enforce_permission_to :join, :conference, conference: conference
+        enforce_permission_to(:join, :conference, conference:)
 
         JoinConference.call(conference, registration_type, current_user) do
           on(:ok) do
@@ -23,7 +23,7 @@ module Decidim
       end
 
       def destroy
-        enforce_permission_to :leave, :conference, conference: conference
+        enforce_permission_to(:leave, :conference, conference:)
 
         LeaveConference.call(conference, registration_type, current_user) do
           on(:ok) do
@@ -39,7 +39,7 @@ module Decidim
       end
 
       def decline_invitation
-        enforce_permission_to :decline_invitation, :conference, conference: conference
+        enforce_permission_to(:decline_invitation, :conference, conference:)
 
         DeclineInvitation.call(conference, current_user) do
           on(:ok) do

data/app/controllers/decidim/conferences/conferences_controller.rb

@@ -1,16 +1,21 @@
 # frozen_string_literal: true
 
+# i18n-tasks-use t('decidim.conferences.conferences.show.already_have_an_account?')
+# i18n-tasks-use t('decidim.conferences.conferences.show.are_you_new?')
+# i18n-tasks-use t('decidim.conferences.conferences.show.sign_in_description')
+# i18n-tasks-use t('decidim.conferences.conferences.show.sign_up_description')
 module Decidim
   module Conferences
     # A controller that holds the logic to show Conferences in a
     # public layout.
     class ConferencesController < Decidim::Conferences::ApplicationController
       include ParticipatorySpaceContext
+      include Paginable
+
       participatory_space_layout only: :show
 
       helper Decidim::AttachmentsHelper
       helper Decidim::IconHelper
-      helper Decidim::WidgetUrlsHelper
       helper Decidim::SanitizeHelper
       helper Decidim::ResourceReferenceHelper
       helper Decidim::Conferences::PartnersHelper
@@ -49,7 +54,9 @@ module Decidim
         @conferences ||= OrganizationPrioritizedConferences.new(current_organization, current_user)
       end
 
-      alias collection conferences
+      def collection
+        @collection ||= paginate(conferences.query)
+      end
 
       def promoted_conferences
         @promoted_conferences ||= conferences | PromotedConferences.new

data/app/events/decidim/conferences/conference_registration_notification_event.rb

@@ -1,10 +1,9 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Conferences
     class ConferenceRegistrationNotificationEvent < Decidim::Events::BaseEvent
       include Decidim::Events::NotificationEvent
-      include Decidim::SanitizeHelper
 
       def notification_title
         I18n.t("notification_title", **i18n_options).html_safe
@@ -12,20 +11,11 @@ module Decidim
 
       def i18n_options
         {
-          resource_title: resource_title,
-          resource_path: resource_path,
-          resource_url: resource_url,
+          resource_title:,
+          resource_url:,
           scope: event_name
         }
       end
-
-      def resource_title
-        return unless resource
-
-        title = decidim_sanitize_translated(resource.title)
-
-        Decidim::ContentProcessor.render_without_format(title, links: false).html_safe
-      end
     end
   end
 end

data/app/events/decidim/conferences/conference_registrations_enabled_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Conferences

data/app/events/decidim/conferences/conference_registrations_over_percentage_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Conferences

data/app/events/decidim/conferences/conference_role_assigned_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Conferences
@@ -16,12 +16,12 @@ module Decidim
 
       def i18n_options
         {
-          resource_path: resource_path,
-          resource_title: resource_title,
-          resource_url: resource_url,
+          resource_path:,
+          resource_title:,
+          resource_url:,
           scope: event_name,
-          participatory_space_title: participatory_space_title,
-          participatory_space_url: participatory_space_url,
+          participatory_space_title:,
+          participatory_space_url:,
           role: i18n_role
         }
       end

data/app/forms/decidim/conferences/admin/conference_copy_form.rb

@@ -24,7 +24,7 @@ module Decidim
         private
 
         def slug_uniqueness
-          return unless OrganizationConferences.new(current_organization).query.where(slug: slug).where.not(id: id).any?
+          return unless OrganizationConferences.new(current_organization).query.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end

data/app/forms/decidim/conferences/admin/conference_form.rb

@@ -20,6 +20,7 @@ module Decidim
         mimic :conference
 
         attribute :slug, String
+        attribute :weight, Integer, default: 0
         attribute :hashtag, String
         attribute :promoted, Boolean
         attribute :scopes_enabled, Boolean
@@ -36,8 +37,8 @@ module Decidim
         attribute :location, String
         attribute :participatory_processes_ids, Array[Integer]
         attribute :assemblies_ids, Array[Integer]
-        attribute :consultations_ids, Array[Integer]
 
+        validates :weight, presence: true, numericality: { greater_than_or_equal_to: 0 }
         validates :slug, presence: true, format: { with: Decidim::Conference.slug_format }
         validates :title, :slogan, :description, :short_description, translatable_presence: true
 
@@ -88,29 +89,17 @@ module Decidim
           end
         end
 
-        def consultations_for_select
-          return unless Decidim.participatory_space_manifests.map(&:name).include?(:consultations)
-
-          @consultations_for_select ||= Decidim.find_participatory_space_manifest(:consultations)
-                                               .participatory_spaces.call(current_organization)&.order(title: :asc)&.map do |consultation|
-            [
-              translated_attribute(consultation.title),
-              consultation.id
-            ]
-          end
-        end
-
         private
 
         def available_slots_greater_than_or_equal_to_registrations_count
-          conference = OrganizationConferences.new(current_organization).query.find_by(slug: slug)
+          conference = OrganizationConferences.new(current_organization).query.find_by(slug:)
           return true if conference.blank?
 
           errors.add(:available_slots, :invalid) if available_slots < conference.conference_registrations.count
         end
 
         def slug_uniqueness
-          return unless OrganizationConferences.new(current_organization).query.where(slug: slug).where.not(id: context[:conference_id]).any?
+          return unless OrganizationConferences.new(current_organization).query.where(slug:).where.not(id: context[:conference_id]).any?
 
           errors.add(:slug, :taken)
         end

data/app/forms/decidim/conferences/admin/conference_user_role_form.rb

@@ -5,25 +5,10 @@ module Decidim
     module Admin
       # A form object used to create conference user roles from the admin dashboard.
       #
-      class ConferenceUserRoleForm < Form
+      class ConferenceUserRoleForm < Decidim::Admin::ParticipatorySpaceAdminUserForm
         mimic :conference_user_role
 
-        attribute :name, String
-        attribute :email, String
-        attribute :role, String
-
-        validates :email, :role, presence: true
-        validates :name, presence: true
-        validates :role, inclusion: { in: Decidim::ConferenceUserRole::ROLES }
-
-        def roles
-          Decidim::ConferenceUserRole::ROLES.map do |role|
-            [
-              I18n.t(role, scope: "decidim.admin.models.conference_user_role.roles"),
-              role
-            ]
-          end
-        end
+        def scope = "decidim.admin.models.conference_user_role.roles"
       end
     end
   end

data/app/helpers/decidim/conferences/admin/conferences_helper.rb

@@ -18,10 +18,6 @@ module Decidim
         def assemblies_selected
           @assemblies_selected ||= current_conference.linked_participatory_space_resources(:assemblies, "included_assemblies").pluck(:id) if current_conference.present?
         end
-
-        def consultations_selected
-          @consultations_selected ||= current_conference.linked_participatory_space_resources("Consultations", "included_consultations").pluck(:id) if current_conference.present?
-        end
       end
     end
   end

data/app/helpers/decidim/conferences/conference_helper.rb

@@ -4,6 +4,8 @@ module Decidim
   # A Helper to render conferences.
   module Conferences
     module ConferenceHelper
+      include PaginateHelper
+
       # Renders the dates of a conference
       #
       def render_date(conference)
@@ -11,6 +13,59 @@ module Decidim
 
         "#{l(conference.start_date, format: :decidim_with_month_name_short)} - #{l(conference.end_date, format: :decidim_with_month_name_short)}"
       end
+
+      # Items to display in the navigation of a conference
+      #
+      def conference_nav_items(participatory_space)
+        [].tap do |items|
+          if participatory_space.speakers.exists?
+            items << {
+              name: t("layouts.decidim.conferences_nav.conference_speaker_menu_item"),
+              url: decidim_conferences.conference_conference_speakers_path(participatory_space)
+            }
+          end
+
+          meeting_components = participatory_space.components.published.where(manifest_name: "meetings")
+          other_components = participatory_space.components.published.where.not(manifest_name: "meetings")
+
+          meeting_components.each do |component|
+            next unless Decidim::Meetings::Meeting.where(component:).published.not_hidden.visible_for(current_user).exists?
+
+            items << {
+              name: translated_attribute(component.name),
+              url: decidim_conferences.conference_conference_program_path(participatory_space, id: component.id)
+            }
+          end
+
+          if participatory_space.partners.exists?
+            items << {
+              name: t("layouts.decidim.conferences_nav.conference_partners_menu_item"),
+              url: decidim_conferences.conference_path(participatory_space, anchor: "conference-partners-main_promotor")
+            }
+          end
+
+          if meeting_components.exists?
+            items << {
+              name: t("layouts.decidim.conferences_nav.venues"),
+              url: decidim_conferences.conference_path(participatory_space, anchor: "venues")
+            }
+          end
+
+          other_components.each do |component|
+            items << {
+              name: translated_attribute(component.name),
+              url: main_component_path(component)
+            }
+          end
+
+          if participatory_space.attachments.any? || participatory_space.media_links.any?
+            items << {
+              name: t("layouts.decidim.conferences_nav.media"),
+              url: decidim_conferences.conference_media_path(participatory_space)
+            }
+          end
+        end
+      end
     end
   end
 end

data/app/helpers/decidim/conferences/conference_program_helper.rb

@@ -12,7 +12,7 @@ module Decidim
         meetings_by_time = {}
         meetings.each do |meeting|
           meetings_by_time[start_time: meeting.start_time, end_time: meeting.end_time] ||= []
-          meetings_by_time[start_time: meeting.start_time, end_time: meeting.end_time] << { meeting: meeting }
+          meetings_by_time[start_time: meeting.start_time, end_time: meeting.end_time] << { meeting: }
         end
         meetings_by_time
       end

data/app/helpers/decidim/conferences/media_attachments_helper.rb

@@ -4,16 +4,6 @@ module Decidim
   # A Helper to render and link to resources.
   module Conferences
     module MediaAttachmentsHelper
-      # Renders the attachments of a Conference that includes the
-      # HasAttachments concern.
-      #
-      # attached_to - The model to render the attachments from.
-      #
-      # Returns nothing.
-      def attachments_for_conference(attached_to)
-        render partial: "attachments", locals: { attached_to: attached_to }
-      end
-
       # Renders the attachment's title.
       # Checks if the attachment's title is translated or not and use
       # the correct render method.

data/app/helpers/decidim/conferences/partners_helper.rb

@@ -7,8 +7,10 @@ module Decidim
       # conference - The model to render the partners
       #
       # Returns nothing.
+
+      # deprecated
       def partners_for(conference)
-        render partial: "partners", locals: { conference: conference }
+        render partial: "partners", locals: { conference: }
       end
     end
   end

data/app/mailers/decidim/conferences/admin/invite_join_conference_mailer.rb

@@ -29,7 +29,7 @@ module Decidim
             @registration_type = registration_type
 
             subject = I18n.t("invite.subject", scope: "decidim.conferences.mailer.invite_join_conference_mailer")
-            mail(to: user.email, subject: subject)
+            mail(to: user.email, subject:)
           end
         end
 

data/app/mailers/decidim/conferences/admin/send_conference_diploma_mailer.rb

@@ -26,7 +26,7 @@ module Decidim
             add_diploma_attachment
 
             subject = I18n.t("diploma.subject", scope: "decidim.conferences.mailer.send_conference_diploma_mailer")
-            mail(to: user.email, subject: subject)
+            mail(to: user.email, subject:)
           end
         end
 

data/app/mailers/decidim/conferences/conference_registration_mailer.rb

@@ -21,7 +21,7 @@ module Decidim
           @registration_type = registration_type
 
           subject = I18n.t("pending_validation.subject", scope: "decidim.conferences.mailer.conference_registration_mailer")
-          mail(to: user.email, subject: subject)
+          mail(to: user.email, subject:)
         end
       end
 
@@ -36,7 +36,7 @@ module Decidim
           add_calendar_attachment
 
           subject = I18n.t("confirmation.subject", scope: "decidim.conferences.mailer.conference_registration_mailer")
-          mail(to: user.email, subject: subject)
+          mail(to: user.email, subject:)
         end
       end
 

data/app/models/decidim/conference.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Decidim
-  # Interaction between a user and an organization can be done via an Conference.
-  # It's a unit of action from the Organization point of view that groups
+  # Interaction between a user and an organization can be done via a Conference.
+  # It is a unit of action from the Organization point of view that groups
   # several components (proposals, debates...) that can be enabled or disabled.
   #
   class Conference < ApplicationRecord
@@ -100,11 +100,11 @@ module Decidim
     end
 
     def has_registration_for?(user)
-      conference_registrations.where(user: user).any?
+      conference_registrations.where(user:).any?
     end
 
     def has_registration_for_user_and_registration_type?(user, registration_type)
-      conference_registrations.where(user: user, registration_type: registration_type).any?
+      conference_registrations.where(user:, registration_type:).any?
     end
 
     def has_available_slots?

data/app/models/decidim/conference_user_role.rb

@@ -1,51 +1,23 @@
 # frozen_string_literal: true
 
 module Decidim
-  # Defines a relation between a user and an conference, and what kind of relation
+  # Defines a relation between a user and a Conference, and what kind of relation
   # does the user have.
   class ConferenceUserRole < ApplicationRecord
     include Traceable
     include Loggable
+    include ParticipatorySpaceUser
 
-    belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User", optional: true
     belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference", optional: true
     alias participatory_space conference
 
-    ROLES = %w(admin collaborator moderator valuator).freeze
-    validates :role, inclusion: { in: ROLES }, uniqueness: { scope: [:user, :conference] }
-    validate :user_and_conference_same_organization
+    scope :for_space, ->(participatory_space) { where(conference: participatory_space) }
+
+    validates :role, inclusion: { in: ParticipatorySpaceUser::ROLES }, uniqueness: { scope: [:user, :conference] }
+    def target_space_association = :conference
 
     def self.log_presenter_class_for(_log)
       Decidim::Conferences::AdminLog::ConferenceUserRolePresenter
     end
-
-    ransacker :name do
-      Arel.sql(%{("decidim_users"."name")::text})
-    end
-
-    ransacker :nickname do
-      Arel.sql(%{("decidim_users"."nickname")::text})
-    end
-
-    ransacker :email do
-      Arel.sql(%{("decidim_users"."email")::text})
-    end
-
-    ransacker :invitation_accepted_at do
-      Arel.sql(%{("decidim_users"."invitation_accepted_at")::text})
-    end
-
-    ransacker :last_sign_in_at do
-      Arel.sql(%{("decidim_users"."last_sign_in_at")::text})
-    end
-
-    private
-
-    # Private: check if the process and the user have the same organization
-    def user_and_conference_same_organization
-      return if !conference || !user
-
-      errors.add(:conference, :invalid) unless user.organization == conference.organization
-    end
   end
 end