decidim-conferences 0.18.1 → 0.21.0

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

@@ -7,11 +7,12 @@ module Decidim
       #
       class PartnersController < Decidim::Conferences::Admin::ApplicationController
         include Concerns::ConferenceAdmin
+        include Decidim::Paginable
 
         def index
           enforce_permission_to :index, :partner
 
-          @partners = collection.page(params[:page]).per(15)
+          @partners = paginate(collection)
         end
 
         def new

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

@@ -8,11 +8,12 @@ module Decidim
       class RegistrationTypesController < Decidim::Conferences::Admin::ApplicationController
         include Concerns::ConferenceAdmin
         include Decidim::ApplicationHelper
+        include Decidim::Paginable
 
         def index
           enforce_permission_to :index, :registration_type
 
-          @registration_types = collection.page(params[:page]).per(15)
+          @registration_types = paginate(collection)
         end
 
         def new

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

@@ -11,7 +11,8 @@ module Decidim
       helper_method :collection, :conference, :meeting_days, :meeting_component
 
       def show
-        raise ActionController::RoutingError, "No meetings for this conference " if meetings.empty?
+        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
@@ -20,11 +21,13 @@ module Decidim
 
       def meeting_component
         return if params[:id].blank?
+
         @meeting_component ||= current_participatory_space.components.where(manifest_name: "meetings").find_by(id: params[:id])
       end
 
       def meetings
         return unless meeting_component.published? || !meeting_component.presence
+
         @meetings ||= Decidim::Meetings::Meeting.where(component: meeting_component).visible_meeting_for(current_user).order(:start_time)
       end
 

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

@@ -65,6 +65,7 @@ module Decidim
       def redirect_after_path
         referer = request.headers["Referer"]
         return redirect_to(conference_path(conference)) if referer =~ /invitation_token/
+
         redirect_back fallback_location: conference_path(conference)
       end
     end

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

@@ -11,6 +11,7 @@ module Decidim
 
       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

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

@@ -13,6 +13,7 @@ module Decidim
 
       def index
         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

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

@@ -11,6 +11,7 @@ module Decidim
 
       def index
         raise ActionController::RoutingError, "No registration types for this conference " if registration_types.empty? && current_participatory_space.registrations_enabled.empty?
+
         enforce_permission_to :list, :registration_types
         redirect_to decidim_conferences.conference_path(current_participatory_space) unless current_user_can_visit_space?
       end

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

@@ -62,6 +62,7 @@ module Decidim
 
         def processes_for_select
           return unless Decidim.participatory_space_manifests.map(&:name).include?(:participatory_processes)
+
           @processes_for_select ||= Decidim.find_participatory_space_manifest(:participatory_processes)
                                            .participatory_spaces.call(current_organization)&.order(title: :asc)&.map do |process|
             [
@@ -73,6 +74,7 @@ module Decidim
 
         def assemblies_for_select
           return unless Decidim.participatory_space_manifests.map(&:name).include?(:assemblies)
+
           @assemblies_for_select ||= Decidim.find_participatory_space_manifest(:assemblies)
                                             .participatory_spaces.call(current_organization)&.order(title: :asc)&.map do |assembly|
             [
@@ -84,6 +86,7 @@ module Decidim
 
         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|
             [
@@ -98,6 +101,7 @@ module Decidim
         def available_slots_greater_than_or_equal_to_registrations_count
           conference = OrganizationConferences.new(current_organization).query.find_by(slug: slug)
           return true if conference.blank?
+
           errors.add(:available_slots, :invalid) if available_slots < conference.conference_registrations.count
         end
 

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

@@ -50,6 +50,7 @@ module Decidim
         def conference_meetings
           meeting_components = current_participatory_space.components.where(manifest_name: "meetings")
           return unless meeting_components || conference_meeting_ids.delete("").present?
+
           @conference_meetings ||= Decidim::ConferenceMeeting.where(component: meeting_components).where(id: conference_meeting_ids)
         end
 

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

@@ -36,6 +36,7 @@ module Decidim
         def conference_meetings
           meeting_components = current_participatory_space.components.where(manifest_name: "meetings")
           return unless meeting_components || conference_meeting_ids.delete("").present?
+
           @conference_meetings ||= Decidim::ConferenceMeeting.where(component: meeting_components).where(id: conference_meeting_ids)
         end
       end

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

@@ -8,6 +8,7 @@ module Decidim
       #
       def render_date(conference)
         return l(conference.start_date, format: :decidim_with_month_name_short) if conference.start_date == conference.end_date
+
         "#{l(conference.start_date, format: :decidim_with_month_name_short)} - #{l(conference.end_date, format: :decidim_with_month_name_short)}"
       end
     end

data/app/models/decidim/conference.rb

@@ -16,14 +16,12 @@ module Decidim
     include Decidim::Traceable
     include Decidim::Loggable
     include Decidim::ParticipatorySpaceResourceable
+    include Decidim::Searchable
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization"
-    belongs_to :area,
-               foreign_key: "decidim_area_id",
-               class_name: "Decidim::Area",
-               optional: true
+
     has_many :categories,
              foreign_key: "decidim_participatory_space_id",
              foreign_type: "decidim_participatory_space_type",
@@ -58,6 +56,18 @@ module Decidim
     mount_uploader :main_logo, Decidim::Conferences::DiplomaUploader
     mount_uploader :signature, Decidim::Conferences::DiplomaUploader
 
+    searchable_fields({
+                        scope_id: :decidim_scope_id,
+                        participatory_space: :itself,
+                        A: :title,
+                        B: :slogan,
+                        C: :short_description,
+                        D: [:description, :objectives],
+                        datetime: :published_at
+                      },
+                      index_on_create: ->(_conference) { false },
+                      index_on_update: ->(conference) { conference.visible? })
+
     # Scope to return only the promoted conferences.
     #
     # Returns an ActiveRecord::Relation.
@@ -87,6 +97,7 @@ module Decidim
 
     def has_available_slots?
       return true if available_slots.zero?
+
       available_slots > conference_registrations.count
     end
 
@@ -96,12 +107,26 @@ module Decidim
 
     def diploma_sent?
       return false if diploma_sent_at.nil?
+
       true
     end
 
     def closed?
       return false if end_date.blank?
+
       end_date < Date.current
     end
+
+    def user_roles(role_name = nil)
+      roles = Decidim::ConferenceUserRole.where(conference: self)
+      return roles if role_name.blank?
+
+      roles.where(role: role_name)
+    end
+
+    # Allow ransacker to search for a key in a hstore column (`title`.`en`)
+    ransacker :title do |parent|
+      Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
+    end
   end
 end

data/app/models/decidim/conference_user_role.rb

@@ -11,7 +11,7 @@ module Decidim
     belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference", optional: true
     alias participatory_space conference
 
-    ROLES = %w(admin collaborator moderator).freeze
+    ROLES = %w(admin collaborator moderator valuator).freeze
     validates :role, inclusion: { in: ROLES }, uniqueness: { scope: [:user, :conference] }
     validate :user_and_conference_same_organization
 
@@ -24,6 +24,7 @@ module Decidim
     # 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

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

@@ -30,6 +30,7 @@ module Decidim
         end
 
         return permission_action unless user
+
         if !has_manageable_conferences? && !user.admin?
           disallow!
           return permission_action
@@ -50,6 +51,7 @@ module Decidim
 
         moderator_action?
         collaborator_action?
+        valuator_action?
         conference_admin_action?
 
         permission_action
@@ -94,12 +96,14 @@ module Decidim
       # Checks if it has any manageable conference, with any possible role.
       def has_manageable_conferences?(role: :any)
         return unless user
+
         conferences_with_role_privileges(role).any?
       end
 
       # Whether the user can manage the given conference or not.
       def can_manage_conference?(role: :any)
         return unless user
+
         conferences_with_role_privileges(role).include? conference
       end
 
@@ -123,6 +127,7 @@ module Decidim
 
         return allow! if user&.admin?
         return allow! if conference.published?
+
         toggle_allow(can_manage_conference?)
       end
 
@@ -222,12 +227,14 @@ module Decidim
       # Everyone can read the conference list
       def user_can_read_conference_list?
         return unless read_conference_list_permission_action?
+
         toggle_allow(user.admin? || has_manageable_conferences?)
       end
 
       def user_can_read_current_conference?
         return unless read_conference_list_permission_action?
         return if permission_action.subject == :conference_list
+
         toggle_allow(user.admin? || can_manage_conference?)
       end
 
@@ -246,6 +253,14 @@ module Decidim
         allow! if permission_action.action == :read || permission_action.action == :preview
       end
 
+      # Valuators can only read components
+      def valuator_action?
+        return unless can_manage_conference?(role: :valuator)
+
+        allow! if permission_action.action == :read && permission_action.subject == :component
+        allow! if permission_action.action == :export && permission_action.subject == :component_data
+      end
+
       # Process admins can eprform everything *inside* that conference. They cannot
       # create a conference or perform actions on conference groups or other
       # conferences.

data/app/presenters/decidim/conferences/admin_log/value_types/role_presenter.rb

@@ -13,6 +13,7 @@ module Decidim
           # Returns an HTML-safe String.
           def present
             return if value.blank?
+
             h.t(value, scope: "decidim.admin.models.conference_user_role.roles", default: value)
           end
         end

data/app/presenters/decidim/log/value_types/conference_presenter.rb

@@ -14,6 +14,7 @@ module Decidim
         def present
           return unless value
           return h.translated_attribute(conference.title) if conference
+
           I18n.t("not_found", id: value, scope: "decidim.log.value_types.conference_presenter")
         end
 

data/app/queries/decidim/conferences/admin/conference_invites.rb

@@ -36,6 +36,7 @@ module Decidim
 
         def filter_by_search(conference_invites)
           return conference_invites if @query.blank?
+
           conference_invites.joins(:user).where(
             User.arel_table[:name].lower.matches("%#{@query}%").or(User.arel_table[:email].lower.matches("%#{@query}%"))
           )

data/app/queries/decidim/conferences/admin/conference_speakers.rb

@@ -32,6 +32,7 @@ module Decidim
 
         def filter_by_search(conference_speakers)
           return conference_speakers if @query.blank?
+
           conference_speakers.where("LOWER(full_name) LIKE LOWER(?)", "%#{@query}%")
         end
       end

data/app/types/decidim/conferences/conference_media_link_type.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This type represents a conference.
+    ConferenceMediaLinkType = GraphQL::ObjectType.define do
+      name "ConferenceMediaLink"
+      description "A conference media link"
+
+      field :id, !types.ID, "Internal ID for this media link"
+      field :title, Decidim::Core::TranslatedFieldType, "Title for this media link"
+      field :link, types.String, "URL for this media link"
+      field :date, Decidim::Core::DateType, "Relevant date for the media link"
+      field :weight, types.Int, "Order of appearance in which it should be presented"
+      field :createdAt, Decidim::Core::DateTimeType, "The time this entry was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "The time this entry was updated", property: :updated_at
+    end
+  end
+end

data/app/types/decidim/conferences/conference_partner_type.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This type represents a conference.
+    ConferencePartnerType = GraphQL::ObjectType.define do
+      name "ConferencePartner"
+      description "A conference partner"
+
+      field :id, !types.ID, "ID of the resource"
+      field :name, types.String, "Partner name"
+      field :partnerType, types.String, "Partner type", property: :partner_type
+      field :weight, types.Int, "Order of appearance in which it should be presented"
+      field :link, types.String, "Relevant URL for this partner"
+      field :logo, types.String, "Link to the partner's logo"
+      field :createdAt, Decidim::Core::DateTimeType, "The time this partner was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "The time this partner was updated", property: :updated_at
+    end
+  end
+end

data/app/types/decidim/conferences/conference_speaker_type.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This type represents a conference.
+    ConferenceSpeakerType = GraphQL::ObjectType.define do
+      name "ConferenceSpeaker"
+      description "A conference speaker"
+
+      field :id, !types.ID, "Internal ID of the speaker"
+      field :fullName, types.String, "Full name of the speaker", property: :full_name
+      field :position, Decidim::Core::TranslatedFieldType, "Position of the speaker in the conference"
+      field :affiliation, Decidim::Core::TranslatedFieldType, "Affiliation of the speaker"
+      field :twitterHandle, types.String, "Twitter handle", property: :twitter_handle
+      field :shortBio, Decidim::Core::TranslatedFieldType, "Short biography of the speaker", property: :short_bio
+      field :personalUrl, types.String, "Personal URL of the speaker", property: :personal_url
+      field :avatar, types.String, "Avatar of the speaker"
+      field :user, Decidim::Core::UserType, "Decidim user corresponding to this speaker", property: :user
+
+      field :createdAt, Decidim::Core::DateTimeType, "The time this member was created ", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "The time this member was updated", property: :updated_at
+    end
+  end
+end

data/app/types/decidim/conferences/conference_type.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This type represents a conference.
+    ConferenceType = GraphQL::ObjectType.define do
+      interfaces [
+        -> { Decidim::Core::ParticipatorySpaceInterface },
+        -> { Decidim::Core::ScopableInterface },
+        -> { Decidim::Core::AttachableInterface }
+      ]
+
+      name "Conference"
+      description "A conference"
+
+      field :id, !types.ID, "Internal ID for this conference"
+      field :shortDescription, Decidim::Core::TranslatedFieldType, "The short description of this conference", property: :short_description
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this conference"
+      field :slug, types.String, "The slug of this conference"
+      field :hashtag, types.String, "The hashtag for this conference"
+      field :slogan, Decidim::Core::TranslatedFieldType, "The slogan of the conference"
+      field :location, types.String, "The location of this conference"
+      field :createdAt, Decidim::Core::DateTimeType, "The time this conference was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "The time this conference was updated", property: :updated_at
+      field :publishedAt, Decidim::Core::DateTimeType, "The time this conference was published", property: :published_at
+      field :reference, types.String, "Reference prefix for this conference"
+
+      field :heroImage, types.String, "The hero image for this conference", property: :hero_image
+      field :bannerImage, types.String, "The banner image for this conference", property: :banner_image
+      field :promoted, types.Boolean, "If this conference is promoted (therefore in the homepage)"
+      field :objectives, Decidim::Core::TranslatedFieldType, "The objectives of the conference"
+      field :showStatistics, types.Boolean, "If this conference shows the statistics", property: :show_statistics
+      field :startDate, Decidim::Core::DateType, "The date this conference starts", property: :start_date
+      field :endDate, Decidim::Core::DateType, "The date this conference ends", property: :end_date
+      field :registrationsEnabled, types.Boolean, "If the registrations are enabled in this conference", property: :registrations_enabled
+      field :availableSlots, types.Int, "The number of available slots in this conference", property: :available_slots
+      field :registrationTerms, Decidim::Core::TranslatedFieldType, "The registration terms of this conference", property: :registration_terms
+
+      field :speakers, types[Decidim::Conferences::ConferenceSpeakerType], "List of speakers in this conference"
+      field :partners, types[Decidim::Conferences::ConferencePartnerType], "List of partners in this conference"
+      field :categories, types[Decidim::Core::CategoryType], "List of categories in this conference"
+      field :mediaLinks, types[Decidim::Conferences::ConferenceMediaLinkType], "List of media links in this conference", property: :media_links
+    end
+  end
+end