decidim-core 0.26.2 → 0.27.0.rc1

data/app/cells/decidim/upload_modal_cell.rb

@@ -0,0 +1,205 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell creates the necessary elements for dynamic uploads.
+  class UploadModalCell < Decidim::ViewModel
+    include Cell::ViewModel::Partial
+    include ERB::Util
+
+    alias form model
+
+    def show
+      return unless resource_name
+
+      render
+    end
+
+    private
+
+    def button_id
+      prefix = form.object_name.present? ? "#{form.object_name}_" : ""
+
+      "#{prefix.gsub(/[\[\]]/, "_").gsub(/__+/, "_")}#{attribute}_button"
+    end
+
+    def button_class
+      "button small hollow add-field add-file" if has_title?
+
+      "button small add-file"
+    end
+
+    def label
+      options[:label]
+    end
+
+    def button_label
+      return button_edit_label if attachments.count.positive?
+
+      options[:button_label]
+    end
+
+    def button_edit_label
+      options[:button_edit_label] || options[:button_label]
+    end
+
+    def max_file_size
+      options[:max_file_size]
+    end
+
+    def max_file_size_mb
+      return unless max_file_size
+
+      (((max_file_size / 1024 / 1024) * 100) / 100).round
+    end
+
+    def resource_class
+      options[:resource_class].to_s
+    end
+
+    def resource_name
+      options[:resource_name]
+    end
+
+    def actions_wrapper_class
+      has_title? ? "actions-wrapper titled" : "actions-wrapper"
+    end
+
+    def attribute
+      options[:attribute]
+    end
+
+    def multiple
+      options[:multiple] || false
+    end
+
+    def optional
+      options[:optional]
+    end
+
+    # By default Foundation adds form errors next to input, but since input is in the modal
+    # and modal is hidden by default, we need to add an additional validation field to the form.
+    # This should only be necessary when file is required by the form.
+    def input_validation_field
+      object_name = form.object.present? ? "#{form.object.model_name.param_key}[#{add_attribute}_validation]" : "#{add_attribute}_validation"
+      input = check_box_tag object_name, 1, attachments.present?, class: "hide", label: false, required: !optional
+      message = form.send(:abide_error_element, add_attribute) + form.send(:error_and_help_text, add_attribute)
+      input + message
+    end
+
+    def explanation
+      return I18n.t("explanation", scope: options[:help_i18n_scope], attribute: attribute) if options[:help_i18n_scope].present?
+
+      I18n.t("explanation", scope: "decidim.forms.upload_help", attribute: attribute)
+    end
+
+    def add_attribute
+      return "add_#{attribute}" if form.object.respond_to? "add_#{attribute}"
+
+      attribute
+    end
+
+    def has_title?
+      options[:titled] == true
+    end
+
+    def with_title
+      "with-title" if has_title?
+    end
+
+    def attachment_label
+      return I18n.t("current_image", scope: "decidim.forms") if attachments.count.positive? && file_attachment_path(attachments.first).present?
+
+      I18n.t("default_image", scope: "decidim.forms")
+    end
+
+    def help_messages
+      Array(options[:help])
+    end
+
+    def attachments
+      @attachments = begin
+        attachments = options[:attachments] || form.object.send(attribute)
+        attachments = Array(attachments).compact_blank
+        attachments.map { |attachment| attachment.is_a?(String) ? ActiveStorage::Blob.find_signed(attachment) : attachment }
+      end
+    end
+
+    def id_for(attachment)
+      return attachment.id if attachment.respond_to? :id
+
+      rand(1..10_000)
+    end
+
+    def title_for(attachment)
+      return unless has_title?
+
+      translated_attribute(attachment.title)
+    end
+
+    def truncated_file_name_for(attachment, max_length = 31)
+      filename = file_name_for(attachment)
+      return filename if filename.length <= max_length
+
+      name = File.basename(filename, File.extname(filename))
+      name.truncate(max_length, omission: "...#{name.last((max_length / 2) - 3)}#{File.extname(filename)}")
+    end
+
+    def file_name_for(attachment)
+      filename = determine_filename(attachment)
+
+      return "(#{filename})" if has_title?
+
+      filename
+    end
+
+    def determine_filename(attachment)
+      return attachment.filename.to_s if attachment.is_a? ActiveStorage::Blob
+      return blob(attachment).filename.to_s if blob(attachment).present?
+
+      attachment.url.split("/").last
+    end
+
+    def file_attachment_path(attachment)
+      return unless attachment
+      return Rails.application.routes.url_helpers.rails_blob_url(attachment, only_path: true) if attachment.is_a? ActiveStorage::Blob
+
+      if attachment.try(:attached?)
+        attachment_path = Rails.application.routes.url_helpers&.rails_blob_url(attachment.blob, only_path: true)
+        return attachment_path if attachment_path.present?
+      end
+
+      uploader_default_image_path(attribute)
+    end
+
+    def uploader_default_image_path(attribute)
+      uploader = Decidim::FileValidatorHumanizer.new(form.object, attribute).uploader
+      return if uploader.blank?
+      return unless uploader.is_a?(Decidim::ImageUploader)
+
+      uploader.try(:default_url)
+    end
+
+    def blob(attachment)
+      return attachment if attachment.is_a? ActiveStorage::Blob
+      return ActiveStorage::Blob.find_signed(attachment) if attachment.is_a? String
+      return attachment.file.blob if attachment.is_a? Decidim::Attachment
+      return attachment.blob if attachment.respond_to? :blob
+    end
+
+    def direct_upload_url
+      Rails.application.class.routes.url_helpers.rails_direct_uploads_path
+    end
+
+    def form_object_class
+      form.object.class.to_s
+    end
+
+    def modal_id
+      @modal_id ||= "upload_#{SecureRandom.uuid}"
+    end
+
+    def current_organization
+      controller.current_organization
+    end
+  end
+end

data/app/cells/decidim/user_conversation/reply.erb

@@ -9,7 +9,7 @@
         <%= f.hidden_field :recipient_id, id: nil, name: "conversation[recipient_id][]", value: recipient.id %>
       <% end %>
 
-      <%= f.text_area :body, label: false, rows: 4, required: true, placeholder: t("decidim.user_conversations.reply.placeholder") %>
+      <%= f.text_area :body, label: false, rows: 4, required: true, placeholder: t("decidim.user_conversations.reply.placeholder"), data: { input_emoji: true } %>
 
       <%= f.submit t("decidim.user_conversations.reply.send"), class: "button secondary light pull-right", data: { disable: true } %>
     <% end %>

data/app/cells/decidim/user_conversations/add_conversation_users.erb

@@ -6,18 +6,20 @@
       </div>
     </div>
     <div class="row">
-      <div class="row columns mentions__container">
+      <div class="row columns multiple-mentions" data-name="recipient_id[]" data-multiple="true">
         <label for="add_conversation_users"><%= t "decidim.user_conversations.index.add_max_users" %></label>
         <input id="add_conversation_users" type="text"
-            class="js-multiple-mentions mentions__container"
+            spellcheck="false"
+            autocomplete="off"
             placeholder="<%= t("decidim.user_conversations.index.add_users_placeholder") %>"
             data-noresults="<%= t("decidim.user_conversations.index.no_results") %>"
             contenteditable="true"
             data-direct-messages-disabled="<%= t("decidim.user_conversations.index.participant_with_disabled_message_reception") %>"
+            data-selected="multiple-mentions-selected"
             aria-expanded="false">
       </div>
       <div class="columns large-12">
-        <div class="js-multiple-mentions-recipients"></div>
+        <ul class="multiple-mentions-selected"></ul>
       </div>
     </div>
   </div>

data/app/cells/decidim/version_cell.rb

@@ -49,19 +49,8 @@ module Decidim
       i18n("version_created_at")
     end
 
-    def i18n(string, params = {})
-      t(
-        string,
-        params.merge(
-          scope: i18n_scope,
-          default: t(
-            string,
-            params.merge(
-              scope: default_i18n_scope
-            )
-          )
-        )
-      )
+    def i18n(string, **params)
+      t(string, **params, scope: i18n_scope, default: t(string, **params, scope: default_i18n_scope))
     end
 
     def i18n_scope

data/app/cells/decidim/versions_list_cell.rb

@@ -32,19 +32,8 @@ module Decidim
       i18n("back_to_resource")
     end
 
-    def i18n(string, params = {})
-      t(
-        string,
-        params.merge(
-          scope: i18n_scope,
-          default: t(
-            string,
-            params.merge(
-              scope: default_i18n_scope
-            )
-          )
-        )
-      )
+    def i18n(string, **params)
+      t(string, **params, scope: i18n_scope, default: t(string, **params, scope: default_i18n_scope))
     end
 
     def i18n_scope

data/app/cells/decidim/versions_list_item_cell.rb

@@ -25,19 +25,8 @@ module Decidim
       i18n("version_index", index: index)
     end
 
-    def i18n(string, params = {})
-      t(
-        string,
-        params.merge(
-          scope: i18n_scope,
-          default: t(
-            string,
-            params.merge(
-              scope: default_i18n_scope
-            )
-          )
-        )
-      )
+    def i18n(string, **params)
+      t(string, **params, scope: i18n_scope, default: t(string, **params, scope: default_i18n_scope))
     end
 
     def i18n_scope

data/app/commands/decidim/accept_group_invitation.rb

@@ -3,7 +3,7 @@
 module Decidim
   # A command with all the business logic to accept an invitation to belong to a
   # group.
-  class AcceptGroupInvitation < Rectify::Command
+  class AcceptGroupInvitation < Decidim::Command
     # Public: Initializes the command.
     #
     # user_group - the UserGroup where the user has been invited

data/app/commands/decidim/accept_user_group_join_request.rb

@@ -3,7 +3,7 @@
 module Decidim
   # A command with all the business logic to accept a join request to a user
   # group.
-  class AcceptUserGroupJoinRequest < Rectify::Command
+  class AcceptUserGroupJoinRequest < Decidim::Command
     # Public: Initializes the command.
     #
     # membership - the UserGroupMembership to be accepted.

data/app/commands/decidim/amendable/accept.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic to accept an amend.
-    class Accept < Rectify::Command
+    class Accept < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.

data/app/commands/decidim/amendable/create_draft.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic when a user starts amending a resource.
-    class CreateDraft < Rectify::Command
+    class CreateDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.

data/app/commands/decidim/amendable/destroy_draft.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic when a user starts amending a resource.
-    class DestroyDraft < Rectify::Command
+    class DestroyDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # amendment     - The amendment to destroy.

data/app/commands/decidim/amendable/promote.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic when a user promotes a rejected emendation.
-    class Promote < Rectify::Command
+    class Promote < Decidim::Command
       # Public: Initializes the command.
       #
       # emendation - The emendation to promote.

data/app/commands/decidim/amendable/publish_draft.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic when a user publishes an amendment draft.
-    class PublishDraft < Rectify::Command
+    class PublishDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.

data/app/commands/decidim/amendable/reject.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic to reject an amend.
-    class Reject < Rectify::Command
+    class Reject < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.

data/app/commands/decidim/amendable/update_draft.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic when a user updates and amendment draft.
-    class UpdateDraft < Rectify::Command
+    class UpdateDraft < Decidim::Command
       # Public: Initializes the command.
       #
       # form         - A form object with the params.

data/app/commands/decidim/amendable/withdraw.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Amendable
     # A command with all the business logic to withdraw an amendment.
-    class Withdraw < Rectify::Command
+    class Withdraw < Decidim::Command
       # Public: Initializes the command.
       #
       # amendment     - The amendment to withdraw.

data/app/commands/decidim/attachment_methods.rb

@@ -18,7 +18,7 @@ module Decidim
     end
 
     def delete_attachment(attachment)
-      Attachment.find(attachment.id).delete if attachment.id == proposal.documents.first.id
+      Attachment.find(attachment.id).delete if attachment.id.to_i == proposal.documents.first.id
     end
 
     def attachment_invalid?
@@ -36,7 +36,8 @@ module Decidim
       !@form.attachment.file.is_a?(Decidim::ApplicationUploader)
     end
 
-    def create_attachment
+    def create_attachment(weight: 0)
+      attachment.weight = weight
       attachment.attached_to = @attached_to
       attachment.save!
     end

data/app/commands/decidim/create_editor_image.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to create an editor image.
-  class CreateEditorImage < Rectify::Command
+  class CreateEditorImage < Decidim::Command
     # Public: Initializes the command.
     #
     # form - A form object with the params.

data/app/commands/decidim/create_follow.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic for when a user starts following a resource.
-  class CreateFollow < Rectify::Command
+  class CreateFollow < Decidim::Command
     # Public: Initializes the command.
     #
     # form         - A form object with the params.

data/app/commands/decidim/create_omniauth_registration.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to create a user from omniauth
-  class CreateOmniauthRegistration < Rectify::Command
+  class CreateOmniauthRegistration < Decidim::Command
     # Public: Initializes the command.
     #
     # form - A form object with the params.
@@ -63,13 +63,12 @@ module Decidim
         @user.name = form.name
         @user.nickname = form.normalized_nickname
         @user.newsletter_notifications_at = nil
-        @user.email_on_notification = true
         @user.password = generated_password
         @user.password_confirmation = generated_password
         if form.avatar_url.present?
           url = URI.parse(form.avatar_url)
           filename = File.basename(url.path)
-          file = URI.open(url)
+          file = url.open
           @user.avatar.attach(io: file, filename: filename)
         end
         @user.skip_confirmation! if verified_email

data/app/commands/decidim/create_registration.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to create a user through the sign up form.
-  class CreateRegistration < Rectify::Command
+  class CreateRegistration < Decidim::Command
     # Public: Initializes the command.
     #
     # form - A form object with the params.
@@ -44,7 +44,6 @@ module Decidim
         organization: form.current_organization,
         tos_agreement: form.tos_agreement,
         newsletter_notifications_at: form.newsletter_at,
-        email_on_notification: true,
         accepted_tos_version: form.current_organization.tos_version,
         locale: form.current_locale
       )

data/app/commands/decidim/create_report.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic when a user creates a report.
-  class CreateReport < Rectify::Command
+  class CreateReport < Decidim::Command
     # Public: Initializes the command.
     #
     # form         - A form object with the params.

data/app/commands/decidim/create_user_group.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic to create a user group.
-  class CreateUserGroup < Rectify::Command
+  class CreateUserGroup < Decidim::Command
     # Public: Initializes the command.
     #
     # form - A form object with the params.
@@ -63,7 +63,7 @@ module Decidim
         affected_users: Decidim::User.org_admins_except_me(form.current_user)
       }
 
-      Decidim::EventsManager.publish(data)
+      Decidim::EventsManager.publish(**data)
     end
   end
 end

data/app/commands/decidim/create_user_report.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic when a user creates a report.
-  class CreateUserReport < Rectify::Command
+  class CreateUserReport < Decidim::Command
     # Public: Initializes the command.
     #
     # form         - A form object with the params.
@@ -55,8 +55,10 @@ module Decidim
     end
 
     def send_notification_to_admins!
-      current_organization.admins.each do |admin|
-        Decidim::UserReportJob.perform_later(admin, current_user, form.reason, reportable)
+      @current_user.organization.admins.each do |admin|
+        next unless admin.email_on_moderations
+
+        Decidim::UserReportJob.perform_later(admin, report)
       end
     end
 

data/app/commands/decidim/delete_follow.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # A command with all the business logic for when a user stops following a resource.
-  class DeleteFollow < Rectify::Command
+  class DeleteFollow < Decidim::Command
     # Public: Initializes the command.
     #
     # form         - A form object with the params.

data/app/commands/decidim/demote_membership.rb

@@ -4,7 +4,7 @@ module Decidim
   # A command with all the business logic to demote an admin. This means
   # removing their admin righta dn converting them to a basic member. It's the
   # coutnerpart of `PromoteMembership`.
-  class DemoteMembership < Rectify::Command
+  class DemoteMembership < Decidim::Command
     # Public: Initializes the command.
     #
     # membership - the UserGroupMembership to be demoted.

data/app/commands/decidim/destroy_account.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # This command destroys the user's account.
-  class DestroyAccount < Rectify::Command
+  class DestroyAccount < Decidim::Command
     # Destroy a user's account.
     #
     # user - The user to be updated.

data/app/commands/decidim/endorse_resource.rb

@@ -3,7 +3,7 @@
 module Decidim
   # A command with all the business logic related with a user endorsing a resource.
   # This is a user creates and endorsement.
-  class EndorseResource < Rectify::Command
+  class EndorseResource < Decidim::Command
     # Public: Initializes the command.
     #
     # resource     - An instance of Decidim::Endorsable.

data/app/commands/decidim/gallery_methods.rb

@@ -8,22 +8,27 @@ module Decidim
 
     def build_gallery(attached_to = nil)
       @gallery = []
-      @form.add_photos.each do |photo|
-        next unless image? photo
+      @form.add_photos.compact_blank.each do |photo|
+        if photo.is_a?(Hash) && photo.has_key?(:id)
+          update_attachment_title_for(photo)
+          next
+        end
 
         @gallery << Attachment.new(
-          title: { I18n.locale => photo.original_filename },
+          title: photos_title(photo),
           attached_to: attached_to || gallery_attached_to,
-          file: photo, # Define attached_to before this
-          content_type: photo.content_type
+          file: photos_signed_id(photo), # Define attached_to before this
+          content_type: photos_content_type(photo)
         )
       end
     end
 
-    def image?(image)
-      return unless image.respond_to? :content_type
+    def update_attachment_title_for(photo)
+      Decidim::Attachment.find(photo[:id]).update(title: title_for(photo))
+    end
 
-      image.content_type.start_with? "image"
+    def image?(signed_id)
+      blob(signed_id).content_type.start_with? "image"
     end
 
     def gallery_invalid?
@@ -36,17 +41,27 @@ module Decidim
       false
     end
 
-    def create_gallery
+    def create_gallery(first_weight: 0)
+      weight = first_weight
+      # Add the weights first to the old photos
+      @form.photos.each do |photo|
+        photo.update!(weight: weight)
+        weight += 1
+      end
       @gallery.map! do |photo|
+        photo.weight = weight
         photo.attached_to = gallery_attached_to
         photo.save!
+        weight += 1
         @form.photos << photo
       end
     end
 
     def photo_cleanup!
       gallery_attached_to.photos.each do |photo|
-        photo.destroy! if @form.photos.map(&:id).exclude? photo.id
+        next unless @form.photos.map(&:id).exclude?(photo.id)
+
+        photo.destroy! if (@form.respond_to?(:documents) && @form.documents.map(&:id).exclude?(photo.id)) || !@form.respond_to?(:documents)
       end
       # manually reset cached photos
       gallery_attached_to.reload
@@ -68,5 +83,25 @@ module Decidim
 
       form.current_component.organization if form.respond_to?(:current_component)
     end
+
+    def photos_signed_id(photo)
+      return photo[:file] if photo.is_a?(Hash)
+
+      photo
+    end
+
+    def photos_title(photo)
+      return { I18n.locale => photo[:title] } if photo.is_a?(Hash) && photo.has_key?(:title)
+
+      { I18n.locale => "" }
+    end
+
+    def photos_content_type(photo)
+      blob(photos_signed_id(photo)).content_type
+    end
+
+    def blob(signed_id)
+      ActiveStorage::Blob.find_signed(signed_id)
+    end
   end
 end