decidim-conferences 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 073cb7b12f74449977cfec9e2d7adb06068471c034cd41bfd4d7bfb18a34e178
-  data.tar.gz: 5f10e62f54d3a8511f565ef53c7b2d50ab49f1e75da0df5f89f35056efb36284
+  metadata.gz: 99821cad74f86b23d2243a063e9c5f347aff5a1c8e284e8c8c0cc250c726da59
+  data.tar.gz: 681fd61ed392ae35e2f580fac6e6ff49e6fad73f90e2e87585a5e343042ef73b
 SHA512:
-  metadata.gz: 5ab470eaa1b17bbd6cee13c6238fe492abd41f2888728dde9c650c7ac595b5af7852532740626726b457ca81933519c4673fcb66c81295d303ca2a65cb221145
-  data.tar.gz: 3a7469d214456fb69eb48eeeb0afe2656df021d630dba27dc97beac8eafd751960f047dcbcbb6816f4f2db20ae795a48295fd356c51c16ff32814984619eec53
+  metadata.gz: dd9b00dae882f1a7e7aba6aced3e95ae4812abc5e7f81e2abf3f10cfa425a26cea3b6fef3c706ceae59cca30008e86c1fc505130b963668c888b13eecf8af285
+  data.tar.gz: 4ad9c3cfa57db46f38e22da1310323249f955d6c2f95b467ba62cbc184a7db7ff6b74e4bd60eec1bc75346f05bbf744674d2e8dbc07b2c1559e9d93559d78c84

data/README.md

@@ -27,6 +27,8 @@ And then execute:
 
 ```bash
 bundle
+bundle exec rails decidim_conferences:install:migrations
+bundle exec rails db:migrate
 ```
 
 ## Contributing

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

@@ -85,7 +85,7 @@ module Decidim
         end
 
         def link_participatory_processes
-          conference.link_participatory_spaces_resources(participatory_processes, "included_participatory_processes")
+          conference.link_participatory_space_resources(participatory_processes, "included_participatory_processes")
         end
 
         def assemblies
@@ -93,7 +93,7 @@ module Decidim
         end
 
         def link_assemblies
-          conference.link_participatory_spaces_resources(assemblies, "included_assemblies")
+          conference.link_participatory_space_resources(assemblies, "included_assemblies")
         end
 
         def consultations
@@ -102,7 +102,7 @@ module Decidim
         end
 
         def link_consultations
-          conference.link_participatory_spaces_resources(consultations, "included_consultations")
+          conference.link_participatory_space_resources(consultations, "included_consultations")
         end
       end
     end

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

@@ -140,7 +140,7 @@ module Decidim
         end
 
         def link_participatory_processes
-          @conference.link_participatory_spaces_resources(participatory_processes, "included_participatory_processes")
+          @conference.link_participatory_space_resources(participatory_processes, "included_participatory_processes")
         end
 
         def assemblies
@@ -148,7 +148,7 @@ module Decidim
         end
 
         def link_assemblies
-          @conference.link_participatory_spaces_resources(assemblies, "included_assemblies")
+          @conference.link_participatory_space_resources(assemblies, "included_assemblies")
         end
 
         def consultations
@@ -157,7 +157,7 @@ module Decidim
         end
 
         def link_consultations
-          @conference.link_participatory_spaces_resources(consultations, "included_consultations")
+          @conference.link_participatory_space_resources(consultations, "included_consultations")
         end
       end
     end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Conferences
+    module Admin
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def filters
+            [:published_at_null]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,11 +8,11 @@ module Decidim
       class ConferencesController < Decidim::Conferences::Admin::ApplicationController
         helper_method :current_conference, :current_participatory_space
         layout "decidim/admin/conferences"
-        include Decidim::Paginable
+        include Decidim::Conferences::Admin::Filterable
 
         def index
           enforce_permission_to :read, :conference_list
-          @conferences = paginate(collection)
+          @conferences = filtered_collection
         end
 
         def new
@@ -70,9 +70,8 @@ module Decidim
         private
 
         def current_conference
-          scope = OrganizationConferences.new(current_user.organization).query
-          @current_conference ||= scope.where(slug: params[:slug]).or(
-            scope.where(id: params[:slug])
+          @current_conference ||= collection.where(slug: params[:slug]).or(
+            collection.where(id: params[:slug])
           ).first
         end
 

data/app/models/decidim/conference.rb

@@ -116,5 +116,17 @@ 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
+
+    # 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
 

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/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/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>
@@ -27,6 +28,8 @@
                 <% 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/layouts/decidim/admin/conference.html.erb

@@ -10,9 +10,9 @@
       <% if allowed_to? :read, :component, conference: current_participatory_space %>
         <li <% if is_active_link?(decidim_admin_conferences.components_path(current_participatory_space)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("components", scope: "decidim.admin.menu.conferences_submenu"), decidim_admin_conferences.components_path(current_participatory_space) %>
-          <ul>
+          <ul id="components-list">
             <% current_participatory_space.components.each do |component| %>
-              <% if component.manifest.admin_engine %>
+              <% if component.manifest.admin_engine && user_role_config.component_is_accessible?(component.manifest_name) %>
                 <li <% if is_active_link?(manage_component_path(component)) || is_active_link?(decidim_admin_conferences.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_conferences.edit_component_permissions_path(current_participatory_space, component)) %> class="is-active" <% end %>>
                   <%= link_to manage_component_path(component) do %>
                     <%= translated_attribute component.name %>

data/config/locales/ca.yml

@@ -183,6 +183,7 @@ ca:
             admin: Administradora
             collaborator: Col·laboradora
             moderator: Moderadora
+            valuator: Avaluadora
         media_link:
           fields:
             date: Data

data/config/locales/cs.yml

@@ -189,6 +189,7 @@ cs:
             admin: Správce
             collaborator: Spolupracovník
             moderator: Moderátor
+            valuator: Hodnotitel
         media_link:
           fields:
             date: datum
@@ -499,7 +500,7 @@ cs:
         comments_count: Komentáře
         conference_count: Konference
         debates_count: Debaty
-        endorsements_count: Potvrzení
+        endorsements_count: Schválení
         headline: Aktivita
         meetings_count: Setkání
         orders_count: Hlasy

data/config/locales/el.yml

@@ -0,0 +1 @@
+el:

data/config/locales/en.yml

@@ -184,6 +184,7 @@ en:
             admin: Administrator
             collaborator: Collaborator
             moderator: Moderator
+            valuator: Valuator
         media_link:
           fields:
             date: Date

data/config/locales/es-MX.yml

@@ -183,6 +183,7 @@ es-MX:
             admin: Administrador
             collaborator: Colaborador
             moderator: Moderador
+            valuator: Evaluadora
         media_link:
           fields:
             date: Fecha

data/config/locales/es-PY.yml

@@ -183,6 +183,7 @@ es-PY:
             admin: Administrador
             collaborator: Colaborador
             moderator: Moderador
+            valuator: Evaluadora
         media_link:
           fields:
             date: Fecha

data/config/locales/es.yml

@@ -183,6 +183,7 @@ es:
             admin: Administradora
             collaborator: Colaboradora
             moderator: Moderadora
+            valuator: Evaluadora
         media_link:
           fields:
             date: Fecha

data/config/locales/fi-plain.yml

@@ -183,6 +183,7 @@ fi-pl:
             admin: Hallinnointikäyttäjä
             collaborator: Työryhmän jäsen
             moderator: Moderoija
+            valuator: Arvioija
         media_link:
           fields:
             date: Päivämäärä

data/config/locales/fi.yml

@@ -183,6 +183,7 @@ fi:
             admin: Hallinnointikäyttäjä
             collaborator: Työryhmän jäsen
             moderator: Moderoija
+            valuator: Arvioija
         media_link:
           fields:
             date: Päivämäärä

data/config/locales/hu.yml

@@ -183,6 +183,7 @@ hu:
             admin: Adminisztrátor
             collaborator: Együttműködő
             moderator: moderátor
+            valuator: Értékelő
         media_link:
           fields:
             date: Dátum

data/lib/decidim/conferences/participatory_space.rb

@@ -15,6 +15,8 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
     "Decidim::Conferences::ConferenceInvite"
   ]
 
+  participatory_space.query_type = "Decidim::Conferences::ConferenceType"
+
   participatory_space.register_resource(:conference) do |resource|
     resource.model_class_name = "Decidim::Conference"
     resource.card = "decidim/conferences/conference"

data/lib/decidim/conferences/test/factories.rb

@@ -23,6 +23,7 @@ FactoryBot.define do
     show_statistics { true }
     start_date { 1.month.ago }
     end_date { 1.month.ago + 3.days }
+    registration_terms { generate_localized_title }
 
     trait :promoted do
       promoted { true }
@@ -95,6 +96,21 @@ FactoryBot.define do
     end
   end
 
+  factory :conference_valuator, parent: :user, class: "Decidim::User" do
+    transient do
+      conference { create(:conference) }
+    end
+
+    organization { conference.organization }
+
+    after(:create) do |user, evaluator|
+      create :conference_user_role,
+             user: user,
+             conference: evaluator.conference,
+             role: :valuator
+    end
+  end
+
   factory :conference_speaker, class: "Decidim::ConferenceSpeaker" do
     conference { create(:conference) }
 

data/lib/decidim/conferences/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-conferences version.
   module Conferences
     def self.version
-      "0.20.1"
+      "0.21.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-conferences
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Isaac Massot Gil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 description: Conferences component for decidim.
 email:
 - isaac.mg@coditramuntana.com
@@ -168,6 +168,7 @@ files:
 - app/constraints/decidim/conferences/current_component.rb
 - app/constraints/decidim/conferences/current_conference.rb
 - app/controllers/concerns/decidim/conferences/admin/conference_context.rb
+- app/controllers/concerns/decidim/conferences/admin/filterable.rb
 - app/controllers/decidim/conferences/admin/application_controller.rb
 - app/controllers/decidim/conferences/admin/categories_controller.rb
 - app/controllers/decidim/conferences/admin/component_permissions_controller.rb
@@ -265,6 +266,10 @@ files:
 - app/serializers/decidim/conferences/conference_registration_serializer.rb
 - app/serializers/decidim/conferences/data_portability_conference_invite_serializer.rb
 - app/serializers/decidim/conferences/data_portability_conference_registration_serializer.rb
+- app/types/decidim/conferences/conference_media_link_type.rb
+- app/types/decidim/conferences/conference_partner_type.rb
+- app/types/decidim/conferences/conference_speaker_type.rb
+- app/types/decidim/conferences/conference_type.rb
 - app/uploaders/decidim/conferences/diploma_uploader.rb
 - app/uploaders/decidim/conferences/partner_logo_uploader.rb
 - app/views/decidim/conference_speakers/_conference_speaker.html.erb
@@ -311,7 +316,6 @@ files:
 - app/views/decidim/conferences/conference_registration_mailer/confirmation.html.erb
 - app/views/decidim/conferences/conference_registration_mailer/pending_validation.html.erb
 - app/views/decidim/conferences/conference_speakers/index.html.erb
-- app/views/decidim/conferences/conference_widgets/show.html.erb
 - app/views/decidim/conferences/conferences/_partners.html.erb
 - app/views/decidim/conferences/conferences/_promoted_conference.html.erb
 - app/views/decidim/conferences/conferences/_statistics.html.erb
@@ -337,6 +341,7 @@ files:
 - config/locales/cs.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
+- config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
 - config/locales/es-MX.yml

data/app/views/decidim/conferences/conference_widgets/show.html.erb

@@ -1,11 +0,0 @@
-<% content_for(:header, "false") %>
-<% content_for(:title, translated_attribute(model.title)) %>
-<p class="card__desc"><%= decidim_sanitize html_truncate(translated_attribute(model.short_description), length: 630, separator: "...") %></p>
-<% content_for(:footer) do %>
-  <div class="card__support">
-    <span class="card--process__small"></span>
-    <%= link_to conference_path(model), class: "card__button button small" do %>
-      <%= t("conference_widgets.show.take_part", scope: "layouts.decidim") %>
-    <% end %>
-  </div>
-<% end %>