fist draft

Author: eouin

packages/fe-fpm-writer/src/building-block/index.ts

@@ -14,6 +14,8 @@ import {
     type TemplateConfig,
     type CustomFilterField
 } from './types';
+import type { InternalCustomFilter } from '../filter/types';
+
 import { DOMParser, XMLSerializer } from '@xmldom/xmldom';
 import * as xpath from 'xpath';
 import format from 'xml-formatter';
@@ -55,7 +57,7 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
     fs?: Editor
 ): Promise<Editor> {
     debugger;
-    console.log('last attempt');
+    console.log('last  kitty');
 
     const { viewOrFragmentPath, aggregationPath, buildingBlockData, allowAutoAddDependencyLib = true } = config;
     // Validate the base and view paths
@@ -256,33 +258,39 @@ function processBuildingBlock<T extends BuildingBlock>(
 
     if (isCustomFilterField(buildingBlockData) && buildingBlockData.embededFragment) {
         const embededFragment = setCommonDefaults(buildingBlockData.embededFragment, manifestPath, manifest);
+
+        const config: InternalCustomFilter = {} as InternalCustomFilter;
+        if (buildingBlockData.embededFragment) {
+            config.controlID = buildingBlockData.filterFieldKey!;
+            config.label = buildingBlockData.label!;
+            config.property = buildingBlockData.property!;
+            config.required = buildingBlockData.required ?? false;
+            config.position = buildingBlockData.position!;
+
+            config.eventHandler = buildingBlockData.embededFragment.eventHandler;
+            config.ns = embededFragment.ns;
+            config.name = embededFragment.name;
+            config.path = embededFragment.path;
+        }
+
         const viewPath = join(
             embededFragment.path,
             `${embededFragment.fragmentFile ?? embededFragment.name}.fragment.xml`
         );
 
         // Apply event handler
-        if (buildingBlockData.embededFragment.eventHandler) {
-            buildingBlockData.embededFragment.eventHandler = applyEventHandlerConfiguration(
-                fs,
-                buildingBlockData.embededFragment,
-                buildingBlockData.embededFragment.eventHandler,
-                {
-                    controllerSuffix: false,
-                    typescript: buildingBlockData.embededFragment.typescript
-                }
-            );
+        if (config.eventHandler) {
+            config.eventHandler = applyEventHandlerConfiguration(fs, config, config.eventHandler, {
+                controllerSuffix: false,
+                typescript: buildingBlockData.embededFragment.typescript,
+                templatePath: 'filter/Controller'
+            });
         }
 
-        buildingBlockData.embededFragment.content = getDefaultFragmentContent(
-            'Sample Text',
-            buildingBlockData.embededFragment.eventHandler
-        );
         if (!fs.exists(viewPath)) {
-            fs.copyTpl(getTemplatePath('common/Fragment.xml'), viewPath, buildingBlockData.embededFragment);
+            fs.copyTpl(getTemplatePath('filter/Fragment.xml'), viewPath, config);
         }
 
-        // check xmlDocument for macrosFilterBar element
         const filterBarResult = updateAggregationPathForFilterBar(xmlDocument, aggregationPath, buildingBlockData);
         updatedAggregationPath = filterBarResult.updatedAggregationPath;
         hasAggregation = filterBarResult.hasFilterFields;

packages/fe-fpm-writer/src/building-block/types.ts

@@ -413,10 +413,9 @@ export interface CustomFilterField extends BuildingBlock {
      */
     label: string;
     /**
-     * Defines where this filter should be placed relative to the defined anchor.
-     * Allowed values are `Before` and `After`.
+     * Position of a custom filter relative to an anchor element.
      */
-    placement: 'Before' | 'After';
+    position?: Position;
     /**
      * The property used to filter by.
      */

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

@@ -1,5 +1,11 @@
 <% if (!config?.hasAggregation) { %><<%- macrosNamespace %>:filterFields><% } %>
-    <<%- config?.aggregationNamespace %>:FilterField key="<%- data.filterFieldKey %>" label="<%- data.label %>">
+    <<%- config?.aggregationNamespace %>:FilterField 
+		key="<%- data.filterFieldKey %>" 
+		label="<%- data.label %>"
+		<% if (data.position.anchor) { %> anchor="<%- data.position.anchor %>"<% } %>
+		<% if (data.position.placement) { %> placement="<%- data.position.placement %>"<% } %>
+		<% if (data.required) { %> required="<%- data.required %>"<% } %>
+		<% if (data.property) { %> property="<%- data.property %>"<% } %>>
 		<core:Fragment fragmentName="<%- data.embededFragment.ns %>.<%- data.embededFragment.name %>" type="XML" />
 	</<%- config?.aggregationNamespace %>:FilterField>
 <% if (!config?.hasAggregation) { %></<%- macrosNamespace %>:filterFields><% } %>