decidim-conferences 0.20.0 → 0.23.1.rc1

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

@@ -26,7 +26,18 @@ module Decidim
         validates :full_name, presence: true, unless: proc { |object| object.existing_user }
         validates :user, presence: true, if: proc { |object| object.existing_user }
         validates :position, :affiliation, presence: true
-        validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
+        validates :avatar, passthru: {
+          to: Decidim::ConferenceSpeaker,
+          with: {
+            # The speaker gets its organization context through the conference
+            # object which is why we need to create a dummy conference in order
+            # to pass the correct organization context to the file upload
+            # validators.
+            conference: lambda do |form|
+              Decidim::Conference.new(organization: form.current_organization)
+            end
+          }
+        }
         validate :personal_url_format
 
         def personal_url

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

@@ -7,6 +7,8 @@ module Decidim
       # from the admin dashboard
       #
       class DiplomaForm < Form
+        include Decidim::HasUploadValidations
+
         mimic :conference
 
         attribute :main_logo
@@ -16,8 +18,10 @@ module Decidim
 
         validates :signature_name, :sign_date, :main_logo, :signature, presence: true
 
-        validates :main_logo, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
-        validates :signature, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :main_logo, passthru: { to: Decidim::Conference }
+        validates :signature, passthru: { to: Decidim::Conference }
+
+        alias organization current_organization
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Decidim
     module Admin
       # A form object used to create conference members from the admin dashboard.
       class PartnerForm < Form
+        include Decidim::HasUploadValidations
+
         mimic :conference_partner
 
         attribute :name, String
@@ -15,11 +17,24 @@ module Decidim
         attribute :remove_logo
 
         validates :name, :partner_type, presence: true, if: ->(form) { form.logo.present? }
-        validates :logo, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
+        validates :logo, passthru: {
+          to: Decidim::Conferences::Partner,
+          with: {
+            # The partner gets its organization context through the conference
+            # object which is why we need to create a dummy conference in order
+            # to pass the correct organization context to the file upload
+            # validators.
+            conference: lambda do |form|
+              Decidim::Conference.new(organization: form.current_organization)
+            end
+          }
+        }
         validate :link_format
         validates :weight, numericality: { greater_than_or_equal_to: 0 }
         validates :partner_type, inclusion: { in: Decidim::Conferences::Partner::TYPES }
 
+        alias organization current_organization
+
         def link
           return if super.blank?
 

data/app/jobs/decidim/conferences/admin/send_conference_diploma_job.rb

@@ -11,7 +11,7 @@ module Decidim
           return unless confirmed_registrations.any?
 
           confirmed_registrations.each do |registration_confirmed|
-            SendConferenceDiplomaMailer.diploma(conference, registration_confirmed.user).deliver_now
+            SendConferenceDiplomaMailer.diploma(conference, registration_confirmed.user).deliver_later
           end
         end
       end

data/app/models/decidim/conference.rb

@@ -10,13 +10,17 @@ module Decidim
     include Decidim::HasAttachmentCollections
     include Decidim::Participable
     include Decidim::Publicable
-    include Decidim::Scopable
+    include Decidim::ScopableParticipatorySpace
     include Decidim::Followable
     include Decidim::HasReference
     include Decidim::Traceable
     include Decidim::Loggable
     include Decidim::ParticipatorySpaceResourceable
     include Decidim::Searchable
+    include Decidim::HasUploadValidations
+    include Decidim::TranslatableResource
+
+    translatable_fields :title, :slogan, :short_description, :description, :objectives, :registration_terms
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -51,9 +55,16 @@ module Decidim
     validates :slug, uniqueness: { scope: :organization }
     validates :slug, presence: true, format: { with: Decidim::Conference.slug_format }
 
+    validates_upload :hero_image
     mount_uploader :hero_image, Decidim::HeroImageUploader
+
+    validates_upload :banner_image
     mount_uploader :banner_image, Decidim::HomepageImageUploader
+
+    validates_upload :main_logo
     mount_uploader :main_logo, Decidim::Conferences::DiplomaUploader
+
+    validates_upload :signature
     mount_uploader :signature, Decidim::Conferences::DiplomaUploader
 
     searchable_fields({
@@ -116,5 +127,21 @@ module Decidim
 
       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
+
+    def attachment_context
+      :admin
+    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_speaker.rb

@@ -6,16 +6,19 @@ module Decidim
   class ConferenceSpeaker < ApplicationRecord
     include Decidim::Traceable
     include Decidim::Loggable
+    include Decidim::HasUploadValidations
+    include Decidim::TranslatableResource
+
+    translatable_fields :position, :affiliation, :short_bio
 
     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"
     has_many :conference_speaker_conference_meetings, dependent: :destroy
     has_many :conference_meetings, through: :conference_speaker_conference_meetings, foreign_key: "conference_speaker_id", class_name: "Decidim::ConferenceMeeting"
 
-    validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
-
     default_scope { order(full_name: :asc, created_at: :asc) }
 
+    validates_avatar
     mount_uploader :avatar, Decidim::AvatarUploader
 
     delegate :organization, to: :conference

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
 

data/app/models/decidim/conferences/media_link.rb

@@ -6,6 +6,9 @@ module Decidim
     class MediaLink < ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
 

data/app/models/decidim/conferences/partner.rb

@@ -6,15 +6,19 @@ module Decidim
     class Partner < ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::HasUploadValidations
 
       TYPES = %w(main_promotor collaborator).freeze
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
-      validates :logo, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
 
       default_scope { order(partner_type: :desc, weight: :asc) }
+
+      validates_avatar :logo
       mount_uploader :logo, Decidim::Conferences::PartnerLogoUploader
 
+      delegate :organization, to: :conference
+
       alias participatory_space conference
 
       def self.log_presenter_class_for(_log)

data/app/models/decidim/conferences/registration_type.rb

@@ -7,6 +7,9 @@ module Decidim
       include Decidim::Publicable
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title, :description
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
       has_many :conference_meeting_registration_types, dependent: :destroy

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

@@ -51,6 +51,7 @@ module Decidim
 
         moderator_action?
         collaborator_action?
+        valuator_action?
         conference_admin_action?
 
         permission_action
@@ -252,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/conference_stats_presenter.rb

@@ -38,7 +38,7 @@ module Decidim
 
       def render_stats_data(component_manifest, name, data, index)
         safe_join([
-                    index.zero? ? manifest_icon(component_manifest) : " /&nbsp".html_safe,
+                    index.zero? ? manifest_icon(component_manifest, role: "img", "aria-hidden": true) : " /&nbsp".html_safe,
                     content_tag(:span, "#{number_with_delimiter(data)} " + I18n.t(name, scope: "decidim.conferences.statistics"),
                                 class: "#{name} process_stats-text")
                   ])

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

data/app/views/decidim/conferences/_order_by_conferences.html.erb

@@ -1,3 +1,3 @@
 <div class="row collapse order-by">
-  <h2 class="order-by__text section-heading"><%= t("conferences.order_by_conferences.conferences", scope: "layouts.decidim", count: collection.count) %></h2>
+  <h3 class="order-by__text section-heading"><%= t("conferences.order_by_conferences.conferences", scope: "layouts.decidim", count: collection.count) %></h3>
 </div>

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

@@ -26,8 +26,8 @@
           <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
           <%= hidden_field_tag :state, @state %>
           <div class="input-group-button">
-            <button type="submit" class="button button--muted">
-              <%= icon "magnifying-glass", aria_label: t(".search") %>
+            <button type="submit" class="button">
+              <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
             </button>
           </div>
         </div>

data/app/views/decidim/conferences/admin/conference_speakers/index.html.erb

@@ -5,8 +5,8 @@
         <div class="input-group">
           <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
           <div class="input-group-button">
-            <button type="submit" class="button button--muted">
-              <%= icon "magnifying-glass", aria_label: t(".search") %>
+            <button type="submit" class="button">
+              <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
             </button>
           </div>
         </div>

data/app/views/decidim/conferences/admin/conferences/index.html.erb

@@ -1,17 +1,18 @@
-<div class="card" id="conferences">
+<div class="card with-overflow" id="conferences">
   <div class="card-divider">
     <h2 class="card-title">
       <%= t "decidim.admin.titles.conferences" %>
       <%= link_to t("actions.new_conference", scope: "decidim.admin"), new_conference_path, class: "button tiny button--title" if allowed_to? :create, :conference %>
     </h2>
   </div>
+  <%= admin_filter_selector %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
         <thead>
           <tr>
             <th><%= t("models.conference.fields.title", scope: "decidim.admin") %></th>
-            <th><%= t("models.conference.fields.created_at", scope: "decidim.admin") %></th>
+            <th><%= sort_link(query, :created_at, t("models.conference.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
             <th class="table-list__actions"><%= t("models.conference.fields.published", scope: "decidim.admin") %></th>
             <th></th>
           </tr>
@@ -22,11 +23,13 @@
               <td>
                 <% if conference.promoted? %>
                   <span data-tooltip class="icon-state icon-highlight" aria-haspopup="true" data-disable-hover="false" title="<%= t("models.conference.fields.promoted", scope: "decidim.admin") %>">
-                    <%= icon "star" %>
+                    <%= icon "star", aria_label: t("models.conference.fields.promoted", scope: "decidim.admin"), role: "img" %>
                   </span>
                 <% end %>
                 <% if allowed_to? :update, :conference, conference: conference %>
                   <%= link_to translated_attribute(conference.title), edit_conference_path(conference) %><br>
+                <% elsif allowed_to? :read, :component, conference: conference %>
+                  <%= link_to translated_attribute(conference.title), components_path(conference) %><br>
                 <% elsif allowed_to? :preview, :conference, conference: conference %>
                   <%= link_to translated_attribute(conference.title), decidim_conferences.conference_path(conference) %><br>
                 <% elsif allowed_to? :read, :moderation, conference: conference %>

data/app/views/decidim/conferences/conference_program/_program_item.html.erb

@@ -8,10 +8,12 @@
           <ul class="tabs buttons__row" id="conference-row-<%= seed %>-tabs" data-tabs>
             <% categories.each_with_index do |category, i| %>
               <li class="tabs-title<%= " is-active" if i == 0 %>">
-                <!-- Wrap button in an anchor to make foundation tabs work -->
-                <a href="#conference-row-<%= seed %>-tab<%= i %>">
-                  <button class="button button--shadow secondary tiny light"><%= category.present? ? translated_attribute(category.name) : "other" %></button>
-                </a>
+                <!-- Wrap the anchor inside a div to keep correct button styling -->
+                <div>
+                  <a href="#conference-row-<%= seed %>-tab<%= i %>" class="button button--shadow tiny hollow">
+                    <%= category.present? ? translated_attribute(category.name) : "other" %>
+                  </a>
+                </div>
               </li>
             <% end %>
           </ul>