decidim-core 0.30.0.rc2 → 0.30.0.rc3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.30.0.rc2
+  version: 0.30.0.rc3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-03 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -780,28 +780,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc2
+        version: 0.30.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc2
+        version: 0.30.0.rc3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc2
+        version: 0.30.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0.rc2
+        version: 0.30.0.rc3
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -843,8 +843,6 @@ files:
 - app/cells/decidim/author/contact.erb
 - app/cells/decidim/author/date.erb
 - app/cells/decidim/author/endorsements.erb
-- app/cells/decidim/author/flag.erb
-- app/cells/decidim/author/flag_user.erb
 - app/cells/decidim/author/name.erb
 - app/cells/decidim/author/profile_minicard.erb
 - app/cells/decidim/author/show.erb
@@ -996,9 +994,6 @@ files:
 - app/cells/decidim/endorsers_list/full.erb
 - app/cells/decidim/endorsers_list/show.erb
 - app/cells/decidim/endorsers_list_cell.rb
-- app/cells/decidim/flag_modal/flag_user.erb
-- app/cells/decidim/flag_modal/show.erb
-- app/cells/decidim/flag_modal_cell.rb
 - app/cells/decidim/follow_button/content.erb
 - app/cells/decidim/follow_button/show.erb
 - app/cells/decidim/follow_button_cell.rb
@@ -1074,8 +1069,6 @@ files:
 - app/cells/decidim/profile_actions/show.erb
 - app/cells/decidim/profile_actions_cell.rb
 - app/cells/decidim/profile_cell.rb
-- app/cells/decidim/profile_sidebar/show.erb
-- app/cells/decidim/profile_sidebar_cell.rb
 - app/cells/decidim/progress_bar/show.erb
 - app/cells/decidim/progress_bar_cell.rb
 - app/cells/decidim/public_participation/show.erb
@@ -1084,6 +1077,10 @@ files:
 - app/cells/decidim/report_button/flag_modal.erb
 - app/cells/decidim/report_button/show.erb
 - app/cells/decidim/report_button_cell.rb
+- app/cells/decidim/report_user_button/already_reported_modal.erb
+- app/cells/decidim/report_user_button/flag_modal.erb
+- app/cells/decidim/report_user_button/show.erb
+- app/cells/decidim/report_user_button_cell.rb
 - app/cells/decidim/reported_content/show.erb
 - app/cells/decidim/reported_content_cell.rb
 - app/cells/decidim/represent_user_group/show.erb
@@ -1421,6 +1418,7 @@ files:
 - app/jobs/decidim/machine_translation_resource_job.rb
 - app/jobs/decidim/machine_translation_save_job.rb
 - app/jobs/decidim/metric_job.rb
+- app/jobs/decidim/migrate/paper_trail_job.rb
 - app/jobs/decidim/newsletters_opt_in_job.rb
 - app/jobs/decidim/notification_generator_for_recipient_job.rb
 - app/jobs/decidim/notification_generator_job.rb

data/app/cells/decidim/author/flag.erb

@@ -1,6 +0,0 @@
-<button type="button" data-open="<%= current_user.present? ? "flagModal" : "loginModal" %>" title="<%= t("report", scope: "decidim.shared.flag_modal" ) %>" aria-controls="<%= current_user.present? ? "flagModal" : "loginModal" %>" aria-haspopup="true" tabindex="0">
-  <%= icon "flag", aria_hidden: true, class: "icon--small", role: "img", "aria-hidden": true %>
-  <span>
-    <%= t("report", scope: "decidim.shared.flag_modal" ) %>
-  </span>
-</button>

data/app/cells/decidim/author/flag_user.erb

@@ -1,14 +0,0 @@
-<% if user_flaggable? && model.try(:id) != current_user.try(:id) %>
-  <%= cell(
-        "decidim/button",
-        { icon: "flag-line", text: t("decidim.shared.flag_modal.report") },
-        button_classes: "button button__sm button__text-secondary only:m-auto",
-        html_options: {
-          "data-open" => current_user.present? ? "flagUserModal" : "loginModal",
-          "aria-controls" => current_user.present? ? "flagUserModal" : "loginModal",
-          "aria-haspopup" => "dialog"
-        }
-      ) %>
-
-  <%= cell("decidim/flag_modal", model).flag_user %>
-<% end %>

data/app/cells/decidim/flag_modal/flag_user.erb

@@ -1,34 +0,0 @@
-<div class="flag-modal hidden" id="flagUserModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="flagUserModal-label">
-  <div>
-    <h3 id="flagUserModal-label"><%= t("decidim.shared.flag_user_modal.title") %></h3>
-    <button class="close-button" data-close aria-label="<%= t("decidim.shared.flag_user_modal.close") %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <% if model.reported_by? current_user %>
-    <p><%= t("decidim.shared.flag_user_modal.already_reported") %></p>
-  <% else %>
-    <p><%= t("decidim.shared.flag_user_modal.description") %></p>
-    <%= decidim_form_for report_form, url: decidim.report_user_path(sgid: model.to_sgid.to_s), method: :post do |f| %>
-      <%= f.collection_radio_buttons :reason, [
-          [:spam, t("decidim.shared.flag_user_modal.spam")],
-          [:offensive, t("decidim.shared.flag_user_modal.offensive")],
-          [:does_not_belong, t("decidim.shared.flag_user_modal.does_not_belong", organization_name: current_organization.name)]
-      ], :first, :last do |builder| %>
-        <%= builder.label { builder.radio_button + builder.text } %>
-      <% end %>
-      <%= f.text_area :details, rows: 4 %>
-      <% if current_user&.admin? %>
-        <%= f.check_box :block, label: t("decidim.shared.flag_user_modal.block"),
-                                include_hidden: false,
-                                data: {
-                                  label_action: t("decidim.shared.flag_user_modal.block"),
-                                  label_report: t("decidim.shared.flag_user_modal.report"),
-                                  block: "true"
-                                } %>
-        <%= f.check_box :hide, label: t("decidim.shared.flag_user_modal.hide"), label_options: { id: "block_and_hide" } %>
-      <% end %>
-      <%= f.submit t("decidim.shared.flag_user_modal.report") %>
-    <% end %>
-  <% end %>
-</div>

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

@@ -1,52 +0,0 @@
-<%= decidim_modal id: modal_id do %>
-  <%= decidim_form_for report_form, url: decidim.report_path(sgid: model.to_sgid.to_s), method: :post, html: { id: nil, class: "modal__report form-defaults" } do |f| %>
-    <div data-dialog-container>
-      <%= icon "flag-line", class: "inline-block align-middle" %>
-      <h3 data-dialog-title id="dialog-title-<%= modal_id %>">
-        <%= t("decidim.shared.flag_modal.title") %>
-      </h3>
-
-      <% if model.reported_by? current_user %>
-        <div>
-          <p class="modal__report-text">
-            <%= t("decidim.shared.flag_modal.already_reported") %>
-          </p>
-        </div>
-      <% else %>
-        <div>
-          <p class="modal__report-text">
-            <%= t("decidim.shared.flag_modal.description") %>
-          </p>
-          <fieldset>
-            <legend><%= t("decidim.shared.flag_modal.reason") %></legend>
-            <%= f.collection_radio_buttons :reason, [
-              [:spam, t("decidim.shared.flag_modal.spam")],
-              [:offensive, t("decidim.shared.flag_modal.offensive")],
-              [:does_not_belong, t("decidim.shared.flag_modal.does_not_belong", organization_name: current_organization.name)]
-            ], :first, :last do |builder| %>
-              <div class="modal__report-container__radio">
-                <%= builder.radio_button(id: builder.value) %>
-                <label for="<%= builder.value %>">
-                  <%= builder.text %>
-                </label>
-              </div>
-            <% end %>
-          </fieldset>
-          <% unless model.reported_by? current_user %>
-            <%= f.text_area :details, class: "w-full rounded border min-h-[160px] border-text-gray-2 mt-2", id: "#{modal_id}_details", label_options: { for: "#{modal_id}_details", class: "text-gray-2" } %>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-    <div data-dialog-actions>
-      <% unless model.reported_by? current_user %>
-        <button type="submit" class="button button__lg button__secondary">
-          <span>
-            <%= t("decidim.shared.flag_modal.report") %>
-          </span>
-          <%= icon "arrow-right-line" %>
-        </button>
-      <% end %>
-    </div>
-  <% end %>
-<% end %>

data/app/cells/decidim/flag_modal_cell.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  class FlagModalCell < Decidim::ViewModel
-    include ActionView::Helpers::FormOptionsHelper
-
-    def flag_user
-      render
-    end
-
-    def cache_hash
-      hash = []
-      hash.push(I18n.locale)
-      hash.push(current_user.try(:id))
-      hash.push(model.reported_by?(current_user) ? 1 : 0)
-      hash.push(model.class.name.gsub("::", ":"))
-      hash.push(model.id)
-      hash.join(Decidim.cache_key_separator)
-    end
-
-    private
-
-    def frontend_administrable?
-      author.respond_to?(:nickname) &&
-        model.can_be_administered_by?(current_user) &&
-        (model.respond_to?(:official?) && !model.official?)
-    end
-
-    def link_to_profile
-      author.presenter.profile_url
-    end
-
-    def author
-      model.try(:creator_identity) || model.try(:normalized_author)
-    end
-
-    def user_report_form
-      Decidim::ReportForm.from_params(reason: "spam")
-    end
-
-    def modal_id
-      options[:modal_id] || "flagModal"
-    end
-
-    def hide_checkbox_id
-      @hide_checkbox_id ||= Digest::MD5.hexdigest("report_form_hide_#{model.class.name}_#{model.id}")
-    end
-
-    def report_form
-      @report_form ||= begin
-        context = { can_hide: model.try(:can_be_administered_by?, current_user) }
-        Decidim::ReportForm.new(reason: "spam").with_context(context)
-      end
-    end
-  end
-end

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

@@ -1,167 +0,0 @@
-<div class="card profile--sidebar">
-  <%= image_tag profile_user.avatar_url(:profile), class: "card__image card__image--larger", alt: "avatar #{profile_user.name}" %>
-  <div>
-    <h1>
-      <strong><%= profile_user.name %></strong>
-      <br>
-      <span>
-        <%= profile_user.nickname %> <br>
-      </span>
-      <% if user_flaggable? %>
-        <span class="user-report_link">
-          <%== cell("decidim/author", profile_user, from:profile_user).flag_user %>
-        </span>
-        &nbsp;
-      <% end %>
-      <% if can_contact_user? %>
-        <span>
-          <%= link_to_current_or_new_conversation_with(profile_holder) %>
-        </span>
-      <% end %>
-    </h1>
-    <div>
-      <small><%= decidim_html_escape(profile_user.about.to_s) %></small>
-    </div>
-    <% if profile_user.personal_url.present? %>
-      <%= link_to html_truncate(profile_user.personal_url.gsub(%r{https?\:\/\/}, ""), length: 30), profile_user.personal_url, rel: "nofollow noopener noreferrer ugc" %>
-    <% end %>
-  </div>
-  <% if profile_user.badge.present? %>
-    <div>
-      <span>
-        <%= icon profile_user.badge, class: "author__verified", aria_label: t("decidim.profiles.show.officialized"), role: "img" %>
-      </span>
-      <span>
-        <%= officialization_text %>
-      </span>
-    </div>
-  <% end %>
-  <%= render_hook(:user_profile_bottom) %>
-  <div>
-    <div class="text-center">
-      <% if profile_user_can_follow? %>
-        <div>
-          <%= link_to profile_followers_path(nickname: profile_holder.nickname) do %>
-            <%= t("decidim.profiles.show.followers") %>
-            <div><strong><%= profile_user.followers_count %></strong></div>
-          <% end %>
-        </div>
-        <div>
-          <%= link_to profile_following_path(nickname: profile_holder.nickname) do %>
-            <%= t("decidim.profiles.show.following") %>
-            <div><strong><%= profile_user.following_count %></strong></div>
-          <% end %>
-        </div>
-      <% else %>
-        <div>
-          <%= link_to profile_followers_path(nickname: profile_holder.nickname) do %>
-            <%= t("decidim.profiles.show.followers") %>
-            <div><%= profile_user.followers_count %></div>
-          <% end %>
-        </div>
-        <div>
-          <%= link_to profile_members_path(nickname: profile_holder.nickname) do %>
-            <%= t("decidim.profiles.show.members") %>
-            <div><%= profile_user.members_count %></div>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-  </div>
-
-  <% if current_organization.badges_enabled? && badge_statuses.any? %>
-    <div>
-      <div>
-        <div class="row column">
-          <strong><%= t("decidim.profiles.sidebar.badges.title") %></strong>
-          <div>
-            <div data-tooltip data-position="top" title="<%= t("decidim.profiles.sidebar.badges.info") %>" data-yeti-box="badges-tooltip" data-toggle="badges-tooltip" data-resize="badges-tooltip" data-events="resize">
-              <%= icon "info", class: "icon--small", role: "img", "aria-hidden": true %>
-            </div>
-          </div>
-        </div>
-        <div class="row collapse">
-          <% badge_statuses.each do |status| %>
-            <div class="column">
-              <div>
-                <%= cell("decidim/badge", profile_holder, badge: status.badge, status:).call(:small) %>
-              </div>
-            </div>
-          <% end %>
-        </div>
-      </div>
-    </div>
-  <% end %>
-</div>
-
-<div class="row">
-  <div class="column">
-    <% if own_profile? %>
-      <div class="text-center">
-        <%= link_to decidim.account_path, class: "button" do %>
-          <span>
-            <%= t("decidim.profiles.user.edit_profile") %>
-          </span>
-        <% end %>
-      </div>
-      <% if user_groups_enabled? %>
-        <div class="text-center">
-          <%= link_to decidim.new_group_path, class: "button hollow" do %>
-            <span>
-              <%= t("decidim.profiles.user.create_user_group") %>
-            </span>
-          <% end %>
-        </div>
-      <% end %>
-    <% elsif logged_in? %>
-      <%= cell "decidim/follow_button", profile_holder %>
-    <% end %>
-
-    <% if user_groups_enabled? %>
-      <% if can_edit_user_group_profile? %>
-        <% if user_group_email_to_be_confirmed? %>
-          <div class="text-center">
-            <%= link_to decidim.group_email_confirmation_path(model.nickname), method: :post, class: "button hollow expanded" do %>
-              <span>
-                <%= t("decidim.profiles.user.resend_email_confirmation_instructions") %>
-              </span>
-            <% end %>
-          </div>
-        <% end %>
-
-        <div class="text-center">
-          <%= link_to t("decidim.profiles.user.edit_user_group"), edit_group_path(profile_holder.nickname) %>
-        </div>
-        <div class="text-center">
-          <%= link_to t("decidim.profiles.user.manage_user_group_users"), profile_group_members_path(profile_holder.nickname) %>
-        </div>
-        <div class="text-center">
-          <%= link_to t("decidim.profiles.user.manage_user_group_admins"), profile_group_admins_path(profile_holder.nickname) %>
-        </div>
-        <div class="text-center">
-          <%= link_to t("decidim.profiles.user.invite_user"), group_invites_path(profile_holder.nickname) %>
-        </div>
-      <% end %>
-
-      <% if can_join_user_group? %>
-        <div class="text-center">
-          <%= link_to decidim.group_join_requests_path(model.nickname), method: :post, class: "button hollow expanded" do %>
-            <span>
-              <%= t("decidim.profiles.user.join_user_group") %>
-            </span>
-          <% end %>
-        </div>
-      <% end %>
-
-      <% if can_leave_group? %>
-        <div class="text-center">
-          <%= link_to decidim.leave_group_path(model.nickname), method: :delete, data: { confirm: t("decidim.groups.actions.are_you_sure") }, class: "button hollow expanded" do %>
-            <span>
-              <%= t("decidim.profiles.user.leave_user_group") %>
-            </span>
-          <% end %>
-        </div>
-      <% end %>
-    <% end %>
-  </div>
-</div>

data/app/cells/decidim/profile_sidebar_cell.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  class ProfileSidebarCell < Decidim::ProfileCell
-    include Decidim::Messaging::ConversationHelper
-    include Decidim::ViewHooksHelper
-    include Decidim::CellsHelper
-
-    helper_method :profile_user
-
-    def show
-      render :show
-    end
-
-    private
-
-    def profile_user
-      @profile_user ||= present(model)
-    end
-
-    def can_contact_user?
-      !current_user || (current_user && current_user != model && profile_user.can_be_contacted?)
-    end
-
-    def officialization_text
-      profile_user.officialization_text
-    end
-
-    def can_edit_user_group_profile?
-      return false unless current_user
-      return false if model.is_a?(Decidim::User)
-
-      Decidim::UserGroups::ManageableUserGroups.for(current_user).include?(model)
-    end
-
-    def profile_user_can_follow?
-      profile_user.can_follow?
-    end
-
-    def badge_statuses
-      Decidim::Gamification.badges.select { |badge| badge.valid_for?(profile_holder) }.map do |badge|
-        status = Decidim::Gamification.status_for(profile_holder, badge.name)
-        status.level.positive? ? status : nil
-      end.compact
-    end
-
-    def can_join_user_group?
-      return false unless current_user
-      return false if model.is_a?(Decidim::User)
-
-      Decidim::UserGroupMembership.where(user: current_user, user_group: model).empty?
-    end
-
-    def can_leave_group?
-      return false unless current_user
-      return false if model.is_a?(Decidim::User)
-
-      Decidim::UserGroupMembership.where(user: current_user, user_group: model).any?
-    end
-
-    def user_group_email_to_be_confirmed?
-      return false unless current_user
-      return false if model.is_a?(Decidim::User)
-
-      !model.confirmed?
-    end
-  end
-end