decidim-conferences 0.28.5 → 0.29.0.rc1

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

@@ -5,77 +5,26 @@ module Decidim
     module Admin
       # A command with all the business logic when updating a conference
       # partner in the system.
-      class UpdatePartner < Decidim::Command
-        include ::Decidim::AttachmentAttributesMethods
+      class UpdatePartner < Decidim::Commands::UpdateResource
+        fetch_file_attributes :logo
 
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        # conference_partner - The ConferencePartner to update
-        def initialize(form, conference_partner)
-          @form = form
-          @conference_partner = conference_partner
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
-          return broadcast(:invalid) unless conference_partner
-
-          # We are going to assign the attributes only to handle the validation of the avatar before accessing
-          # `update_conference_partner!` which uses `update!`. Without this step, the image validation may render
-          # an ActiveRecord::RecordInvalid error
-          # After we assign and check if the object is valid, we reload the model to let it be handled the old way
-          # If there is an error we add the error to the form
-          conference_partner.assign_attributes(attributes)
-          if conference_partner.valid?
-            conference_partner.reload
-
-            update_conference_partner!
-            broadcast(:ok)
-          else
-            form.errors.add(:logo, conference_partner.errors[:logo]) if conference_partner.errors.include? :logo
+        fetch_form_attributes :name, :weight, :partner_type, :link
 
-            broadcast(:invalid)
-          end
-        end
-
-        private
+        protected
 
-        attr_reader :form, :conference_partner
-
-        def attributes
-          form.attributes.slice(
-            "name",
-            "weight",
-            "partner_type",
-            "link"
-          ).symbolize_keys.merge(
-            attachment_attributes(:logo)
-          )
+        def invalid?
+          form.invalid? || !resource
         end
 
-        def update_conference_partner!
-          log_info = {
+        def extra_params
+          {
             resource: {
-              title: conference_partner.name
+              title: resource.name
             },
             participatory_space: {
-              title: conference_partner.conference.title
+              title: resource.conference.title
             }
           }
-
-          Decidim.traceability.update!(
-            conference_partner,
-            form.current_user,
-            attributes,
-            log_info
-          )
         end
       end
     end

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

@@ -5,69 +5,34 @@ module Decidim
     module Admin
       # A command with all the business logic when updating a conference
       # registration type in the system.
-      class UpdateRegistrationType < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        # registration_type - The RegistrationType to update
-        def initialize(form, registration_type)
-          @form = form
-          @registration_type = registration_type
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
-          return broadcast(:invalid) unless registration_type
+      class UpdateRegistrationType < Decidim::Commands::UpdateResource
+        fetch_form_attributes :title, :description, :price, :weight
 
-          transaction do
-            update_registration_type!
-            link_meetings(@registration_type)
-          end
-
-          broadcast(:ok)
+        def invalid?
+          form.invalid? || !resource
         end
 
-        private
+        def run_after_hooks
+          resource.conference_meetings = conference_meetings(resource)
+        end
 
-        attr_reader :form, :registration_type
+        protected
 
-        def update_registration_type!
-          log_info = {
+        def extra_params
+          {
             resource: {
-              title: registration_type.title
+              title: resource.title
             },
             participatory_space: {
-              title: registration_type.conference.title
+              title: resource.conference.title
             }
           }
-
-          Decidim.traceability.update!(
-            registration_type,
-            form.current_user,
-            form.attributes.slice(
-              "title",
-              "description",
-              "price",
-              "weight"
-            ).symbolize_keys,
-            log_info
-          )
         end
 
         def conference_meetings(registration_type)
           meeting_components = registration_type.conference.components.where(manifest_name: "meetings")
           Decidim::ConferenceMeeting.where(component: meeting_components).where(id: @form.attributes[:conference_meeting_ids])
         end
-
-        def link_meetings(registration_type)
-          registration_type.conference_meetings = conference_meetings(registration_type)
-        end
       end
     end
   end

data/app/controllers/concerns/decidim/conferences/admin/conferences_invites/filterable.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Conferences
+    module Admin
+      module ConferencesInvites
+        module Filterable
+          extend ActiveSupport::Concern
+
+          included do
+            include Decidim::Admin::Filterable
+
+            private
+
+            def filters
+              [:accepted_at_not_null, :rejected_at_not_null, :sent_at_not_null]
+            end
+
+            def filters_with_values
+              {
+                accepted_at_not_null: %w(true false),
+                rejected_at_not_null: %w(true false),
+                sent_at_not_null: %w(true false)
+              }
+            end
+
+            def base_query
+              collection
+            end
+
+            def search_field_predicate
+              :user_name_or_user_email_cont
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ module Decidim
       class ConferenceInvitesController < Decidim::Conferences::Admin::ApplicationController
         include Concerns::ConferenceAdmin
         include Decidim::Paginable
+        include Decidim::Conferences::Admin::ConferencesInvites::Filterable
 
         helper_method :conference
 
@@ -18,9 +19,7 @@ module Decidim
         def index
           enforce_permission_to(:read_invites, :conference, conference: current_participatory_space)
 
-          @query = params[:q]
-          @status = params[:status]
-          @conference_invites = Decidim::Admin::Invites.for(current_participatory_space.conference_invites, @query, @status).page(params[:page]).per(15)
+          @conference_invites = filtered_collection
         end
 
         def new
@@ -46,6 +45,12 @@ module Decidim
             end
           end
         end
+
+        private
+
+        def collection
+          current_conference.conference_invites
+        end
       end
     end
   end

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

@@ -28,7 +28,7 @@ module Decidim
           enforce_permission_to :create, :conference_speaker
           @form = form(ConferenceSpeakerForm).from_params(params)
 
-          CreateConferenceSpeaker.call(@form, current_user, current_conference) do
+          CreateConferenceSpeaker.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("conference_speakers.create.success", scope: "decidim.admin")
               redirect_to conference_speakers_path(current_conference)
@@ -74,6 +74,38 @@ module Decidim
           end
         end
 
+        def publish
+          enforce_permission_to(:update, :conference_speaker, speaker: conference_speaker)
+
+          Decidim::Conferences::Admin::PublishConferenceSpeaker.call(conference_speaker, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("conference_speakers.publish.success", scope: "decidim.admin")
+              redirect_to conference_speakers_path(current_conference)
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("conference_speakers.publish.invalid", scope: "decidim.admin")
+              render action: "index"
+            end
+          end
+        end
+
+        def unpublish
+          enforce_permission_to(:update, :conference_speaker, speaker: conference_speaker)
+
+          Decidim::Conferences::Admin::UnpublishConferenceSpeaker.call(conference_speaker, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("conference_speakers.unpublish.success", scope: "decidim.admin")
+              redirect_to conference_speakers_path(current_conference)
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("conference_speakers.unpublish.invalid", scope: "decidim.admin")
+              render action: "index"
+            end
+          end
+        end
+
         private
 
         def meetings_selected

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

@@ -52,7 +52,7 @@ module Decidim
             conference_id: current_conference.id
           )
 
-          UpdateConference.call(current_conference, @form) do
+          UpdateConference.call(@form, current_conference) do
             on(:ok) do |conference|
               flash[:notice] = I18n.t("conferences.update.success", scope: "decidim.admin")
               redirect_to edit_conference_path(conference)

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

@@ -23,7 +23,7 @@ module Decidim
           enforce_permission_to :create, :media_link
           @form = form(Decidim::Conferences::Admin::MediaLinkForm).from_params(params)
 
-          CreateMediaLink.call(@form, current_user, current_conference) do
+          CreateMediaLink.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("media_links.create.success", scope: "decidim.admin")
               redirect_to conference_media_links_path(current_conference)

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

@@ -24,7 +24,7 @@ module Decidim
           enforce_permission_to :create, :partner
           @form = form(Decidim::Conferences::Admin::PartnerForm).from_params(params)
 
-          CreatePartner.call(@form, current_user, current_conference) do
+          CreatePartner.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("partners.create.success", scope: "decidim.admin")
               redirect_to conference_partners_path(current_conference)

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

@@ -27,7 +27,7 @@ module Decidim
           enforce_permission_to :create, :registration_type
           @form = form(Decidim::Conferences::Admin::RegistrationTypeForm).from_params(params)
 
-          CreateRegistrationType.call(@form, current_user, current_conference) do
+          CreateRegistrationType.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("registration_types.create.success", scope: "decidim.admin")
               redirect_to conference_registration_types_path(current_conference)

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

@@ -2,7 +2,10 @@
 
 module Decidim
   module Conferences
-    # The main admin application controller for conferences
+    # The main application controller for conferences
+    #
+    # This controller is the abstract class from which all other controllers of
+    # this engine inherit.
     class ApplicationController < Decidim::ApplicationController
       helper Decidim::ApplicationHelper
       helper Decidim::ResourceHelper

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

@@ -4,9 +4,9 @@ module Decidim
   module Conferences
     class ConferenceProgramController < Decidim::Conferences::ApplicationController
       include ParticipatorySpaceContext
+
       helper Decidim::SanitizeHelper
       helper Decidim::Conferences::ConferenceProgramHelper
-      participatory_space_layout only: :show
 
       helper_method :collection, :conference, :meeting_days, :meeting_component
 
@@ -14,7 +14,6 @@ module Decidim
         raise ActionController::RoutingError, "No meetings for this conference " if meetings.blank?
 
         enforce_permission_to :list, :program
-        redirect_to decidim_conferences.conference_path(current_participatory_space) unless current_user_can_visit_space?
       end
 
       private

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

@@ -5,21 +5,18 @@ module Decidim
     class ConferenceSpeakersController < Decidim::Conferences::ApplicationController
       include ParticipatorySpaceContext
 
-      participatory_space_layout only: :index
-
       helper_method :collection, :conference
 
       def index
         raise ActionController::RoutingError, "No speakers for this conference " if speakers.empty?
 
         enforce_permission_to :list, :speakers
-        redirect_to decidim_conferences.conference_path(current_participatory_space) unless current_user_can_visit_space?
       end
 
       private
 
       def speakers
-        @speakers ||= current_participatory_space.speakers
+        @speakers ||= current_participatory_space.speakers.published
       end
 
       alias collection speakers

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

@@ -12,13 +12,10 @@ module Decidim
       include ParticipatorySpaceContext
       include Paginable
 
-      participatory_space_layout only: :show
-
       helper Decidim::AttachmentsHelper
       helper Decidim::IconHelper
       helper Decidim::SanitizeHelper
       helper Decidim::ResourceReferenceHelper
-      helper Decidim::Conferences::PartnersHelper
 
       helper_method :collection, :promoted_conferences, :conferences, :stats
 
@@ -29,7 +26,7 @@ module Decidim
       end
 
       def show
-        check_current_user_can_visit_space
+        enforce_permission_to :read, :conference, conference: current_participatory_space
       end
 
       def user_diploma

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

@@ -4,10 +4,8 @@ module Decidim
   module Conferences
     class MediaController < Decidim::Conferences::ApplicationController
       include ParticipatorySpaceContext
-      helper Decidim::Conferences::MediaAttachmentsHelper
-      helper Decidim::SanitizeHelper
 
-      participatory_space_layout only: :index
+      helper Decidim::SanitizeHelper
 
       helper_method :collection, :conference
 
@@ -15,7 +13,6 @@ module Decidim
         raise ActionController::RoutingError, "No media_links for this conference " if media_links.empty? && current_participatory_space.attachments.empty?
 
         enforce_permission_to :list, :media_links
-        redirect_to decidim_conferences.conference_path(current_participatory_space) unless current_user_can_visit_space?
       end
 
       private

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

@@ -5,15 +5,12 @@ module Decidim
     class RegistrationTypesController < Decidim::Conferences::ApplicationController
       include ParticipatorySpaceContext
 
-      participatory_space_layout only: :index
-
       helper_method :collection, :conference
 
       def index
         raise ActionController::RoutingError, "No registration types for this conference " if registration_types.empty? && current_participatory_space.registrations_enabled
 
         enforce_permission_to :list, :registration_types
-        redirect_to decidim_conferences.conference_path(current_participatory_space) unless current_user_can_visit_space?
       end
 
       private

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

@@ -3,13 +3,8 @@
 module Decidim
   module Conferences
     class ConferenceRoleAssignedEvent < Decidim::Events::SimpleEvent
-      include Decidim::Events::NotificationEvent
       include Decidim::Events::AuthorEvent
 
-      def notification_title
-        I18n.t("notification_title", **i18n_options).html_safe
-      end
-
       def i18n_role
         I18n.t(extra["role"], scope: "decidim.admin.models.conference_user_role.roles", default: extra["role"])
       end

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

@@ -12,10 +12,10 @@ module Decidim
 
         translatable_attribute :title, String
         translatable_attribute :slogan, String
-        translatable_attribute :short_description, Decidim::Attributes::RichText
-        translatable_attribute :description, Decidim::Attributes::RichText
-        translatable_attribute :objectives, Decidim::Attributes::RichText
-        translatable_attribute :registration_terms, Decidim::Attributes::RichText
+        translatable_attribute :short_description, String
+        translatable_attribute :description, String
+        translatable_attribute :objectives, String
+        translatable_attribute :registration_terms, String
 
         mimic :conference
 
@@ -33,7 +33,7 @@ module Decidim
         attribute :start_date, Decidim::Attributes::LocalizedDate
         attribute :end_date, Decidim::Attributes::LocalizedDate
         attribute :registrations_enabled, Boolean
-        attribute :available_slots, Integer
+        attribute :available_slots, Integer, default: 0
         attribute :location, String
         attribute :participatory_processes_ids, Array[Integer]
         attribute :assemblies_ids, Array[Integer]

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

@@ -10,7 +10,7 @@ module Decidim
 
         translatable_attribute :position, String
         translatable_attribute :affiliation, String
-        translatable_attribute :short_bio, Decidim::Attributes::RichText
+        translatable_attribute :short_bio, String
 
         mimic :conference_speaker
 

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

@@ -11,7 +11,7 @@ module Decidim
         mimic :conference_registration_type
 
         translatable_attribute :title, String
-        translatable_attribute :description, Decidim::Attributes::RichText
+        translatable_attribute :description, String
 
         attribute :weight, Integer
         attribute :price, Decimal

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

@@ -5,6 +5,7 @@ module Decidim
   module Conferences
     module ConferenceHelper
       include PaginateHelper
+      include Decidim::AttachmentsHelper
 
       # Renders the dates of a conference
       #
@@ -18,7 +19,7 @@ module Decidim
       #
       def conference_nav_items(participatory_space)
         [].tap do |items|
-          if participatory_space.speakers.exists?
+          if participatory_space.speakers.published.exists?
             items << {
               name: t("layouts.decidim.conferences_nav.conference_speaker_menu_item"),
               url: decidim_conferences.conference_conference_speakers_path(participatory_space)

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

@@ -33,18 +33,14 @@ module Decidim
         private
 
         def add_diploma_attachment
-          diploma = WickedPdf.new.pdf_from_string(pdf_content, orientation: "Landscape")
-
-          attachments["conference-#{@user.nickname.parameterize}-diploma.pdf"] = diploma
-        end
-
-        def pdf_content
-          Premailer.new(
+          diploma = WickedPdf.new.pdf_from_string(
             render_to_string(pdf: "conference-diploma",
                              template: "decidim/conferences/admin/send_conference_diploma_mailer/diploma_user",
                              layout: "decidim/diploma"),
-            with_html_string: true
-          ).to_inline_css
+            orientation: "Landscape"
+          )
+
+          attachments["conference-#{@user.nickname.parameterize}-diploma.pdf"] = diploma
         end
       end
     end

data/app/models/decidim/conference.rb

@@ -60,7 +60,7 @@ module Decidim
     validates_upload :hero_image, uploader: Decidim::HeroImageUploader
 
     has_one_attached :banner_image
-    validates_upload :banner_image, uploader: Decidim::HomepageImageUploader
+    validates_upload :banner_image, uploader: Decidim::BannerImageUploader
 
     has_one_attached :main_logo
     validates_upload :main_logo, uploader: Decidim::Conferences::DiplomaUploader
@@ -136,7 +136,7 @@ module Decidim
     end
 
     def user_roles(role_name = nil)
-      roles = Decidim::ConferenceUserRole.order_by_name.where(conference: self)
+      roles = Decidim::ConferenceUserRole.where(conference: self)
       return roles if role_name.blank?
 
       roles.where(role: role_name)

data/app/models/decidim/conference_speaker.rb

@@ -8,6 +8,7 @@ module Decidim
     include Decidim::Loggable
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
+    include Decidim::Publicable
 
     translatable_fields :position, :affiliation, :short_bio
 
@@ -17,6 +18,7 @@ module Decidim
     has_many :conference_meetings, through: :conference_speaker_conference_meetings, class_name: "Decidim::ConferenceMeeting"
 
     default_scope { order(full_name: :asc, created_at: :asc) }
+    scope :published, -> { where.not(published_at: nil) }
 
     has_one_attached :avatar
     validates_avatar :avatar, uploader: Decidim::AvatarUploader

data/app/permissions/decidim/conferences/permissions.rb

@@ -160,7 +160,7 @@ module Decidim
       end
 
       # All users with a relation to a conference and organization admins can enter
-      # the space area. The sapce area is considered to be the conferences zone,
+      # the space area. The space area is considered to be the conferences zone,
       # not the conference groups one.
       def user_can_enter_space_area?
         return unless permission_action.action == :enter &&
@@ -254,7 +254,7 @@ module Decidim
         allow! if permission_action.action == :export && permission_action.subject == :component_data
       end
 
-      # Process admins can eprform everything *inside* that conference. They cannot
+      # Process admins can perform everything *inside* that conference. They cannot
       # create a conference or perform actions on conference groups or other
       # conferences.
       def conference_admin_action?

data/app/presenters/decidim/conferences/admin_log/conference_speaker_presenter.rb

@@ -26,7 +26,8 @@ module Decidim
             position: "Decidim::Conferences::AdminLog::ValueTypes::SpeakerPositionPresenter",
             position_other: :string,
             weight: :integer,
-            ceased_date: :date
+            ceased_date: :date,
+            published_at: :date
           }
         end
 

data/app/views/decidim/conferences/admin/conference_invites/_form.html.erb

@@ -1,7 +1,7 @@
 <div class="form__wrapper">
   <div class="card attendee-fields pt-4">
     <div class="row column">
-      <fieldset class="check-radio-collection">
+      <fieldset>
         <legend><%= t(".attendee_type") %></legend>
         <%= form.collection_radio_buttons(:existing_user, [[t(".non_user"), false], [t(".existing_user"), true]], :last, :first) %>
       </fieldset>
@@ -11,21 +11,21 @@
       <p><%= t(".invite_explanation") %></p>
     </div>
 
-    <div class="row column auto cell attendee-fields--new-user">
+    <div class="row column cell attendee-fields--new-user">
       <%= form.text_field :name %>
     </div>
-    <div class="row column auto cell attendee-fields--new-user">
+    <div class="row column cell attendee-fields--new-user">
       <%= form.text_field :email %>
     </div>
 
-    <div class="row column auto cell attendee-fields--user-picker">
+    <div class="row column cell attendee-fields--user-picker">
         <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_user") } %>
         <%= form.autocomplete_select(:user_id, form.object.user.presence, { multiple: false, class: "autocomplete-field--results-inline" }, prompt_options) do |user|
           { value: user.id, label: "#{user.name} (@#{user.nickname})" }
         end %>
     </div>
 
-    <div class="row column auto cell">
+    <div class="row column cell">
       <%= form.select :registration_type_id,
                       options_for_select(@form.registration_types_for_select),
                       { include_blank: false },