From 961f09e0929979a8b7ea492e9c5a592491de209e Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Thu, 5 Mar 2026 10:08:29 +0200
Subject: [PATCH] set dynamic fields

---
 app/javascript/template_builder/builder.vue |  4 +-
 app/javascript/template_builder/preview.vue | 68 ++++++++++++++++++++-
 app/models/dynamic_document.rb              |  2 +
 3 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index 2aabcb64..218a182f 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -3027,9 +3027,7 @@ export default {
         this.template.fields.splice(this.template.fields.indexOf(field), 1)
       })
 
-      if (toRemove.length) {
-        this.save()
-      }
+      this.save()
     }
   }
 }
diff --git a/app/javascript/template_builder/preview.vue b/app/javascript/template_builder/preview.vue
index 981a999d..b09bd860 100644
--- a/app/javascript/template_builder/preview.vue
+++ b/app/javascript/template_builder/preview.vue
@@ -187,6 +187,7 @@ import ReplaceButton from './replace'
 import GoogleDriveDocumentSettings from './google_drive_document_settings'
 import Field from './field'
 import FieldType from './field_type'
+import { v4 } from 'uuid'
 
 export default {
   name: 'DocumentPreview',
@@ -246,7 +247,7 @@ export default {
       default: true
     }
   },
-  emits: ['scroll-to', 'change', 'remove', 'up', 'down', 'replace', 'reorder', 'make-dynamic'],
+  emits: ['scroll-to', 'change', 'remove', 'up', 'down', 'replace', 'reorder'],
   data () {
     return {
       isShowConditionsModal: false,
@@ -282,17 +283,78 @@ export default {
       }).then(async (resp) => {
         const dynamicDocument = await resp.json()
 
+        this.template.schema.find((item) => item.attachment_uuid === dynamicDocument.uuid).dynamic = true
+
+        this.removeFieldAreas()
+
+        if (dynamicDocument.fields?.length) {
+          this.addDynamicFields(dynamicDocument.fields)
+        }
+
         if (dynamicDocument.uuid) {
+          delete dynamicDocument.fields
+
           this.dynamicDocuments.push(dynamicDocument)
         }
 
-        this.template.schema.find((item) => item.attachment_uuid === dynamicDocument.uuid).dynamic = true
-
         this.$emit('change')
       }).finally(() => {
         this.isMakeDynamicLoading = false
       })
     },
+    removeFieldAreas () {
+      this.template.fields.forEach((field) => {
+        if (field.areas?.length) {
+          field.areas = field.areas.filter((a) => a.attachment_uuid !== this.document.uuid)
+        }
+      })
+
+      this.template.fields = this.template.fields.filter((field) => field.areas?.length)
+    },
+    addDynamicFields (fields) {
+      const submittersNameIndex = this.template.submitters.reduce((acc, submitter) => {
+        acc[submitter.name] = submitter
+
+        return acc
+      }, {})
+
+      fields.forEach((field) => {
+        const roleName = field.role || this.template.submitters[0]?.name || this.t('first_party')
+
+        let submitter = submittersNameIndex[roleName]
+
+        if (!submitter) {
+          submitter = { name: roleName, uuid: v4() }
+
+          this.template.submitters.push(submitter)
+
+          submittersNameIndex[roleName] = submitter
+        }
+
+        const existingField = this.template.fields.find((f) => {
+          return f.name && f.name === field.name && f.type === (field.type || 'text') && f.submitter_uuid === submitter.uuid
+        })
+
+        if (existingField) {
+          field.areas.forEach((area) => {
+            area.attachment_uuid = this.document.uuid
+
+            existingField.areas = existingField.areas || []
+            existingField.areas.push(area)
+          })
+        } else {
+          field.submitter_uuid = submitter.uuid
+
+          delete field.role
+
+          field.areas.forEach((area) => {
+            area.attachment_uuid = this.document.uuid
+          })
+
+          this.template.fields.push(field)
+        }
+      })
+    },
     onUpdateName (value) {
       this.item.name = value
 
diff --git a/app/models/dynamic_document.rb b/app/models/dynamic_document.rb
index bc50d51c..33f1322f 100644
--- a/app/models/dynamic_document.rb
+++ b/app/models/dynamic_document.rb
@@ -28,6 +28,8 @@ class DynamicDocument < ApplicationRecord
 
   has_many :versions, class_name: 'DynamicDocumentVersion', dependent: :destroy
 
+  attribute :fields, :json
+
   before_validation :set_sha1
 
   def set_sha1