@sap/ux-specification 1.90.20 → 1.90.25

package/dist/src/sync/common/types.js

@@ -5,6 +5,11 @@ var ExportArtifacts;
     ExportArtifacts["flex"] = "flex";
     ExportArtifacts["manifest"] = "manifest";
 })(ExportArtifacts = exports.ExportArtifacts || (exports.ExportArtifacts = {}));
+var ALPViewType;
+(function (ALPViewType) {
+    ALPViewType["Primary"] = "primary";
+    ALPViewType["Secondary"] = "secondary";
+})(ALPViewType = exports.ALPViewType || (exports.ALPViewType = {}));
 var DirName;
 (function (DirName) {
     DirName["Sapux"] = "src";
@@ -59,6 +64,11 @@ var ControlType;
     ControlType["Section"] = "sap.uxap.ObjectPageSection";
     ControlType["SubSection"] = "sap.uxap.ObjectPageSubSection";
 })(ControlType = exports.ControlType || (exports.ControlType = {}));
+var Visualization;
+(function (Visualization) {
+    Visualization["LineItem"] = "LineItem";
+    Visualization["Chart"] = "Chart";
+})(Visualization = exports.Visualization || (exports.Visualization = {}));
 var FacetBase;
 (function (FacetBase) {
     FacetBase["LineItem"] = "LineItem";
@@ -80,20 +90,62 @@ var ViewTemplateType;
     ViewTemplateType["GridTableColumnsExtension"] = "GridTableColumnsExtension";
     ViewTemplateType["ResponsiveTableCellsExtension"] = "ResponsiveTableCellsExtension";
 })(ViewTemplateType = exports.ViewTemplateType || (exports.ViewTemplateType = {}));
+//Definitions for elements in app schema
 var DefinitionName;
 (function (DefinitionName) {
-    DefinitionName["TableColumn"] = "TableColumn";
-    DefinitionName["ObjectPageTable"] = "ObjectPageTable";
-    DefinitionName["ObjectPageTableColumn"] = "ObjectPageTableColumn";
-    DefinitionName["ToolBarLR"] = "ToolBar<LineItems>";
-    DefinitionName["CustomColumns"] = "TableCustomColumns";
+    DefinitionName["Actions"] = "Actions";
+    DefinitionName["ALPChart"] = "ALPChart";
+    DefinitionName["ALPChartView"] = "ALPChartView";
+    DefinitionName["ALPTable"] = "ALPTable";
+    DefinitionName["ALPTableView"] = "ALPTableView";
+    DefinitionName["AnalyticalListPageFilterBar"] = "AnalyticalListPageFilterBar";
+    DefinitionName["AnnotationPathAsObject"] = "AnnotationPathAsObject";
+    DefinitionName["ChartToolBarAction"] = "ChartToolBarAction";
     DefinitionName["CustomColumn"] = "TableCustomColumn";
     DefinitionName["CustomColumnOP"] = "TableCustomColumnOP";
+    DefinitionName["CustomColumns"] = "TableCustomColumns";
+    DefinitionName["Fields"] = "Fields";
+    DefinitionName["FooterActions"] = "FooterActions";
+    DefinitionName["Form"] = "Form";
+    DefinitionName["FormAction"] = "FormAction";
+    DefinitionName["GenericActions"] = "GenericActions";
+    DefinitionName["HeaderActions"] = "HeaderActions";
+    DefinitionName["LineItems"] = "LineItems";
+    DefinitionName["LineItemsOfView"] = "LineItemsOfView";
+    DefinitionName["ListReportFilterBar"] = "ListReportFilterBar";
+    DefinitionName["LRTableView"] = "LRTableView";
+    DefinitionName["LRChartView"] = "LRChartView";
+    DefinitionName["MultiTableModeV4"] = "MultiTableModeV4";
+    DefinitionName["ObjectPageFooter"] = "ObjectPageFooter";
+    DefinitionName["ObjectPageFooterAction"] = "ObjectPageFooterAction";
+    DefinitionName["ObjectPageFooterActions"] = "ObjectPageFooterActions";
+    DefinitionName["ObjectPageHeader"] = "ObjectPageHeader";
+    DefinitionName["ObjectPageTable"] = "ObjectPageTable";
+    DefinitionName["ObjectPageTableColumn"] = "ObjectPageTableColumn";
+    DefinitionName["ObjectPageToolBarAction"] = "ObjectPageToolBarAction";
     DefinitionName["Position"] = "Position";
     DefinitionName["PositionOP"] = "PositionOP";
-    DefinitionName["ListReportFilterBar"] = "ListReportFilterBar";
-    DefinitionName["AnalyticalListPageFilterBar"] = "AnalyticalListPageFilterBar";
+    DefinitionName["Table"] = "Table";
+    DefinitionName["TableColumn"] = "TableColumn";
+    DefinitionName["ToolBarAction"] = "ToolBarAction";
+    DefinitionName["ToolBarLR"] = "ToolBar<LineItems>";
+    DefinitionName["ToolBar"] = "ToolBar";
+    DefinitionName["ViewTableColumn"] = "ViewTableColumn";
+    DefinitionName["ViewCustomColumn"] = "ViewTableCustomColumn";
+    DefinitionName["ViewChartToolBar"] = "ViewChartToolBar";
+    DefinitionName["ViewToolBarAction"] = "ViewToolBarAction";
 })(DefinitionName = exports.DefinitionName || (exports.DefinitionName = {}));
+var SchemaTag;
+(function (SchemaTag) {
+    SchemaTag["hidden"] = "hidden";
+    SchemaTag["isViewNode"] = "isViewNode";
+    SchemaTag["annotationPath"] = "annotationPath";
+    SchemaTag["annotationType"] = "annotationType";
+    SchemaTag["dataType"] = "dataType";
+    SchemaTag["propertyIndex"] = "propertyIndex";
+    SchemaTag["artifactType"] = "artifactType";
+    SchemaTag["key"] = "key";
+})(SchemaTag = exports.SchemaTag || (exports.SchemaTag = {}));
 exports.METADATAPATH = 'webapp/localService/metadata.xml';
 exports.MANIFESTPATH = 'webapp/manifest.json';
 exports.VOCWITHSLASH = '/@com.sap.vocabularies';

package/dist/src/sync/common/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/sync/common/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/sync/common/types.ts"],"names":[],"mappings":"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"}

package/dist/src/sync/common/utils.d.ts

@@ -1,9 +1,10 @@
-import { FacetConfigs, FileData, FacetConfig, FacetSection, SchemaFilePath } from './types';
-import { AnnotationTerm, CollectionFacet, ConverterOutput, DataFieldAbstractTypes, EntityType, PropertyAnnotations, PropertyPath, ReferenceFacet, ReferenceURLFacet } from '@sap-ux/vocabularies-types';
-import { FioriElementsVersion, Manifest, PageType, PageTypeV4 } from '../../specification/common';
+import type { FacetConfigs, FileData, FacetConfig, FacetSection, SchemaFilePath } from './types';
+import type { AnnotationTerm, CollectionFacet, ConverterOutput, DataFieldAbstractTypes, EntityType, PropertyAnnotations, PropertyPath, ReferenceFacet, ReferenceURLFacet } from '@sap-ux/vocabularies-types';
+import type { Manifest } from '../../specification/common';
+import { FioriElementsVersion, PageType, PageTypeV4 } from '../../specification/common';
 import { SchemaType } from '../../specification/schemaAccess';
-import { ExtensionLogger } from '../../apiTypes';
-import { MetadataInstanceInterface } from './decoration/factory';
+import type { ExtensionLogger } from '../../apiTypes';
+import type { MetadataInstanceInterface } from './decoration/factory';
 export declare enum TemplateType {
     ListReportObjectPageV2 = "ListReportObjectPageV2",
     ListReportObjectPageV4 = "ListReportObjectPageV4",
@@ -82,15 +83,17 @@ export declare function findAlias(namespace: string, oDataServiceAVT: ConverterO
  */
 export declare function getSectionFacet(facetDefinition: AnnotationTerm<CollectionFacet> | AnnotationTerm<ReferenceFacet> | AnnotationTerm<ReferenceURLFacet>, sourceEntityType: EntityType, oDataServiceAVT: ConverterOutput, logger?: ExtensionLogger, oDataVersion?: FioriElementsVersion, keyForRelatedFacetKeys?: boolean): FacetSection | undefined;
 /**
- * Finds the alias for a given namespace in the references' section of the converted service metadata
- * @param {object} exportResultManifest - manifest that is being modified during export
+ * Finds the alias for a given namespace in the references' section of the converted service metadata.
+ * An empty object is created if the path element does not exist yet.
+ * Exception: if an empty array is the next element  of the 'path' definition, an empty array is created instaed of an empty object.
+ * @param {object} manifest - manifest that is being modified during export
  * @param {string} path - path of the property in the manifest
  * @param {string} targetAnnotation - target annotation (optional)
  * @param {string} targetAnnotationEncoded - target annotation in its encoded form, as used in manifest settings
  * @param {boolean} importScenario - indicates if the function is called for the import, else it is the export
  * @returns returns section of the manifest based on path, generates an empty object in case it does not exists
  */
-export declare const getManifestSectionByPathV4: (exportResultManifest: object, path: string, targetAnnotation?: string, targetAnnotationEncoded?: string, importScenario?: boolean) => object;
+export declare const getManifestSectionByPathV4: (manifest: object, path: string, targetAnnotation?: string, targetAnnotationEncoded?: string, importScenario?: boolean) => object;
 export declare function getSchemaKeyOfLineItemRecord(lineItemRecord: DataFieldAbstractTypes): string;
 /**
  * Retrieve header facet configurations that can be used to generate ObjectPage schemas
@@ -142,6 +145,13 @@ export declare function getTemplateTypeFromManifest(manifest: Manifest, fioriEle
  * @param facetKey - key of the facet
  */
 export declare function addSectionTitleAndDescription(facet: FacetConfig, section: object, facetKey: string): void;
+/**
+ * Adds target title or description to a section or header section in an app schema
+ * @param facet - intermediate facet structure comprising annotation information
+ * @param section - section in the app schema
+ * @param facetKey - key of the facet
+ */
+export declare function addTargetTitleAndSectionDescription(facet: FacetConfig, section: object, facetKey: string): void;
 /**
  * Creates a default object for a new section or subsection, and adds the ID as title if present.
  * @param facet Facet configuration, to be analyzed

package/dist/src/sync/common/utils.js

@@ -359,28 +359,43 @@ function getSectionFacet(facetDefinition, sourceEntityType, oDataServiceAVT, log
 }
 exports.getSectionFacet = getSectionFacet;
 /**
- * Finds the alias for a given namespace in the references' section of the converted service metadata
- * @param {object} exportResultManifest - manifest that is being modified during export
+ * Finds the alias for a given namespace in the references' section of the converted service metadata.
+ * An empty object is created if the path element does not exist yet.
+ * Exception: if an empty array is the next element  of the 'path' definition, an empty array is created instaed of an empty object.
+ * @param {object} manifest - manifest that is being modified during export
  * @param {string} path - path of the property in the manifest
  * @param {string} targetAnnotation - target annotation (optional)
  * @param {string} targetAnnotationEncoded - target annotation in its encoded form, as used in manifest settings
  * @param {boolean} importScenario - indicates if the function is called for the import, else it is the export
  * @returns returns section of the manifest based on path, generates an empty object in case it does not exists
  */
-exports.getManifestSectionByPathV4 = (exportResultManifest, path, targetAnnotation, targetAnnotationEncoded, importScenario = false) => {
-    let exportResultSection = exportResultManifest;
-    for (const element of path.split('/')) {
-        const decodedElement = targetAnnotationEncoded && targetAnnotationEncoded === element ? targetAnnotation : element;
-        if (!exportResultSection[decodedElement]) {
+exports.getManifestSectionByPathV4 = (manifest, path, targetAnnotation, targetAnnotationEncoded, importScenario = false) => {
+    let manifestSection = manifest;
+    const pathElements = path.split('/');
+    for (let index = 0; index < pathElements.length; index++) {
+        const element = pathElements[index];
+        if (element === '[]') {
+            continue;
+        }
+        const decodedElement = targetAnnotationEncoded && targetAnnotationEncoded === element
+            ? targetAnnotation
+            : element.replace('??', '/');
+        //?? can be used in path functions to encoode /
+        if (!manifestSection[decodedElement]) {
             if (importScenario) {
-                exportResultSection = undefined;
+                manifestSection = undefined;
                 break;
             }
-            exportResultSection[decodedElement] = {};
+            if (pathElements[index + 1] === '[]') {
+                manifestSection[decodedElement] = [];
+            }
+            else {
+                manifestSection[decodedElement] = {};
+            }
         }
-        exportResultSection = exportResultSection[decodedElement];
+        manifestSection = manifestSection[decodedElement];
     }
-    return exportResultSection;
+    return manifestSection;
 };
 function getSchemaKeyOfLineItemRecord(lineItemRecord) {
     let schemaKey, target, value;
@@ -437,64 +452,130 @@ function getSchemaKeyOfLineItemRecord(lineItemRecord) {
 }
 exports.getSchemaKeyOfLineItemRecord = getSchemaKeyOfLineItemRecord;
 /**
- * Evaluates the target annotation of a reference facet and actualizes the facets for the config
- * @param {AnnotationTerm} annotationRecord - the actual annotation record
- * @param {FacetConfigs} facets - list of facets in config format, to be updated
+ * Determines if type of given annotation term is of UIAnnotationTerm
+ * @param {string} path path in manifest
+ * @param {string} alias for a given namespace
  * @param {EntityType} entityType - the entity type
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
- * @param {FioriElementsVersion} oDataVersion - OData version
- * @param {ExtensionLogger} logger - Logger class for logging messages
+ * @returns UI annotation term type
  */
-function evaluateTargetAnnotation(section, annotationRecord, facets, entityType, oDataServiceAVT, oDataVersion = common_1.FioriElementsVersion.v2, logger) {
-    var _a, _b, _c, _d, _e, _f;
-    const alias = findAlias(types_1.UIVOCABULARY, oDataServiceAVT);
-    let path = section ? section.key : '';
-    const targetEntityType = section.entityType;
-    let annotation, targetAnnotation;
+function getUIAnnotationTerm(path, alias, entityType) {
     if (path.includes("com.sap.vocabularies.UI.v1.Chart" /* Chart */) || path.includes(alias + '.Chart')) {
-        facets[path] = { base: types_1.FacetBase.Chart };
-        facets[path].entityType = targetEntityType;
+        return "com.sap.vocabularies.UI.v1.Chart" /* Chart */;
     }
     else if (path.includes("com.sap.vocabularies.UI.v1.Identification" /* Identification */) || path.includes(alias + '.Identification')) {
-        annotation = path.split('.')[path.split('.').length - 1];
-        targetAnnotation = targetEntityType.annotations[alias][annotation];
-        facets[path] = { base: types_1.FacetBase.Identification };
-        facets[path].entityType = targetEntityType;
-        facets[path].target = targetAnnotation;
-    }
-    else if (entityType && (path.includes("com.sap.vocabularies.UI.v1.LineItem" /* LineItem */) || path.includes(alias + '.LineItem'))) {
-        if (!path.includes("com.sap.vocabularies.UI.v1.LineItem" /* LineItem */) && path.includes('.LineItem')) {
-            const pathParts = path.split('::');
-            pathParts[pathParts.length - 1] = `@${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`;
-            path = pathParts.join('::');
-        }
-        facets[path] = { base: types_1.FacetBase.LineItem };
-        facets[path].target = (_a = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _a === void 0 ? void 0 : _a.$target;
-        facets[path].entityType = targetEntityType;
+        return "com.sap.vocabularies.UI.v1.Identification" /* Identification */;
+    }
+    else if ((entityType && path.includes("com.sap.vocabularies.UI.v1.LineItem" /* LineItem */)) || path.includes(alias + '.LineItem')) {
+        return "com.sap.vocabularies.UI.v1.LineItem" /* LineItem */;
     }
     else if (path.includes("com.sap.vocabularies.UI.v1.FieldGroup" /* FieldGroup */) || path.includes(alias + '.FieldGroup')) {
-        facets[path] = { base: types_1.FacetBase.Form };
-        facets[path].target = (_b = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _b === void 0 ? void 0 : _b.$target;
-        facets[path].entityType = targetEntityType;
+        return "com.sap.vocabularies.UI.v1.FieldGroup" /* FieldGroup */;
     }
     else if (path.includes("com.sap.vocabularies.UI.v1.DataPoint" /* DataPoint */) || path.includes(alias + '.DataPoint')) {
-        facets[path] = { base: types_1.FacetBase.DataPoint };
-        facets[path].target = (_c = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _c === void 0 ? void 0 : _c.$target;
-        facets[path].entityType = targetEntityType;
-        facets[path].Label = (_d = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _d === void 0 ? void 0 : _d.$target['Title'];
+        return "com.sap.vocabularies.UI.v1.DataPoint" /* DataPoint */;
     }
-    else if (path.includes('com.sap.vocabularies.Communication.v1.Contact') || path.includes(alias + '.Contact')) {
-        facets[path] = { base: types_1.FacetBase.Contact };
-        facets[path].target = (_e = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _e === void 0 ? void 0 : _e.$target;
-        facets[path].entityType = targetEntityType;
+    else {
+        return undefined;
+    }
+}
+/**
+ * Determines if type of given annotation term is of CommunicationAnnotationTerm
+ * @param {string} path path in manifest
+ * @param {string} alias for a given namespace
+ * @param {EntityType} entityType - the entity type
+ * @returns Communication annotation term type
+ */
+function getCommunicationAnnotationTerm(path, alias) {
+    if (path.includes('com.sap.vocabularies.Communication.v1.Contact') || path.includes(alias + '.Contact')) {
+        return "com.sap.vocabularies.Communication.v1.Contact" /* Contact */;
     }
     else if (path.includes('com.sap.vocabularies.Communication.v1.Address') || path.includes(alias + '.Address')) {
-        facets[path] = { base: types_1.FacetBase.Address };
-        facets[path].target = (_f = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _f === void 0 ? void 0 : _f.$target;
-        facets[path].entityType = targetEntityType;
+        return "com.sap.vocabularies.Communication.v1.Address" /* Address */;
     }
     else {
-        facets[path] = { base: types_1.FacetBase.Unknown };
+        return undefined;
+    }
+}
+/**
+ * Determines the type of given annotation term
+ * @param {string} path path in manifest
+ * @param {string} alias for a given namespace
+ * @param {EntityType} entityType - the entity type
+ * @returns annotation term type
+ */
+function getAnnotationTerm(path, alias, entityType) {
+    return getUIAnnotationTerm(path, alias, entityType) || getCommunicationAnnotationTerm(path, alias);
+}
+/**
+ * Evaluates the target annotation of a reference facet and actualizes the facets for the config
+ * @param {AnnotationTerm} annotationRecord - the actual annotation record
+ * @param {FacetConfigs} facets - list of facets in config format, to be updated
+ * @param {EntityType} entityType - the entity type
+ * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {FioriElementsVersion} oDataVersion - OData version
+ * @param {ExtensionLogger} logger - Logger class for logging messages
+ */
+function evaluateTargetAnnotation(section, annotationRecord, facets, entityType, oDataServiceAVT, oDataVersion = common_1.FioriElementsVersion.v2, logger) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    const alias = findAlias(types_1.UIVOCABULARY, oDataServiceAVT);
+    let path = section ? section.key : '';
+    const targetEntityType = section.entityType;
+    const annotationTerm = getAnnotationTerm(path, alias, entityType);
+    let annotation, targetAnnotation;
+    switch (annotationTerm) {
+        case "com.sap.vocabularies.UI.v1.Chart" /* Chart */: {
+            facets[path] = { base: types_1.FacetBase.Chart };
+            facets[path].target = (_a = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _a === void 0 ? void 0 : _a.$target;
+            facets[path].entityType = targetEntityType;
+            break;
+        }
+        case "com.sap.vocabularies.UI.v1.Identification" /* Identification */: {
+            annotation = path.split('.')[path.split('.').length - 1];
+            targetAnnotation = targetEntityType.annotations[alias][annotation];
+            facets[path] = { base: types_1.FacetBase.Identification };
+            facets[path].entityType = targetEntityType;
+            facets[path].target = targetAnnotation;
+            break;
+        }
+        case "com.sap.vocabularies.UI.v1.LineItem" /* LineItem */: {
+            if (!path.includes("com.sap.vocabularies.UI.v1.LineItem" /* LineItem */) && path.includes('.LineItem')) {
+                const pathParts = path.split('::');
+                pathParts[pathParts.length - 1] = `@${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`;
+                path = pathParts.join('::');
+            }
+            facets[path] = { base: types_1.FacetBase.LineItem };
+            facets[path].target = (_b = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _b === void 0 ? void 0 : _b.$target;
+            facets[path].entityType = targetEntityType;
+            break;
+        }
+        case "com.sap.vocabularies.UI.v1.FieldGroup" /* FieldGroup */: {
+            facets[path] = { base: types_1.FacetBase.Form };
+            facets[path].target = (_c = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _c === void 0 ? void 0 : _c.$target;
+            facets[path].entityType = targetEntityType;
+            break;
+        }
+        case "com.sap.vocabularies.UI.v1.DataPoint" /* DataPoint */: {
+            facets[path] = { base: types_1.FacetBase.DataPoint };
+            facets[path].target = (_d = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _d === void 0 ? void 0 : _d.$target;
+            facets[path].entityType = targetEntityType;
+            facets[path].Label = (_e = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _e === void 0 ? void 0 : _e.$target['Title'];
+            break;
+        }
+        case "com.sap.vocabularies.Communication.v1.Contact" /* Contact */: {
+            facets[path] = { base: types_1.FacetBase.Contact };
+            facets[path].target = (_f = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _f === void 0 ? void 0 : _f.$target;
+            facets[path].entityType = targetEntityType;
+            break;
+        }
+        case "com.sap.vocabularies.Communication.v1.Address" /* Address */: {
+            facets[path] = { base: types_1.FacetBase.Address };
+            facets[path].target = (_g = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _g === void 0 ? void 0 : _g.$target;
+            facets[path].entityType = targetEntityType;
+            break;
+        }
+        default: {
+            facets[path] = { base: types_1.FacetBase.Unknown };
+        }
     }
     if (facets[path]) {
         facets[path].annotationPath = `/${annotationRecord.fullyQualifiedName.replace('@com.sap.vocabularies', types_1.VOCWITHSLASH)}`;
@@ -670,6 +751,7 @@ exports.determineV2Template = determineV2Template;
  * @returns {TemplateType} the template type
  */
 function determineV4Template(manifest, logger) {
+    var _a, _b, _c, _d;
     let templateType;
     const v4Pages = manifest[v4_1.ManifestSection.ui5].routing &&
         manifest[v4_1.ManifestSection.ui5].routing.targets;
@@ -691,10 +773,20 @@ function determineV4Template(manifest, logger) {
             templateType = TemplateType.AnalyticalListPageV4;
             break;
         }
-        else if (pageType === common_1.PageTypeV4.ListReport || pageType === common_1.PageTypeV4.ObjectPage) {
-            templateType = TemplateType.ListReportObjectPageV4;
+        else if (pageType === common_1.PageTypeV4.ListReport) {
+            const viewPath = (_d = (_c = (_b = (_a = v4Page.options) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.views) === null || _c === void 0 ? void 0 : _c.paths) === null || _d === void 0 ? void 0 : _d[0];
+            if (viewPath && (viewPath[types_1.ALPViewType.Primary] || viewPath[types_1.ALPViewType.Secondary])) {
+                templateType = TemplateType.AnalyticalListPageV4;
+            }
+            else {
+                templateType = TemplateType.ListReportObjectPageV4;
+            }
             break;
         }
+        else if (pageType === common_1.PageTypeV4.ObjectPage) {
+            templateType = TemplateType.ListReportObjectPageV4;
+            //fixed now for FEOP scenario, bit continue to check if LR/ALP exists
+        }
     }
     if (!templateType) {
         extensionLogger_1.log(logger, {
@@ -752,7 +844,7 @@ function addSectionTitleAndDescription(facet, section, facetKey) {
         section['title'] = types_1.FacetTitlePrefix + facet.ID;
     }
     else {
-        section['title'] = facetKey.substr(facetKey.lastIndexOf('.') + 1);
+        section['title'] = facetKey.replace(/@com.sap/g, 'com.sap');
     }
     // Description
     if (facet === null || facet === void 0 ? void 0 : facet.Label) {
@@ -766,6 +858,23 @@ function addSectionTitleAndDescription(facet, section, facetKey) {
     }
 }
 exports.addSectionTitleAndDescription = addSectionTitleAndDescription;
+/**
+ * Adds target title or description to a section or header section in an app schema
+ * @param facet - intermediate facet structure comprising annotation information
+ * @param section - section in the app schema
+ * @param facetKey - key of the facet
+ */
+function addTargetTitleAndSectionDescription(facet, section, facetKey) {
+    var _a, _b, _c, _d;
+    addSectionTitleAndDescription(facet, section, facetKey);
+    if ((_a = facet === null || facet === void 0 ? void 0 : facet.target) === null || _a === void 0 ? void 0 : _a['Title']) {
+        section['description'] = (_b = facet === null || facet === void 0 ? void 0 : facet.target) === null || _b === void 0 ? void 0 : _b['Title'];
+    }
+    else if ((_c = facet === null || facet === void 0 ? void 0 : facet.target) === null || _c === void 0 ? void 0 : _c['Description']) {
+        section['description'] = (_d = facet === null || facet === void 0 ? void 0 : facet.target) === null || _d === void 0 ? void 0 : _d['Description'];
+    }
+}
+exports.addTargetTitleAndSectionDescription = addTargetTitleAndSectionDescription;
 /**
  * Creates a default object for a new section or subsection, and adds the ID as title if present.
  * @param facet Facet configuration, to be analyzed
@@ -827,19 +936,24 @@ exports.deleteEmptyStructure = (manifest, path, targetAnnotation, targetAnnotati
     let manifestSection = manifest;
     const pathArray = path.split('/');
     pathArray.forEach(function (element) {
-        if (element === targetAnnotationEncoded) {
-            element = targetAnnotation;
-        }
-        if (!manifestSection[element]) {
+        const decodedElement = targetAnnotationEncoded && targetAnnotationEncoded === element
+            ? targetAnnotation
+            : element.replace('??', '/');
+        if (!manifestSection[decodedElement]) {
             return;
         }
-        if (Object.keys(manifestSection[element]).length === 0) {
-            delete manifestSection[element];
+        if (Object.keys(manifestSection[decodedElement]).length === 0) {
+            if (Array.isArray(manifestSection)) {
+                manifestSection.splice(Number(decodedElement), 1);
+            }
+            else {
+                delete manifestSection[decodedElement];
+            }
             pathArray.pop();
             exports.deleteEmptyStructure(manifest, pathArray.join('/'), targetAnnotation, targetAnnotationEncoded);
             return;
         }
-        manifestSection = manifestSection && manifestSection[element];
+        manifestSection = manifestSection && manifestSection[decodedElement];
     });
 };
 /**