Redesign: replace cells with redesigned versions if present and updat…

…e references (#11123) * Replace cells with redesigned versions if present and update references * Adapt test * Remove unused translations * Remove REDESIGN_PENDING comment * Update decidim-core/app/cells/decidim/author/flag_user.erb Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro> * Update decidim-core/app/cells/decidim/card_cell.rb Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro> * Update decidim-core/app/cells/decidim/endorsement_buttons_cell.rb Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro> * Improve official author presenter identification in card cell * Disable endorse button if endorsements blocked even when user is not logged in * Adapt test * Enable redesign in admin tests * Adapt admin pasword tests to redesign * Update accept_confirm calls with admin --------- Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
decidim · Jul 7, 2023 · f78a24b · f78a24b
1 parent 227e4d5
commit f78a24b
Show file tree

Hide file tree

Showing 117 changed files with 469 additions and 1,482 deletions.
diff --git a/.github/workflows/ci_admin.yml b/.github/workflows/ci_admin.yml
@@ -24,7 +24,7 @@ env:
   PARALLEL_TEST_PROCESSORS: 2
   CODECOV_TOKEN: bc15b944-6b42-420a-b3f9-a5a8fb214326
   WEBPACKER_RUNTIME_COMPILE: "false"
-  REDESIGN_ENABLED: "false"
+  REDESIGN_ENABLED: "true"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

diff --git a/.github/workflows/ci_admin_system.yml b/.github/workflows/ci_admin_system.yml
@@ -24,7 +24,7 @@ env:
   PARALLEL_TEST_PROCESSORS: 2
   CODECOV_TOKEN: bc15b944-6b42-420a-b3f9-a5a8fb214326
   WEBPACKER_RUNTIME_COMPILE: "false"
-  REDESIGN_ENABLED: "false"
+  REDESIGN_ENABLED: "true"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
@@ -363,6 +363,9 @@ ignore_unused:
   - layouts.decidim.conferences.conference.*
   - decidim.consultations.show.footer_button_text.*
   - decidim.admin.conflicts.*
+  - decidim.profiles.show.badges
+  - decidim.profiles.show.conversations
+  - decidim.profiles.show.groups
   - decidim.profiles.show.view_full_profile
   - layouts.decidim.assemblies.promoted_assembly.take_part
   - versions.dropdown.option_*

diff --git a/decidim-admin/spec/shared/manage_impersonations_examples.rb b/decidim-admin/spec/shared/manage_impersonations_examples.rb
@@ -262,6 +262,10 @@
       end
 
       expect(page).to have_content("successfully")
+      within_user_menu do
+        click_link "My public profile"
+      end
+
       expect(page).to have_content(managed_user.name)
 
       relogin_as user

diff --git a/decidim-admin/spec/system/admin_manages_newsletters_spec.rb b/decidim-admin/spec/system/admin_manages_newsletters_spec.rb
@@ -206,7 +206,7 @@ def select_all
           end
 
           within ".button--double" do
-            accept_confirm { find("*", text: "Deliver").click }
+            accept_confirm(admin: true) { find("*", text: "Deliver").click }
           end
 
           expect(page).to have_content("Newsletters")
@@ -243,7 +243,7 @@ def select_all
           end
 
           within ".button--double" do
-            accept_confirm { find("*", text: "Deliver").click }
+            accept_confirm(admin: true) { find("*", text: "Deliver").click }
           end
 
           expect(page).to have_content("Newsletters")
@@ -280,7 +280,7 @@ def select_all
           end
 
           within ".button--double" do
-            accept_confirm { find("*", text: "Deliver").click }
+            accept_confirm(admin: true) { find("*", text: "Deliver").click }
           end
 
           expect(page).to have_content("Newsletters")
@@ -324,7 +324,7 @@ def select_all
           end
 
           within ".button--double" do
-            accept_confirm { find("*", text: "Deliver").click }
+            accept_confirm(admin: true) { find("*", text: "Deliver").click }
           end
 
           expect(page).to have_content("Newsletters")
@@ -345,7 +345,7 @@ def select_all
       visit decidim_admin.newsletters_path
 
       within("tr[data-newsletter-id=\"#{newsletter.id}\"]") do
-        accept_confirm { click_link "Delete" }
+        accept_confirm(admin: true) { click_link "Delete" }
       end
 
       expect(page).to have_content("successfully")

diff --git a/decidim-admin/spec/system/admin_manages_organization_admins_spec.rb b/decidim-admin/spec/system/admin_manages_organization_admins_spec.rb
@@ -84,7 +84,7 @@
         expect(page).to have_content(other_admin.name)
 
         within "tr[data-user-id=\"#{other_admin.id}\"]" do
-          accept_confirm { click_link "Delete" }
+          accept_confirm(admin: true) { click_link "Delete" }
         end
 
         expect(page).not_to have_content(other_admin.name)

diff --git a/decidim-admin/spec/system/admin_manages_organization_area_types_spec.rb b/decidim-admin/spec/system/admin_manages_organization_area_types_spec.rb
@@ -88,7 +88,7 @@
 
     it "can delete them" do
       within find("tr", text: translated(area_type.name)) do
-        accept_confirm { click_link "Delete" }
+        accept_confirm(admin: true) { click_link "Delete" }
       end
 
       expect(page).to have_admin_callout("successfully")

diff --git a/decidim-admin/spec/system/admin_manages_organization_areas_spec.rb b/decidim-admin/spec/system/admin_manages_organization_areas_spec.rb
@@ -100,7 +100,7 @@
 
   def click_delete_area
     within find("tr", text: translated(area.name)) do
-      accept_confirm { click_link "Delete" }
+      accept_confirm(admin: true) { click_link "Delete" }
     end
   end
 end
diff --git a/decidim-admin/spec/system/admin_manages_organization_scope_types_spec.rb b/decidim-admin/spec/system/admin_manages_organization_scope_types_spec.rb
@@ -88,7 +88,7 @@
 
     it "can delete them" do
       within find("tr", text: translated(scope_type.name)) do
-        accept_confirm { click_link "Delete" }
+        accept_confirm(admin: true) { click_link "Delete" }
       end
 
       expect(page).to have_admin_callout("successfully")

diff --git a/decidim-admin/spec/system/admin_manages_organization_scopes_spec.rb b/decidim-admin/spec/system/admin_manages_organization_scopes_spec.rb
@@ -70,7 +70,7 @@
 
       it "can delete them" do
         within find("tr", text: translated(scope.name)) do
-          accept_confirm { click_link "Delete" }
+          accept_confirm(admin: true) { click_link "Delete" }
         end
 
         expect(page).to have_admin_callout("successfully")

diff --git a/decidim-admin/spec/system/admin_passwords_spec.rb b/decidim-admin/spec/system/admin_passwords_spec.rb
@@ -32,8 +32,9 @@
     it "cannot dismiss password change" do
       manual_login(user.email, password)
       expect(page).to have_content("Password change")
-      click_link "user-menu-control"
-      click_link "Admin dashboard"
+      within "#admin-bar" do
+        click_link "Admin dashboard"
+      end
       expect(page).to have_content("You need to change your password in order to proceed further")
       expect(page).to have_content("Password change")
       expect(page).to have_current_path(decidim.change_password_path)
@@ -66,7 +67,7 @@
   end
 
   def manual_login(email, password)
-    click_link "Sign In"
+    click_link "Sign In", match: :first
     fill_in :session_user_email, with: email
     fill_in :session_user_password, with: password
     click_button "Log in"

diff --git a/decidim-admin/spec/system/static_pages_spec.rb b/decidim-admin/spec/system/static_pages_spec.rb
@@ -137,7 +137,7 @@
 
       it "can delete them" do
         within find(".card", text: translated(topic.title)) do
-          accept_confirm { click_link "Remove topic" }
+          accept_confirm(admin: true) { click_link "Remove topic" }
         end
 
         expect(page).to have_admin_callout("successfully")
@@ -248,7 +248,7 @@
 
       it "can delete them" do
         within find("tr", text: translated(decidim_page.title)) do
-          accept_confirm { click_link "Delete" }
+          accept_confirm(admin: true) { click_link "Delete" }
         end
 
         expect(page).to have_admin_callout("successfully")

diff --git a/decidim-comments/app/cells/decidim/comments/comment/show.erb b/decidim-comments/app/cells/decidim/comments/comment/show.erb
@@ -6,7 +6,7 @@
   <% else %>
     <div class="comment__header">
       <span class="font-bold">
-        <%== cell("decidim/redesigned_author", author_presenter) %>
+        <%== cell("decidim/author", author_presenter) %>
       </span>
       <span class="text-gray-2 text-sm">
         <%= time_tag created_at, time_ago_in_words(created_at) %>

diff --git a/...ells/decidim/redesigned_author/avatar.erb → ...-core/app/cells/decidim/author/avatar.erb b/...ells/decidim/redesigned_author/avatar.erb → ...-core/app/cells/decidim/author/avatar.erb
diff --git a/...ecidim/redesigned_author/avatar_image.erb → ...app/cells/decidim/author/avatar_image.erb b/...ecidim/redesigned_author/avatar_image.erb → ...app/cells/decidim/author/avatar_image.erb
diff --git a/...ecidim/redesigned_author/cancelled_on.erb → ...app/cells/decidim/author/cancelled_on.erb b/...ecidim/redesigned_author/cancelled_on.erb → ...app/cells/decidim/author/cancelled_on.erb
diff --git a/decidim-core/app/cells/decidim/author/comments.erb b/decidim-core/app/cells/decidim/author/comments.erb
@@ -1,6 +1,4 @@
-<% if commentable? %>
-  <%= link_to "#{resource_locator(from_context).path}#comments", title: t("decidim.author.comments", count: from_context.comments_count) do %>
-    <%= icon "comment-square", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= from_context.comments_count %> <%= t("decidim.author.comments", count: from_context.comments_count) %>
-  <% end %>
+<%= link_to "#{resource_locator(from_context).path}#comments", title: t("decidim.author.comments", count: from_context.comments_count), class: "author__metadata" do %>
+  <%= icon "chat-1-line" if show_icons? %>
+  <%= from_context.comments_count %> <%= t("decidim.author.comments", count: from_context.comments_count) %>
 <% end %>
diff --git a/decidim-core/app/cells/decidim/author/date.erb b/decidim-core/app/cells/decidim/author/date.erb
@@ -1,5 +1,4 @@
-<% if creation_date? %>
-  <span>
-    <%= creation_date %> &nbsp;
-  </span>
-<% end %>
+<span class="author__metadata">
+  <%= icon "calendar-line" if show_icons? %>
+  <%= creation_date %>
+</span>
diff --git a/decidim-core/app/cells/decidim/author/endorsements.erb b/decidim-core/app/cells/decidim/author/endorsements.erb
@@ -1,6 +1,4 @@
-<% if endorsable? %>
-  <%= link_to "#{resource_locator(from_context).path}#list-of-endorsements", title: t("decidim.author.endorsements",count: from_context.endorsements_count) do %>
-    <%= icon "bullhorn", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= from_context.endorsements_count %> <%= t("decidim.author.endorsements", count: from_context.endorsements_count) %>
-  <% end %>
+<%= link_to "#{resource_locator(from_context).path}#list-of-endorsements", title: t("decidim.author.endorsements", count: from_context.endorsements_count), class: "author__metadata" do %>
+  <%= icon "heart-add-line" if show_icons? %>
+  <%= from_context.endorsements_count %> <%= t("decidim.author.endorsements", count: from_context.endorsements_count) %>
 <% end %>
diff --git a/decidim-core/app/cells/decidim/author/flag.erb b/decidim-core/app/cells/decidim/author/flag.erb
@@ -1,8 +1,6 @@
-<% if flaggable? %>
-  <button type="button" class="link-alt" data-open="<%= current_user.present? ? "flagModal" : "loginModal" %>" title="<%= t("report", scope: "decidim.proposals.proposals.show") %>" 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 class="show-for-sr">
-      <%= t("report", scope: "decidim.proposals.proposals.show") %>
-    </span>
-  </button>
-<% end %>
+<button type="button" class="link-alt" data-open="<%= current_user.present? ? "flagModal" : "loginModal" %>" title="<%= t("report", scope: "decidim.proposals.proposals.show") %>" 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 class="show-for-sr">
+    <%= t("report", scope: "decidim.proposals.proposals.show") %>
+  </span>
+</button>
diff --git a/decidim-core/app/cells/decidim/author/flag_user.erb b/decidim-core/app/cells/decidim/author/flag_user.erb
@@ -1,10 +1,14 @@
 <% if user_flaggable? && model.try(:id) != current_user.try(:id) %>
-  <button type="button" class="link-alt" data-open="<%= current_user.present? ? "flagUserModal" : "loginModal" %>" title="<%= t("report", scope: "decidim.proposals.proposals.show") %>" aria-controls="<%= current_user.present? ? "flagUserModal" : "loginModal" %>" aria-haspopup="dialog" tabindex="0">
-    <%= icon "flag", aria_hidden: true, class: "icon--small", role: "img", "aria-hidden": true %>
-    <span class="show-for-sr">
-        <%= t("report", scope: "decidim.proposals.proposals.show") %>
-    </span>
-  </button>
+  <%= 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 %>
diff --git a/.../cells/decidim/redesigned_author/name.erb → ...im-core/app/cells/decidim/author/name.erb b/.../cells/decidim/redesigned_author/name.erb → ...im-core/app/cells/decidim/author/name.erb
diff --git a/decidim-core/app/cells/decidim/author/profile.erb b/decidim-core/app/cells/decidim/author/profile.erb
diff --git a/decidim-core/app/cells/decidim/author/profile_inline.erb b/decidim-core/app/cells/decidim/author/profile_inline.erb
diff --git a/decidim-core/app/cells/decidim/author/profile_minicard.erb b/decidim-core/app/cells/decidim/author/profile_minicard.erb
@@ -1,25 +1,30 @@
-<div class="p-xs flex--sbc">
-  <div class="mr-s">
-    <div class="card__header collapse">
-      <%= cell("decidim/user_profile", raw_model).user_data %>
-    </div>
-    <div class="card__text card--picture-offset">
-      <%= text_link_to_current_or_new_conversation_with(model) %>
-    </div>
-  </div>
-  <div class="ml-s">
-    <%= cell "decidim/follow_button", raw_model %>
+<div class="author__tooltip bottom" role="tooltip">
+  <div class="author__container">
+    <%= render :avatar %>
+
     <div>
-      <%= link_to decidim.profile_followers_path(raw_model.nickname), class: "card__link" do %>
-        <strong><%= model.followers_count %></strong> <%= t("decidim.profiles.show.followers") %>
-      <% end %>
+      <%= render :name %>
+      <span class="text-md"><%= model.nickname %></span>
     </div>
+  </div>
+
+  <div class="author__tooltip-links">
+    <%= link_to decidim.profile_followers_path(raw_model.nickname) do %>
+      <%= content_tag(:span, model.followers_count, id: dom_id(raw_model, :followers_count)) %> <%= t("decidim.profiles.show.followers") %>
+    <% end %>
     <% if model.can_follow? %>
-      <div>
-        <%= link_to decidim.profile_following_path(raw_model.nickname), class: "card__link" do %>
-          <strong><%= model.following_count %></strong> <%= t("decidim.profiles.show.following") %>
-        <% end %>
-      </div>
+      <%= link_to decidim.profile_following_path(raw_model.nickname) do %>
+        <%= model.following_count %> <%= t("decidim.profiles.show.following") %>
+      <% end %>
     <% end %>
   </div>
+
+  <% if model.direct_messages_enabled?(context) %>
+    <%= link_to current_or_new_conversation_path_with(model), class: "button button__sm button__transparent" do %>
+      <span><%= t("decidim.profiles.show.send_private_message") %></span>
+      <%= icon "mail-send-line" %>
+    <% end %>
+  <% end %>
+
+  <%= follow_button_for(raw_model, false, button_classes: "button button__sm button__transparent") %>
 </div>
diff --git a/decidim-core/app/cells/decidim/author/show.erb b/decidim-core/app/cells/decidim/author/show.erb
@@ -1,19 +1,27 @@
-<div class="<%= author_classes %>">
-  <div class="author-data__main">
-    <%= render :profile %>
-  </div>
+<% data = has_tooltip? ? { tooltip: render(:profile_minicard).html_safe } : nil %>
+<div class="author" data-author>
+  <%= content_tag :div, class: "author__container#{" is-compact" if layout == :compact}", data: do %>
+    <% if layout == :compact %>
+      <%= render :avatar %>
 
-  <% if actionable? %>
-    <div class="author-data__extra">
-      <%= render :date %>
+      <div>
+        <%= render :name %>
 
-      <%= render :comments %>
-
-      <%= render :endorsements %>
-
-      <%= render :flag %>
+        <% context_actions.each do |action| %>
+          <%= render action %>
+        <% end %>
+      </div>
+    <% elsif layout == :avatar %>
+      <%= render :avatar %>
+    <% else %>
+      <%= render :avatar %>
+      <%= render :name %>
+    <% end %>
+  <% end %>
 
-      <%= render :withdraw %>
-    </div>
+  <% if layout == :default %>
+    <% context_actions.each do |action| %>
+      <%= render action %>
+    <% end %>
   <% end %>
 </div>
diff --git a/decidim-core/app/cells/decidim/author/withdraw.erb b/decidim-core/app/cells/decidim/author/withdraw.erb
@@ -1,6 +1,4 @@
-<% if withdrawable? %>
-  <%= action_authorized_link_to :withdraw, withdraw_path, method: :put, class: "title-action__action button small hollow", title: t("withdraw_btn_hint", scope: resource_i18n_scope ), data: { confirm: t("withdraw_confirmation_html", scope: resource_i18n_scope ) } do %>
-    <%= t("withdraw_#{resource_name}", scope: resource_i18n_scope) %>
-    <%= icon "x", role: "img", "aria-hidden": true %>
-  <% end %>
+<%= action_authorized_link_to :withdraw, withdraw_path, method: :put, class: "title-action__action button small hollow", title: t("withdraw_btn_hint", scope: resource_i18n_scope ), data: { confirm: t("withdraw_confirmation_html", scope: resource_i18n_scope ) } do %>
+  <%= t("withdraw_#{resource_name}", scope: resource_i18n_scope) %>
+  <%= icon "x", role: "img", "aria-hidden": true %>
 <% end %>