Fix/DEV-217 (#691)

* PS-339 [FIX] Ensure Form buttons line up (#681)

* ID-4527 [FIX] Adjust custom button to be in line with form fields (#680)

* Adjust custom button to be in line with form fields

* ID-4527 [FIX] Adjust custom button to be in line with form fields

* PS-53 [FIX] Ensure Rich text field is rendered in Drag and drop accordion of Add fields overlay after switching between settings tabs (#682)

* Revert "PS-53 [FIX] Ensure Rich text field is rendered in Drag and drop accor…" (#687)

This reverts commit 51a8ad5.

* merge with master

* DEV-217 [FIX] Ensure that the Address field and Map field names do not cause conflicts with data source columns.

* DEV-217 [FIX] Ensure placing Map field in the same form with the Address field and another Map field doesn't cause data source columns conflict

---------

Co-authored-by: ysolodka <[email protected]>

js/libs/builder.js

@@ -982,8 +982,8 @@ Fliplet().then(function() {
 
 
             case 'flMap':
-              fieldNames.push('Lat/Long');
-              fieldNames.push('Map Address');
+              fieldNames.push(`${field.name} Lat/Long`);
+              fieldNames.push(`${field.name} Address`);
 
               break;
 

js/libs/form.js

@@ -406,8 +406,8 @@ Fliplet().then(function() {
                 break;
               case 'flMap':
                 fieldData = {
-                  address: entry.data['Map Address'],
-                  latLong: entry.data['Lat/Long']
+                  address: entry.data[`${field.name} Address`],
+                  latLong: entry.data[`${field.name} Lat/Long`]
                 };
                 break;
 
@@ -1197,8 +1197,8 @@ Fliplet().then(function() {
                     });
                   }
                 } else if (type === 'flMap') {
-                  appendField('Map Address', value.address);
-                  appendField('Lat/Long', value.latLong);
+                  appendField(`${field.name} Address`, value.address);
+                  appendField(`${field.name} Lat/Long`, value.latLong);
                 } else if (type === 'flGeolocation') {
                   appendField(field.name, value ? value[0] : null);
                   appendField(`${field.name} (accuracy)`, value ? value[1] : null);