@sap-ux/fiori-app-sub-generator 1.2.0 → 1.3.0

package/generators/fiori-app-generator/transforms.js

@@ -5,9 +5,10 @@ import { DatasourceType } from '@sap-ux/odata-service-inquirer';
 import { ServiceType } from '@sap-ux/odata-service-writer';
 import { AuthenticationType } from '@sap-ux/store';
 import { latestVersionString } from '@sap-ux/ui5-info';
+import { hostEnvironment, getHostEnvironment } from '@sap-ux/fiori-generator-shared';
+import { PageTemplateType } from '@sap-ux/fe-fpm-writer';
 import { DEFAULT_HOST, DEFAULT_SERVICE_PATH, FPM_DEFAULT_PAGE_NAME, FloorplanFE, FloorplanFF, MAIN_DATASOURCE_NAME, MAIN_MODEL_NAME, UI5_VERSION_PROPS } from '../types/index.js';
 import { assignSapUxLayerValue, convertCapRuntimeToCapProjectType, generateToolsId, getAnnotations, getAppId, getMinSupportedUI5Version } from '../utils/index.js';
-import { hostEnvironment, getHostEnvironment } from '@sap-ux/fiori-generator-shared';
 import { isFeatureEnabled } from '@sap-ux/feature-toggle';
 /**
  * Get the writer template type from the Fiori App floorplan.
@@ -61,9 +62,12 @@ export function transformTemplateType(floorplan, entityRelatedConfig, viewName)
             };
         }
     }
-    // Add page title if addPageBuildingBlock is true
+    // Add page building block config if addPageBuildingBlock is true
     const pageBuildingBlockConfig = entityRelatedConfig?.addPageBuildingBlock
-        ? { pageBuildingBlockTitle: entityRelatedConfig.pageBuildingBlockTitle }
+        ? {
+            pageBuildingBlockTitle: entityRelatedConfig.pageBuildingBlockTitle,
+            pageBuildingBlockTemplateType: entityRelatedConfig.pageBuildingBlockLayout ?? PageTemplateType.Basic
+        }
         : {};
     const templateSettingsMap = {
         [TemplateTypeFE.ListReportObjectPage]: {

package/generators/types/constants.d.ts

@@ -48,7 +48,6 @@ export declare const generatorName = "SAP Fiori Application Generator";
 export declare const FPM_DEFAULT_PAGE_NAME = "Main";
 export declare const minSupportedUi5Version = "1.65.0";
 export declare const minSupportedUi5VersionV4 = "1.84.0";
-export declare const minUi5VersionForPageBuildingBlock = "1.136.0";
 export declare const defaultNavActionTile = "tile";
 export declare const defaultNavActionDisplay = "display";
 /**

package/generators/types/constants.js

@@ -93,8 +93,6 @@ export const FPM_DEFAULT_PAGE_NAME = 'Main';
 // App gen specific (not writer specific) supported UI5 versions
 export const minSupportedUi5Version = '1.65.0';
 export const minSupportedUi5VersionV4 = '1.84.0';
-// The minimum UI5 version required for page building block feature
-export const minUi5VersionForPageBuildingBlock = '1.136.0';
 export const defaultNavActionTile = 'tile';
 export const defaultNavActionDisplay = 'display';
 /**

package/generators/utils/common.d.ts

@@ -42,7 +42,7 @@ export declare function buildSapClientParam(sapClient: string): string;
 export declare function getRequiredOdataVersion(floorplan: Floorplan): OdataVersion | undefined;
 /**
  * Gets the minimum supported UI5 version for the specified OData version, floorplan, and entity configuration.
- * For FPM floorplans with page building blocks, enforces a minimum version of 1.136.0.
+ * For FPM floorplans with page building blocks, enforces a minimum version based on layout type.
  *
  * @param version - The OData version.
  * @param floorplan - The floorplan type.

package/generators/utils/common.js

@@ -3,13 +3,14 @@ import { isAbapEnvironmentOnBtp, isAppStudio } from '@sap-ux/btp-utils';
 import { checkCdsUi5PluginEnabled, getAppLaunchText } from '@sap-ux/cap-config-writer';
 import { parse } from '@sap-ux/edmx-parser';
 import { TemplateTypeAttributes } from '@sap-ux/fiori-elements-writer';
+import { PageTemplateType, MIN_UI5_VERSION_PAGE_BUILDING_BLOCK, MIN_UI5_VERSION_PAGE_BUILDING_BLOCK_FULL_LAYOUT } from '@sap-ux/fe-fpm-writer';
 import { writeApplicationInfoSettings } from '@sap-ux/fiori-tools-settings';
 import { createLaunchConfig } from '@sap-ux/launch-config';
 import { DatasourceType, OdataVersion } from '@sap-ux/odata-service-inquirer';
 import { isCapJavaProject, toReferenceUri } from '@sap-ux/project-access';
 import { basename, join } from 'node:path';
 import { v4 as uuidV4 } from 'uuid';
-import { ApiHubType, SapSystemSourceType, FloorplanFE, minUi5VersionForPageBuildingBlock } from '../types/index.js';
+import { ApiHubType, SapSystemSourceType, FloorplanFE } from '../types/index.js';
 import { minSupportedUi5Version, minSupportedUi5VersionV4 } from '../types/constants.js';
 import { FloorplanAttributes, FloorplanFF } from '../types/external.js';
 import { t } from './i18n.js';
@@ -64,7 +65,7 @@ export function getRequiredOdataVersion(floorplan) {
 }
 /**
  * Gets the minimum supported UI5 version for the specified OData version, floorplan, and entity configuration.
- * For FPM floorplans with page building blocks, enforces a minimum version of 1.136.0.
+ * For FPM floorplans with page building blocks, enforces a minimum version based on layout type.
  *
  * @param version - The OData version.
  * @param floorplan - The floorplan type.
@@ -73,7 +74,9 @@ export function getRequiredOdataVersion(floorplan) {
  */
 export function getMinSupportedUI5Version(version, floorplan, entityRelatedConfig) {
     if (floorplan === FloorplanFE.FE_FPM && entityRelatedConfig?.addPageBuildingBlock) {
-        return minUi5VersionForPageBuildingBlock;
+        return entityRelatedConfig.pageBuildingBlockLayout === PageTemplateType.Full
+            ? MIN_UI5_VERSION_PAGE_BUILDING_BLOCK_FULL_LAYOUT
+            : MIN_UI5_VERSION_PAGE_BUILDING_BLOCK;
     }
     let minUI5Version;
     if (floorplan && floorplan !== FloorplanFF.FF_SIMPLE) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-app-sub-generator",
   "description": "A yeoman (sub) generator that can generate Fiori applications. Not for standalone use.",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -34,13 +34,14 @@
     "@sap-ux/axios-extension": "2.0.7",
     "@sap-ux/btp-utils": "2.0.5",
     "@sap-ux/cap-config-writer": "1.0.22",
+    "@sap-ux/fe-fpm-writer": "1.3.0",
     "@sap-ux/feature-toggle": "1.0.5",
-    "@sap-ux/fiori-elements-writer": "3.0.60",
+    "@sap-ux/fiori-elements-writer": "3.1.0",
     "@sap-ux/fiori-freestyle-writer": "3.0.53",
     "@sap-ux/fiori-generator-shared": "1.2.0",
     "@sap-ux/fiori-tools-settings": "1.0.1",
     "@sap-ux/launch-config": "1.0.12",
-    "@sap-ux/odata-service-inquirer": "3.1.0",
+    "@sap-ux/odata-service-inquirer": "3.2.0",
     "@sap-ux/odata-service-writer": "1.0.12",
     "@sap-ux/project-access": "2.1.6",
     "@sap-ux/store": "2.0.4",
@@ -64,7 +65,7 @@
     "mock-spawn": "0.2.6",
     "rimraf": "6.1.3",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "1.0.43",
+    "@sap-ux/deploy-config-sub-generator": "1.0.44",
     "@sap-ux/flp-config-sub-generator": "1.0.39",
     "@sap-ux/inquirer-common": "1.0.23",
     "@sap-ux/jest-file-matchers": "1.0.2",