decidim-conferences 0.28.5 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 799db136737580b3118c90054f05f63d5ff38ced48374a73d307f20bfa331c39
-  data.tar.gz: c65f90582421ac958db3e72ae02fc2154b64493edeb2889865c668235539d290
+  metadata.gz: a1b968b73364e0893374bd0ed3f1703a40b61ab120290a16980ce8add800b884
+  data.tar.gz: 1159a29d1a0504aff4d859709e938081f52b026c2125dfadc7c4be0f02e2d9ba
 SHA512:
-  metadata.gz: 189cfdff2ea5e9939381ac5402c13a53b422628f716a37d44f16bd89ba3ff949aef59fb73637b6295e43def166c5d2a27a7e5067469bc0c62ec937fad8a52952
-  data.tar.gz: 7c93100b3b430058a66f97779eab26303e899608c49866a6054f2ffdb75aacea209c61474dc98c00fba22bc5d3fde5037182bf3730506b4679949aedbfb967ee
+  metadata.gz: 14d3bb61f2c51cb95870e83bdf9c0f7cf2b7860ede6393c81df860b022d4a390c476cc357e5c0457ef28c4850529b2c7e8ec5f8b10f331c1d165babc201094ec
+  data.tar.gz: 6fbd57e26675159b4ea3cfedcc366bf58cc44ab9053659723381db36041cca57d0bf7eea3c02d3b7efeb2adc3a47037051a98792b9435904eeea6ca81c8220a9

data/app/cells/decidim/conferences/conference_g_cell.rb

@@ -11,8 +11,8 @@ module Decidim
         Decidim::Conferences::Engine.routes.url_helpers.conference_path(model)
       end
 
-      def resource_image_url
-        model.attached_uploader(:hero_image).url
+      def resource_image_path
+        model.attached_uploader(:hero_image).path
       end
 
       def metadata_cell

data/app/cells/decidim/conferences/conference_speaker_cell.rb

@@ -50,7 +50,7 @@ module Decidim
       def short_bio
         return unless model.short_bio.presence
 
-        decidim_sanitize_editor_admin translated_attribute model.short_bio
+        decidim_escape_translated model.short_bio
       end
 
       def twitter_handle

data/app/cells/decidim/conferences/content_blocks/highlighted_conferences_cell.rb

@@ -4,8 +4,6 @@ module Decidim
   module Conferences
     module ContentBlocks
       class HighlightedConferencesCell < Decidim::ContentBlocks::HighlightedParticipatorySpacesCell
-        delegate :current_user, to: :controller
-
         def highlighted_spaces
           @highlighted_spaces ||= OrganizationPrioritizedConferences
                                   .new(current_organization, current_user)

data/app/cells/decidim/conferences/linked_participatory_spaces_cell.rb

@@ -5,7 +5,6 @@ module Decidim
     # This cell renders a collection of linked Participatory Space of current conference.
     # `model` is the current conference
     class LinkedParticipatorySpacesCell < Decidim::ViewModel
-      include Decidim::ApplicationHelper
       include Decidim::CardHelper
 
       def show

data/app/cells/decidim/conferences/media_link/show.erb

@@ -1,5 +1,5 @@
 <div class="card__list-content">
-  <%= link_to decidim_html_escape(translated_attribute(model.title)), model.link, rel: "noopener noreferrer", target: "_blank", class: "card__list-title" %>
+  <%= link_to decidim_escape_translated(model.title), model.link, rel: "noopener noreferrer", target: "_blank", class: "card__list-title" %>
   <div class="card__list-metadata">
     <span><%= icon "calendar-line" %><%= l(model.date, format: :decidim_short_with_month_name_short) %></span>
     <span><%= icon "link-m" %><%= model.link %></span>

data/app/cells/decidim/conferences/media_link_cell.rb

@@ -4,9 +4,6 @@ module Decidim
   module Conferences
     # This cell renders the media link card for an instance of a MediaLink
     class MediaLinkCell < Decidim::ViewModel
-      include Decidim::LayoutHelper
-      include Decidim::SanitizeHelper
-
       def show
         render
       end

data/app/cells/decidim/conferences/partner/image.erb

@@ -1,3 +1,3 @@
 <div class="conference__grid-item-img">
-  <%= image_tag model.attached_uploader(:logo).variant_url(:medium), alt: "logo" %>
+  <%= image_tag model.attached_uploader(:logo).path(variant: :medium), alt: "logo" %>
 </div>

data/app/cells/decidim/conferences/partner_cell.rb

@@ -21,7 +21,7 @@ module Decidim
       def logo
         return unless model.logo.attached?
 
-        "<div class='card p-m'> #{image_tag model.attached_uploader(:logo).variant_url(:medium), alt: "logo"} </div>"
+        "<div class='card p-m'> #{image_tag model.attached_uploader(:logo).path(variant: :medium), alt: "logo"} </div>"
       end
     end
   end

data/app/cells/decidim/conferences/registration_type_cell.rb

@@ -5,9 +5,7 @@ module Decidim
     # This cell renders the media link card for an instance of a RegistrationType
     class RegistrationTypeCell < Decidim::ViewModel
       include ActionView::Helpers::NumberHelper
-      include Decidim::SanitizeHelper
       include Decidim::Conferences::Engine.routes.url_helpers
-      include Decidim::LayoutHelper
 
       def show
         render
@@ -15,10 +13,8 @@ module Decidim
 
       private
 
-      delegate :current_user, to: :controller, prefix: false
-
       def title
-        decidim_sanitize translated_attribute model.title
+        decidim_sanitize_translated(model.title)
       end
 
       def description

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

@@ -5,95 +5,50 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new
       # conference in the system.
-      class CreateConference < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        def initialize(form)
-          @form = form
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
+      class CreateConference < Decidim::Commands::CreateResource
+        fetch_file_attributes :hero_image, :banner_image
 
-          if conference.persisted?
-            add_admins_as_followers(conference)
-            link_participatory_processes
-            link_assemblies
-
-            broadcast(:ok, conference)
-          else
-            form.errors.add(:hero_image, conference.errors[:hero_image]) if conference.errors.include? :hero_image
-            form.errors.add(:banner_image, conference.errors[:banner_image]) if conference.errors.include? :banner_image
-            broadcast(:invalid)
-          end
-        end
+        fetch_form_attributes :organization, :title, :slogan, :slug, :weight, :hashtag, :description,
+                              :short_description, :objectives, :location, :scopes_enabled, :scope, :start_date, :end_date,
+                              :promoted, :show_statistics, :registrations_enabled, :available_slots, :registration_terms
 
         private
 
-        attr_reader :form
-
-        def conference
-          @conference ||= Decidim.traceability.create(
-            Conference,
-            form.current_user,
-            organization: form.current_organization,
-            title: form.title,
-            slogan: form.slogan,
-            slug: form.slug,
-            weight: form.weight,
-            hashtag: form.hashtag,
-            description: form.description,
-            short_description: form.short_description,
-            objectives: form.objectives,
-            location: form.location,
-            scopes_enabled: form.scopes_enabled,
-            scope: form.scope,
-            start_date: form.start_date,
-            end_date: form.end_date,
-            hero_image: form.hero_image,
-            banner_image: form.banner_image,
-            promoted: form.promoted,
-            show_statistics: form.show_statistics,
-            registrations_enabled: form.registrations_enabled,
-            available_slots: form.available_slots || 0,
-            registration_terms: form.registration_terms
-          )
+        def run_after_hooks
+          add_admins_as_followers
+          link_participatory_processes
+          link_assemblies
         end
 
-        def add_admins_as_followers(conference)
-          conference.organization.admins.each do |admin|
+        def resource_class = Decidim::Conference
+
+        def add_admins_as_followers
+          resource.organization.admins.each do |admin|
             form = Decidim::FollowForm
-                   .from_params(followable_gid: conference.to_signed_global_id.to_s)
+                   .from_params(followable_gid: resource.to_signed_global_id.to_s)
                    .with_context(
-                     current_organization: conference.organization,
+                     current_organization: resource.organization,
                      current_user: admin
                    )
 
-            Decidim::CreateFollow.new(form, admin).call
+            Decidim::CreateFollow.new(form).call
           end
         end
 
         def participatory_processes
-          @participatory_processes ||= conference.participatory_space_sibling_scope(:participatory_processes).where(id: @form.participatory_processes_ids)
+          @participatory_processes ||= resource.participatory_space_sibling_scope(:participatory_processes).where(id: form.participatory_processes_ids)
         end
 
         def link_participatory_processes
-          conference.link_participatory_space_resources(participatory_processes, "included_participatory_processes")
+          resource.link_participatory_space_resources(participatory_processes, "included_participatory_processes")
         end
 
         def assemblies
-          @assemblies ||= conference.participatory_space_sibling_scope(:assemblies).where(id: @form.assemblies_ids)
+          @assemblies ||= resource.participatory_space_sibling_scope(:assemblies).where(id: form.assemblies_ids)
         end
 
         def link_assemblies
-          conference.link_participatory_space_resources(assemblies, "included_assemblies")
+          resource.link_participatory_space_resources(assemblies, "included_assemblies")
         end
       end
     end

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

@@ -5,102 +5,38 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new conference
       # speaker in the system.
-      class CreateConferenceSpeaker < Decidim::Command
-        include ::Decidim::AttachmentAttributesMethods
+      class CreateConferenceSpeaker < Decidim::Commands::CreateResource
+        fetch_file_attributes :avatar
 
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        # conference - The Conference that will hold the speaker
-        def initialize(form, current_user, conference)
-          @form = form
-          @current_user = current_user
-          @conference = conference
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          # We are going to assign the attributes only to handle the validation of the avatar before accessing
-          # `create_conference_speaker!` which uses `create!`, and this will render an ActiveRecord::RecordInvalid error
-          # After we assign and check if the object is valid, we will not save the model to let it be handled the old way
-          # If there is an error we add the error to the form
-          # We are using this method to assign the conference because if we are trying to assign all at once, there will be thrown a
-          # Delegation error
-
-          if conference_speaker_with_attributes.valid?
-
-            transaction do
-              create_conference_speaker!
-              link_meetings(@conference_speaker)
-            end
-            broadcast(:ok)
-          else
-            form.errors.add(:avatar, conference_speaker_with_attributes.errors[:avatar]) if conference_speaker_with_attributes.errors.include? :avatar
-
-            broadcast(:invalid)
-          end
-        end
-
-        private
-
-        attr_reader :form, :conference, :current_user
+        fetch_form_attributes :full_name, :twitter_handle, :personal_url, :position, :affiliation, :short_bio,
+                              :user
 
-        def conference_speaker_attributes
-          @conference_speaker_attributes ||= form.attributes.slice(
-            "full_name",
-            "twitter_handle",
-            "personal_url",
-            "position",
-            "affiliation",
-            "short_bio"
-          ).symbolize_keys.merge(
-            decidim_conference_id: conference.id,
-            conference:,
-            user: form.user
-          ).merge(
-            attachment_attributes(:avatar)
-          )
-        end
+        protected
 
-        def conference_speaker_with_attributes
-          conference_speaker = conference.speakers.build
-          conference_speaker.conference = conference
-          conference_speaker.assign_attributes(conference_speaker_attributes)
-          conference_speaker
-        end
+        def resource_class = Decidim::ConferenceSpeaker
 
-        def create_conference_speaker!
-          log_info = {
+        def extra_params
+          {
             resource: {
               title: form.full_name
             },
             participatory_space: {
-              title: conference.title
+              title: form.participatory_space.title
             }
           }
+        end
 
-          @conference_speaker = Decidim.traceability.create!(
-            Decidim::ConferenceSpeaker,
-            current_user,
-            conference_speaker_attributes,
-            log_info
-          )
+        def attributes
+          super.merge(conference: form.participatory_space)
         end
 
-        def conference_meetings(speaker)
-          meeting_components = speaker.conference.components.where(manifest_name: "meetings")
-          Decidim::ConferenceMeeting.where(component: meeting_components).where(id: @form.attributes[:conference_meeting_ids])
+        def conference_meetings
+          meeting_components = resource.conference.components.where(manifest_name: "meetings")
+          Decidim::ConferenceMeeting.where(component: meeting_components).where(id: form.conference_meeting_ids)
         end
 
-        def link_meetings(conference_speaker)
-          conference_speaker.conference_meetings = conference_meetings(conference_speaker)
+        def run_after_hooks
+          resource.conference_meetings = conference_meetings
         end
       end
     end

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

@@ -5,60 +5,26 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new
       # media link for conference in the system.
-      class CreateMediaLink < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        # conference - The Conference that will hold the speaker
-        def initialize(form, current_user, conference)
-          @form = form
-          @current_user = current_user
-          @conference = conference
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          transaction do
-            create_media_link!
-          end
+      class CreateMediaLink < Decidim::Commands::CreateResource
+        fetch_form_attributes :title, :link, :weight, :date
 
-          broadcast(:ok)
-        end
-
-        private
+        protected
 
-        attr_reader :form, :conference, :current_user
+        def resource_class = Decidim::Conferences::MediaLink
 
-        def create_media_link!
-          log_info = {
+        def extra_params
+          {
             resource: {
               title: form.title
             },
             participatory_space: {
-              title: conference.title
+              title: form.current_participatory_space.title
             }
           }
+        end
 
-          @media_link = Decidim.traceability.create!(
-            Decidim::Conferences::MediaLink,
-            current_user,
-            form.attributes.slice(
-              "title",
-              "link",
-              "weight",
-              "date"
-            ).symbolize_keys.merge(
-              conference:
-            ),
-            log_info
-          )
+        def attributes
+          super.merge(conference: form.current_participatory_space)
         end
       end
     end

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

@@ -5,81 +5,28 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new partner
       # in the system.
-      class CreatePartner < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        # conference - The Conference that will hold the speaker
-        def initialize(form, current_user, conference)
-          @form = form
-          @current_user = current_user
-          @conference = conference
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          if conference_partner.valid?
-            transaction do
-              create_partner!
-            end
+      class CreatePartner < Decidim::Commands::CreateResource
+        fetch_file_attributes :logo
 
-            broadcast(:ok)
-          else
-            form.errors.add(:logo, conference_partner.errors[:logo]) if conference_partner.errors.include? :logo
-
-            broadcast(:invalid)
-          end
-        end
+        fetch_form_attributes :name, :weight, :link, :partner_type
 
-        private
+        protected
 
-        attr_reader :form, :conference, :current_user
+        def resource_class = Decidim::Conferences::Partner
 
-        def create_partner!
-          log_info = {
+        def extra_params
+          {
             resource: {
               title: form.name
             },
             participatory_space: {
-              title: conference.title
+              title: form.current_participatory_space.title
             }
           }
-
-          @partner = Decidim.traceability.create!(
-            Decidim::Conferences::Partner,
-            form.current_user,
-            attributes,
-            log_info
-          )
-        end
-
-        def conference_partner
-          return @conference_partner if defined?(@conference_partner)
-
-          @conference_partner = conference.partners.build
-          @conference_partner.conference = conference
-          @conference_partner.assign_attributes(attributes)
-          @conference_partner
         end
 
         def attributes
-          { conference: }.merge(
-            form.attributes.slice(
-              "name",
-              "weight",
-              "link",
-              "partner_type",
-              "logo",
-              "remove_avatar"
-            ).symbolize_keys
-          )
+          super.merge(conference: form.participatory_space)
         end
       end
     end

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

@@ -5,71 +5,35 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new registration type
       # in the system.
-      class CreateRegistrationType < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        # current_user - The current user hwo do the action of create
-        # conference - The Conference that will hold the speaker
-        def initialize(form, current_user, conference)
-          @form = form
-          @current_user = current_user
-          @conference = conference
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          transaction do
-            create_registration_type!
-            link_meetings(@registration_type)
-          end
+      class CreateRegistrationType < Decidim::Commands::CreateResource
+        fetch_form_attributes :title, :description, :price, :weight
 
-          broadcast(:ok)
-        end
-
-        private
+        protected
 
-        attr_reader :form, :conference, :current_user
+        def resource_class = Decidim::Conferences::RegistrationType
 
-        def create_registration_type!
-          log_info = {
+        def extra_params
+          {
             resource: {
               title: form.title
             },
             participatory_space: {
-              title: conference.title
+              title: form.participatory_space.title
             }
           }
+        end
 
-          @registration_type = Decidim.traceability.create!(
-            Decidim::Conferences::RegistrationType,
-            form.current_user,
-            form.attributes.slice(
-              "title",
-              "description",
-              "price",
-              "weight"
-            ).symbolize_keys.merge(
-              conference:
-            ),
-            log_info
-          )
+        def attributes
+          super.merge({ conference: form.participatory_space })
         end
 
-        def conference_meetings(registration_type)
-          meeting_components = registration_type.conference.components.where(manifest_name: "meetings")
-          Decidim::ConferenceMeeting.where(component: meeting_components).where(id: @form.attributes[:conference_meeting_ids])
+        def conference_meetings
+          meeting_components = resource.conference.components.where(manifest_name: "meetings")
+          Decidim::ConferenceMeeting.where(component: meeting_components).where(id: form.conference_meeting_ids)
         end
 
-        def link_meetings(registration_type)
-          registration_type.conference_meetings = conference_meetings(registration_type)
+        def run_after_hooks
+          resource.conference_meetings = conference_meetings
         end
       end
     end

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

@@ -5,50 +5,18 @@ module Decidim
     module Admin
       # A command with all the business logic when destroying a conference
       # speaker in the system.
-      class DestroyConferenceSpeaker < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # conference_speaker - the ConferenceSpeaker to destroy
-        # current_user - the user performing this action
-        def initialize(conference_speaker, current_user)
-          @conference_speaker = conference_speaker
-          @current_user = current_user
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          destroy_speaker!
-          broadcast(:ok)
-        end
+      class DestroyConferenceSpeaker < Decidim::Commands::DestroyResource
+        protected
 
-        private
-
-        attr_reader :conference_speaker, :current_user
-
-        def destroy_speaker!
-          log_info = {
+        def extra_params
+          {
             resource: {
-              title: conference_speaker.full_name
+              title: resource.full_name
             },
             participatory_space: {
-              title: conference_speaker.conference.title
+              title: resource.conference.title
             }
           }
-
-          Decidim.traceability.perform_action!(
-            "delete",
-            conference_speaker,
-            current_user,
-            log_info
-          ) do
-            conference_speaker.destroy!
-            conference_speaker
-          end
         end
       end
     end