@sap-ux/fe-fpm-writer 1.3.11 → 1.3.13

package/dist/building-block/prompts/questions/chart.js

@@ -96,7 +96,7 @@ export async function getChartBuildingBlockPrompts(context) {
             getAggregationPathPrompt(context, {
                 message: t('aggregation'),
                 guiOptions: { groupId: groupIds.commonChartBuildingBlockProperties, mandatory: true }
-            }),
+            }, { defaultTarget: 'items' }),
             getFilterBarIdPrompt(context, {
                 message: t('filterBar.message'),
                 type: 'list',

package/dist/building-block/prompts/questions/filter-bar.js

@@ -73,7 +73,7 @@ export async function getFilterBarBuildingBlockPrompts(context) {
             getAggregationPathPrompt(context, {
                 message: t('aggregation'),
                 guiOptions: { groupId: groupIds.commonFilterBarBuildingBlockProperties, mandatory: true }
-            }),
+            }, { defaultTarget: 'items' }),
             getEntityPrompt(context, {
                 message: t('entity'),
                 guiOptions: {

package/dist/building-block/prompts/questions/form.js

@@ -89,7 +89,7 @@ export async function getFormBuildingBlockPrompts(context) {
                 groupId: groupIds.commonFormBuildingBlockProperties,
                 mandatory: true
             }
-        }),
+        }, { defaultTarget: 'items' }),
         {
             type: 'input',
             name: 'buildingBlockData.title',

package/dist/building-block/prompts/questions/table.js

@@ -108,7 +108,7 @@ export async function getTableBuildingBlockPrompts(context) {
                     groupId: groupIds.commonTableBuildingBlockProperties,
                     mandatory: true
                 }
-            }),
+            }, { defaultTarget: 'items' }),
             getFilterBarIdPrompt(context, {
                 message: t('filterBar.message'),
                 type: 'list',

package/dist/building-block/prompts/utils/questions.d.ts

@@ -63,9 +63,13 @@ export declare function getCAPServiceChoices(project: Project, appId: string): P
  *
  * @param context - prompt context including data about project
  * @param properties - object with additional properties of question
+ * @param options - additional options
+ * @param options.defaultTarget - preferred aggregation to pre-select by default: `'page'` (default) or `'items'`
  * @returns prompt for choosing aggregation path of selected xml file.
  */
-export declare function getAggregationPathPrompt(context: PromptContext, properties?: Partial<ListPromptQuestion>): ListPromptQuestion;
+export declare function getAggregationPathPrompt(context: PromptContext, properties?: Partial<ListPromptQuestion>, options?: {
+    defaultTarget?: 'page' | 'items';
+}): ListPromptQuestion;
 /**
  * Method converts choices to "PromptListChoices" type.
  *

package/dist/building-block/prompts/utils/questions.js

@@ -212,16 +212,59 @@ export async function getCAPServiceChoices(project, appId) {
     }
     return transformChoices(servicesMap);
 }
+/**
+ * Resolves the default (pre-selected) aggregation-path choice key.
+ *
+ * By default the pre-selected choice is the page macro node itself (`macros:Page`), matching the historic
+ * behavior. When `defaultTarget` is `'items'`, the default is the `macros:items` slot under the page macro,
+ * or the first tab's content (`IconTabFilter`) directly inside that slot when one exists.
+ *
+ * The lookup is anchored to the `macros:items` slot under the page macro, so this only applies to a Custom Page
+ * building block layout. For views without a `macros:Page` (e.g. object-page sections or plain FPM views) no key
+ * matches, so it falls through to the historic fallback and the default is unchanged.
+ *
+ * @param inputChoices - map of available aggregation XPath choices
+ * @param pageMacroDefinition - the page macro node name (e.g. `macros:Page`)
+ * @param defaultTarget - preferred default target: `'page'` (default) or `'items'`
+ * @returns the choice key to mark as checked, or undefined when none applies
+ */
+function resolveDefaultKey(inputChoices, pageMacroDefinition, defaultTarget) {
+    const keys = Object.keys(inputChoices);
+    if (defaultTarget === 'items' && pageMacroDefinition) {
+        // Use local-name matching throughout to handle non-default namespace prefixes (e.g. xmlns:m="sap.m").
+        const localName = (path) => path.split('/').pop()?.split(':').pop();
+        // Find the items slot as the direct child of the page macro node with local-name 'items'.
+        const pageKey = keys.find((k) => k.endsWith(`/${pageMacroDefinition}`));
+        const itemsKey = pageKey
+            ? keys.find((k) => k.startsWith(`${pageKey}/`) &&
+                k.slice(pageKey.length + 1).split('/').length === 1 &&
+                localName(k) === 'items')
+            : undefined;
+        if (itemsKey) {
+            // Prefer the first tab's content (IconTabFilter) directly under the items slot.
+            // Depth check: exactly 3 segments after itemsKey (e.g. IconTabBar/items/IconTabFilter).
+            const tabKey = keys.find((k) => k.startsWith(`${itemsKey}/`) &&
+                localName(k) === 'IconTabFilter' &&
+                k.slice(itemsKey.length + 1).split('/').length === 3);
+            return tabKey ?? itemsKey;
+        }
+    }
+    // Default / fallback: the page macro node itself (undefined when no page macro node exists).
+    return keys.find((k) => k.endsWith(`/${pageMacroDefinition}`));
+}
 /**
  * Return a Prompt for choosing the aggregation path.
  *
  * @param context - prompt context including data about project
  * @param properties - object with additional properties of question
+ * @param options - additional options
+ * @param options.defaultTarget - preferred aggregation to pre-select by default: `'page'` (default) or `'items'`
  * @returns prompt for choosing aggregation path of selected xml file.
  */
-export function getAggregationPathPrompt(context, properties = {}) {
+export function getAggregationPathPrompt(context, properties = {}, options = {}) {
     const { fs, project, appPath } = context;
     const { guiOptions } = properties;
+    const { defaultTarget = 'page' } = options;
     return {
         ...properties,
         type: 'list',
@@ -231,7 +274,7 @@ export function getAggregationPathPrompt(context, properties = {}) {
                 const { viewOrFragmentPath } = answers;
                 if (viewOrFragmentPath) {
                     const { inputChoices, pageMacroDefinition } = getXPathStringsForXmlFile(join(appPath, viewOrFragmentPath), fs);
-                    const key = Object.keys(inputChoices).find((k) => k.endsWith(`/${pageMacroDefinition}`));
+                    const key = resolveDefaultKey(inputChoices, pageMacroDefinition, defaultTarget);
                     const choices = transformChoices(inputChoices, false, key);
                     if (!choices.length) {
                         throw new Error('Failed while fetching the aggregation path.');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fe-fpm-writer",
   "description": "SAP Fiori elements flexible programming model writer",
-  "version": "1.3.11",
+  "version": "1.3.13",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -31,7 +31,7 @@
     "semver": "7.8.5",
     "xml-formatter": "3.7.0",
     "xpath": "0.0.34",
-    "@sap-ux/fiori-annotation-api": "1.0.22",
+    "@sap-ux/fiori-annotation-api": "1.0.23",
     "@sap-ux/i18n": "1.0.2",
     "@sap-ux/project-access": "2.1.10",
     "@sap-ux/logger": "1.0.3"