decidim-core 0.21.0 → 0.22.0

data/app/cells/decidim/versions_list_item/show.erb

@@ -0,0 +1,20 @@
+<div class="card--list__item">
+  <div class="card--list__text">
+    <div>
+      <%= link_to version_path do %>
+        <h6 class="card--list__heading heading6">
+          <%= i18n_version_index %>
+        </h6>
+      <% end %>
+      <div class="author-data">
+        <%= render_resource_editor(version) %>
+        <%= l version.created_at, format: :decidim_short %>
+      </div>
+    </div>
+  </div>
+  <div class="card--list__data">
+    <%= link_to version_path, class: "card--list__data__icon" do %>
+      <%= icon "chevron-right", role: "img", "aria-hidden": true %>
+    <% end %>
+  </div>
+</div>

data/app/cells/decidim/versions_list_item_cell.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  class VersionsListItemCell < Decidim::ViewModel
+    include Decidim::TraceabilityHelper
+    include Decidim::LayoutHelper
+
+    def version
+      model
+    end
+
+    def versioned_resource
+      options[:versioned_resource]
+    end
+
+    def index
+      options[:index] + 1
+    end
+
+    def version_path
+      options[:version_path].call(index)
+    end
+
+    def i18n_version_index
+      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
+            )
+          )
+        )
+      )
+    end
+
+    def i18n_scope
+      options[:i18n_scope]
+    end
+
+    def default_i18n_scope
+      "decidim.versions_list_item.show"
+    end
+  end
+end

data/app/cells/decidim/wizard_step_form/wizard_aside.erb

@@ -2,7 +2,7 @@
   <% if wizard_aside_back_url %>
     <div class="m-bottom">
       <%= link_to wizard_aside_back_url do %>
-        <%= icon "chevron-left", class: "icon--small" %>
+        <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
         <%= i18n_wizard_aside_back %>
       <% end %>
     </div>

data/app/cells/decidim/wizard_step_form/wizard_header.erb

@@ -12,7 +12,7 @@
 <div class="hide-for-large m-bottom">
   <%= wizard_header_see_steps %>
 
-  <ol id="steps" class="wizard__steps steps-toggle is-hidden" data-toggler=".is-hidden">
+  <div id="steps" class="wizard__steps steps-toggle is-hidden" data-toggler=".is-hidden">
     <%= wizard_stepper %>
-  </ol>
+  </div>
 </div>

data/app/cells/decidim/wizard_step_form_cell.rb

@@ -42,7 +42,10 @@ module Decidim
 
     # Returns the list item of the given step, in HTML.
     def wizard_stepper_step(step)
-      content_tag(:li, wizard_step_name(step), class: wizard_step_classes(step))
+      attributes = { class: wizard_step_classes(step) }
+      attributes[:"aria-current"] = "step" if step == current_step
+
+      content_tag(:li, wizard_step_name(step), attributes)
     end
 
     # Returns the name of the step, translated

data/app/commands/decidim/attachment_methods.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A module with all the attachment common methods
+  module AttachmentMethods
+    private
+
+    def build_attachment
+      @attachment = Attachment.new(
+        title: @form.attachment.title,
+        file: @form.attachment.file,
+        attached_to: @attached_to
+      )
+    end
+
+    def attachment_invalid?
+      if attachment.invalid? && attachment.errors.has_key?(:file)
+        @form.attachment.errors.add :file, attachment.errors[:file]
+        true
+      end
+    end
+
+    def attachment_present?
+      @form.attachment.file.present?
+    end
+
+    def create_attachment
+      attachment.attached_to = @attached_to
+      attachment.save!
+    end
+
+    def attachments_allowed?
+      @form.current_component.settings.attachments_allowed?
+    end
+
+    def process_attachments?
+      attachments_allowed? && attachment_present?
+    end
+  end
+end

data/app/commands/decidim/create_registration.rb

@@ -45,7 +45,8 @@ module Decidim
         tos_agreement: form.tos_agreement,
         newsletter_notifications_at: form.newsletter_at,
         email_on_notification: true,
-        accepted_tos_version: form.current_organization.tos_version
+        accepted_tos_version: form.current_organization.tos_version,
+        locale: form.current_locale
       )
     end
   end

data/app/commands/decidim/create_user_group.rb

@@ -23,6 +23,7 @@ module Decidim
         create_user_group
         create_membership
       end
+      notify_admins
 
       broadcast(:ok, @user_group)
     end
@@ -53,5 +54,16 @@ module Decidim
         user_group: @user_group
       )
     end
+
+    def notify_admins
+      data = {
+        event: "decidim.events.groups.user_group_created",
+        event_class: Decidim::UserGroupCreatedEvent,
+        resource: @user_group,
+        affected_users: Decidim::User.org_admins_except_me(form.current_user)
+      }
+
+      Decidim::EventsManager.publish(data)
+    end
   end
 end

data/app/commands/decidim/destroy_account.rb

@@ -20,6 +20,8 @@ module Decidim
         destroy_user_identities
         destroy_user_group_memberships
         destroy_follows
+        destroy_participatory_space_private_user
+        delegate_destroy_to_participatory_spaces
       end
 
       broadcast(:ok)
@@ -50,5 +52,15 @@ module Decidim
       Decidim::Follow.where(followable: @user).destroy_all
       Decidim::Follow.where(user: @user).destroy_all
     end
+
+    def destroy_participatory_space_private_user
+      Decidim::ParticipatorySpacePrivateUser.where(user: @user).destroy_all
+    end
+
+    def delegate_destroy_to_participatory_spaces
+      Decidim.participatory_space_manifests.each do |space_manifest|
+        space_manifest.invoke_on_destroy_account(@user)
+      end
+    end
   end
 end

data/app/commands/decidim/endorse_resource.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+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
+    # Public: Initializes the command.
+    #
+    # resource     - An instance of Decidim::Endorsable.
+    # current_user - The current user.
+    # current_group_id- (optional) The current_grup that is endorsing the Resource.
+    def initialize(resource, current_user, current_group_id = nil)
+      @resource = resource
+      @current_user = current_user
+      @current_group_id = current_group_id
+    end
+
+    # Executes the command. Broadcasts these events:
+    #
+    # - :ok when everything is valid, together with the resource vote.
+    # - :invalid if the form wasn't valid and we couldn't proceed.
+    #
+    # Returns nothing.
+    def call
+      return broadcast(:invalid) if existing_group_endorsement?
+
+      endorsement = build_resource_endorsement
+      if endorsement.save
+        notify_endorser_followers
+        broadcast(:ok, endorsement)
+      else
+        broadcast(:invalid)
+      end
+    end
+
+    private
+
+    def existing_group_endorsement?
+      @current_group_id.present? && @resource.endorsements.exists?(decidim_user_group_id: @current_group_id)
+    end
+
+    def build_resource_endorsement
+      endorsement = @resource.endorsements.build(author: @current_user)
+      endorsement.user_group = user_groups.find(@current_group_id) if @current_group_id.present?
+      endorsement
+    end
+
+    def user_groups
+      Decidim::UserGroups::ManageableUserGroups.for(@current_user).verified
+    end
+
+    def notify_endorser_followers
+      Decidim::EventsManager.publish(
+        event: "decidim.events.resource_endorsed",
+        event_class: Decidim::ResourceEndorsedEvent,
+        resource: @resource,
+        followers: @current_user.followers,
+        extra: {
+          endorser_id: @current_user.id
+        }
+      )
+    end
+  end
+end

data/app/commands/decidim/gallery_methods.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A module with all the gallery common methods
+  # Allows to create several image attachments at once
+  module GalleryMethods
+    private
+
+    def build_gallery
+      @gallery = []
+      @form.add_photos.each do |photo|
+        next unless image? photo
+
+        @gallery << Attachment.new(
+          title: photo.original_filename,
+          file: photo,
+          attached_to: @attached_to
+        )
+      end
+    end
+
+    def image?(image)
+      return unless image.respond_to? :content_type
+
+      image.content_type.start_with? "image"
+    end
+
+    def gallery_invalid?
+      gallery.each do |photo|
+        if photo.invalid? && photo.errors.has_key?(:file)
+          @form.errors.add(:add_photos, photo.errors[:file])
+          return true
+        end
+      end
+      false
+    end
+
+    def create_gallery
+      @gallery.map! do |photo|
+        photo.attached_to = @attached_to
+        photo.save!
+        @form.photos << photo.id.to_s
+      end
+    end
+
+    def photo_cleanup!
+      @attached_to.photos.each do |photo|
+        photo.destroy! if @form.photos.exclude? photo.id.to_s
+      end
+      # manually reset cached photos
+      @attached_to.reload
+      @attached_to.instance_variable_set(:@photos, nil)
+    end
+
+    # maybe a custom settings options would be nice
+    def gallery_allowed?
+      true
+    end
+
+    def process_gallery?
+      gallery_allowed? && @form.add_photos.any?
+    end
+  end
+end

data/app/commands/decidim/invite_user_again.rb

@@ -5,17 +5,15 @@ module Decidim
   class InviteUserAgain < Rectify::Command
     # Public: Initializes the command.
     #
-    # form - A form object with the params.
+    # user         - The user that receives the invitation instructions.
+    # instructions - The invitation instructions that is sent to the user.
     def initialize(user, instructions)
       @user = user
       @instructions = instructions
     end
 
     def call
-      return broadcast(:invalid) unless user&.invited_to_sign_up?
-
       user.invite!(user.invited_by, invitation_instructions: instructions)
-
       broadcast(:ok)
     end
 

data/app/commands/decidim/messaging/reply_to_conversation.rb

@@ -24,6 +24,7 @@ module Decidim
 
         if message.save
           notify_interlocutors
+          notify_comanagers if sender.is_a?(UserGroup)
 
           broadcast(:ok, message)
         else
@@ -34,19 +35,49 @@ module Decidim
       private
 
       def sender
-        form.current_user
+        form.context.sender
       end
 
       def message
-        @message ||= conversation.add_message(sender: sender, body: form.body)
+        @message ||= conversation.add_message(sender: sender, body: form.body, user: form.context.current_user)
       end
 
       def notify_interlocutors
+        @already_notified = [form.context.current_user]
+
         conversation.interlocutors(sender).each do |recipient|
-          ConversationMailer.new_message(sender, recipient, conversation, message).deliver_later if conversation.unread_count(recipient) == 1
+          if recipient.is_a?(UserGroup)
+            recipient.managers.each do |manager|
+              notify(manager) do
+                ConversationMailer.new_group_message(sender, manager, conversation, message, recipient).deliver_later
+              end
+            end
+          else
+            notify(recipient) do
+              ConversationMailer.new_message(sender, recipient, conversation, message).deliver_later
+            end
+          end
+        end
+      end
+
+      def notify_comanagers
+        sender.managers.each do |recipient|
+          notify(recipient) do
+            ConversationMailer.comanagers_new_message(sender, recipient, conversation, message, form.context.current_user).deliver_later
+          end
         end
       end
 
+      # in order for a recipient to receive an email it should not have direct-messages disabled
+      # if direct-messages are disabled, only send if he follows the sending user
+      def notify(recipient)
+        return unless conversation.unread_count(recipient) == 1
+        return unless recipient.accepts_conversation?(form.context.current_user)
+
+        yield unless @already_notified.include?(recipient)
+        @already_notified.push(recipient)
+      end
+
       attr_reader :conversation, :form
     end
   end

data/app/commands/decidim/messaging/start_conversation.rb

@@ -22,6 +22,7 @@ module Decidim
 
         if conversation.save
           notify_interlocutors
+          notify_comanagers if originator.is_a?(UserGroup)
 
           broadcast(:ok, conversation)
         else
@@ -31,22 +32,52 @@ module Decidim
 
       private
 
+      def originator
+        form.context.sender
+      end
+
       def conversation
         @conversation ||= Conversation.start(
           originator: originator,
-          interlocutors: [form.recipient],
-          body: form.body
+          interlocutors: form.recipient,
+          body: form.body,
+          user: form.context.current_user
         )
       end
 
       def notify_interlocutors
+        @already_notified = [form.context.current_user]
+
         conversation.interlocutors(originator).each do |recipient|
-          ConversationMailer.new_conversation(originator, recipient, conversation).deliver_later
+          if recipient.is_a?(UserGroup)
+            recipient.managers.each do |manager|
+              notify(manager) do
+                ConversationMailer.new_group_conversation(originator, manager, conversation, recipient).deliver_later
+              end
+            end
+          else
+            notify(recipient) do
+              ConversationMailer.new_conversation(originator, recipient, conversation).deliver_later
+            end
+          end
         end
       end
 
-      def originator
-        form.current_user
+      def notify_comanagers
+        originator.managers.each do |recipient|
+          notify(recipient) do
+            ConversationMailer.comanagers_new_conversation(originator, recipient, conversation, form.context.current_user).deliver_later
+          end
+        end
+      end
+
+      # in order for a recipient to receive an email it should not have direct-messages disabled
+      # if direct-messages are disabled, only send if he follows the sending user
+      def notify(recipient)
+        return unless recipient.accepts_conversation?(form.context.current_user)
+
+        yield unless @already_notified.include?(recipient)
+        @already_notified.push(recipient)
       end
 
       attr_reader :form