decidim-core 0.29.3 → 0.30.0.rc1

data/app/cells/decidim/onboarding_action_message_cell.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders an announcement of pending onboarding action
+  # if exists for a user
+  #
+  # The `model` is expected to be a user
+  #
+  class OnboardingActionMessageCell < Decidim::ViewModel
+    include ActiveLinkTo
+
+    alias user model
+
+    def show
+      return if is_active_link?(onboarding_path)
+      return unless onboarding_manager.valid?
+      return unless onboarding_manager.pending_action?
+      return if authorization_status == :unauthorized
+      return if pending_authorization_link_active?
+      return if ephemeral_authorized?
+
+      render :show
+    end
+
+    private
+
+    def onboarding_path
+      decidim_verifications.onboarding_pending_authorizations_path
+    end
+
+    def onboarding_manager
+      @onboarding_manager ||= OnboardingManager.new(user)
+    end
+
+    def authorizations
+      @authorizations ||= action_authorized_to(onboarding_manager.action, **onboarding_manager.action_authorized_resources)
+    end
+
+    def authorization_status
+      @authorization_status ||= authorizations.global_code
+    end
+
+    def pending_authorization_link_active?
+      return unless authorizations.single_authorization_required?
+
+      is_active_link? authorizations.statuses.first.current_path
+    end
+
+    def message_text
+      t(
+        "cta_html",
+        scope: "decidim.onboarding_action_message",
+        link_text:,
+        path: onboarding_path,
+        action: onboarding_manager.action_text.downcase,
+        resource_name: onboarding_manager.model_name.human.downcase,
+        resource_title: decidim_sanitize_translated(onboarding_manager.model_title)
+      )
+    end
+
+    def link_text
+      if onboarding_manager.finished_verifications?
+        t("click_link", scope: "decidim.onboarding_action_message")
+      else
+        t("finish_authorization_process", scope: "decidim.onboarding_action_message")
+      end
+    end
+
+    def ephemeral_authorized?
+      user.ephemeral? && authorization_status == :ok
+    end
+
+    def info_icon
+      icon("information-line")
+    end
+
+    def close_icon
+      icon("close-line")
+    end
+  end
+end

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

@@ -3,9 +3,7 @@
     <%= render :metadata %>
     <%= cell "decidim/content_blocks/menu_breadcrumb_last_activity", model, hide_participatory_space: true %>
   </div>
-  <nav role="navigation" aria-label="<%= t("decidim.accessibility.secondary_menu") %>">
-    <ul class="menu-bar__secondary-dropdown__menu">
-      <%= render :links %>
-    </ul>
-  </nav>
+  <ul class="menu-bar__secondary-dropdown__menu">
+    <%= render :links %>
+  </ul>
 </div>

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/profile_actions/show.erb

@@ -7,6 +7,6 @@
   <%= cell("decidim/follow_button", profile_holder) %>
 
   <% if user_flaggable? && model.try(:id) != current_user.try(:id) %>
-    <%= cell("decidim/report_user_button", profile_holder) %>
+    <%= cell("decidim/report_button", profile_holder) %>
   <% end %>
 </div>

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

@@ -0,0 +1,167 @@
+<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

@@ -0,0 +1,68 @@
+# 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

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/already_reported_modal.erb

@@ -1,10 +1,10 @@
 <%= decidim_modal id: modal_id, class: "flag-modal" do %>
   <div data-dialog-container>
     <%= icon "flag-line" %>
-    <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
+    <h2 id="dialog-title-flagModal" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
     <div>
       <div class="form__wrapper flag-modal__form">
-        <p class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.already_reported") %></p>
+        <p id="dialog-desc-flagModal" class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.already_reported") %></p>
       </div>
     </div>
   </div>

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

@@ -2,7 +2,7 @@
   <%= form_for report_form, builder:, url: report_path, method: :post, html: { id: nil } do |f| %>
     <div data-dialog-container>
       <%= icon "flag-line" %>
-      <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
+      <h2 id="dialog-title-<%= modal_id %>" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
       <div>
         <div class="form__wrapper flag-modal__form">
           <p id="dialog-desc-<%= modal_id %>" class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.description") %></p>
@@ -18,18 +18,32 @@
           <%= f.text_area :details, rows: 4, label_options: { class: "flag-modal__form-textarea-label", for: nil }, id: nil %>
 
           <% if frontend_administrable? %>
-            <%= f.check_box :hide,
-                            label: t("decidim.shared.flag_modal.hide_content"),
-                            include_hidden: false,
-                            id: hide_checkbox_id,
-                            data: {
-                              label_action: t("decidim.shared.flag_modal.hide"),
-                              label_report: t("decidim.shared.flag_modal.report"),
-                              hide: "true"
-                            },
-                            label_options: {
-                              for: hide_checkbox_id
-                            } %>
+            <% if user_reportable? %>
+              <% 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: { class: :invisible, id: "block_and_hide" } %>
+              <% end %>
+            <% else %>
+              <%= f.check_box :hide,
+                              label: t("decidim.shared.flag_modal.hide_content"),
+                              include_hidden: false,
+                              id: hide_checkbox_id,
+                              data: {
+                                label_action: t("decidim.shared.flag_modal.hide"),
+                                label_report: t("decidim.shared.flag_modal.report"),
+                                hide: "true"
+                              },
+                              label_options: {
+                                for: hide_checkbox_id
+                              } %>
+            <% end %>
           <% end %>
 
         </div>

data/app/cells/decidim/report_button_cell.rb

@@ -11,6 +11,8 @@ module Decidim
     end
 
     def frontend_administrable?
+      return true if user_reportable? && current_user&.admin?
+
       user_entity? &&
         model.can_be_administered_by?(current_user) &&
         (model.respond_to?(:official?) && !model.official?)
@@ -30,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("::", ":"))
@@ -45,12 +48,16 @@ module Decidim
       options[:modal_id] || "flagModal"
     end
 
+    def user_reportable?
+      model.is_a?(Decidim::UserReportable)
+    end
+
     def report_form
-      @report_form ||= Decidim::ReportForm.new(reason: "spam")
+      @report_form ||= user_reportable? ? Decidim::ReportForm.from_params(reason: "spam") : Decidim::ReportForm.new(reason: "spam")
     end
 
     def report_path
-      @report_path ||= decidim.report_path(sgid: model.to_sgid.to_s)
+      @report_path ||= user_reportable? ? decidim.report_user_path(sgid: model.to_sgid.to_s) : decidim.report_path(sgid: model.to_sgid.to_s)
     end
 
     def builder

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/resource_types_filter/show.erb

@@ -11,7 +11,7 @@
   <ul id="dropdown-menu-resource">
     <% resource_types.each do |resource_type| %>
       <li role="menuitem">
-        <%= link_to filter_url(resource_type[0]), class: "filter#{" is-active" if filter_param == resource_type[0]}" do %>
+        <%= link_to decidim.last_activities_path(filter: { with_resource_type: resource_type[0] } ), class: "filter#{" is-active" if filter_param == resource_type[0]}" do %>
           <span class="sr-only"><%= resource_type[1] %></span>
           <%= text_with_resource_icon(*resource_type) %>
         <% end %>

data/app/cells/decidim/resource_types_filter_cell.rb

@@ -27,12 +27,8 @@ module Decidim
       options[:id] || "filters"
     end
 
-    def filter_url(resource_type)
-      if options[:source] == :last_activities
-        last_activities_path(filter: { with_resource_type: resource_type })
-      else
-        profile_activity_path(nickname: params[:nickname], filter: { resource_type: })
-      end
+    def form_path
+      options[:form_path]
     end
 
     def filter_param_key
@@ -43,6 +39,10 @@ module Decidim
       @filter_param ||= params.dig(:filter, filter_param_key) || all_types_key
     end
 
+    def filter
+      options[:filter]
+    end
+
     def all_resource_types_option
       [all_types_key, I18n.t("all", scope: "decidim.last_activities")]
     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 %>