decidim-conferences 0.29.3 → 0.30.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b056fcba0fa3cf922a47542bc71c71d9000bf744e4fd7189f54c6ca54a5c58ed
-  data.tar.gz: 76ee0e478c2ed479a0fd864c0bb16fbc20e08f65e9592fd283b89ca6da6ca56c
+  metadata.gz: 746fa4d57c4279940ee0bdf0d91f677f5a97434f3f612b18db5c6bbfe117db84
+  data.tar.gz: 680cc926f12df702e109e15966a3485f8efbc90afff2014fbf77944154a3edd8
 SHA512:
-  metadata.gz: ae34397a1453be305b6c19f31a14d752f0c43d997d36b1ba5d75a2ccbba3f2c405de80368c970fe2d707a621a11c4db27e4506ba04b5d1b80776c09873659271
-  data.tar.gz: 7bad3148ab40489e8b06ef2044247c0e33e8027e2a8b9f1cc00d09e5f5b431d466ab2ec807c063352332d7cada14136906b5b2c134290228214e4af7d35556db
+  metadata.gz: fee47471b85139cbe414644618bd9368f121ed9ff12755b030bab94f83888c7f53def57ee95dbb809492538e322763a8519f1262f2ae4d5960bc1fdaae1afef0
+  data.tar.gz: fe3fecfe9fd53af89356ba02455421d6d8afdd7ed5840db3ead35deae3895276c7b509c4efc237df21338b228b884517d1f327a05ff5357dc4d35afc8cc85f47

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

@@ -1,3 +1,3 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.select :max_results, [6, 9, 12], prompt: "", label: %>
+  <%= settings_fields.number_field :max_results, label: %>
 <% end %>

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

@@ -27,7 +27,6 @@ module Decidim
           Conference.transaction do
             copy_conference
             copy_conference_attachments
-            copy_conference_categories if @form.copy_categories?
             copy_conference_components if @form.copy_components?
           end
 
@@ -49,11 +48,10 @@ module Decidim
             short_description: @conference.short_description,
             location: @conference.location,
             promoted: @conference.promoted,
-            scopes_enabled: @conference.scopes_enabled,
-            scope: @conference.scope,
             objectives: @conference.objectives,
             start_date: @conference.start_date,
-            end_date: @conference.end_date
+            end_date: @conference.end_date,
+            taxonomies: @conference.taxonomies
           )
         end
 
@@ -65,14 +63,6 @@ module Decidim
           end
         end
 
-        def copy_conference_categories
-          @conference.categories.each do |category|
-            category_copied = category.dup
-            category_copied.participatory_space = @copied_conference
-            category_copied.save
-          end
-        end
-
         def copy_conference_components
           @conference.components.each do |component|
             component_copied = component.dup

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

@@ -9,7 +9,7 @@ module Decidim
         fetch_file_attributes :hero_image, :banner_image
 
         fetch_form_attributes :organization, :title, :slogan, :slug, :weight, :hashtag, :description,
-                              :short_description, :objectives, :location, :scopes_enabled, :scope, :start_date, :end_date,
+                              :short_description, :objectives, :location, :taxonomizations, :start_date, :end_date,
                               :promoted, :show_statistics, :registrations_enabled, :available_slots, :registration_terms
 
         private

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

@@ -10,7 +10,7 @@ module Decidim
 
         fetch_form_attributes :title, :slogan, :slug, :weight, :hashtag, :description, :short_description,
                               :objectives, :location, :start_date, :end_date, :promoted, :show_statistics,
-                              :scopes_enabled, :scope, :registrations_enabled
+                              :taxonomizations, :registrations_enabled
 
         private
 

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module Admin
+      # This controller allows sharing unpublished things.
+      # It is targeted for customizations for sharing unpublished things that lives under
+      # an conference.
+      class ComponentShareTokensController < Decidim::Admin::ShareTokensController
+        include Concerns::ConferenceAdmin
+
+        def resource
+          @resource ||= current_participatory_space.components.find(params[:component_id])
+        end
+      end
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ module Decidim
           included do
             include Decidim::Admin::ParticipatorySpaceAdminContext
             helper_method :current_conference
-            add_breadcrumb_item_from_menu :conferences_admin_menu
+            add_breadcrumb_item_from_menu :conference_admin_menu
 
             participatory_space_admin_layout
 

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module Admin
+      # This controller allows sharing unpublished things.
+      # It is targeted for customizations for sharing unpublished things that lives under
+      # an conference.
+      class ConferenceShareTokensController < Decidim::Admin::ShareTokensController
+        include Concerns::ConferenceAdmin
+
+        def resource
+          current_conference
+        end
+      end
+    end
+  end
+end

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

@@ -6,11 +6,12 @@ module Decidim
       # Controller that allows managing conferences.
       #
       class ConferencesController < Decidim::Conferences::Admin::ApplicationController
-        include Decidim::Admin::ParticipatorySpaceAdminBreadcrumb
+        include Decidim::Admin::HasTrashableResources
+        include Decidim::Admin::ParticipatorySpaceAdminContext
+        include Decidim::Conferences::Admin::Filterable
 
         helper_method :current_conference, :current_participatory_space
         layout "decidim/admin/conferences"
-        include Decidim::Conferences::Admin::Filterable
 
         def index
           enforce_permission_to :read, :conference_list
@@ -71,9 +72,21 @@ module Decidim
 
         private
 
+        def trashable_deleted_resource_type
+          :conference
+        end
+
+        def trashable_deleted_resource
+          @trashable_deleted_resource ||= current_conference
+        end
+
+        def trashable_deleted_collection
+          @trashable_deleted_collection = filtered_collection.only_deleted.deleted_at_desc
+        end
+
         def current_conference
-          @current_conference ||= collection.where(slug: params[:slug]).or(
-            collection.where(id: params[:slug])
+          @current_conference ||= collection.with_deleted.where(slug: params[:slug]).or(
+            collection.with_deleted.where(id: params[:slug])
           ).first
         end
 

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

@@ -14,7 +14,6 @@ module Decidim
         mimic :conference
 
         attribute :slug, String
-        attribute :copy_categories, Boolean
         attribute :copy_components, Boolean
 
         validates :slug, presence: true, format: { with: Decidim::Conference.slug_format }

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

@@ -9,6 +9,7 @@ module Decidim
       class ConferenceForm < Form
         include TranslatableAttributes
         include Decidim::HasUploadValidations
+        include Decidim::HasTaxonomyFormAttributes
 
         translatable_attribute :title, String
         translatable_attribute :slogan, String
@@ -23,8 +24,6 @@ module Decidim
         attribute :weight, Integer, default: 0
         attribute :hashtag, String
         attribute :promoted, Boolean
-        attribute :scopes_enabled, Boolean
-        attribute :scope_id, Integer
         attribute :hero_image
         attribute :remove_hero_image, Boolean, default: false
         attribute :banner_image
@@ -57,12 +56,8 @@ module Decidim
 
         alias organization current_organization
 
-        def map_model(model)
-          self.scope_id = model.decidim_scope_id
-        end
-
-        def scope
-          @scope ||= current_organization.scopes.find_by(id: scope_id)
+        def participatory_space_manifest
+          :conferences
         end
 
         def processes_for_select

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

@@ -11,8 +11,10 @@ module Decidim
 
         meetings_by_time = {}
         meetings.each do |meeting|
-          meetings_by_time[start_time: meeting.start_time, end_time: meeting.end_time] ||= []
-          meetings_by_time[start_time: meeting.start_time, end_time: meeting.end_time] << { meeting: }
+          key = { start_time: meeting.start_time, end_time: meeting.end_time }
+
+          meetings_by_time[key] ||= []
+          meetings_by_time[key] << { meeting: }
         end
         meetings_by_time
       end

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

@@ -33,19 +33,9 @@ module Decidim
         private
 
         def add_diploma_attachment
-          diploma = WickedPdf.new.pdf_from_string(pdf_content, orientation: "Landscape")
-
+          diploma = Decidim::Conferences::ConferenceDiplomaPDF.new(@conference, @user).render
           attachments["conference-#{@user.nickname.parameterize}-diploma.pdf"] = diploma
         end
-
-        def pdf_content
-          Premailer.new(
-            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
-        end
       end
     end
   end

data/app/models/decidim/conference.rb

@@ -10,6 +10,7 @@ module Decidim
     include Decidim::HasAttachmentCollections
     include Decidim::Participable
     include Decidim::Publicable
+    include Decidim::Taxonomizable
     include Decidim::ScopableParticipatorySpace
     include Decidim::Followable
     include Decidim::HasReference
@@ -20,6 +21,8 @@ module Decidim
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
     include Decidim::FilterableResource
+    include Decidim::SoftDeletable
+    include Decidim::ShareableWithToken
 
     translatable_fields :title, :slogan, :short_description, :description, :objectives, :registration_terms
 
@@ -146,7 +149,23 @@ module Decidim
       :admin
     end
 
+    def shareable_url(share_token)
+      EngineRouter.main_proxy(self).conference_url(self, share_token: share_token.token)
+    end
+
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
     ransacker_i18n :title
+
+    def self.ransackable_attributes(auth_object = nil)
+      base = %w(title short_description description id)
+
+      return base unless auth_object&.admin?
+
+      base + %w(published_at)
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w(taxonomies)
+    end
   end
 end

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

@@ -22,6 +22,16 @@ module Decidim
         Decidim::Conferences::AdminLog::InvitePresenter
       end
 
+      def self.ransackable_attributes(auth_object = nil)
+        return [] unless auth_object&.admin?
+
+        %w(accepted_at rejected_at sent_at)
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w(user)
+      end
+
       def self.user_collection(user)
         where(decidim_user_id: user.id)
       end

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

@@ -3,8 +3,6 @@
 module Decidim
   module Conferences
     class Permissions < Decidim::DefaultPermissions
-      include Decidim::UserRoleChecker
-
       def permissions
         user_can_enter_space_area?
 
@@ -44,7 +42,6 @@ module Decidim
         user_can_export_conference_registrations?
         user_can_confirm_conference_registration?
         user_can_create_conference?
-        user_can_upload_images_in_conference?
 
         # org admins and space admins can do everything in the admin section
         org_admin_action?
@@ -130,6 +127,7 @@ module Decidim
 
         return allow! if user&.admin?
         return allow! if conference.published?
+        return allow! if user_can_preview_space?
 
         toggle_allow(can_manage_conference?)
       end
@@ -269,7 +267,6 @@ module Decidim
         is_allowed = [
           :attachment,
           :attachment_collection,
-          :category,
           :component,
           :component_data,
           :moderation,
@@ -279,7 +276,8 @@ module Decidim
           :partner,
           :media_link,
           :registration_type,
-          :conference_invite
+          :conference_invite,
+          :share_tokens
         ].include?(permission_action.subject)
         allow! if is_allowed
       end
@@ -290,7 +288,6 @@ module Decidim
         is_allowed = [
           :attachment,
           :attachment_collection,
-          :category,
           :component,
           :component_data,
           :moderation,
@@ -302,11 +299,18 @@ module Decidim
           :partner,
           :registration_type,
           :read_conference_registrations,
-          :export_conference_registrations
+          :export_conference_registrations,
+          :share_tokens
         ].include?(permission_action.subject)
         allow! if is_allowed
       end
 
+      def user_can_preview_space?
+        context[:share_token].present? && Decidim::ShareToken.use!(token_for: conference, token: context[:share_token], user:)
+      rescue ActiveRecord::RecordNotFound, StandardError
+        nil
+      end
+
       # Checks if the permission_action is to read the admin conferences list or
       # not.
       def read_conference_list_permission_action?
@@ -317,11 +321,6 @@ module Decidim
       def conference
         @conference ||= context.fetch(:current_participatory_space, nil) || context.fetch(:conference, nil)
       end
-
-      # Checks of assigned admins can upload images in the conference
-      def user_can_upload_images_in_conference?
-        allow! if user&.admin_terms_accepted? && user_has_any_role?(user, conference, broad_check: true) && (permission_action.subject == :editor_image)
-      end
     end
   end
 end

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

@@ -41,7 +41,7 @@ module Decidim
 
         def action_string
           case action
-          when "create", "publish", "unpublish", "update", "update_diploma"
+          when "create", "publish", "unpublish", "update", "update_diploma", "soft_delete", "restore"
             "decidim.admin_log.conference.#{action}"
           else
             super

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    class ConferencePresenter < SimpleDelegator
+      def hero_image_url
+        conference.attached_uploader(:hero_image).url
+      end
+
+      def banner_image_url
+        conference.attached_uploader(:banner_image).url
+      end
+
+      def conference
+        __getobj__
+      end
+    end
+  end
+end

data/app/serializers/decidim/conferences/conference_serializer.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This class serializes a Conference so it can be exported to CSV, JSON or other formats.
+    class ConferenceSerializer < Decidim::Conferences::OpenDataConferenceSerializer
+      # Public: Exports a hash with the serialized data for this conference.
+      def serialize
+        super.merge(
+          {
+            categories: serialize_categories,
+            taxonomies:,
+            attachments: {
+              attachment_collections: serialize_attachment_collections,
+              files: serialize_attachments
+            },
+            weight: resource.weight,
+            components: serialize_components
+          }
+        )
+      end
+    end
+  end
+end

data/app/serializers/decidim/conferences/download_your_data_conference_invite_serializer.rb

@@ -10,15 +10,14 @@ module Decidim
           sent_at: resource.sent_at,
           accepted_at: resource.accepted_at,
           rejected_at: resource.rejected_at,
-          user: {
-            name: resource.user.name,
-            email: resource.user.email
-          },
+          created_at: resource.created_at,
+          updated_at: resource.updated_at,
           registration_type: {
             title: resource.registration_type.title,
             price: resource.registration_type.price
           },
           conference: {
+            url: Decidim::EngineRouter.main_proxy(resource.conference).conference_url(resource.conference),
             title: resource.conference.title,
             reference: resource.conference.reference,
             slogan: resource.conference.slogan,

data/app/serializers/decidim/conferences/download_your_data_conference_registration_serializer.rb

@@ -7,15 +7,15 @@ module Decidim
       def serialize
         {
           id: resource.id,
-          user: {
-            name: resource.user.name,
-            email: resource.user.email
-          },
+          created_at: resource.created_at,
+          updated_at: resource.updated_at,
+          confirmed_at: resource.confirmed_at,
           registration_type: {
             title: resource.registration_type.title,
             price: resource.registration_type.price
           },
           conference: {
+            url: Decidim::EngineRouter.main_proxy(resource.conference).conference_url(resource.conference),
             title: resource.conference.title,
             reference: resource.conference.reference,
             slogan: resource.conference.slogan,

data/app/serializers/decidim/conferences/open_data_conference_serializer.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This class serializes a Conference so it can be exported to CSV for the Open Data feature.
+    class OpenDataConferenceSerializer < Decidim::Exporters::ParticipatorySpaceSerializer
+      # Public: Exports a hash with the serialized data for this conference.
+      def serialize
+        super.merge(
+          {
+            url: EngineRouter.main_proxy(resource).conference_url(resource),
+            slogan: resource.slogan,
+            remote_hero_image_url: Decidim::Conferences::ConferencePresenter.new(resource).hero_image_url,
+            remote_banner_image_url: Decidim::Conferences::ConferencePresenter.new(resource).banner_image_url,
+            location: resource.location,
+            objectives: resource.objectives,
+            start_date: resource.start_date,
+            end_date: resource.end_date,
+            scopes_enabled: resource.scopes_enabled,
+            decidim_scope_id: resource.decidim_scope_id,
+            scope: {
+              id: resource.scope.try(:id),
+              name: resource.scope.try(:name) || empty_translatable
+            }
+          }
+        )
+      end
+    end
+  end
+end

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

@@ -16,9 +16,6 @@
           </div>
           <div class="card-section">
             <div class="row">
-              <div class="row column">
-                <%= form.check_box :copy_categories %>
-              </div>
               <div class="row column">
                 <%= form.check_box :copy_components %>
               </div>

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

@@ -0,0 +1,35 @@
+<% if view == :deleted %>
+  <% if allowed_to? :restore, :conference, trashable_deleted_resource: conference %>
+    <%= icon_link_to "refresh-line", restore_conference_path(conference), t("decidim.admin.actions.restore"), method: :patch, class: "action-icon--restore" %>
+  <% end %>
+<% else %>
+  <% if allowed_to? :read, :share_tokens, current_participatory_space: conference %>
+    <%= icon_link_to "share-line", decidim_admin_conferences.conference_share_tokens_path(conference), t("actions.share_tokens", scope: "decidim.admin"), class: "action-icon--new" %>
+  <% else %>
+    <span class="action-space icon"></span>
+  <% end %>
+
+  <% if allowed_to? :update, :conference, conference: conference %>
+    <%= icon_link_to "pencil-line", edit_conference_path(conference), t("decidim.admin.actions.configure"), class: "action-icon--new" %>
+  <% end %>
+
+  <% if allowed_to? :create, :conference, conference: conference %>
+    <%= icon_link_to "file-copy-line", new_conference_copy_path(conference), t("decidim.admin.actions.duplicate"), class: "action-icon--copy" %>
+  <% end %>
+
+  <% if allowed_to? :preview, :conference, conference: conference %>
+    <%= icon_link_to "eye-line", decidim_conferences.conference_path(conference), t("decidim.admin.actions.preview"), class: "action-icon--preview", target: "_blank", data: { "external-link": false } %>
+  <% end %>
+
+  <% if allowed_to? :read, :moderation, conference: conference %>
+    <%= icon_link_to "flag-line", moderations_path(conference), t("decidim.admin.actions.moderate"), class: "action-icon--moderate" %>
+  <% end %>
+
+  <% if allowed_to? :soft_delete, :conference, trashable_deleted_resource: conference %>
+    <% if conference.published? %>
+      <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("decidim.admin.actions.soft_delete") %>
+    <% else %>
+      <%= icon_link_to "delete-bin-line", soft_delete_conference_path(conference), t("decidim.admin.actions.soft_delete"), method: :patch, class: "action-icon--delete", data: { confirm: t("decidim.admin.actions.confirm_delete_conference") } %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,28 @@
+<tr>
+  <td>
+    <% if conference.promoted? %>
+      <%= icon_with_tooltip "star-s-fill", t("models.assembly.fields.promoted", scope: "decidim.admin") %>
+    <% 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>
+    <% else %>
+      <%= translated_attribute(conference.title) %>
+    <% end %>
+  </td>
+  <td>
+    <%= l conference.created_at, format: :short %>
+  </td>
+  <td class="table-list__state">
+    <% if conference.published? %>
+      <span class="label !text-sm success"><%= t("conferences.index.published", scope: "decidim.admin") %></span>
+    <% else %>
+      <span class="label !text-sm alert"><%= t("conferences.index.unpublished", scope: "decidim.admin") %></span>
+    <% end %>
+  </td>
+  <td class="table-list__actions">
+    <%= render partial: "decidim/conferences/admin/conferences/actions", locals: { conference:, view: } %>
+  </td>
+</tr>

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

@@ -0,0 +1,8 @@
+<thead>
+<tr>
+  <th><%= t("models.conference.fields.title", 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>
+</thead>

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

@@ -62,14 +62,6 @@
         </div>
       </div>
 
-      <div class="row column">
-        <%= form.check_box :scopes_enabled %>
-      </div>
-
-      <div class="row column">
-        <%= scopes_select_field form, :scope_id, root: nil %>
-      </div>
-
       <div class="row column">
         <%= form.check_box :show_statistics %>
       </div>
@@ -116,5 +108,32 @@
     </div>
   </div>
 
+  <div class="card" data-component="accordion" id="accordion-taxonomies">
+    <div class="card-divider">
+      <button class="card-divider-button" data-open="true" data-controls="panel-taxonomies" type="button">
+        <%= icon "arrow-right-s-line" %>
+        <h2 class="card-title" id="taxonomies">
+          <%= t("taxonomies", scope: "decidim.conferences.admin.conferences.form") %>
+        </h2>
+      </button>
+    </div>
+    <div id="panel-taxonomies" class="card-section">
+      <% if @form.taxonomy_filters.blank? %>
+        <div class="row column">
+          <p class="text-gray mr-2 mt-4">
+            <%= t("no_taxonomy_filters_found", scope: "decidim.conferences.admin.conferences.form") %>
+            <%= link_to(t("define_taxonomy_filters", scope: "decidim.conferences.admin.conferences.form"), decidim_admin.taxonomies_path, class: "button button__text-secondary") %>
+          </p>
+        </div>
+      <% else %>
+        <% @form.taxonomy_filters.each do |filter| %>
+          <div class="row column">
+            <%= filter_taxonomy_items_select_field form, :taxonomies, filter %>
+          </div>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
 </div>
+
 <%= append_javascript_pack_tag "decidim_conferences_admin" %>