add ability to edit submitter details

2024-10-08 13:25:55 +03:00
parent 40f5fa4217
commit e0a297cf81
11 changed files with 209 additions and 40 deletions
@@ -15,6 +15,6 @@ class SubmissionsDashboardController < ApplicationController
    @submissions = @submissions.pending if params[:status] == 'pending'
    @submissions = @submissions.completed if params[:status] == 'completed'

-    @pagy, @submissions = pagy(@submissions.preload(:submitters).order(id: :desc))
+    @pagy, @submissions = pagy(@submissions.preload(submitters: :submission_events).order(id: :desc))
  end
 end
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+class SubmittersController < ApplicationController
+  load_and_authorize_resource :submitter, only: %i[edit update]
+
+  def edit
+    @submitter_email_message =
+      if @submitter.preferences['email_message_uuid'].present?
+        @submitter.account
+                  .email_messages
+                  .find_by(uuid: @submitter.preferences['email_message_uuid'])
+      end
+  end
+
+  def update
+    submission = @submitter.submission
+
+    if @submitter.submission_events.exists?(event_type: 'start_form') || submission.archived_at? || submission.expired?
+      return redirect_back fallback_location: submission_path(submission), alert: I18n.t('submitter_cannot_be_updated')
+    end
+
+    if submitter_params.values.all?(&:blank?)
+      return redirect_back fallback_location: submission_path(submission),
+                           alert: I18n.t('at_least_one_field_must_be_filled')
+    end
+
+    if params[:is_custom_message] != '1'
+      params.delete(:subject)
+      params.delete(:body)
+    end
+
+    assign_preferences(@submitter, params)
+    assign_submitter_attrs(@submitter, submitter_params)
+
+    if @submitter.save
+      if @submitter.preferences['send_email'] || @submitter.preferences['send_sms']
+        Submitters.send_signature_requests([@submitter])
+      end
+
+      redirect_back fallback_location: submission_path(submission), notice: I18n.t('changes_have_been_saved')
+    else
+      redirect_back fallback_location: submission_path(submission), alert: I18n.t('unable_to_save')
+    end
+  end
+
+  private
+
+  def assign_submitter_attrs(submitter, attrs)
+    submitter.phone = attrs[:phone].to_s.gsub(/[^0-9+]/, '') if attrs.key?(:phone)
+
+    submitter.email = Submissions.normalize_email(attrs[:email]) if attrs.key?(:email)
+
+    submitter.name = attrs[:name] if attrs.key?(:name)
+
+    submitter
+  end
+
+  def assign_preferences(submitter, attrs)
+    submitter_preferences = Submitters.normalize_preferences(submitter.account, current_user, attrs)
+
+    if submitter_preferences.key?('send_email')
+      submitter.preferences['send_email'] = submitter_preferences['send_email']
+    end
+
+    submitter.preferences['send_sms'] = submitter_preferences['send_sms'] if submitter_preferences.key?('send_sms')
+
+    if submitter_preferences.key?('email_message_uuid')
+      submitter.preferences['email_message_uuid'] = submitter_preferences['email_message_uuid']
+    end
+
+    submitter
+  end
+
+  def submitter_params
+    params.require(:submitter).permit(:email, :name, :phone).transform_values(&:strip)
+  end
+end
@@ -15,7 +15,7 @@ class TemplatesController < ApplicationController
    submissions = submissions.pending if params[:status] == 'pending'
    submissions = submissions.completed if params[:status] == 'completed'

-    @pagy, @submissions = pagy(submissions.preload(:submitters).order(id: :desc))
+    @pagy, @submissions = pagy(submissions.preload(submitters: :submission_events).order(id: :desc))
  rescue ActiveRecord::RecordNotFound
    redirect_to root_path
  end
@@ -31,7 +31,7 @@
                  </submitters-autocomplete>
                  <submitters-autocomplete data-field="phone">
                    <linked-input data-target-id="<%= "detailed_phone_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
-                      <input type="tel" pattern="^\+[0-9\s\-]+$" oninvalid="this.value ? this.setCustomValidity('Use internatioanl format: +1xxx...') : ''" oninput="this.setCustomValidity('')" name="submission[1][submitters][][phone]" autocomplete="off" class="base-input !h-10 mt-1.5 w-full" placeholder="<%= "#{t('phone')} (#{t('optional')})" %>" id="detailed_phone_<%= item['uuid'] %>">
+                      <input type="tel" pattern="^\+[0-9\s\-]+$" oninvalid="this.value ? this.setCustomValidity('<%= t('use_international_format_1xxx_') %>') : ''" oninput="this.setCustomValidity('')" name="submission[1][submitters][][phone]" autocomplete="off" class="base-input !h-10 mt-1.5 w-full" placeholder="<%= "#{t('phone')} (#{t('optional')})" %>" id="detailed_phone_<%= item['uuid'] %>">
                    </linked-input>
                  </submitters-autocomplete>
                </div>
@@ -21,7 +21,7 @@
                  <input type="hidden" name="submission[1][submitters][][uuid]" value="<%= item['uuid'] %>">
                  <submitters-autocomplete data-field="phone">
                    <linked-input data-target-id="<%= "phone_phone_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
-                      <%= tag.input type: 'tel', pattern: '^\+[0-9\s\-]+$', oninvalid: "this.value ? this.setCustomValidity('Use internatioanl format: +1xxx...') : ''", oninput: "this.setCustomValidity('')", name: 'submission[1][submitters][][phone]', autocomplete: 'off', class: 'base-input !h-10 w-full', placeholder: t('phone'), required: index.zero?, id: "phone_phone_#{item['uuid']}" %>
+                      <%= tag.input type: 'tel', pattern: '^\+[0-9\s\-]+$', oninvalid: "this.value ? this.setCustomValidity('#{t('use_international_format_1xxx_')}') : ''", oninput: "this.setCustomValidity('')", name: 'submission[1][submitters][][phone]', autocomplete: 'off', class: 'base-input !h-10 w-full', placeholder: t('phone'), required: index.zero?, id: "phone_phone_#{item['uuid']}" %>
                    </linked-input>
                  </submitters-autocomplete>
                  <% if submitters.size > 1 %>
@@ -2,12 +2,12 @@
  <% can_send_emails = Accounts.can_send_emails?(current_account) %>
  <div class="flex justify-between items-center">
    <%= f.label :send_email, for: uuid = SecureRandom.uuid, class: 'flex items-center cursor-pointer' do %>
-      <%= f.check_box :send_email, id: uuid, class: 'base-checkbox', disabled: !can_send_emails, checked: can_send_emails %>
-      <span class="label"><%= t('send_emails') %></span>
+      <%= f.check_box :send_email, id: uuid, class: 'base-checkbox', disabled: !can_send_emails, checked: can_send_emails && !local_assigns.key?(:resend_email) %>
+      <span class="label"><%= local_assigns[:resend_email] ? t('re_send_email') : t('send_email') %></span>
    <% end %>
    <div>
      <% if can_send_emails %>
-        <%= render 'email_stats' %>
+        <%= render 'submissions/email_stats' %>
        <%= content_for(:edit_button) || capture do %>
          <label>
            <%= f.check_box :is_custom_message, onchange: "[this.form.querySelector('#message_field').classList.toggle('hidden', !event.currentTarget.checked)]", checked: false, class: 'hidden peer' %>
@@ -39,7 +39,7 @@
    <div class="form-control space-y-2">
      <div class="form-control">
        <%= f.label :subject, t('subject'), class: 'label' %>
-        <%= f.text_field :subject, value: @template.preferences['request_email_subject'].presence || config.value['subject'], required: true, class: '!text-sm base-input w-full', dir: 'auto' %>
+        <%= f.text_field :subject, value: local_assigns[:submitter_email_message]&.subject.presence || template.preferences['request_email_subject'].presence || config.value['subject'], required: true, class: '!text-sm base-input w-full', dir: 'auto' %>
      </div>
      <div class="form-control">
        <div class="flex items-center">
@@ -49,14 +49,16 @@
          </span>
        </div>
        <autoresize-textarea>
-          <%= f.text_area :body, value: @template.preferences['request_email_body'].presence || config.value['body'], required: true, class: 'base-textarea w-full', rows: 10, dir: 'auto' %>
+          <%= f.text_area :body, value: local_assigns[:submitter_email_message]&.body.presence || template.preferences['request_email_body'].presence || config.value['body'], required: true, class: 'base-textarea w-full', rows: 10, dir: 'auto' %>
        </autoresize-textarea>
-        <label for="<%= uuid = SecureRandom.uuid %>" class="flex items-center cursor-pointer">
-          <%= check_box_tag :save_message, id: uuid, class: 'base-checkbox', checked: false %>
-          <span class="label"><%= t('save_as_default_template_message') %></span>
-        </label>
+        <% unless local_assigns.fetch(:disable_save_as_default_template_option, false) %>
+          <label for="<%= uuid = SecureRandom.uuid %>" class="flex items-center cursor-pointer">
+            <%= check_box_tag :save_message, id: uuid, class: 'base-checkbox', checked: false %>
+            <span class="label"><%= t('save_as_default_template_message') %></span>
+          </label>
+        <% end %>
      </div>
-      <%= render 'message_fields' %>
+      <%= render 'submissions/message_fields' %>
    </div>
  </div>
 </div>
@@ -107,12 +107,21 @@
      <% (@submission.template_submitters || @submission.template.submitters).each_with_index do |item, index| %>
        <% submitter = @submission.submitters.find { |e| e.uuid == item['uuid'] } %>
        <div class="sticky -top-1 bg-base-100 pt-1 -mt-1">
-          <div class="border border-base-300 rounded-md px-2 py-1 mb-1">
-            <div class="flex items-center space-x-1">
-              <span class="mx-1 w-3 h-3 rounded-full <%= colors[index] %>"></span>
-              <span class="text-lg" dir="auto">
-                <%= (@submission.template_submitters || @submission.template.submitters).find { |e| e['uuid'] == submitter&.uuid }&.dig('name') || "#{(index + 1).ordinalize} Submitter" %>
-              </span>
+          <div class="group border border-base-300 rounded-md px-2 py-1 mb-1">
+            <div class="flex items-center justify-between">
+              <div class="flex items-center space-x-1">
+                <span class="mx-1 w-3 h-3 shrink-0 rounded-full <%= colors[index] %>"></span>
+                <span class="text-lg" dir="auto">
+                  <%= (@submission.template_submitters || @submission.template.submitters).find { |e| e['uuid'] == submitter&.uuid }&.dig('name') || "#{(index + 1).ordinalize} Submitter" %>
+                </span>
+              </div>
+              <% if can?(:update, submitter) && !submitter.submission_events.exists?(event_type: 'start_form') && !@submission.archived_at? && !@submission.expired? %>
+                <span class="tooltip tooltip-left" data-tip="<%= t('edit') %>">
+                  <%= link_to edit_submitter_path(submitter), class: 'shrink-0 text-neutral-600 md:text-neutral-400 md:group-hover:text-neutral-600', data: { turbo_frame: 'modal' } do %>
+                    <%= svg_icon('pencil', class: 'w-5 h-5 stroke-2') %>
+                  <% end %>
+                </span>
+              <% end %>
            </div>
            <% if submitter&.name.present? %>
              <div class="flex items-center space-x-1 mt-1">
@@ -0,0 +1,29 @@
+<%= render 'shared/turbo_modal_large', title: t('edit_recipient') do %>
+  <div class="px-5 mb-5 mt-4">
+    <%= form_for '', url: submitter_path(@submitter), method: :patch, html: { class: 'space-y-4', autocomplete: 'off' }, data: { turbo_frame: :_top } do |f| %>
+      <div class="grid gap-4">
+        <submitter-item class="form-control">
+          <submitters-autocomplete data-field="name">
+            <%= text_field_tag 'submitter[name]', @submitter.name, autocomplete: 'off', class: 'base-input !h-10 w-full', placeholder: "#{t('name')} (#{t('optional')})", dir: 'auto' %>
+          </submitters-autocomplete>
+          <div class="grid md:grid-cols-2 gap-1">
+            <submitters-autocomplete data-field="email">
+              <%= email_field_tag 'submitter[email]', @submitter.email, autocomplete: 'off', class: 'base-input !h-10 mt-1.5 w-full', placeholder: "#{t('email')} (#{t('optional')})" %>
+            </submitters-autocomplete>
+            <submitters-autocomplete data-field="phone">
+              <%= telephone_field_tag 'submitter[phone]', @submitter.phone, autocomplete: 'off', pattern: '^\+[0-9\s\-]+$', class: 'base-input !h-10 mt-1.5 w-full', placeholder: "#{t('phone')} (#{t('optional')})", oninvalid: "this.value ? this.setCustomValidity('#{t('use_international_format_1xxx_')}') : ''", oninput: "this.setCustomValidity('')" %>
+            </submitters-autocomplete>
+          </div>
+        </submitter-item>
+      </div>
+      <div>
+        <%= render 'submissions/send_email', f:, template: @submitter.template, submitter: @submitter, resend_email: @submitter.sent_at?, submitter_email_message: @submitter_email_message, disable_save_as_default_template_option: true %>
+        <%= render 'submissions/send_sms', f:, resend_sms: @submitter.sent_at? %>
+      </div>
+      <div class="form-control">
+        <%= f.button button_title(title: t('update_recipient'), disabled_with: t('updating')), class: 'base-button' %>
+      </div>
+    <% end %>
+  </div>
+  <%= content_for(:modal_extra) %>
+<% end %>
@@ -26,7 +26,8 @@
      </div>
    </a>
  <% end %>
-  <a href="<%= submission_path(submission) %>" class="w-full flex flex-col md:flex-row space-y-4 md:space-y-0 md:justify-between px-5 md:px-6 pb-5 md:items-center pt-5">
+  <div class="w-full flex flex-col md:flex-row space-y-4 md:space-y-0 md:justify-between px-5 md:px-6 pb-5 md:items-center pt-5 relative cursor-pointer">
+    <a href="<%= submission_path(submission) %>" class="top-0 bottom-0 left-0 right-0 absolute"></a>
    <% submitters = (submission.template_submitters || submission.template.submitters).filter_map { |item| submission.submitters.find { |e| e.uuid == item['uuid'] } } %>
    <% is_submission_completed = submitters.all?(&:completed_at?) && submitters.size.positive? %>
    <% if submitters.size == 1 %>
@@ -47,13 +48,22 @@
                </span>
              </div>
            <% end %>
-            <span class="text-lg break-all flex items-center">
-              <%= submitter.name || submitter.email || submitter.phone %>
+            <span class="flex space-x-1 items-center z-[1]">
+              <a href="<%= submission_path(submission) %>" class="text-lg break-all peer">
+                <%= submitter.name || submitter.email || submitter.phone %>
+              </a>
+              <% if can?(:update, submitter) && !submitter.submission_events.any? { |e| e.event_type == 'start_form' } && !submission.archived_at? && !submission.expired? %>
+                <span class="tooltip tooltip-top md:opacity-0 md:hover:opacity-100 md:peer-hover:opacity-100" data-tip="<%= t('edit') %>">
+                  <%= link_to edit_submitter_path(submitter), class: 'text-neutral-600 shrink-0', data: { turbo_frame: 'modal' } do %>
+                    <%= svg_icon('pencil', class: 'w-5 h-5 stroke-2') %>
+                  <% end %>
+                </span>
+              <% end %>
            </span>
          </span>
        </div>
      </div>
-      <div class="flex space-x-2 items-center">
+      <div class="flex space-x-2 items-center z-[1]">
        <% if submitter.completed_at? %>
          <form onsubmit="event.preventDefault()" class="flex-1 md:flex-none">
            <button onclick="event.stopPropagation()" class="w-full md:w-fit">
@@ -71,16 +81,14 @@
          </form>
        <% elsif !submission.archived_at? && !template.archived_at? && !submission.expired? && !submitter.declined_at? %>
          <% if current_user.email == submitter.email %>
-            <form data-turbo="false" method="get" action="<%= submit_form_url(slug: submitter.slug) %>" class="flex-1 md:flex-none">
-              <button onclick="event.stopPropagation()" class="btn btn-sm btn-neutral btn-outline bg-white w-full md:w-36 flex">
-                <span class="flex items-center justify-center space-x-1 md:space-x-2">
-                  <% if t('sign_now').length < 12 %>
-                    <%= svg_icon('writing_sign', class: 'w-4 h-4 stroke-2') %>
-                  <% end %>
-                  <span class="inline shrink-0"><%= t('sign_now') %></span>
-                </span>
-              </button>
-            </form>
+            <a href="<%= submit_form_url(slug: submitter.slug) %>" class="btn btn-sm btn-neutral btn-outline bg-white w-full md:w-36 flex z-[1]">
+              <span class="flex items-center justify-center space-x-1 md:space-x-2">
+                <% if t('sign_now').length < 12 %>
+                  <%= svg_icon('writing_sign', class: 'w-4 h-4 stroke-2') %>
+                <% end %>
+                <span class="inline shrink-0"><%= t('sign_now') %></span>
+              </span>
+            </a>
          <% else %>
            <div class="flex-1 md:flex-none">
              <%= render 'shared/clipboard_copy', text: submit_form_url(slug: submitter.slug), class: 'btn btn-sm btn-neutral text-white md:w-36 flex', icon_class: 'w-6 h-6 text-white', copy_title: t('copy_link').length < 10 ? t('copy_link') : t('copy'), copy_title_md: t('copy'), copied_title_md: t('copied') %>
@@ -88,7 +96,9 @@
          <% end %>
        <% end %>
        <div class="flex-1 md:flex-none">
-          <span class="btn btn-outline btn-sm w-full md:w-24"><%= t('view') %></span>
+          <a href="<%= submission_path(submission) %>" class="btn btn-outline btn-sm w-full md:w-24">
+            <%= t('view') %>
+          </a>
        </div>
        <% if !submission.archived_at? && !template.archived_at? && can?(:destroy, submission) %>
          <span data-tip="<%= t('archive') %>" class="sm:tooltip tooltip-top">
@@ -129,8 +139,17 @@
                      </span>
                    </div>
                  <% end %>
-                  <span class="text-lg break-all">
-                    <%= submitter.name || submitter.email || submitter.phone %>
+                  <span class="flex space-x-1 items-center z-[1]">
+                    <a href="<%= submission_path(submission) %>" class="text-lg break-all peer">
+                      <%= submitter.name || submitter.email || submitter.phone %>
+                    </a>
+                    <% if can?(:update, submitter) && !submitter.submission_events.any? { |e| e.event_type == 'start_form' } && !submission.archived_at? && !submission.expired? %>
+                      <span class="tooltip tooltip-top md:opacity-0 md:hover:opacity-100 md:peer-hover:opacity-100" data-tip="<%= t('edit') %>">
+                        <%= link_to edit_submitter_path(submitter), class: 'text-neutral-600 shrink-0', data: { turbo_frame: 'modal' } do %>
+                          <%= svg_icon('pencil', class: 'w-5 h-5 stroke-2') %>
+                        <% end %>
+                      </span>
+                    <% end %>
                  </span>
                </span>
                <% if submitter.completed_at? && !is_submission_completed %>
@@ -171,7 +190,7 @@
          </div>
        </div>
      </div>
-      <div class="flex space-x-1 md:space-x-2 items-center">
+      <div class="flex space-x-1 md:space-x-2 items-center z-[1]">
        <% if is_submission_completed %>
          <% latest_submitter = submitters.select(&:completed_at?).max_by(&:completed_at) %>
          <div class="flex-1 md:flex-none">
@@ -192,7 +211,9 @@
          </div>
        <% end %>
        <div class="flex-1 md:flex-none">
-          <span class="btn btn-outline btn-sm w-full md:w-24"><%= t('view') %></span>
+          <a href="<%= submission_path(submission) %>" class="btn btn-outline btn-sm w-full md:w-24">
+            <%= t('view') %>
+          </a>
        </div>
        <% if !submission.archived_at? && !template.archived_at? %>
          <span data-tip="<%= t('archive') %>" class="sm:tooltip tooltip-top">
@@ -206,5 +227,5 @@
        <% end %>
      </div>
    <% end %>
-  </a>
+  </div>
 </div>
@@ -613,6 +613,11 @@ en: &en
  unverified: Unverified
  document: Document
  completed_at: Completed At
+  edit_recipient: Edit Recipient
+  update_recipient: Update Recipient
+  use_international_format_1xxx_: 'Use internatioanl format: +1xxx...'
+  submitter_cannot_be_updated: Submitter cannot be updated.
+  at_least_one_field_must_be_filled: At least one field must be filled.
  submission_event_names:
    send_email_to_html: '<b>Email sent</b> to %{submitter_name}'
    send_reminder_email_to_html: '<b>Reminder email sent</b> to %{submitter_name}'
@@ -1244,6 +1249,11 @@ es: &es
  unverified: No verificado
  document: Documento
  completed_at: Completado el
+  edit_recipient: Editar Destinatario
+  update_recipient: Actualizar Destinatario
+  use_international_format_1xxx_: 'Usa el formato internacional: +1xxx...'
+  submitter_cannot_be_updated: El remitente no puede ser actualizado.
+  at_least_one_field_must_be_filled: Al menos un campo debe estar completo.
  submission_event_names:
    send_email_to_html: '<b>Correo electrónico enviado</b> a %{submitter_name}'
    send_reminder_email_to_html: '<b>Correo de recordatorio enviado</b> a %{submitter_name}'
@@ -1875,6 +1885,11 @@ it: &it
  unverified: Non verificato
  document: Documento
  completed_at: Completato il
+  edit_recipient: Modifica Destinatario
+  update_recipient: Aggiorna Destinatario
+  use_international_format_1xxx_: 'Utilizza il formato internazionale: +1xxx...'
+  submitter_cannot_be_updated: Il mittente non può essere aggiornato.
+  at_least_one_field_must_be_filled: Almeno un campo deve essere compilato.
  submission_event_names:
    send_email_to_html: '<b>E-mail inviato</b> a %{submitter_name}'
    send_reminder_email_to_html: '<b>E-mail di promemoria inviato</b> a %{submitter_name}'
@@ -2507,6 +2522,11 @@ fr: &fr
  unverified: Non vérifié
  document: Document
  completed_at: Terminé le
+  edit_recipient: Modifica Destinatario
+  update_recipient: Aggiorna Destinatario
+  use_international_format_1xxx_: 'Utilizza il formato internazionale: +1xxx...'
+  submitter_cannot_be_updated: Il mittente non può essere aggiornato.
+  at_least_one_field_must_be_filled: Almeno un campo deve essere compilato.
  submission_event_names:
    send_email_to_html: '<b>E-mail envoyé</b> à %{submitter_name}'
    send_reminder_email_to_html: '<b>E-mail de rappel envoyé</b> à %{submitter_name}'
@@ -3138,6 +3158,11 @@ pt: &pt
  unverified: Não verificado
  document: Documento
  completed_at: Concluído em
+  edit_recipient: Editar Destinatário
+  update_recipient: Atualizar Destinatário
+  use_international_format_1xxx_: 'Use o formato internacional: +1xxx...'
+  submitter_cannot_be_updated: O remetente não pode ser atualizado.
+  at_least_one_field_must_be_filled: Pelo menos um campo deve ser preenchido.
  submission_event_names:
    send_email_to_html: '<b>E-mail enviado</b> para %{submitter_name}'
    send_reminder_email_to_html: '<b>E-mail de lembrete enviado</b> para %{submitter_name}'
@@ -3769,6 +3794,11 @@ de: &de
  unverified: Nicht verifiziert
  document: Dokument
  completed_at: Abgeschlossen am
+  edit_recipient: Empfänger bearbeiten
+  update_recipient: Empfänger aktualisieren
+  use_international_format_1xxx_: 'Verwenden Sie das internationale Format: +1xxx...'
+  submitter_cannot_be_updated: Der Absender kann nicht aktualisiert werden.
+  at_least_one_field_must_be_filled: Mindestens ein Feld muss ausgefüllt werden.
  submission_event_names:
    send_email_to_html: '<b>E-Mail gesendet</b> an %{submitter_name}'
    send_reminder_email_to_html: '<b>Erinnerungs-E-Mail gesendet</b> an %{submitter_name}'
@@ -69,6 +69,7 @@ Rails.application.routes.draw do
  resources :submissions_archived, only: %i[index], path: 'submissions/archived'
  resources :submissions, only: %i[index], controller: 'submissions_dashboard'
  resources :submissions, only: %i[show destroy]
+  resources :submitters, only: %i[edit update]
  resources :console_redirect, only: %i[index]
  resources :upgrade, only: %i[index], controller: 'console_redirect'
  resources :manage, only: %i[index], controller: 'console_redirect'