decidim-conferences 0.30.2 → 0.31.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6db2d7011e1e1833c7c2daf06cec7d89bb2477be82ee56b6b549866f0cd51048
-  data.tar.gz: faf1d8ed82e6792632d119b05b8241f4659af976d5428087c35f70d269f161bd
+  metadata.gz: 0b887cd8971831b59eee1f63a2101059c0ea980b297c5b3776cc74ab309bfd84
+  data.tar.gz: 6bb90bfa32c0b365910fd1404910992355cc55778cf27c9678c8d382401a458d
 SHA512:
-  metadata.gz: 0c69694944b98d42da33468573aa3f24e3c644c169d5b232d486b3577f2c8188d54728e1ffc2d9b13b2e9cfc5c3f640db166d61d65ac7ed87a8ef6f889bac57f
-  data.tar.gz: fefcb46942129fabeccb62262679bdea34c6ba3bd705799df8836d863afef6a55156bc1f33ff300e35a47fc1964c821b62c7649063c3bf82efc7e2348128b12a
+  metadata.gz: 366dee830593889471931933b1c4ebdda1f324b3f819d34a46ffc814671d5743fde99b6461cc3743dd65aff2d51282612d5fd83f1266d7c6a31046252d2eafb0
+  data.tar.gz: a061b1609f621df28be8e29f69e3491037637a0fbec22d4cd369d006d6520ec3ebe60507c7543d5515eedc29b85f040f3a2459f2e66edfcfb46dd6e40c8e35bd

data/app/cells/decidim/conferences/content_blocks/highlighted_conferences_settings_form/show.erb

@@ -1,3 +1,5 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.number_field :max_results, label: %>
+  <div class="row column">
+    <%= settings_fields.number_field :max_results, label: %>
+  </div>
 <% end %>

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

@@ -8,7 +8,7 @@ module Decidim
       class CreateConference < Decidim::Commands::CreateResource
         fetch_file_attributes :hero_image, :banner_image
 
-        fetch_form_attributes :organization, :title, :slogan, :slug, :weight, :hashtag, :description,
+        fetch_form_attributes :organization, :title, :slogan, :slug, :weight, :description,
                               :short_description, :objectives, :location, :taxonomizations, :start_date, :end_date,
                               :promoted, :show_statistics, :registrations_enabled, :available_slots, :registration_terms
 

data/app/commands/decidim/conferences/admin/{copy_conference.rb → duplicate_conference.rb}

@@ -3,9 +3,9 @@
 module Decidim
   module Conferences
     module Admin
-      # A command with all the business logic when copying a new participatory
+      # A command with all the business logic when duplicating a new participatory
       # conference in the system.
-      class CopyConference < Decidim::Command
+      class DuplicateConference < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -25,25 +25,24 @@ module Decidim
           return broadcast(:invalid) if form.invalid?
 
           Conference.transaction do
-            copy_conference
-            copy_conference_attachments
-            copy_conference_components if @form.copy_components?
+            duplicate_conference
+            duplicate_conference_attachments
+            duplicate_conference_components if @form.duplicate_components?
           end
 
-          broadcast(:ok, @copied_conference)
+          broadcast(:ok, @duplicated_conference)
         end
 
         private
 
         attr_reader :form
 
-        def copy_conference
-          @copied_conference = Conference.create!(
+        def duplicate_conference
+          @duplicated_conference = Conference.create!(
             organization: @conference.organization,
             title: form.title,
             slogan: @conference.slogan,
             slug: form.slug,
-            hashtag: @conference.hashtag,
             description: @conference.description,
             short_description: @conference.short_description,
             location: @conference.location,
@@ -55,20 +54,20 @@ module Decidim
           )
         end
 
-        def copy_conference_attachments
+        def duplicate_conference_attachments
           [:hero_image, :banner_image].each do |attribute|
             next unless @conference.attached_uploader(attribute).attached?
 
-            @copied_conference.send(attribute).attach(@conference.send(attribute).blob)
+            @duplicated_conference.send(attribute).attach(@conference.send(attribute).blob)
           end
         end
 
-        def copy_conference_components
+        def duplicate_conference_components
           @conference.components.each do |component|
-            component_copied = component.dup
-            component_copied.participatory_space = @copied_conference
-            component_copied.save
-            component.manifest.run_hooks(:copy, new_component: component_copied, old_component: component)
+            component_duplicated = component.dup
+            component_duplicated.participatory_space = @duplicated_conference
+            component_duplicated.save
+            component.manifest.run_hooks(:duplicate, new_component: component_duplicated, old_component: component)
           end
         end
       end

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

@@ -8,7 +8,7 @@ module Decidim
       class UpdateConference < Decidim::Commands::UpdateResource
         fetch_file_attributes :hero_image, :banner_image
 
-        fetch_form_attributes :title, :slogan, :slug, :weight, :hashtag, :description, :short_description,
+        fetch_form_attributes :title, :slogan, :slug, :weight, :description, :short_description,
                               :objectives, :location, :start_date, :end_date, :promoted, :show_statistics,
                               :taxonomizations, :registrations_enabled
 
@@ -75,7 +75,7 @@ module Decidim
           checksum = Decidim::Conferences::UpcomingConferenceNotificationJob.generate_checksum(resource)
 
           Decidim::Conferences::UpcomingConferenceNotificationJob
-            .set(wait_until: (resource.start_date - 2.days).to_s)
+            .set(wait_until: (resource.start_date - 2.days).to_time)
             .perform_later(resource.id, checksum)
         end
 

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module Admin
+      # Controller that allows managing conferences.
+      #
+      class ConferenceDuplicatesController < Decidim::Conferences::Admin::ApplicationController
+        include Concerns::ConferenceAdmin
+
+        def new
+          enforce_permission_to :create, :conference
+          @form = form(ConferenceDuplicateForm).from_model(current_conference)
+        end
+
+        def create
+          enforce_permission_to :create, :conference
+          @form = form(ConferenceDuplicateForm).from_params(params)
+
+          DuplicateConference.call(@form, current_conference) do
+            on(:ok) do
+              flash[:notice] = I18n.t("conferences_duplicates.create.success", scope: "decidim.admin")
+              redirect_to conferences_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("conferences_duplicates.create.error", scope: "decidim.admin")
+              render :new, status: :unprocessable_entity
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -41,7 +41,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("conference_invites.create.error", scope: "decidim.conferences.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end

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

@@ -36,7 +36,7 @@ module Decidim
 
             on(:invalid) do
               flash[:alert] = I18n.t("conference_speakers.create.error", scope: "decidim.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end
@@ -58,7 +58,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("conference_speakers.update.error", scope: "decidim.admin")
-              render :edit
+              render :edit, status: :unprocessable_entity
             end
           end
         end
@@ -85,7 +85,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("conference_speakers.publish.invalid", scope: "decidim.admin")
-              render action: "index"
+              render action: "index", status: :unprocessable_entity
             end
           end
         end
@@ -101,7 +101,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("conference_speakers.unpublish.invalid", scope: "decidim.admin")
-              render action: "index"
+              render action: "index", status: :unprocessable_entity
             end
           end
         end

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

@@ -35,7 +35,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("conferences.create.error", scope: "decidim.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end
@@ -61,12 +61,12 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("conferences.update.error", scope: "decidim.admin")
-              render :edit, layout: "decidim/admin/conference"
+              render :edit, layout: "decidim/admin/conference", status: :unprocessable_entity
             end
           end
         end
 
-        def copy
+        def duplicate
           enforce_permission_to :create, :conference
         end
 

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

@@ -28,7 +28,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("conferences.update.error", scope: "decidim.admin")
-              render :edit
+              render :edit, status: :unprocessable_entity
             end
           end
         end

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

@@ -31,7 +31,7 @@ module Decidim
 
             on(:invalid) do
               flash[:alert] = I18n.t("media_links.create.error", scope: "decidim.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end
@@ -55,7 +55,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("media_links.update.error", scope: "decidim.admin")
-              render :edit
+              render :edit, status: :unprocessable_entity
             end
           end
         end

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

@@ -32,7 +32,7 @@ module Decidim
 
             on(:invalid) do
               flash[:alert] = I18n.t("partners.create.error", scope: "decidim.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end
@@ -56,7 +56,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("partners.update.error", scope: "decidim.admin")
-              render :edit
+              render :edit, status: :unprocessable_entity
             end
           end
         end

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

@@ -35,7 +35,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("registration_types.create.error", scope: "decidim.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end
@@ -59,7 +59,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("registration_types.update.error", scope: "decidim.admin")
-              render :edit
+              render :edit, status: :unprocessable_entity
             end
           end
         end

data/app/forms/decidim/conferences/admin/{conference_copy_form.rb → conference_duplicate_form.rb}

@@ -3,10 +3,10 @@
 module Decidim
   module Conferences
     module Admin
-      # A form object used to copy a conferences from the admin
+      # A form object used to duplicate a conferences from the admin
       # dashboard.
       #
-      class ConferenceCopyForm < Form
+      class ConferenceDuplicateForm < Form
         include TranslatableAttributes
 
         translatable_attribute :title, String
@@ -14,7 +14,7 @@ module Decidim
         mimic :conference
 
         attribute :slug, String
-        attribute :copy_components, Boolean
+        attribute :duplicate_components, Boolean
 
         validates :slug, presence: true, format: { with: Decidim::Conference.slug_format }
         validates :title, translatable_presence: true

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

@@ -22,7 +22,6 @@ module Decidim
 
         attribute :slug, String
         attribute :weight, Integer, default: 0
-        attribute :hashtag, String
         attribute :promoted, Boolean
         attribute :hero_image
         attribute :remove_hero_image, Boolean, default: false
@@ -51,9 +50,6 @@ module Decidim
         validates :banner_image, passthru: { to: Decidim::Conference }
         validate :available_slots_greater_than_or_equal_to_registrations_count, if: ->(form) { form.registrations_enabled? && form.available_slots.try(:positive?) }
 
-        validates :start_date, presence: true, date: { before_or_equal_to: :end_date }
-        validates :end_date, presence: true, date: { after_or_equal_to: :start_date }
-
         alias organization current_organization
 
         def participatory_space_manifest

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

@@ -10,6 +10,7 @@ module Decidim
       # Renders the dates of a conference
       #
       def render_date(conference)
+        return if conference.start_date.nil? || conference.end_date.nil?
         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)}"

data/app/jobs/decidim/conferences/upcoming_conference_notification_job.rb

@@ -11,7 +11,7 @@ module Decidim
       end
 
       def self.generate_checksum(conference)
-        Digest::MD5.hexdigest("#{conference.id}-#{conference.start_date}")
+        Digest::SHA256.hexdigest("#{conference.id}-#{conference.start_date}")
       end
 
       private

data/app/models/decidim/conference.rb

@@ -94,10 +94,6 @@ module Decidim
       Decidim::Conferences::AdminLog::ConferencePresenter
     end
 
-    def hashtag
-      attributes["hashtag"].to_s.delete("#")
-    end
-
     def to_param
       slug
     end

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

@@ -20,6 +20,10 @@ module Decidim
 
       alias participatory_space conference
 
+      def visible?
+        conference.registrations_enabled? && published?
+      end
+
       def self.log_presenter_class_for(_log)
         Decidim::Conferences::AdminLog::RegistrationTypePresenter
       end

data/app/packs/entrypoints/decidim_conferences_admin.js

@@ -1,7 +1,6 @@
 import "src/decidim/conferences/admin/conferences"
 import "src/decidim/conferences/admin/conference_speakers"
 import "src/decidim/conferences/admin/conference_invite_form"
-import "src/decidim/slug_form"
 
 // Images
 require.context("../images", true)

data/app/packs/src/decidim/conferences/admin/conference_invite_form.js

@@ -1,6 +1,6 @@
 import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   const $attendeeType = $('[name="conference_registration_invite[existing_user]"');
 
   createFieldDependentInputs({

data/app/packs/src/decidim/conferences/admin/conference_speakers.js

@@ -1,6 +1,6 @@
 import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   const $conferenceSpeakerType = $("#conference_speaker_existing_user");
 
   createFieldDependentInputs({

data/app/packs/src/decidim/conferences/admin/conferences.js

@@ -1,4 +1,4 @@
-$(() => {
+document.addEventListener("turbo:load", () => {
   const $conferenceScopeEnabled = $("#conference_scopes_enabled");
   const $conferenceScopeId = $("#conference_scope_id");
   const $form = $(".edit_conference, .new_conference");

data/app/packs/stylesheets/decidim/conferences/conferences.scss

@@ -1,5 +1,5 @@
-@import "stylesheets/decidim/conferences/conference.scss";
-@import "stylesheets/decidim/conferences/speaker.scss";
-@import "stylesheets/decidim/conferences/registration.scss";
-@import "stylesheets/decidim/conferences/program.scss";
-@import "stylesheets/decidim/conferences/media.scss";
+@use "stylesheets/decidim/conferences/conference";
+@use "stylesheets/decidim/conferences/speaker";
+@use "stylesheets/decidim/conferences/registration";
+@use "stylesheets/decidim/conferences/program";
+@use "stylesheets/decidim/conferences/media";

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

@@ -51,7 +51,7 @@ module Decidim
 
         moderator_action?
         collaborator_action?
-        valuator_action?
+        evaluator_action?
         conference_admin_action?
 
         permission_action
@@ -248,9 +248,9 @@ 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)
+      # Evaluators can only read components
+      def evaluator_action?
+        return unless can_manage_conference?(role: :evaluator)
 
         allow! if permission_action.action == :read && permission_action.subject == :component
         allow! if permission_action.action == :export && permission_action.subject == :component_data

data/app/presenters/decidim/conference_speaker_presenter.rb

@@ -29,10 +29,6 @@ module Decidim
       user ? true : false
     end
 
-    def has_tooltip?
-      false
-    end
-
     def avatar
       attached_uploader(:avatar)
     end

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

@@ -18,7 +18,6 @@ module Decidim
         def diff_fields_mapping
           {
             description: :i18n,
-            hashtag: :string,
             promoted: :boolean,
             published_at: :date,
             reference: :string,

data/app/presenters/decidim/conferences/conference_stats_presenter.rb

@@ -8,9 +8,7 @@ module Decidim
 
       private
 
-      def participatory_space = __getobj__.fetch(:conference)
-
-      def participatory_space_sym = :conferences
+      def scope_entity = __getobj__.fetch(:conference)
     end
   end
 end

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

@@ -8,7 +8,7 @@ module Decidim
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # conference_speakers - the initial ConferenceSpeaker relation that needs to be filtered.
-        # query - query to filter user group names
+        # query - query to filter user names
         def self.for(conference_speakers, query = nil)
           new(conference_speakers, query).query
         end
@@ -16,7 +16,7 @@ module Decidim
         # Initializes the class.
         #
         # conference_speakers - the ConferenceSpeaker relation that need to be filtered
-        # query - query to filter user group names
+        # query - query to filter user names
         def initialize(conference_speakers, query = nil)
           @conference_speakers = conference_speakers
           @query = query

data/app/queries/decidim/conferences/conferences_stats_followers_count.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This class counts all Followers of a conference
+    class ConferencesStatsFollowersCount < Decidim::StatsFollowersCount
+      def self.for(participatory_space)
+        return 0 unless participatory_space.is_a?(Decidim::Conferences)
+
+        new(participatory_space).query
+      end
+    end
+  end
+end

data/app/queries/decidim/conferences/conferences_stats_participants_count.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This class counts unique Participants on a conference
+    class ConferencesStatsParticipantsCount < Decidim::StatsParticipantsCount
+      def self.for(participatory_space)
+        return 0 unless participatory_space.is_a?(Decidim::Conferences)
+
+        new(participatory_space).query
+      end
+    end
+  end
+end

data/app/views/decidim/conferences/admin/{conference_copies → conference_duplicates}/_form.html.erb

@@ -6,18 +6,18 @@
       <div class="row column">
         <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
       </div>
-      <div class="row column slug">
+      <div class="row column" data-controller="slug">
         <%= form.text_field :slug, help_text: t(".slug_help_html", url: decidim_form_slug_url(:conferences, form.object.slug)) %>
       </div>
       <div class="row column">
         <div class="card">
           <div class="card-divider">
-            <legend><%= t("conference_copies.new.select", scope: "decidim.admin") %></legend>
+            <legend><%= t("conference_duplicates.new.select", scope: "decidim.admin") %></legend>
           </div>
           <div class="card-section">
             <div class="row">
               <div class="row column">
-                <%= form.check_box :copy_components %>
+                <%= form.check_box :duplicate_components %>
               </div>
             </div>
           </div>

data/app/views/decidim/conferences/admin/conference_duplicates/new.html.erb

@@ -0,0 +1,19 @@
+<% add_decidim_page_title(t("conference_duplicates.new.title", scope: "decidim.admin")) %>
+
+<div class="item_show__header">
+  <h1 class="item_show__header-title">
+    <%= t("conference_duplicates.new.title", scope: "decidim.admin") %>
+  </h1>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: conference_duplicates_path(current_conference), method: :post, html: { class: "form form-defaults duplicate_conference" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t("conference_duplicates.new.duplicate", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>