Merge from docusealco/wip

Author: AlexBTurchyn

app/controllers/api/submissions_controller.rb

@@ -112,7 +112,9 @@ def filter_submissions(submissions, params)
       submissions = submissions.where(slug: params[:slug]) if params[:slug].present?
 
       if params[:template_folder].present?
-        submissions = submissions.joins(template: :folder).where(folder: { name: params[:template_folder] })
+        folder = TemplateFolder.accessible_by(current_ability).find_by(name: params[:template_folder])
+
+        submissions = folder ? submissions.joins(:template).where(template: { folder_id: folder.id }) : submissions.none
       end
 
       if params.key?(:archived)

app/controllers/api/templates_controller.rb

@@ -93,7 +93,12 @@ def filter_templates(templates, params)
       templates = templates.where(external_id: params[:application_key]) if params[:application_key].present?
       templates = templates.where(external_id: params[:external_id]) if params[:external_id].present?
       templates = templates.where(slug: params[:slug]) if params[:slug].present?
-      templates = templates.joins(:folder).where(folder: { name: params[:folder] }) if params[:folder].present?
+
+      if params[:folder].present?
+        folder = TemplateFolder.accessible_by(current_ability).find_by(name: params[:folder])
+
+        templates = folder ? templates.where(folder:) : templates.none
+      end
 
       templates
     end

app/controllers/errors_controller.rb

@@ -5,8 +5,12 @@ class ErrorsController < ActionController::Base
     'This feature is available in Pro Edition: https://www.docuseal.com/pricing'
 
   ENTERPRISE_PATHS = [
+    '/submissions/html',
+    '/api/submissions/html',
     '/templates/html',
     '/api/templates/html',
+    '/submissions/pdf',
+    '/api/submissions/pdf',
     '/templates/pdf',
     '/api/templates/pdf',
     '/templates/doc',

app/controllers/search_entries_reindex_controller.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class SearchEntriesReindexController < ApplicationController
+  def create
+    authorize!(:manage, EncryptedConfig)
+
+    ReindexAllSearchEntriesJob.perform_async
+
+    AccountConfig.find_or_initialize_by(account_id: Account.minimum(:id), key: :fulltext_search)
+                 .update!(value: true)
+
+    Docuseal.instance_variable_set(:@fulltext_search, nil)
+
+    redirect_back(fallback_location: settings_account_path,
+                  notice: "Started building search index. Visit #{root_url}jobs/busy to check progress.")
+  end
+end

app/controllers/send_submission_email_controller.rb

@@ -11,11 +11,16 @@ class SendSubmissionEmailController < ApplicationController
 
   def create
     if params[:template_slug]
-      @submitter = Submitter.completed.joins(submission: :template).find_by!(email: params[:email].to_s.downcase,
-                                                                             template: { slug: params[:template_slug] })
+      template = Template.find_by!(slug: params[:template_slug])
+
+      @submitter =
+        Submitter.completed.where(submission: template.submissions).find_by!(email: params[:email].to_s.downcase)
     elsif params[:submission_slug]
-      @submitter = Submitter.completed.joins(:submission).find_by(email: params[:email].to_s.downcase,
-                                                                  submission: { slug: params[:submission_slug] })
+      submission = Submission.find_by(slug: params[:submission_slug])
+
+      if submission
+        @submitter = Submitter.completed.find_by(submission: submission, email: params[:email].to_s.downcase)
+      end
 
       return redirect_to submissions_preview_completed_path(params[:submission_slug], status: :error) unless @submitter
     else
@@ -24,14 +29,18 @@ def create
 
     RateLimit.call("send-email-#{@submitter.id}", limit: 2, ttl: 5.minutes)
 
-    unless EmailEvent.exists?(tag: :submitter_documents_copy, email: @submitter.email, emailable: @submitter,
-                              event_type: :send, created_at: SEND_DURATION.ago..Time.current)
-      SubmitterMailer.documents_copy_email(@submitter, sig: true).deliver_later!
-    end
+    SubmitterMailer.documents_copy_email(@submitter, sig: true).deliver_later! unless already_sent?(@submitter)
 
     respond_to do |f|
       f.html { render :success }
       f.json { head :ok }
     end
   end
+
+  private
+
+  def already_sent?(submitter)
+    EmailEvent.exists?(tag: :submitter_documents_copy, email: submitter.email, emailable: submitter,
+                       event_type: :send, created_at: SEND_DURATION.ago..Time.current)
+  end
 end

app/controllers/setup_controller.rb

@@ -34,6 +34,7 @@ def create
         { key: EncryptedConfig::ESIGN_CERTS_KEY, value: GenerateCertificate.call.transform_values(&:to_pem) }
       ]
       @account.encrypted_configs.create!(encrypted_configs)
+      @account.account_configs.create!(key: :fulltext_search, value: true) if SearchEntry.table_exists?
 
       Docuseal.refresh_default_url_options!
 

app/controllers/submitters_autocomplete_controller.rb

@@ -22,7 +22,7 @@ def index
 
   def search_submitters(submitters)
     if SELECT_COLUMNS.include?(params[:field])
-      if Docuseal.fulltext_search?(current_user)
+      if Docuseal.fulltext_search?
         Submitters.fulltext_search_field(current_user, submitters, params[:q], params[:field])
       else
         column = Submitter.arel_table[params[:field].to_sym]

app/controllers/template_folders_autocomplete_controller.rb

@@ -6,7 +6,9 @@ class TemplateFoldersAutocompleteController < ApplicationController
   LIMIT = 100
 
   def index
-    template_folders = @template_folders.joins(:templates).where(templates: { archived_at: nil }).distinct
+    templates_query = Template.accessible_by(current_ability).where(archived_at: nil)
+
+    template_folders = @template_folders.where(id: templates_query.select(:folder_id))
     template_folders = TemplateFolders.search(template_folders, params[:q]).limit(LIMIT)
 
     render json: template_folders.as_json(only: %i[name archived_at])

app/controllers/templates_dashboard_controller.rb

@@ -36,6 +36,8 @@ def index
         end
 
       @pagy, @templates = pagy_auto(@templates, limit:)
+
+      load_related_submissions if params[:q].present? && @templates.blank?
     end
   end
 
@@ -100,4 +102,19 @@ def sort_template_folders(template_folders, current_user, order)
       template_folders.order(id: :desc)
     end
   end
+
+  def load_related_submissions
+    @related_submissions = Submission.accessible_by(current_ability)
+                                     .left_joins(:template)
+                                     .where(archived_at: nil)
+                                     .where(templates: { archived_at: nil })
+                                     .preload(:template_accesses, :created_by_user,
+                                              template: :author,
+                                              submitters: :start_form_submission_events)
+
+    @related_submissions = Submissions.search(current_user, @related_submissions, params[:q])
+                                      .order(id: :desc)
+
+    @related_submissions_pagy, @related_submissions = pagy_auto(@related_submissions, limit: 5)
+  end
 end

app/controllers/templates_preferences_controller.rb

@@ -25,7 +25,7 @@ def template_params
                       documents_copy_email_attach_documents documents_copy_email_reply_to
                       completed_notification_email_attach_documents
                       completed_redirect_url validate_unique_submitters
-                      submitters_order require_phone_2fa
+                      require_all_submitters submitters_order require_phone_2fa
                       default_expire_at_duration
                       default_expire_at
                       completed_notification_email_subject completed_notification_email_body