From 8d685d1f73dbbf04a1b4ef52a2c5cee05e1bf22b Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Tue, 11 Feb 2025 22:37:47 +0200
Subject: [PATCH] adjust event log

---
 .../submission_events_controller.rb           |  3 ++-
 app/views/submission_events/index.html.erb    | 22 +++++++++----------
 config/locales/i18n.yml                       |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/controllers/submission_events_controller.rb b/app/controllers/submission_events_controller.rb
index 044b9319..e493bd95 100644
--- a/app/controllers/submission_events_controller.rb
+++ b/app/controllers/submission_events_controller.rb
@@ -24,9 +24,10 @@ class SubmissionEventsController < ApplicationController
   # rubocop:disable Metrics
   def index
     submitters = @submission.submitters
+
     submitters_uuids = (@submission.template_submitters || @submission.template.submitters).pluck('uuid')
 
-    @events_data = @submission.submission_events.sort_by(&:event_timestamp).map do |event|
+    @events_data = @submission.submission_events.order(:event_timestamp).map do |event|
       submitter = submitters.find { |e| e.id == event.submitter_id }
       submitter_name =
         if event.event_type.include?('sms') || event.event_type.include?('phone')
diff --git a/app/views/submission_events/index.html.erb b/app/views/submission_events/index.html.erb
index 00392cbf..31f184fe 100644
--- a/app/views/submission_events/index.html.erb
+++ b/app/views/submission_events/index.html.erb
@@ -1,15 +1,15 @@
-<% event_colors = %w[bg-red-200 bg-sky-200 bg-emerald-200 bg-yellow-300 bg-purple-200 bg-pink-200 bg-cyan-200 bg-orange-200 bg-lime-200 bg-indigo-200] %>
+<% event_colors = %w[bg-red-200 bg-sky-200 bg-emerald-200 bg-yellow-200 bg-purple-200 bg-pink-200 bg-cyan-200 bg-orange-200 bg-lime-200 bg-indigo-200] %>
 <%= render 'shared/turbo_modal_large', title: t('event_log') do %>
   <div class="pl-8 pr-4 py-4">
-    <ol class="relative border-s border-neutral-300 space-y-10">
-      <li class="ml-6">
-        <span class="absolute flex items-center justify-center w-6 h-6 rounded-full -start-3 ring-8 ring-base-100 text-base-content bg-gray-200">
+    <ol class="relative border-s border-base-300 space-y-6">
+      <li class="ml-7">
+        <span class="absolute flex items-center justify-center w-7 h-7 rounded-full -start-3.5 ring-8 ring-base-100 text-base-content bg-gray-200">
           <%= svg_icon('file_text', class: 'w-3.5 h-3.5') %>
         </span>
-        <p class="text-sm leading-none text-base-content/60 pt-1">
+        <p class="text-sm leading-none text-base-content/60 pt-1.5">
           <%= l(@submission.created_at.in_time_zone(current_account.timezone), format: :long, locale: current_account.locale) %>
         </p>
-        <p class="text-base-content/80 mt-2">
+        <p class="text-base-content/80 mt-1">
           <% if @submission.source == 'invite' %>
             <%= t('submission_created_by_email_invite_html', email: @submission.created_by_user.email) %>
           <% elsif @submission.created_by_user %>
@@ -21,14 +21,14 @@
       </li>
       <% @events_data.each do |row| %>
         <% bg_class = event_colors[row[:submitter_index] % event_colors.length] %>
-        <li class="ml-6">
-          <span class="absolute flex items-center justify-center w-6 h-6 rounded-full -start-3 ring-8 ring-base-100 text-base-content <%= bg_class %>">
-            <%= svg_icon(SubmissionEventsController::SUBMISSION_EVENT_ICONS.fetch(row[:event_type], 'circle_dot'), class: 'w-3.5 h-3.5') %>
+        <li class="ml-7">
+          <span class="absolute flex items-center justify-center w-7 h-7 rounded-full -start-3.5 ring-8 ring-base-100 text-base-content <%= bg_class %>">
+            <%= svg_icon(SubmissionEventsController::SUBMISSION_EVENT_ICONS.fetch(row[:event_type], 'circle_dot'), class: 'w-4 h-4') %>
           </span>
-          <p class="text-sm leading-none text-base-content/60 pt-1">
+          <p class="text-sm leading-none text-base-content/60 pt-1.5">
             <%= l(row[:timestamp], format: :long, locale: current_account.locale) %>
           </p>
-          <p class="text-base-content/80 mt-2">
+          <p class="text-base-content/80 mt-1">
             <%= row[:text] %>
           </p>
         </li>
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index 44d04f02..6f5a3ec7 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -695,7 +695,7 @@ en: &en
   overdue_payment: Overdue Payment
   your_pro_plan_has_been_suspended_due_to_unpaid_invoices_you_can_update_your_payment_details_to_settle_the_invoice_and_continue_using_docuseal_or_cancel_your_subscription: Your Pro Plan has been suspended due to unpaid invoices. You can update your payment details to settle the invoice and continue using DocuSeal or cancel your subscription.
   manage_subscription: Manage Subscription
-  submission_created_by_email_invite_html: '<b>Submission created</b> by %{email} invite'
+  submission_created_by_email_invite_html: '<b>Submission created</b> by %{email}'
   submission_created_by_email_via_source_html: '<b>Submission created</b> by %{email} via %{source}'
   submission_created_via_source_html: '<b>Submission created</b> via %{source}'
   submission_sources: