fix(fpm-writer): custom form field view.xml update (#4605)

* fix issue on formelement view format

* fix after comments

* Create dirty-pets-listen.md

* rename unit test after comment

* update snapshot

Author: eouin

.changeset/dirty-pets-listen.md

@@ -0,0 +1,5 @@
+---
+"@sap-ux/fe-fpm-writer": patch
+---
+
+fix(fpm-writer): custom form field view.xml update

packages/fe-fpm-writer/templates/building-block/custom-form-field/View.xml

@@ -1,14 +1,12 @@
-<% if (!config?.hasAggregation) { %><<%- macrosNamespace %>:fields><% } %>
-<<%- config?.aggregationNamespace %>:FormElement 
+<<%- config?.aggregationNamespace %>:FormElement
 	<% if (data.formElementKey) { %> key="<%- data.formElementKey %>"<% } %>
 	label="<%- data.label %>"
 	<% if (data.id) { %> id="<%- data.id %>"<% } %>
 	<% if (data.metaPath) { %> metaPath="<%- data.metaPath %>"<% } %>
 	<% if (data.contextPath) { %> contextPath="<%- data.contextPath %>"<% } %>
 	<% if (data.position?.anchor) { %> anchor="<%- data.position.anchor %>"<% } %>
 	<% if (data.position?.placement) { %> placement="<%- data.position.placement %>"<% } %>>
-	<<%- macrosNamespace %>:fields>
+	<<%- config?.aggregationNamespace %>:fields>
 		<core:Fragment fragmentName="<%- data.embededFragment.ns %>.<%- data.embededFragment.name %>" type="XML" />
-	</<%- macrosNamespace %>:fields>
+	</<%- config?.aggregationNamespace %>:fields>
 </<%- config?.aggregationNamespace %>:FormElement>
-<% if (!config?.hasAggregation) { %></<%- macrosNamespace %>:fields><% } %>

packages/fe-fpm-writer/test/unit/__snapshots__/building-block.test.ts.snap

@@ -767,18 +767,16 @@ exports[`Building Blocks CustomFormField building block generate CustomFormField
 </mvc:View>"
 `;
 
-exports[`Building Blocks CustomFormField building block generate CustomFormField without macros:fields - creates aggregation: generate-custom-form-field-without-fields 1`] = `
+exports[`Building Blocks CustomFormField building block generate CustomFormField without macros:fields - inserts FormElement directly into Form: generate-custom-form-field-without-fields 1`] = `
 "<mvc:View xmlns:core=\\"sap.ui.core\\" xmlns:mvc=\\"sap.ui.core.mvc\\" xmlns=\\"sap.m\\" xmlns:html=\\"http://www.w3.org/1999/xhtml\\" controllerName=\\"com.test.myApp.ext.main.Main\\" xmlns:macros=\\"sap.fe.macros\\">
     <Page title=\\"Main\\">
         <content>
             <macros:Form id=\\"myForm\\" metaPath=\\"@com.sap.vocabularies.UI.v1.FieldGroup#General\\">
-                <macros:fields>
-                    <macros:FormElement label=\\"Custom Form Field 2\\" id=\\"testCustomFormField2\\" anchor=\\"DataField::AnotherProperty\\" placement=\\"Before\\">
-                        <macros:fields>
-                            <core:Fragment fragmentName=\\"my.test.App.ext.fragment.CustomFormField2\\" type=\\"XML\\"/>
-                        </macros:fields>
-                    </macros:FormElement>
-                </macros:fields>
+                <macros:FormElement label=\\"Custom Form Field 2\\" id=\\"testCustomFormField2\\" anchor=\\"DataField::AnotherProperty\\" placement=\\"Before\\">
+                    <macros:fields>
+                        <core:Fragment fragmentName=\\"my.test.App.ext.fragment.CustomFormField2\\" type=\\"XML\\"/>
+                    </macros:fields>
+                </macros:FormElement>
             </macros:Form>
         </content>
     </Page>

packages/fe-fpm-writer/test/unit/building-block.test.ts

@@ -3065,7 +3065,7 @@ describe('Building Blocks', () => {
             await writeFilesForDebugging(fs);
         });
 
-        test('generate CustomFormField without macros:fields - creates aggregation', async () => {
+        test('generate CustomFormField without macros:fields - inserts FormElement directly into Form', async () => {
             const basePath = join(testAppPath, 'generate-custom-form-field-without-fields');
             const aggregationPath = `/mvc:View/*[local-name()='Page']/*[local-name()='content']/macros:Form`;
             const customFormFieldData: CustomFormField = {
@@ -3105,9 +3105,8 @@ describe('Building Blocks', () => {
 
             const viewContent = fs.read(join(basePath, xmlViewFilePath));
             expect(viewContent).toMatchSnapshot('generate-custom-form-field-without-fields');
-            expect(viewContent).toContain('<macros:fields>');
-            expect(viewContent).toMatch(/<macros:fields>[\s\S]*FormElement[\s\S]*<\/macros:fields>/);
-            expect(viewContent).toContain('FormElement');
+            expect(viewContent).not.toMatch(/<macros:fields>[\s\S]*<macros:FormElement/);
+            expect(viewContent).toContain('<macros:FormElement');
             expect(viewContent).toContain('Custom Form Field 2');
             expect(viewContent).toContain('anchor="DataField::AnotherProperty"');
             expect(viewContent).toContain('placement="Before"');