@sap-ux/fe-fpm-writer 0.27.4 → 0.27.6

package/dist/building-block/index.js

@@ -141,11 +141,9 @@ function getMetaPath(type, metaPath, usePlaceholders) {
     if (!metaPath) {
         return getDefaultMetaPath(type, usePlaceholders);
     }
-    const { entitySet, bindingContextType = 'absolute' } = metaPath;
-    let { qualifier } = metaPath;
-    let entityPath = entitySet || (usePlaceholders ? PLACEHOLDERS.entitySet : '');
-    const lastIndex = entityPath.lastIndexOf('.');
-    entityPath = lastIndex >= 0 ? entityPath.substring?.(lastIndex + 1) : entityPath;
+    const { bindingContextType = 'absolute' } = metaPath;
+    let { entitySet, qualifier } = metaPath;
+    entitySet = entitySet || (usePlaceholders ? PLACEHOLDERS.entitySet : '');
     const qualifierOrPlaceholder = qualifier || (usePlaceholders ? PLACEHOLDERS.qualifier : '');
     if (type === types_1.BuildingBlockType.Chart) {
         // Special handling for chart - while runtime does not support approach without contextPath
@@ -153,11 +151,11 @@ function getMetaPath(type, metaPath, usePlaceholders) {
         qualifier = qualifierParts.pop();
         return {
             metaPath: qualifier,
-            contextPath: qualifierParts.length ? `/${entityPath}/${qualifierParts.join('/')}` : `/${entityPath}`
+            contextPath: qualifierParts.length ? `/${entitySet}/${qualifierParts.join('/')}` : `/${entitySet}`
         };
     }
     return {
-        metaPath: bindingContextType === 'absolute' ? `/${entityPath}/${qualifierOrPlaceholder}` : qualifierOrPlaceholder
+        metaPath: bindingContextType === 'absolute' ? `/${entitySet}/${qualifierOrPlaceholder}` : qualifierOrPlaceholder
     };
 }
 /**

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

@@ -5,7 +5,8 @@ const i18n_1 = require("../../../i18n");
 const utils_1 = require("../utils");
 const types_1 = require("../../types");
 const defaultAnswers = {
-    id: 'FilterBar'
+    id: 'FilterBar',
+    bindingContextType: 'absolute'
 };
 /**
  * Returns a list of prompts required to generate a filterbar building block.
@@ -32,6 +33,14 @@ async function getFilterBarBuildingBlockPrompts(context) {
                     mandatory: true
                 }
             }),
+            (0, utils_1.getBindingContextTypePrompt)({
+                message: t('bindingContextType'),
+                default: defaultAnswers.bindingContextType,
+                guiOptions: {
+                    mandatory: true,
+                    dependantPromptNames: ['buildingBlockData.metaPath.qualifier']
+                }
+            }),
             ...(project && (0, utils_1.isCapProject)(project)
                 ? [
                     await (0, utils_1.getCAPServicePrompt)(context, {

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

@@ -149,14 +149,8 @@ function getEntityPrompt(context, properties = {}) {
         name: 'buildingBlockData.metaPath.entitySet',
         choices: project
             ? async () => {
-                const entityTypes = await (0, service_1.getEntityTypes)(project, appId);
-                const entityTypeMap = {};
-                for (const entityType of entityTypes) {
-                    const value = entityType.fullyQualifiedName;
-                    const qualifierParts = value.split('.');
-                    entityTypeMap[qualifierParts[qualifierParts.length - 1]] = value;
-                }
-                return transformChoices(entityTypeMap);
+                const entitySets = (await (0, service_1.getEntitySets)(project, appId)).map((entitySet) => entitySet.name);
+                return transformChoices(entitySets);
             }
             : [],
         guiOptions: {

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

@@ -1,4 +1,4 @@
-import type { ConvertedMetadata, EntityType } from '@sap-ux/vocabularies-types';
+import type { ConvertedMetadata, EntitySet } from '@sap-ux/vocabularies-types';
 import type { EntityTypeAnnotations } from '@sap-ux/vocabularies-types/vocabularies/Edm_Types';
 import type { UIAnnotationTerms } from '@sap-ux/vocabularies-types/vocabularies/UI';
 import { FioriAnnotationService } from '@sap-ux/fiori-annotation-api';
@@ -38,13 +38,13 @@ export declare function getAnnotationService(project: Project, serviceName: stri
  */
 export declare function getMergedMetadata(annotationService: FioriAnnotationService): ConvertedMetadata;
 /**
- * Method gets available entity types in project.
+ * Method gets available entity sets in project.
  *
  * @param project = project
  * @param appId = app id
- * @returns an array of entity types
+ * @returns an array of entity sets
  */
-export declare function getEntityTypes(project: Project, appId: string): Promise<EntityType[]>;
+export declare function getEntitySets(project: Project, appId: string): Promise<EntitySet[]>;
 /**
  * Method to get the annotation term alias.
  *

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAnnotationPathQualifiers = exports.getAnnotationTermAlias = exports.getEntityTypes = exports.getMergedMetadata = exports.getAnnotationService = exports.getMappedServiceName = void 0;
+exports.getAnnotationPathQualifiers = exports.getAnnotationTermAlias = exports.getEntitySets = exports.getMergedMetadata = exports.getAnnotationService = exports.getMappedServiceName = void 0;
 const annotation_converter_1 = require("@sap-ux/annotation-converter");
 const fiori_annotation_api_1 = require("@sap-ux/fiori-annotation-api");
 const project_access_1 = require("@sap-ux/project-access");
@@ -88,17 +88,17 @@ function getMainService(project, appId) {
     return mainService ?? 'mainService';
 }
 /**
- * Method gets available entity types in project.
+ * Method gets available entity sets in project.
  *
  * @param project = project
  * @param appId = app id
- * @returns an array of entity types
+ * @returns an array of entity sets
  */
-async function getEntityTypes(project, appId) {
+async function getEntitySets(project, appId) {
     const metadata = await getServiceMetadata(project, getMainService(project, appId), appId);
-    return Array.from(metadata.entityTypes);
+    return Array.from(metadata.entitySets);
 }
-exports.getEntityTypes = getEntityTypes;
+exports.getEntitySets = getEntitySets;
 /**
  * Method to get the annotation term alias.
  *
@@ -126,13 +126,8 @@ async function getAnnotationPathQualifiers(project, appId, entity, annotationTer
     try {
         const annotationService = await getAnnotationService(project, getMainService(project, appId), appId);
         const mergedMetadata = getMergedMetadata(annotationService);
-        let entityType = mergedMetadata.entityTypes.by_fullyQualifiedName(entity);
-        if (!entityType) {
-            const entitySet = mergedMetadata.entitySets.by_name(entity);
-            if (entitySet) {
-                entityType = entitySet.entityType;
-            }
-        }
+        const entitySet = mergedMetadata.entitySets.by_name(entity);
+        const entityType = entitySet?.entityType;
         if (entityType) {
             getAnnotationPathQualifiersForEntityType(entityType, annotationTerm, result, useNamespace, bindingContext);
         }

package/dist/prompts/translations/i18n.en.json

@@ -103,7 +103,8 @@
             "qualifier": "Selection Fields Qualifier",
             "qualifierPlaceholder": "Select selection fields qualifier",
             "aggregation": "Aggregation Path",
-            "valuesDependentOnEntityTypeInfo": "Values are dependent on entity type"
+            "valuesDependentOnEntityTypeInfo": "Values are dependent on entity type",
+            "bindingContextType": "Binding Context Path Type"
         },
         "table": {
             "tableBuildingBlockPropertiesTitle": "Table Building Block Properties",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fe-fpm-writer",
   "description": "SAP Fiori elements flexible programming model writer",
-  "version": "0.27.4",
+  "version": "0.27.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -42,7 +42,7 @@
     "@types/mem-fs-editor": "7.0.1",
     "@types/semver": "7.5.2",
     "@types/vinyl": "2.0.7",
-    "@sap-ux/ui-prompting": "0.1.2"
+    "@sap-ux/ui-prompting": "0.1.4"
   },
   "engines": {
     "node": ">=18.x"