decidim-core 0.29.1 → 0.30.0.rc1

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

@@ -0,0 +1,23 @@
+<div class="profile__user">
+  <div class="profile__user-avatar-container">
+    <div class="<%= has_profile? ? "profile__user-avatar" : "profile__user-avatar !border-0" %>">
+      <%= image_tag(has_profile? ? model.avatar_url(:big) : model.non_user_avatar_path, alt: "member-avatar") %>
+    </div>
+  </div>
+  <div>
+    <div class="<%= has_profile? ? "profile__user-name" : "profile__user-name !no-underline" %>">
+      <%= name %>
+    </div>
+    <% if nickname.present? %>
+      <span class="profile__user-nick block">
+        <%= nickname %>
+      </span>
+    <% end %>
+
+    <div class="mt-3">
+      <span class="text-gray-2 capitalize font-semibold">
+        <%= role_translated %>
+      </span>
+    </div>
+  </div>
+</div>

data/app/cells/decidim/participatory_space_private_user_cell.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders the card for an instance of an Assembly member
+  class ParticipatorySpacePrivateUserCell < Decidim::ViewModel
+    property :name
+    property :role
+    property :nickname
+    property :profile_url
+
+    private
+
+    def has_profile?
+      model.profile_url.present?
+    end
+
+    def role_translated
+      decidim_html_escape(decidim_sanitize(translated_attribute(role)))
+    end
+  end
+end

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

@@ -5,12 +5,12 @@
   </div>
 
   <div class="proposals__aside-progress">
-    <%= content_tag :div, units_name_text, class: "progress-bar__units" if units_name %>
-
     <% if total != 0 %>
       <div class="progress-bar" role="progressbar" aria-label="<%= units_name.present? ? units_name_text : t("decidim.shared.progress") %>" aria-valuenow="<%= number_with_precision(percentage, separator: ".", precision: 2) %>" aria-valuemin="0" aria-valuemax="100" aria-valuetext="<%= number_to_percentage(percentage, precision: 2) %>">
         <div style="width: <%= percentage %>%"></div>
       </div>
     <% end %>
   </div>
+  <%= content_tag :div, units_name_text, class: "progress-bar__units" if units_name %>
+
 </div>

data/app/cells/decidim/report_button_cell.rb

@@ -32,6 +32,7 @@ module Decidim
     def cache_hash
       hash = []
       hash.push(I18n.locale)
+      hash.push(only_button? ? 1 : 0)
       hash.push(current_user.try(:id))
       hash.push(model.reported_by?(current_user) ? 1 : 0)
       hash.push(model.class.name.gsub("::", ":"))

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

@@ -0,0 +1,20 @@
+<ul class="resource_history">
+  <% history_items.each_with_index do |item, index| %>
+    <li class="resource_history__item">
+      <div class="resource_history__item_icon">
+        <div class="<%= item[:id] == "#{history_cell_id}_creation" ? "resource_history__item_icon-creation" : "" %>">
+          <%= icon item[:icon], class: item[:id] == "#{history_cell_id}_creation" ? "fill-current text-white" : "fill-current text-secondary" %>
+        </div>
+      </div>
+      <div class="resource_history__item_content">
+        <span class="resource_history__item_date"><%= item[:date].strftime("%d/%m/%Y %H:%M") %></span>
+        <p class="resource_history_text">
+          <%= item[:text] %>
+          <% if index < history_items.size - 1 %>
+            <span class="resource_history__line"></span>
+          <% end %>
+        </p>
+      </div>
+    </li>
+  <% end %>
+</ul>

data/app/cells/decidim/resource_history_cell.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ResourceHistoryCell < Decidim::ViewModel
+    def show
+      render
+    end
+
+    def history_items
+      return @history_items if @history_items.present?
+
+      @history_items = []
+      linked_resources_items.each do |item|
+        add_linked_resources_items(item[:resources], item)
+      end
+
+      @history_items << creation_item if @history_items.any?
+
+      @history_items.sort_by! { |item| item[:date] }
+    end
+
+    # return an unique id to identify the type of history cell
+    def history_cell_id
+      raise NotImplementedError
+    end
+
+    # return an array of linked resources to show in the history
+    def linked_resources_items
+      raise NotImplementedError
+    end
+
+    # return the creation item to show in the history, it will be added only if there are linked resources
+    def creation_item
+      raise NotImplementedError
+    end
+
+    def render?
+      linked_resources_items.any? { |item| item[:resources].present? }
+    end
+
+    private
+
+    def add_linked_resources_items(resources, options)
+      return if resources.blank?
+
+      resources.each do |resource|
+        title = decidim_sanitize_translated(resource.title)
+        url = resource_locator(resource).path
+        link = link_to(title, url, class: "underline decoration-current text-secondary font-semibold")
+
+        @history_items << {
+          id: "#{options[:link_name]}_#{resource.id}",
+          date: resource.updated_at,
+          text: t(options[:text_key], scope: "activerecord.models", link:),
+          icon: resource_type_icon_key(options[:icon_key])
+        }
+      end
+    end
+
+    def history_items_contains?(link_name)
+      return false if @history_items.blank?
+
+      @history_items.any? { |item| item[:id].include?(link_name.to_s) }
+    end
+  end
+end

data/app/cells/decidim/share_button_cell.rb

@@ -4,10 +4,6 @@ module Decidim
   class ShareButtonCell < ButtonCell
     private
 
-    def button_classes
-      "button button__sm button__text-secondary"
-    end
-
     def text
       t("decidim.shared.share_modal.share")
     end

data/app/cells/decidim/share_widget/modal.erb

@@ -0,0 +1,26 @@
+<%= decidim_modal id: "socialShare", class: "share-modal" do %>
+  <div data-dialog-container>
+    <%= icon "share-line" %>
+    <h2 id="dialog-title-socialShare" tabindex="-1" data-dialog-title><%= t("share", scope: "decidim.shared.share_modal") %></h2>
+    <div>
+      <%= social_share_button_tag(decidim_page_title,
+                                  url: decidim_meta_url,
+                                  image: decidim_meta_image_url,
+                                  desc: decidim_html_escape(decidim_meta_description || ""),
+                                  via: decidim_meta_twitter_handler) %>
+
+      <div class="share-modal__input">
+        <input id="urlShareLink" type="text" title="<%= t("share_link" , scope: "decidim.shared.share_modal") %>" value="<%= resource_name ? short_url(route_name: resource_name, params:) : decidim_meta_url %>" readonly>
+        <button type="button"
+                class="button button__sm button__text-secondary"
+                data-clipboard-copy="#urlShareLink"
+                data-clipboard-copy-label="<%= t("copy_share_link_copied", scope: "decidim.shared.share_modal") %>"
+                data-clipboard-copy-message="<%= t("copy_share_link_message", scope: "decidim.shared.share_modal") %>"
+                title="<%= t("copy_share_link_clarification", scope: "decidim.shared.share_modal") %>">
+          <span><%= t("copy_share_link", scope: "decidim.shared.share_modal") %></span>
+          <%= icon "file-copy-line" %>
+        </button>
+      </div>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,2 @@
+<%= cell("decidim/share_button", model) %>
+<%= render :modal %>

data/app/cells/decidim/share_widget_cell.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ShareWidgetCell < Decidim::ViewModel
+    include Decidim::ShortLinkHelper
+    include Decidim::SocialShareButtonHelper
+
+    def show
+      render
+    end
+
+    private
+
+    def resource_name
+      return "budget_project" if model.is_a?(Decidim::Budgets::Project)
+
+      model.class.name.demodulize.underscore
+    end
+  end
+end

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

@@ -1,4 +1,7 @@
-<%= content_tag :ul, class: tags_classes, data: { tags: "" } do %>
-  <%= content_tag :li, link_to_tag(category_path, category_name, t("decidim.tags.filter_results_for_category", resource: category_name)) if category? %>
-  <%= content_tag :li, link_to_tag(scope_path, scope_name, t("decidim.tags.filter_results_for_scope", resource: scope_name)) if scope? %>
-<% end %>
+<section class="layout-main__section">
+  <%= content_tag :ul, class: tags_classes, data: { tags: "" } do %>
+    <% taxonomies.each do |tax| %>
+      <%= content_tag :li, link_to_tag(tax[:url], tax[:name], t("decidim.tags.filter_results_for_taxonomy", resource: tax[:name])) %>
+    <% end %>
+  <% end %>
+</section>

data/app/cells/decidim/tags_cell.rb

@@ -1,24 +1,16 @@
 # frozen_string_literal: true
 
 module Decidim
-  # This cell renders the category of a resource
+  # This cell renders the taxonomies of a resource
   # shown with the translated name and links to
   # the resource parent `component` and `participatory space` index.
   # The context `resource` must be present
   # example use inside another `cell`:
-  #   <%= cell("decidim/category", model.category, context: {resource: model}) %>
+  #   <%= cell("decidim/tags", model.taxonomies, context: {resource: model}) %>
   #
   class TagsCell < Decidim::ViewModel
     def show
-      render if category? || scope?
-    end
-
-    def category
-      render if category?
-    end
-
-    def scope
-      render if scope?
+      render if taxonomies.any?
     end
 
     private
@@ -27,27 +19,14 @@ module Decidim
       (["tag-container"] + context[:extra_classes].to_a).join(" ")
     end
 
-    def category?
-      model.category.present?
-    end
-
-    # deprecated
-    def link_to_category
-      accessible_title = t("decidim.tags.filter_results_for_category", resource: category_name)
+    def taxonomies
+      return [] unless model.respond_to?(:taxonomies)
 
-      link_to category_path, title: accessible_title, class: "tag" do
-        sr_title = content_tag(
-          :span,
-          accessible_title,
-          class: "sr-only"
-        )
-        display_title = content_tag(
-          :span,
-          category_name,
-          "aria-hidden": true
-        )
-
-        sr_title + display_title
+      @taxonomies ||= model.taxonomies.map do |taxonomy|
+        {
+          name: decidim_sanitize_translated(taxonomy.name),
+          url: resource_locator(model).index(filter: { "with_any_taxonomies[#{taxonomy.root_taxonomy.id}]" => [taxonomy.id.to_s] })
+        }
       end
     end
 
@@ -68,48 +47,8 @@ module Decidim
       end
     end
 
-    def category_name
-      decidim_html_escape model.category.translated_name
-    end
-
-    def category_path
-      resource_locator(model).index(filter: { filter_param(:category) => [model.category.id.to_s] })
-    end
-
-    def scope?
-      has_visible_scopes?(model)
-    end
-
-    # deprecated
-    def link_to_scope
-      accessible_title = t("decidim.tags.filter_results_for_scope", resource: scope_name)
-
-      link_to scope_path, title: accessible_title, class: "tag" do
-        sr_title = content_tag(
-          :span,
-          accessible_title,
-          class: "sr-only"
-        )
-        display_title = content_tag(
-          :span,
-          scope_name,
-          "aria-hidden": true
-        )
-
-        sr_title + display_title
-      end
-    end
-
-    def scope_name
-      translated_attribute model.scope.name
-    end
-
-    def scope_path
-      resource_locator(model).index(filter: { filter_param(:scope) => [model.scope.id] })
-    end
-
     def filter_param(name)
-      candidates = ["with_any_#{name}".to_sym, "with_#{name}".to_sym]
+      candidates = [:"with_any_#{name}", :"with_#{name}"]
       return candidates.first unless controller.respond_to?(:default_filter_params, true)
 
       available_params = controller.send(:default_filter_params)

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

@@ -1,6 +1,6 @@
 <div>
-  <div class="row column">
+  <div class="pt-4 pb-4 text-center bg-background">
     <%= link %>
-    <span class="translation-button-help"><%= help_text %></span>
+    <span class="translation-button-help ml-4"><%= help_text %></span>
   </div>
 </div>

data/app/cells/decidim/translation_bar_cell.rb

@@ -32,7 +32,7 @@ module Decidim
       parsed_url.query = new_query
       url = parsed_url.to_s
 
-      link_to button_text, url, class: "button small hollow"
+      link_to button_text, url, class: "button button__sm button__transparent-secondary"
     end
 
     def button_text

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

@@ -4,7 +4,7 @@ module Decidim
   module Amendable
     # A command with all the business logic when a user starts amending a resource.
     class CreateDraft < Decidim::Command
-      delegate :current_user, to: :form
+      delegate :current_user, :current_organization, to: :form
 
       # Public: Initializes the command.
       #
@@ -53,8 +53,8 @@ module Decidim
             emendation.title = { I18n.locale => form.emendation_params.with_indifferent_access[:title] }
             emendation.body = { I18n.locale => form.emendation_params.with_indifferent_access[:body] }
             emendation.component = amendable.component
+            emendation.taxonomies = amendable.taxonomies if amendable.respond_to?(:taxonomies)
             emendation.add_author(current_user, user_group)
-            emendation.category = amendable.category if amendable.respond_to?(:category)
             emendation.save!
             emendation
           end

data/app/commands/decidim/create_ephemeral_user.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A command with all the business logic to create an ephemeral user.
+  class CreateEphemeralUser < 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?
+
+      create_user!
+      confirm_user
+
+      broadcast(:ok, @user)
+    rescue ActiveRecord::RecordInvalid
+      broadcast(:invalid)
+    end
+
+    private
+
+    attr_reader :form
+
+    def create_user!
+      # The user is saved with tos_agreement to true but in the verification
+      # phase the tos_agreement will be mandatory for ephemeral users
+      @user = User.create!(
+        name: form.name,
+        nickname: form.nickname,
+        organization: form.organization,
+        locale: form.locale,
+        tos_agreement: true,
+        managed: true,
+        extended_data: { ephemeral: true, verified: form.verified }
+      )
+    end
+
+    def confirm_user
+      @user.confirm
+    end
+  end
+end

data/app/commands/decidim/create_omniauth_registration.rb

@@ -36,6 +36,8 @@ module Decidim
         trigger_omniauth_registration
 
         broadcast(:ok, @user)
+      rescue NeedTosAcceptance
+        broadcast(:add_tos_errors, @user)
       rescue ActiveRecord::RecordInvalid => e
         broadcast(:error, e.record)
       end
@@ -73,10 +75,12 @@ module Decidim
           file = url.open
           @user.avatar.attach(io: file, filename:)
         end
+        @user.tos_agreement = form.tos_agreement
+        @user.accepted_tos_version = Time.current
+        raise NeedTosAcceptance if @user.tos_agreement.blank?
+
         @user.skip_confirmation! if verified_email
-        @user.tos_agreement = "1"
         @user.save!
-
         @user.after_confirmation if verified_email
       end
     end
@@ -129,11 +133,17 @@ module Decidim
         name: form.name,
         nickname: form.normalized_nickname,
         avatar_url: form.avatar_url,
-        raw_data: form.raw_data
+        raw_data: form.raw_data,
+        tos_agreement: form.tos_agreement,
+        newsletter_notifications_at: form.newsletter_at,
+        accepted_tos_version: form.current_organization.tos_version
       )
     end
   end
 
+  class NeedTosAcceptance < StandardError
+  end
+
   class InvalidOauthSignature < StandardError
   end
 end

data/app/commands/decidim/create_report.rb

@@ -53,7 +53,7 @@ module Decidim
     end
 
     def participatory_space_moderators
-      @participatory_space_moderators ||= participatory_space.moderators
+      @participatory_space_moderators ||= participatory_space.respond_to?(:moderators) ? participatory_space.moderators : []
     end
 
     def send_report_notification_to_moderators
@@ -84,9 +84,5 @@ module Decidim
         ReportedMailer.hide(moderator, @report).deliver_later
       end
     end
-
-    def participatory_space
-      @participatory_space ||= @reportable.component&.participatory_space || @reportable.try(:participatory_space)
-    end
   end
 end

data/app/commands/decidim/create_user_group.rb

@@ -19,7 +19,7 @@ module Decidim
     def call
       return broadcast(:invalid) if form.invalid?
 
-      transaction do
+      with_events(with_transaction: true) do
         create_user_group
         create_membership
       end
@@ -30,7 +30,11 @@ module Decidim
 
     private
 
-    attr_reader :form
+    attr_reader :form, :user_group
+
+    def event_arguments
+      { resource: user_group }
+    end
 
     def create_user_group
       @user_group = UserGroup.create!(

data/app/commands/decidim/destroy_account.rb

@@ -37,6 +37,9 @@ module Decidim
       current_user.name = ""
       current_user.nickname = ""
       current_user.email = ""
+      current_user.personal_url = ""
+      current_user.about = ""
+      current_user.notifications_sending_frequency = "none"
       current_user.delete_reason = @form.delete_reason
       current_user.admin = false if current_user.admin?
       current_user.deleted_at = Time.current

data/app/commands/decidim/destroy_ephemeral_user.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A command with all the business logic to create an ephemeral user.
+  class DestroyEphemeralUser < Decidim::Command
+    # Public: Initializes the command.
+    #
+    # user - An ephemeral user.
+    def initialize(user)
+      @user = user
+    end
+
+    # Executes the command. Broadcasts these events:
+    #
+    # - :ok when everything is valid.
+    # - :invalid if the user is not ephemeral
+    #
+    # Returns nothing.
+    def call
+      return broadcast(:invalid) unless user.ephemeral?
+
+      destroy_pending_authorizations!
+      destroy_account!
+
+      broadcast(:ok)
+    rescue ActiveRecord::RecordInvalid
+      broadcast(:invalid)
+    end
+
+    private
+
+    attr_reader :user
+
+    def destroy_pending_authorizations!
+      Decidim::Authorization.where(user:, granted_at: nil).destroy_all
+    end
+
+    def destroy_account!
+      user.invalidate_all_sessions!
+
+      user.delete_reason = "Ephemeral user session expired"
+      user.deleted_at = Time.current
+      user.skip_reconfirmation!
+      user.save!
+    end
+  end
+end

data/app/commands/decidim/update_account.rb

@@ -20,10 +20,12 @@ module Decidim
       update_password
 
       if current_user.valid?
-        changes = current_user.changed
-        current_user.save!
+        with_events do
+          changes = current_user.changed
+          current_user.save!
+          send_update_summary!(changes)
+        end
         notify_followers
-        send_update_summary!(changes)
         broadcast(:ok, current_user.unconfirmed_email.present?)
       else
         [:avatar, :password].each do |key|
@@ -33,6 +35,12 @@ module Decidim
       end
     end
 
+    protected
+
+    def event_arguments
+      { resource: current_user }
+    end
+
     private
 
     attr_reader :form

data/app/commands/decidim/update_notifications_settings.rb

@@ -30,6 +30,7 @@ module Decidim
       current_user.notification_types = @form.notification_types
       current_user.direct_message_types = @form.direct_message_types
       current_user.email_on_moderations = @form.email_on_moderations
+      current_user.email_on_assigned_proposals = @form.email_on_assigned_proposals
       current_user.notification_settings = current_user.notification_settings.merge(@form.notification_settings)
       current_user.notifications_sending_frequency = @form.notifications_sending_frequency
     end