[service] form field mapping need to account for form name and field name to avoid conflicts

newmanw · newmanw · commit 53d392e28507 · 2024-11-14T15:11:57.000-07:00
diff --git a/plugins/arcgis/service/src/ObservationsTransformer.ts b/plugins/arcgis/service/src/ObservationsTransformer.ts
@@ -328,7 +328,9 @@ export class ObservationsTransformer {
                             if (fields != undefined) {
                                 const fieldTitle = fields.get(title)
                                 if (fieldTitle != undefined) {
-                                    title = fieldTitle
+                                    const sanitizedName = ObservationsTransformer.replaceSpaces(fieldTitle)
+                                    const sanitizedFormName = ObservationsTransformer.replaceSpaces(fields.name)
+                                    title = `${sanitizedFormName}_${sanitizedName}`.toLowerCase()
                                 }
                             }
                             if (field.type == FormFieldType.Geometry) {

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,9 @@ export class ObservationsTransformer {`
`328`	`328`	`if (fields != undefined) {`
`329`	`329`	`const fieldTitle = fields.get(title)`
`330`	`330`	`if (fieldTitle != undefined) {`
`331`		`- title = fieldTitle`
	`331`	`+ const sanitizedName = ObservationsTransformer.replaceSpaces(fieldTitle)`
	`332`	`+ const sanitizedFormName = ObservationsTransformer.replaceSpaces(fields.name)`
	`333`	+ title = `${sanitizedFormName}_${sanitizedName}`.toLowerCase()
`332`	`334`	`}`
`333`	`335`	`}`
`334`	`336`	`if (field.type == FormFieldType.Geometry) {`