From 4cb85d29604aee9acbdfedae12ad601abb460558 Mon Sep 17 00:00:00 2001
From: Mikhael Rakauskas <mrakauskas@careerplug.com>
Date: Wed, 2 Jul 2025 11:31:58 -0400
Subject: [PATCH 1/7] Tool versions to stop my console screaming at me

---
 .ruby-version  | 1 +
 .tool-versions | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 .ruby-version
 create mode 100644 .tool-versions

diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 00000000..4d9d11cf
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+3.4.2
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 00000000..e15f5d30
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1,2 @@
+nodejs 18.20.4
+ruby 3.1.6

From c9af371bc0893a394670124c8eba3cac742f1424 Mon Sep 17 00:00:00 2001
From: Mikhael Rakauskas <mrakauskas@careerplug.com>
Date: Wed, 2 Jul 2025 14:55:04 -0400
Subject: [PATCH 2/7] export controller

---
 app/controllers/export_controller.rb | 35 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 app/controllers/export_controller.rb

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
new file mode 100644
index 00000000..b7aa73a2
--- /dev/null
+++ b/app/controllers/export_controller.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+require 'faraday'
+
+class ExportController < ApplicationController
+  skip_before_action :maybe_redirect_to_setup
+  skip_before_action :verify_authenticity_token
+
+  # Template is sent as JSON already; we're just gonnna send it on to the third party
+  def export_template
+    conn = Faraday.new(url: 'https://api.thirdparty.com') do |faraday|
+      faraday.request :json
+      faraday.response :json
+      faraday.adapter Faraday.default_adapter
+    end
+    
+    response = conn.post('/endpoint') do |req|
+      req.headers['Authorization'] = 'Bearer YOUR_API_KEY'
+      # Pass along the entire JSON payload received in the request
+      req.body = request.raw_post.present? ? JSON.parse(request.raw_post) : params.to_unsafe_h
+    end
+    
+    if response.success?
+      redirect_to templates_path, alert: I18n.t('exports.templates.success')
+    else
+      Rollbar.error("Third party API error: #{response.status} - #{response.body}") if defined?(Rollbar)
+      redirect_to templates_path, alert: I18n.t('exports.templates.api_error')
+    end
+  rescue Faraday::Error => e
+    Rollbar.error("Failed to send to third party: #{e.message}") if defined?(Rollbar)
+    redirect_to templates_path, alert: I18n.t('exports.templates.api_error')
+  rescue StandardError => e
+    Rollbar.error(e) if defined?(Rollbar)
+    redirect_to templates_path, alert: I18n.t('exports.templates.error')
+  end
+end

From 53d0dee930fd29562b5d30dc9b13528e1a492313 Mon Sep 17 00:00:00 2001
From: Mikhael Rakauskas <mrakauskas@careerplug.com>
Date: Wed, 2 Jul 2025 16:50:24 -0400
Subject: [PATCH 3/7] Export location model and first pass export to
 configurable endpoint.

---
 app/controllers/export_controller.rb          | 23 ++++++----
 app/javascript/template_builder/builder.vue   | 46 +++++++++++++++++++
 app/models/export_location.rb                 | 22 +++++++++
 config/locales/i18n.yml                       |  5 ++
 config/routes.rb                              |  7 +++
 .../20250702193415_create_export_locations.rb | 14 ++++++
 ...317_add_auth_params_to_export_locations.rb |  5 ++
 db/schema.rb                                  | 17 +++++--
 8 files changed, 128 insertions(+), 11 deletions(-)
 create mode 100644 app/models/export_location.rb
 create mode 100644 db/migrate/20250702193415_create_export_locations.rb
 create mode 100644 db/migrate/20250702204317_add_auth_params_to_export_locations.rb

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index b7aa73a2..411daafd 100644
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -2,33 +2,40 @@
 require 'faraday'
 
 class ExportController < ApplicationController
+  skip_authorization_check
   skip_before_action :maybe_redirect_to_setup
   skip_before_action :verify_authenticity_token
 
-  # Template is sent as JSON already; we're just gonnna send it on to the third party
+  # Template is sent as JSON already; we're just gonnna send it on to the third party.
+  # It's assumed that any extra details required will also be passed through from the front end - 
+  # set by the ExportLocation.extra_params
   def export_template
-    conn = Faraday.new(url: 'https://api.thirdparty.com') do |faraday|
+    export_location = ExportLocation.default_location
+    conn = Faraday.new(url: export_location.api_base_url) do |faraday|
       faraday.request :json
       faraday.response :json
       faraday.adapter Faraday.default_adapter
     end
     
-    response = conn.post('/endpoint') do |req|
-      req.headers['Authorization'] = 'Bearer YOUR_API_KEY'
-      # Pass along the entire JSON payload received in the request
+    response = conn.post(export_location.templates_endpoint) do |req|
+      # req.headers['Authorization'] = "Bearer #{export_location.authorization_token}" lol
       req.body = request.raw_post.present? ? JSON.parse(request.raw_post) : params.to_unsafe_h
+      req.body.merge!(export_location.extra_params) if export_location.extra_params
     end
     
     if response.success?
-      redirect_to templates_path, alert: I18n.t('exports.templates.success')
+      head :ok # alert: I18n.t('exports.templates.success')
     else
-      Rollbar.error("Third party API error: #{response.status} - #{response.body}") if defined?(Rollbar)
-      redirect_to templates_path, alert: I18n.t('exports.templates.api_error')
+      Rails.logger.error("Failed to send to third party Faraday: #{response.status}")
+      Rollbar.error("#{export_location.name} API error: #{response.status}") if defined?(Rollbar)
+      head :ok # templates_path, alert: I18n.t('exports.templates.api_error')
     end
   rescue Faraday::Error => e
+    Rails.logger.error("Failed to send to third party Faraday: #{e.message}")
     Rollbar.error("Failed to send to third party: #{e.message}") if defined?(Rollbar)
     redirect_to templates_path, alert: I18n.t('exports.templates.api_error')
   rescue StandardError => e
+    Rails.logger.error("Failed to send to third party: #{e.message}")
     Rollbar.error(e) if defined?(Rollbar)
     redirect_to templates_path, alert: I18n.t('exports.templates.error')
   end
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index df68917a..e36f8d6f 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -73,6 +73,25 @@
           name="buttons"
         />
         <template v-else>
+          <button
+            class="base-button"
+            :class="{ disabled: isExporting }"
+            v-bind="isExporting ? { disabled: true } : {}"
+            @click.prevent="onExportClick"
+          >
+            <IconInnerShadowTop
+              v-if="isExporting"
+              width="22"
+              class="animate-spin"
+            />
+            <IconDeviceFloppy
+              v-else
+              width="22"
+            />
+            <span class="hidden md:inline">
+              {{ t('Export') }}
+            </span>
+          </button>
           <span
             v-if="editable"
             id="save_button_container"
@@ -1739,6 +1758,14 @@ export default {
         }
       }
     },
+    onExportClick () {
+      this.isExporting = true
+      this.export().then(() => {
+        window.Turbo.visit(`/templates/${this.template.id}`)
+      }).finally(() => {
+        this.isExporting = false
+      })
+    },
     scrollToArea (area) {
       const documentRef = this.documentRefs.find((a) => a.document.uuid === area.attachment_uuid)
 
@@ -1791,6 +1818,25 @@ export default {
           this.onSave(this.template)
         }
       })
+    },
+    export () {
+      this.baseFetch(`/export/export_template`, {
+        method: 'PUT',
+        body: JSON.stringify({
+          template: {
+            name: this.template.name,
+            schema: this.template.schema,
+            submitters: this.template.submitters,
+            fields: this.template.fields
+          }
+        }),
+        headers: { 'Content-Type': 'application/json' }
+      }).then(() => {
+        console.log('exported!');
+        // if (this.onSave) {
+        //   this.onSave(this.template)
+        // }
+      })
     }
   }
 }
diff --git a/app/models/export_location.rb b/app/models/export_location.rb
new file mode 100644
index 00000000..a211c0a3
--- /dev/null
+++ b/app/models/export_location.rb
@@ -0,0 +1,22 @@
+# == Schema Information
+#
+# Table name: export_locations
+#
+#  id                  :bigint           not null, primary key
+#  api_base_url        :string           not null
+#  authorization_token :string
+#  default_location    :boolean          default(FALSE), not null
+#  extra_params        :jsonb            not null
+#  name                :string           not null
+#  templates_endpoint  :string
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#
+class ExportLocation < ApplicationRecord
+  validates :name, presence: true
+  validates :api_base_url, presence: true
+
+  def self.default_location
+    where(default_location: true).first || ExportLocation.first
+  end
+end
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index a9f347ab..8fe4ca46 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -852,6 +852,11 @@ en: &en
     items:
       range_with_total: "%{from}-%{to} of %{count} items"
       range_without_total: "%{from}-%{to} items"
+  exports:
+    templates:
+      error: Error exporting template
+      api_error: Error with remote endpoint
+      success: Template exported successfully
 
 es: &es
   authenticate_embedded_form_preview_with_token: Autenticar vista previa del formulario incrustado con token
diff --git a/config/routes.rb b/config/routes.rb
index db8f3e3b..d6f7242b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -55,6 +55,13 @@ Rails.application.routes.draw do
     end
   end
 
+  resources :export, controller: 'export' do
+    collection do
+      put :export_template
+      put :export_template_by_id
+    end
+  end
+
   resources :verify_pdf_signature, only: %i[create]
   resource :mfa_setup, only: %i[show new edit create destroy], controller: 'mfa_setup'
   resources :account_configs, only: %i[create destroy]
diff --git a/db/migrate/20250702193415_create_export_locations.rb b/db/migrate/20250702193415_create_export_locations.rb
new file mode 100644
index 00000000..99cbac76
--- /dev/null
+++ b/db/migrate/20250702193415_create_export_locations.rb
@@ -0,0 +1,14 @@
+class CreateExportLocations < ActiveRecord::Migration[8.0]
+  def change
+    create_table :export_locations do |t|
+      t.string :name, null: false
+      t.boolean :default_location, null: false, default: false
+      t.string :authorization_token
+      t.string :api_base_url, null: false
+      # t.string extra_params, null: false, default: '{}'
+      t.string :templates_endpoint
+      # t.string other_export_type_endpoints_maybe_one_day
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20250702204317_add_auth_params_to_export_locations.rb b/db/migrate/20250702204317_add_auth_params_to_export_locations.rb
new file mode 100644
index 00000000..b452c1e7
--- /dev/null
+++ b/db/migrate/20250702204317_add_auth_params_to_export_locations.rb
@@ -0,0 +1,5 @@
+class AddAuthParamsToExportLocations < ActiveRecord::Migration[8.0]
+  def change
+    add_column :export_locations, :extra_params, :jsonb, null: false, default: {}
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5e36884c..7bc96f6e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2025_06_18_085322) do
+ActiveRecord::Schema[8.0].define(version: 2025_07_02_204317) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "btree_gin"
   enable_extension "pg_catalog.plpgsql"
@@ -160,7 +160,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_18_085322) do
     t.string "event_name", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["submitter_id", "event_name"], name: "index_document_generation_events_on_submitter_id_and_event_name", unique: true, where: "((event_name)::text = ANY ((ARRAY['start'::character varying, 'complete'::character varying])::text[]))"
+    t.index ["submitter_id", "event_name"], name: "index_document_generation_events_on_submitter_id_and_event_name", unique: true, where: "((event_name)::text = ANY (ARRAY[('start'::character varying)::text, ('complete'::character varying)::text]))"
     t.index ["submitter_id"], name: "index_document_generation_events_on_submitter_id"
   end
 
@@ -177,7 +177,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_18_085322) do
     t.datetime "created_at", null: false
     t.index ["account_id", "event_datetime"], name: "index_email_events_on_account_id_and_event_datetime"
     t.index ["email"], name: "index_email_events_on_email"
-    t.index ["email"], name: "index_email_events_on_email_event_types", where: "((event_type)::text = ANY ((ARRAY['bounce'::character varying, 'soft_bounce'::character varying, 'complaint'::character varying, 'soft_complaint'::character varying])::text[]))"
+    t.index ["email"], name: "index_email_events_on_email_event_types", where: "((event_type)::text = ANY (ARRAY[('bounce'::character varying)::text, ('soft_bounce'::character varying)::text, ('complaint'::character varying)::text, ('soft_complaint'::character varying)::text]))"
     t.index ["emailable_type", "emailable_id"], name: "index_email_events_on_emailable"
     t.index ["message_id"], name: "index_email_events_on_message_id"
   end
@@ -216,6 +216,17 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_18_085322) do
     t.index ["user_id"], name: "index_encrypted_user_configs_on_user_id"
   end
 
+  create_table "export_locations", force: :cascade do |t|
+    t.string "name", null: false
+    t.boolean "default_location", default: false, null: false
+    t.string "authorization_token"
+    t.string "api_base_url", null: false
+    t.string "templates_endpoint"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.jsonb "extra_params", default: {}, null: false
+  end
+
   create_table "oauth_access_grants", force: :cascade do |t|
     t.integer "resource_owner_id", null: false
     t.integer "application_id", null: false

From 780708c4ea8ec74e57c4dcc08535700f9c806826 Mon Sep 17 00:00:00 2001
From: Bernardo Anderson <bdsa@hey.com>
Date: Wed, 2 Jul 2025 16:43:01 -0500
Subject: [PATCH 4/7] Update buttons

---
 app/javascript/application.scss     | 36 ++++++++++++++++++++++++++++-
 app/javascript/form.scss            | 36 ++++++++++++++++++++++++++++-
 app/views/templates/_title.html.erb |  9 --------
 tailwind.config.js                  |  8 ++++---
 4 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/app/javascript/application.scss b/app/javascript/application.scss
index 61d3f645..a9709f8b 100644
--- a/app/javascript/application.scss
+++ b/app/javascript/application.scss
@@ -56,11 +56,45 @@ button[disabled] .enabled {
 }
 
 .base-button {
-  @apply btn btn-neutral text-white text-base;
+  @apply btn btn-primary text-white text-base;
+}
+
+.btn-outline {
+  border-color: #004FCC;
+  color: #004FCC;
+}
+
+.btn-outline:hover {
+  background-color: #004FCC;
+  border-color: #004FCC;
+  color: white;
+}
+
+.btn-ghost {
+  color: #004FCC;
+}
+
+.btn-ghost:hover {
+  background-color: #004FCC;
+  color: white;
+}
+
+.btn-neutral {
+  background-color: #004FCC;
+  border-color: #004FCC;
+  color: white;
+}
+
+.btn-neutral:hover {
+  background-color: #0063FF;
+  border-color: #0063FF;
+  color: white;
 }
 
 .white-button {
   @apply btn btn-outline text-base bg-white border-2;
+  border-color: #004FCC;
+  color: #004FCC;
 }
 
 .base-checkbox {
diff --git a/app/javascript/form.scss b/app/javascript/form.scss
index fb651155..753f53eb 100644
--- a/app/javascript/form.scss
+++ b/app/javascript/form.scss
@@ -56,11 +56,45 @@ button[disabled] .enabled {
 }
 
 .base-button {
-  @apply btn btn-neutral text-white text-base;
+  @apply btn btn-primary text-white text-base;
+}
+
+.btn-outline {
+  border-color: #004FCC;
+  color: #004FCC;
+}
+
+.btn-outline:hover {
+  background-color: #004FCC;
+  border-color: #004FCC;
+  color: white;
+}
+
+.btn-ghost {
+  color: #004FCC;
+}
+
+.btn-ghost:hover {
+  background-color: #004FCC;
+  color: white;
+}
+
+.btn-neutral {
+  background-color: #004FCC;
+  border-color: #004FCC;
+  color: white;
+}
+
+.btn-neutral:hover {
+  background-color: #0063FF;
+  border-color: #0063FF;
+  color: white;
 }
 
 .white-button {
   @apply btn btn-outline text-base bg-white border-2;
+  border-color: #004FCC;
+  color: #004FCC;
 }
 
 .base-checkbox {
diff --git a/app/views/templates/_title.html.erb b/app/views/templates/_title.html.erb
index 28d2e037..1d7501a6 100644
--- a/app/views/templates/_title.html.erb
+++ b/app/views/templates/_title.html.erb
@@ -40,15 +40,6 @@
     </div>
     <% if !template.archived_at? %>
       <div class="flex items-center space-x-2">
-        <% if can?(:update, template) %>
-          <div class="tooltip" data-tip="<%= t('preferences') %>">
-            <%= link_to template_preferences_path(template), class: 'btn border border-base-200 bg-base-200 hover:bg-base-300 hover:border-base-300 btn-sm flex-1 hidden md:flex', data: { turbo_frame: :modal } do %>
-              <span class="flex items-center justify-center space-x-2">
-                <%= svg_icon('adjustments_horizontal', class: 'w-6 h-6') %>
-              </span>
-            <% end %>
-          </div>
-        <% end %>
         <%= link_to template_share_link_path(template), class: 'absolute md:relative bottom-0 right-0 btn btn-xs md:btn-sm whitespace-nowrap btn-neutral text-white mt-1 px-2', data: { turbo_frame: :modal } do %>
           <span class="flex items-center justify-center space-x-2">
             <%= svg_icon('link', class: 'w-4 h-4 md:w-6 md:h-6 text-white') %>
diff --git a/tailwind.config.js b/tailwind.config.js
index e5730a34..bcfdb845 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -7,15 +7,17 @@ module.exports = {
       {
         docuseal: {
           'color-scheme': 'light',
-          primary: '#e4e0e1',
+          primary: '#004FCC',
+          link: '#004FCC',
           secondary: '#ef9fbc',
           accent: '#eeaf3a',
           neutral: '#291334',
           'base-100': '#f2f2f3',
           'base-200': '#efeae6',
           'base-300': '#e7e2df',
-          'base-content': '#291334',
-          '--rounded-btn': '1.9rem',
+          'base-content': 'rgb(73, 75, 80)',
+          'font-size': '16px',
+          '--rounded-btn': '4px',
           '--tab-border': '2px',
           '--tab-radius': '.5rem'
         }

From 9e542c7aaf20e7806b15ca47e1269f90a0697c62 Mon Sep 17 00:00:00 2001
From: Mikhael Rakauskas <mrakauskas@careerplug.com>
Date: Thu, 3 Jul 2025 10:31:57 -0400
Subject: [PATCH 5/7] export controller update and misc migration annoyances

---
 app/controllers/export_controller.rb        | 66 ++++++++++++++-------
 app/javascript/template_builder/builder.vue |  3 +-
 app/models/document_generation_event.rb     |  2 +-
 app/models/email_event.rb                   |  2 +-
 4 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 411daafd..cfa94cf4 100644
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'faraday'
 
 class ExportController < ApplicationController
@@ -7,36 +8,55 @@ class ExportController < ApplicationController
   skip_before_action :verify_authenticity_token
 
   # Template is sent as JSON already; we're just gonnna send it on to the third party.
-  # It's assumed that any extra details required will also be passed through from the front end - 
-  # set by the ExportLocation.extra_params
   def export_template
     export_location = ExportLocation.default_location
-    conn = Faraday.new(url: export_location.api_base_url) do |faraday|
+
+    data = request.raw_post.present? ? JSON.parse(request.raw_post) : params.to_unsafe_h
+    response = post_to_api(data, export_location.templates_endpoint, export_location.extra_params)
+
+    if response&.success?
+      Rails.logger.info("Successfully exported template #{data[:template][:name]} to #{export_location.name}")
+      head :ok
+    else
+      Rails.logger.error("Failed to export template to third party: #{response&.status}")
+      Rollbar.error("#{export_location.name} template export API error: #{response&.status}") if defined?(Rollbar)
+      head :unprocessable_entity
+    end
+  rescue Faraday::Error => e
+    Rails.logger.error("Failed to export template Faraday: #{e.message}")
+    Rollbar.error("Failed to export template: #{e.message}") if defined?(Rollbar)
+    head :service_unavailable
+  rescue StandardError => e
+    Rails.logger.error("Failed to export template: #{e.message}")
+    Rollbar.error(e) if defined?(Rollbar)
+    head :internal_server_error
+  end
+
+  private
+
+  def api_connection
+    @api_connection ||= Faraday.new(url: ExportLocation.default_location.api_base_url) do |faraday|
       faraday.request :json
       faraday.response :json
       faraday.adapter Faraday.default_adapter
     end
-    
-    response = conn.post(export_location.templates_endpoint) do |req|
-      # req.headers['Authorization'] = "Bearer #{export_location.authorization_token}" lol
-      req.body = request.raw_post.present? ? JSON.parse(request.raw_post) : params.to_unsafe_h
-      req.body.merge!(export_location.extra_params) if export_location.extra_params
-    end
-    
-    if response.success?
-      head :ok # alert: I18n.t('exports.templates.success')
-    else
-      Rails.logger.error("Failed to send to third party Faraday: #{response.status}")
-      Rollbar.error("#{export_location.name} API error: #{response.status}") if defined?(Rollbar)
-      head :ok # templates_path, alert: I18n.t('exports.templates.api_error')
-    end
-  rescue Faraday::Error => e
-    Rails.logger.error("Failed to send to third party Faraday: #{e.message}")
-    Rollbar.error("Failed to send to third party: #{e.message}") if defined?(Rollbar)
-    redirect_to templates_path, alert: I18n.t('exports.templates.api_error')
   rescue StandardError => e
-    Rails.logger.error("Failed to send to third party: #{e.message}")
+    Rails.logger.error("Failed to create API connection: #{e.message}")
     Rollbar.error(e) if defined?(Rollbar)
-    redirect_to templates_path, alert: I18n.t('exports.templates.error')
+    nil
+  end
+
+  def post_to_api(data, endpoint, extra_params = nil)
+    connection = api_connection
+    return nil unless connection
+
+    connection.post(endpoint) do |req|
+      # req.headers['Authorization'] = "Bearer #{export_location.authorization_token}" lol
+
+      # Merge extra_params into data if provided
+      data = data.merge(extra_params) if extra_params.present? && data.is_a?(Hash)
+
+      req.body = data.is_a?(String) ? data : data.to_json
+    end
   end
 end
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index e36f8d6f..f14555ab 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -1824,8 +1824,9 @@ export default {
         method: 'PUT',
         body: JSON.stringify({
           template: {
+            id: this.template.id,
             name: this.template.name,
-            schema: this.template.schema,
+            schema: this.template.schema[0],
             submitters: this.template.submitters,
             fields: this.template.fields
           }
diff --git a/app/models/document_generation_event.rb b/app/models/document_generation_event.rb
index f4e0a701..24d71ba3 100644
--- a/app/models/document_generation_event.rb
+++ b/app/models/document_generation_event.rb
@@ -13,7 +13,7 @@
 # Indexes
 #
 #  index_document_generation_events_on_submitter_id                 (submitter_id)
-#  index_document_generation_events_on_submitter_id_and_event_name  (submitter_id,event_name) UNIQUE WHERE ((event_name)::text = ANY ((ARRAY['start'::character varying, 'complete'::character varying])::text[]))
+#  index_document_generation_events_on_submitter_id_and_event_name  (submitter_id,event_name) UNIQUE WHERE ((event_name)::text = ANY (ARRAY[('start'::character varying)::text, ('complete'::character varying)::text]))
 #
 # Foreign Keys
 #
diff --git a/app/models/email_event.rb b/app/models/email_event.rb
index 3c6aac61..3aaa5db9 100644
--- a/app/models/email_event.rb
+++ b/app/models/email_event.rb
@@ -20,7 +20,7 @@
 #
 #  index_email_events_on_account_id_and_event_datetime  (account_id,event_datetime)
 #  index_email_events_on_email                          (email)
-#  index_email_events_on_email_event_types              (email) WHERE ((event_type)::text = ANY ((ARRAY['bounce'::character varying, 'soft_bounce'::character varying, 'complaint'::character varying, 'soft_complaint'::character varying])::text[]))
+#  index_email_events_on_email_event_types              (email) WHERE ((event_type)::text = ANY (ARRAY[('bounce'::character varying)::text, ('soft_bounce'::character varying)::text, ('complaint'::character varying)::text, ('soft_complaint'::character varying)::text]))
 #  index_email_events_on_emailable                      (emailable_type,emailable_id)
 #  index_email_events_on_message_id                     (message_id)
 #

From 1fc9d212caf5559ce89494bfa7732eb5bc4f620a Mon Sep 17 00:00:00 2001
From: Mikhael Rakauskas <mrakauskas@careerplug.com>
Date: Thu, 3 Jul 2025 12:04:06 -0400
Subject: [PATCH 6/7] add external data fields to templates

---
 app/models/template.rb                        | 39 +++++++++++--------
 ...6_add_external_data_fields_to_templates.rb |  5 +++
 db/schema.rb                                  |  3 +-
 3 files changed, 30 insertions(+), 17 deletions(-)
 create mode 100644 db/migrate/20250703143236_add_external_data_fields_to_templates.rb

diff --git a/app/models/template.rb b/app/models/template.rb
index d3802f05..73c54313 100644
--- a/app/models/template.rb
+++ b/app/models/template.rb
@@ -4,22 +4,23 @@
 #
 # Table name: templates
 #
-#  id          :bigint           not null, primary key
-#  archived_at :datetime
-#  fields      :text             not null
-#  name        :string           not null
-#  preferences :text             not null
-#  schema      :text             not null
-#  shared_link :boolean          default(FALSE), not null
-#  slug        :string           not null
-#  source      :text             not null
-#  submitters  :text             not null
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#  account_id  :integer          not null
-#  author_id   :integer          not null
-#  external_id :string
-#  folder_id   :integer          not null
+#  id                   :bigint           not null, primary key
+#  archived_at          :datetime
+#  external_data_fields :string
+#  fields               :text             not null
+#  name                 :string           not null
+#  preferences          :text             not null
+#  schema               :text             not null
+#  shared_link          :boolean          default(FALSE), not null
+#  slug                 :string           not null
+#  source               :text             not null
+#  submitters           :text             not null
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
+#  account_id           :integer          not null
+#  author_id            :integer          not null
+#  external_id          :string
+#  folder_id            :integer          not null
 #
 # Indexes
 #
@@ -78,6 +79,12 @@ class Template < ApplicationRecord
     external_id
   end
 
+  def external_data_fields
+    return {} if self[:external_data_fields].blank?
+
+    JSON.parse(self[:external_data_fields])
+  end
+
   private
 
   def maybe_set_default_folder
diff --git a/db/migrate/20250703143236_add_external_data_fields_to_templates.rb b/db/migrate/20250703143236_add_external_data_fields_to_templates.rb
new file mode 100644
index 00000000..f286278c
--- /dev/null
+++ b/db/migrate/20250703143236_add_external_data_fields_to_templates.rb
@@ -0,0 +1,5 @@
+class AddExternalDataFieldsToTemplates < ActiveRecord::Migration[8.0]
+  def change
+    add_column :templates, :external_data_fields, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7bc96f6e..d2f8780d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2025_07_02_204317) do
+ActiveRecord::Schema[8.0].define(version: 2025_07_03_143236) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "btree_gin"
   enable_extension "pg_catalog.plpgsql"
@@ -393,6 +393,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_07_02_204317) do
     t.string "external_id"
     t.text "preferences", null: false
     t.boolean "shared_link", default: false, null: false
+    t.string "external_data_fields"
     t.index ["account_id", "folder_id", "id"], name: "index_templates_on_account_id_and_folder_id_and_id", where: "(archived_at IS NULL)"
     t.index ["account_id", "id"], name: "index_templates_on_account_id_and_id_archived", where: "(archived_at IS NOT NULL)"
     t.index ["account_id"], name: "index_templates_on_account_id"

From d881b9242c749c1dde5aebbf9eb73bb58af7f1cb Mon Sep 17 00:00:00 2001
From: Mikhael Rakauskas <mrakauskas@careerplug.com>
Date: Thu, 3 Jul 2025 16:28:59 -0400
Subject: [PATCH 7/7] misc id changes

---
 app/controllers/api/submissions_controller.rb          |  2 +-
 app/controllers/api/templates_controller.rb            |  7 ++++---
 app/controllers/templates_controller.rb                |  7 ++++---
 app/models/template.rb                                 | 10 +++-------
 ...0703143236_add_external_data_fields_to_templates.rb |  2 +-
 db/schema.rb                                           |  2 +-
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/controllers/api/submissions_controller.rb b/app/controllers/api/submissions_controller.rb
index af784ba2..1bef7f4e 100644
--- a/app/controllers/api/submissions_controller.rb
+++ b/app/controllers/api/submissions_controller.rb
@@ -193,7 +193,7 @@ module Api
           submitters: [[:send_email, :send_sms, :completed_redirect_url, :uuid, :name, :email, :role,
                         :completed, :phone, :application_key, :external_id, :reply_to, :go_to_last,
                         { metadata: {}, values: {}, roles: [], readonly_fields: [], message: %i[subject body],
-                          fields: [:name, :uuid, :default_value, :value, :title, :description,
+                          fields: [:name, :uuid, :question_id, :default_value, :value, :title, :description,
                                    :readonly, :required, :validation_pattern, :invalid_message,
                                    { default_value: [], value: [], preferences: {} }] }]]
         }
diff --git a/app/controllers/api/templates_controller.rb b/app/controllers/api/templates_controller.rb
index 2af022e7..5262fe04 100644
--- a/app/controllers/api/templates_controller.rb
+++ b/app/controllers/api/templates_controller.rb
@@ -109,15 +109,16 @@ module Api
         :external_id,
         :shared_link,
         {
+          external_data_fields: {},
           submitters: [%i[name uuid is_requester invite_by_uuid optional_invite_by_uuid linked_to_uuid email]],
-          fields: [[:uuid, :submitter_uuid, :name, :type,
+          fields: [[:uuid, :question_id, :submitter_uuid, :name, :type,
                     :required, :readonly, :default_value,
                     :title, :description,
                     { preferences: {},
                       conditions: [%i[field_uuid value action operation]],
-                      options: [%i[value uuid]],
+                      options: [%i[value uuid answer_id]],
                       validation: %i[message pattern],
-                      areas: [%i[x y w h cell_w attachment_uuid option_uuid page]] }]]
+                      areas: [%i[x y w h cell_w attachment_uuid option_uuid answer_id page]] }]]
         }
       ]
 
diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb
index 14b36709..2828ce58 100644
--- a/app/controllers/templates_controller.rb
+++ b/app/controllers/templates_controller.rb
@@ -121,14 +121,15 @@ class TemplatesController < ApplicationController
       :name,
       { schema: [[:attachment_uuid, :name, { conditions: [%i[field_uuid value action operation]] }]],
         submitters: [%i[name uuid is_requester linked_to_uuid invite_by_uuid optional_invite_by_uuid email]],
-        fields: [[:uuid, :submitter_uuid, :name, :type,
+        external_data_fields: {},
+        fields: [[:uuid, :question_id, :submitter_uuid, :name, :type,
                   :required, :readonly, :default_value,
                   :title, :description,
                   { preferences: {},
                     conditions: [%i[field_uuid value action operation]],
-                    options: [%i[value uuid]],
+                    options: [%i[value uuid answer_id]],
                     validation: %i[message pattern],
-                    areas: [%i[x y w h cell_w attachment_uuid option_uuid page]] }]] }
+                    areas: [%i[x y w h cell_w attachment_uuid option_uuid answer_id page]] }]] }
     )
   end
 
diff --git a/app/models/template.rb b/app/models/template.rb
index 73c54313..a2d7fd19 100644
--- a/app/models/template.rb
+++ b/app/models/template.rb
@@ -6,7 +6,7 @@
 #
 #  id                   :bigint           not null, primary key
 #  archived_at          :datetime
-#  external_data_fields :string
+#  external_data_fields :text
 #  fields               :text             not null
 #  name                 :string           not null
 #  preferences          :text             not null
@@ -52,6 +52,7 @@ class Template < ApplicationRecord
   attribute :preferences, :string, default: -> { {} }
   attribute :fields, :string, default: -> { [] }
   attribute :schema, :string, default: -> { [] }
+  attribute :external_data_fields, :string, default: -> { {} }
   attribute :submitters, :string, default: -> { [{ name: I18n.t(:first_party), uuid: SecureRandom.uuid }] }
   attribute :slug, :string, default: -> { SecureRandom.base58(14) }
   attribute :source, :string, default: 'native'
@@ -60,6 +61,7 @@ class Template < ApplicationRecord
   serialize :fields, coder: JSON
   serialize :schema, coder: JSON
   serialize :submitters, coder: JSON
+  serialize :external_data_fields, coder: JSON
 
   has_many_attached :documents
 
@@ -79,12 +81,6 @@ class Template < ApplicationRecord
     external_id
   end
 
-  def external_data_fields
-    return {} if self[:external_data_fields].blank?
-
-    JSON.parse(self[:external_data_fields])
-  end
-
   private
 
   def maybe_set_default_folder
diff --git a/db/migrate/20250703143236_add_external_data_fields_to_templates.rb b/db/migrate/20250703143236_add_external_data_fields_to_templates.rb
index f286278c..75861b27 100644
--- a/db/migrate/20250703143236_add_external_data_fields_to_templates.rb
+++ b/db/migrate/20250703143236_add_external_data_fields_to_templates.rb
@@ -1,5 +1,5 @@
 class AddExternalDataFieldsToTemplates < ActiveRecord::Migration[8.0]
   def change
-    add_column :templates, :external_data_fields, :string
+    add_column :templates, :external_data_fields, :text
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index d2f8780d..9a97cf4f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -393,7 +393,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_07_03_143236) do
     t.string "external_id"
     t.text "preferences", null: false
     t.boolean "shared_link", default: false, null: false
-    t.string "external_data_fields"
+    t.text "external_data_fields"
     t.index ["account_id", "folder_id", "id"], name: "index_templates_on_account_id_and_folder_id_and_id", where: "(archived_at IS NULL)"
     t.index ["account_id", "id"], name: "index_templates_on_account_id_and_id_archived", where: "(archived_at IS NOT NULL)"
     t.index ["account_id"], name: "index_templates_on_account_id"