@sap/ux-specification 1.90.18 → 1.90.21

package/dist/src/specification/v4/controls/ObjectPageTable.d.ts

@@ -1,5 +1,5 @@
-import { AnnotationPathAsObject, TableCreationModeType, TableCustomColumns, TableSettings } from '../controls';
-import { ObjectPageTableColumnAction, TableColumn } from '../webapp/manifest/ManifestSettings';
+import { AnnotationPathAsObject, TableCreationModeType, TableSettings } from '../controls';
+import { ObjectPageTableColumn as ObjectPageTableColumnIF, ObjectPageTableColumnAction } from '../webapp/manifest/ManifestSettings';
 import { ObjectPageToolBar } from './ObjectPageToolBar';
 /**
  * Table
@@ -68,8 +68,8 @@ export interface QuickVariantSelectionV4OP {
      */
     showCounts?: boolean;
 }
-interface GenericColumns {
-    [key: string]: TableColumn | ObjectPageTableColumnAction | TableCustomColumns;
+export interface GenericColumnsOP {
+    [key: string]: ObjectPageTableColumnIF | ObjectPageTableColumnAction;
 }
 export interface TableSettingsOP extends TableSettings {
     /**
@@ -86,6 +86,5 @@ export interface TableSettingsOP extends TableSettings {
      * With quickVariantSelection you can switch on the multiple view feature (single table mode). It links to SelectionVariant (filters) or SelectionPresentationVariant (filters and sorters) you must have added to your annotations beforehand.
      */
     quickVariantSelection?: QuickVariantSelectionV4OP;
-    columns?: GenericColumns;
+    columns?: GenericColumnsOP;
 }
-export {};

package/dist/src/specification/v4/controls/Table.d.ts

@@ -1,4 +1,4 @@
-import { TableColumn, TableColumnAction, TableCustomColumn } from './../webapp/manifest/ManifestSettings';
+import { TableColumn, TableColumnAction } from './../webapp/manifest/ManifestSettings';
 import { ToolBar } from './ToolBar';
 export declare enum SelectionMode {
     Multi = "Multi",
@@ -81,13 +81,8 @@ export interface MultiTableModeV4 {
      */
     showCounts?: boolean;
 }
-/**
- * Custom Columns
- * @isViewNode true
- */
-export declare type TableCustomColumns = Array<TableCustomColumn>;
 export interface GenericColumns {
-    [key: string]: TableColumn | TableColumnAction | TableCustomColumns;
+    [key: string]: TableColumn | TableColumnAction;
 }
 export interface TableSettings<COLS = GenericColumns> {
     /**

package/dist/src/specification/v4/webapp/manifest/ManifestSettings.d.ts

@@ -3,7 +3,7 @@ export declare enum Placement {
     Before = "Before",
     End = "End"
 }
-export declare type Position = {
+export interface Position {
     /**
      * The key of another column to be used as placement anchor.
      */
@@ -12,7 +12,7 @@ export declare type Position = {
      * Define the placement, either before or after the anchor column.
      */
     placement: Placement;
-};
+}
 export declare type Positionable = {
     /**
      *   Defines the position of the column relative to other columns.
@@ -44,11 +44,16 @@ export declare enum Availability {
     'Adaptation' = "Adaptation",
     'Hidden' = "Hidden"
 }
+export declare enum HorizontalAlign {
+    'Begin' = "Begin",
+    'Center' = "Center",
+    'End' = "End"
+}
 /**
  * Table Column
  * @isViewNode true
  */
-export declare type TableColumn = {
+export interface TableColumn {
     /**
      * A string type that represents CSS size values.
      * Refer to https://openui5.hana.ondemand.com/api/sap.ui.core.CSSSize.
@@ -61,29 +66,58 @@ export declare type TableColumn = {
      * Hidden: the column is neither available in the table nor in adaptation.
      */
     availability?: Availability;
-};
+}
+/**
+ * Table Column
+ * @isViewNode true
+ */
+export interface ObjectPageTableColumn {
+    /**
+     * A string type that represents CSS size values.
+     * Refer to https://openui5.hana.ondemand.com/api/sap.ui.core.CSSSize.
+     */
+    width?: string;
+    /**
+     * Defines where the column should be shown.
+     * Default: it will be shown by default in the table.
+     * Adaptation: it will initially not shown in the table but be available via end user adaptation.
+     * Hidden: the column is neither available in the table nor in adaptation.
+     */
+    availability?: Availability;
+}
 /**
  * Inline Action
  * @isViewNode true
  */
-export declare type TableColumnAction = TableColumn & {
+export interface TableColumnAction extends TableColumn {
     /**
      * Settings that are only relevant for actions (associated with a UI.DataFieldForAction annotation)
      */
     afterExecution?: ActionAfterExecutionConfiguration;
-};
+}
+export declare type ColumnPropertiesType = string[];
 /**
  * Inline Action for Object Page
  * @isViewNode true
  */
-export declare type ObjectPageTableColumnAction = TableColumn;
+export interface ObjectPageTableColumnAction extends TableColumn {
+    /**
+     * Settings that are only relevant for actions (associated with a UI.DataFieldForAction annotation)
+     */
+    afterExecution?: ActionAfterExecutionConfigurationOP;
+}
 /**
  * Custom Column
  * @isViewNode true
  */
-export declare type TableCustomColumn = Positionable & {
+export interface TableCustomColumn {
+    /**
+     *   Defines the position of the column relative to other columns.
+     */
+    position?: Position;
     /**
      * The header is shown on the table as header, as well as in the add/remove dialog.
+     * @i18nClassification COL: Custom column header text
      */
     header: string;
     /**
@@ -94,5 +128,20 @@ export declare type TableCustomColumn = Positionable & {
     /**
      * Relevant for extension columns; allows the definition of a target fragment.
      */
-    template?: string;
-};
+    template: string;
+    /**
+     * Aligns the header as well as the content horizontally.
+     */
+    horizontalAlign?: HorizontalAlign;
+    /**
+     * Defines where the column should be shown.
+     * - Default: it will be shown by default in the table.
+     * - Adaptation: it will initially not shown in the table but be available via end user adaptation
+     * - Hidden: the column is neither available in the table nor in adaptation
+     */
+    availability?: Availability;
+    /**
+     * If provided and sorting is enabled for the table the custom column header can be clicked. This will lead to a list of properties (or one) that can be sorted by, they are displayed as the labels of the properties, corresponding to their definition in the annotations.
+     */
+    properties?: ColumnPropertiesType;
+}

package/dist/src/specification/v4/webapp/manifest/ManifestSettings.js

@@ -13,4 +13,10 @@ var Availability;
     Availability["Adaptation"] = "Adaptation";
     Availability["Hidden"] = "Hidden";
 })(Availability = exports.Availability || (exports.Availability = {}));
+var HorizontalAlign;
+(function (HorizontalAlign) {
+    HorizontalAlign["Begin"] = "Begin";
+    HorizontalAlign["Center"] = "Center";
+    HorizontalAlign["End"] = "End";
+})(HorizontalAlign = exports.HorizontalAlign || (exports.HorizontalAlign = {}));
 //# sourceMappingURL=ManifestSettings.js.map

package/dist/src/specification/v4/webapp/manifest/ManifestSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"ManifestSettings.js","sourceRoot":"","sources":["../../../../../../src/specification/v4/webapp/manifest/ManifestSettings.ts"],"names":[],"mappings":";;AAAA,oCAAoC;AACpC,IAAY,SAIX;AAJD,WAAY,SAAS;IACjB,4BAAe,CAAA;IACf,8BAAiB,CAAA;IACjB,wBAAW,CAAA;AACf,CAAC,EAJW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAIpB;AA0CD,IAAY,YAIX;AAJD,WAAY,YAAY;IACpB,mCAAqB,CAAA;IACrB,yCAA2B,CAAA;IAC3B,iCAAmB,CAAA;AACvB,CAAC,EAJW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAIvB"}
+{"version":3,"file":"ManifestSettings.js","sourceRoot":"","sources":["../../../../../../src/specification/v4/webapp/manifest/ManifestSettings.ts"],"names":[],"mappings":";;AAAA,oCAAoC;AACpC,IAAY,SAIX;AAJD,WAAY,SAAS;IACjB,4BAAe,CAAA;IACf,8BAAiB,CAAA;IACjB,wBAAW,CAAA;AACf,CAAC,EAJW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAIpB;AA0CD,IAAY,YAIX;AAJD,WAAY,YAAY;IACpB,mCAAqB,CAAA;IACrB,yCAA2B,CAAA;IAC3B,iCAAmB,CAAA;AACvB,CAAC,EAJW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAIvB;AAED,IAAY,eAIX;AAJD,WAAY,eAAe;IACvB,kCAAiB,CAAA;IACjB,oCAAmB,CAAA;IACnB,8BAAa,CAAA;AACjB,CAAC,EAJW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAI1B"}

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

@@ -1 +1 @@
-{"version":3,"file":"appProvider.js","sourceRoot":"","sources":["../../../../src/sync/common/appProvider.ts"],"names":[],"mappings":";;AAAA,uDAMoC;AAKpC,mCAAmD;AACnD,mCAA4C;AAC5C,mEAA8D;AAO9D,MAAsB,WAAW;IAO7B,YACI,QAAiC,EACjC,OAAc,EACd,IAAY,EACZ,KAAgB,EAChB,OAA6B,EAC7B,QAAwC,EACxC,MAAwB;QAV5B,yDAAyD;QAClD,yBAAoB,GAAkB,EAAE,CAAC;QAW5C,MAAM,UAAU,GAAG,yBAAiB,CAAC,yBAAU,CAAC,WAAW,CAAC,CAAC;QAC7D,IAAI,CAAC,GAAG,mBACJ,OAAO,EAAE,UAAU,CAAC,IAAI,EACxB,EAAE,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,EAC1B,KAAK;YACL,IAAI,EACJ,MAAM,EAAE;gBACJ,aAAa,EAAE,OAAO;gBACtB,KAAK,EAAE,OAAO,KAAK,6BAAoB,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAY,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAY,CAAC,EAAE;aACjF,IACE,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,CAAC,CAChC,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED;;;;;;OAMG;IACI,iBAAiB;QACpB,MAAM,WAAW,GAAU,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAU,EAAE,CAAC;QAC5B,IAAI,IAAqB,CAAC;QAC1B,oCAAoC;QACpC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YACjC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC9B,IAAI,IAAI,CAAC,MAAM,EAAE;gBACb,MAAM,UAAU,GAAG,yBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;gBACpE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBAC3B,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;oBACnC,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC;iBACpC;qBAAM;oBACH,MAAM,iBAAiB,GAAG,yBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAC3D,MAAM,CAAC,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC;iBAC3C;gBACD,WAAW,CAAC,GAAG,eAAO,CAAC,KAAK,IAAI,MAAM,OAAO,CAAC,GAAG,MAAM,CAAC;aAC3D;SACJ;QACD,0CAA0C;QAC1C,MAAM,GAAG,GAAgB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9D,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE;YAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;SACnC;QACD,SAAS,CAAC,gBAAQ,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QAE9B,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;IACtC,CAAC;CACJ;AAnED,kCAmEC"}
+{"version":3,"file":"appProvider.js","sourceRoot":"","sources":["../../../../src/sync/common/appProvider.ts"],"names":[],"mappings":";;AAAA,uDAMoC;AAGpC,mCAAmD;AACnD,mCAA4C;AAC5C,mEAA8D;AAO9D,MAAsB,WAAW;IAO7B,YACI,QAAiC,EACjC,OAAc,EACd,IAAY,EACZ,KAAgB,EAChB,OAA6B,EAC7B,QAAwC,EACxC,MAAwB;QAV5B,yDAAyD;QAClD,yBAAoB,GAAkB,EAAE,CAAC;QAW5C,MAAM,UAAU,GAAG,yBAAiB,CAAC,yBAAU,CAAC,WAAW,CAAC,CAAC;QAC7D,IAAI,CAAC,GAAG,mBACJ,OAAO,EAAE,UAAU,CAAC,IAAI,EACxB,EAAE,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,EAC1B,KAAK;YACL,IAAI,EACJ,MAAM,EAAE;gBACJ,aAAa,EAAE,OAAO;gBACtB,KAAK,EAAE,OAAO,KAAK,6BAAoB,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAY,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAY,CAAC,EAAE;aACjF,IACE,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,CAAC,CAChC,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED;;;;;;OAMG;IACI,iBAAiB;QACpB,MAAM,WAAW,GAAU,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAU,EAAE,CAAC;QAC5B,IAAI,IAAqB,CAAC;QAC1B,oCAAoC;QACpC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YACjC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC9B,IAAI,IAAI,CAAC,MAAM,EAAE;gBACb,MAAM,UAAU,GAAG,yBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;gBACpE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBAC3B,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;oBACnC,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC;iBACpC;qBAAM;oBACH,MAAM,iBAAiB,GAAG,yBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAC3D,MAAM,CAAC,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC;iBAC3C;gBACD,WAAW,CAAC,GAAG,eAAO,CAAC,KAAK,IAAI,MAAM,OAAO,CAAC,GAAG,MAAM,CAAC;aAC3D;SACJ;QACD,0CAA0C;QAC1C,MAAM,GAAG,GAAgB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9D,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE;YAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;SACnC;QACD,SAAS,CAAC,gBAAQ,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QAE9B,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;IACtC,CAAC;CACJ;AAnED,kCAmEC"}

package/dist/src/sync/common/decoration/control.d.ts

@@ -28,7 +28,7 @@ export declare enum BindingValue {
     NotEditable = "{= !${ui>/editable}}"
 }
 /**
- * Export rule  for table columns
+ * Export rule for table columns
  * @param baseId - base ID, first part of the stable ID
  * @param idBreadcrumbs - array of ID parts
  * @param breadcrumbs - array of breadcrumbs
@@ -36,5 +36,15 @@ export declare enum BindingValue {
  * @param title - title from JSON schema, comprising the facet ID
  */
 export declare const buildColumnControlId: (baseId: string, idBreadcrumbs: string[], breadcrumbs: string[], controlType: ControlTypeFunction, title: string) => string;
+/**
+ * Split up action breadcrumb and return different parts from it
+ * @param breadcrumbs - array of breadcrumbs
+ * @returns {object} - actionType, semanticObjectId, actionId of action
+ */
+export declare const getActionBreadcrumbParts: (breadcrumbs: string[]) => {
+    actionType: string;
+    semanticObjectId: string;
+    actionId: string;
+};
 export declare const addPatternForBindingChangeOfEnumLR: (schema: object, definition: object, propertyName: string) => void;
 export declare const addPatternForBindingChangeOfEnumOP: (schema: object, definition: object, propertyName: string) => void;

package/dist/src/sync/common/decoration/control.js

@@ -29,7 +29,7 @@ exports.buildControlIdForPage = (baseId, idBreadcrumbs, breadcrumbs) => {
 exports.convertSectionId = (sectionId, title) => {
     let convertedSectionId;
     const prefix = types_1.FacetTitlePrefix;
-    if (title !== undefined) {
+    if (title !== undefined && title.includes(prefix)) {
         convertedSectionId = title.split(prefix)[1];
     }
     else {
@@ -55,7 +55,7 @@ var BindingValue;
     BindingValue["NotEditable"] = "{= !${ui>/editable}}";
 })(BindingValue = exports.BindingValue || (exports.BindingValue = {}));
 /**
- * Export rule  for table columns
+ * Export rule for table columns
  * @param baseId - base ID, first part of the stable ID
  * @param idBreadcrumbs - array of ID parts
  * @param breadcrumbs - array of breadcrumbs
@@ -85,10 +85,14 @@ exports.buildColumnControlId = (baseId, idBreadcrumbs, breadcrumbs, controlType,
             .replace(/::com.sap.vocabularies/g, types_1.VOCWITHSLASH)
             .replace(/::@com.sap.vocabularies/g, types_1.VOCWITHSLASH);
     }
+    else if (idBreadcrumbs[0] === 'table') {
+        tableId = idBreadcrumbs[0];
+    }
     const lastIdPart = localBreadcrumbs[localBreadcrumbs.length - 1]
         .replace(/::com.sap.vocabularies/g, types_1.VOCWITHSLASH)
         .replace(/::@com.sap.vocabularies/g, types_1.VOCWITHSLASH)
-        .replace('sTarget/@', 'sTarget::@');
+        .replace('sTarget/@', 'sTarget::@')
+        .replace('/', ':2f');
     let fullId;
     const splitPoint = lastIdPart.indexOf(':::');
     if (lastIdPart.startsWith('DataField') && splitPoint > -1) {
@@ -106,6 +110,28 @@ exports.buildColumnControlId = (baseId, idBreadcrumbs, breadcrumbs, controlType,
     }
     return escapeId(fullId);
 };
+/**
+ * Split up action breadcrumb and return different parts from it
+ * @param breadcrumbs - array of breadcrumbs
+ * @returns {object} - actionType, semanticObjectId, actionId of action
+ */
+exports.getActionBreadcrumbParts = (breadcrumbs) => {
+    const actionIdParts = breadcrumbs[breadcrumbs.length - 1].split(':::');
+    let actionType, semanticObjectId, actionId;
+    if (actionIdParts.length > 2) {
+        actionType = actionIdParts[0];
+        semanticObjectId = actionIdParts[1].split('::')[1];
+        actionId = actionIdParts[2].split('::')[1];
+    }
+    else if (actionIdParts.length === 2) {
+        actionType = actionIdParts[0];
+        actionId = actionIdParts[1].split('sAction::')[1];
+    }
+    else {
+        actionId = actionIdParts[0];
+    }
+    return { actionType, semanticObjectId, actionId };
+};
 /**
  * Determines the valid pattern for a binding change
  * @param schemaDefinition - definition in the JSON schema

package/dist/src/sync/common/decoration/control.js.map

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

package/dist/src/sync/common/decoration/factory.js

@@ -31,8 +31,7 @@ class MetadataFactory {
                 ? this.pageTypes[pageType][controlPropertyValue]
                 : this.pageTypes[pageType][schemaPropertyName];
         }
-        const metadataInstance = metadataClass ? Object.assign(new metadataClass(), data) : data;
-        return metadataInstance;
+        return metadataClass ? Object.assign(new metadataClass(), data) : data;
     }
     /**
      * Creates an instance of a metadata class for a given page
@@ -42,8 +41,7 @@ class MetadataFactory {
      */
     createPageInstance(pageType, data) {
         const metadataClass = this.pages[pageType];
-        const metadataInstance = metadataClass ? Object.assign(new metadataClass(), data) : null;
-        return metadataInstance;
+        return Object.assign(new metadataClass(), data);
     }
 }
 exports.MetadataFactory = MetadataFactory;

package/dist/src/sync/common/decoration/factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../../src/sync/common/decoration/factory.ts"],"names":[],"mappings":";;AAiBA,MAAsB,eAAe;IAKjC;;;;;OAKG;IACH,YAAsB,QAAiC,EAAE,KAAwB,EAAE,SAAiB;QAChG,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAED;;;;;;;;;OASG;IACH,cAAc,CACV,QAA+B,EAC/B,kBAA0B,EAC1B,IAAa,EACb,oBAA6B;QAE7B,IAAI,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC;YACnD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC;YACrC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa,EAAE;YAChB,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CAAC;gBAC1D,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CAAC;gBAChD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,kBAAkB,CAAC,CAAC;SACtD;QACD,MAAM,gBAAgB,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,aAAa,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAEzF,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IACD;;;;;OAKG;IACH,kBAAkB,CAAC,QAA+B,EAAE,IAAa;QAC7D,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,gBAAgB,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,aAAa,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAEzF,OAAO,gBAAgB,CAAC;IAC5B,CAAC;CACJ;AAzDD,0CAyDC"}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../../src/sync/common/decoration/factory.ts"],"names":[],"mappings":";;AAiBA,MAAsB,eAAe;IAKjC;;;;;OAKG;IACH,YAAsB,QAAiC,EAAE,KAAwB,EAAE,SAAiB;QAChG,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAED;;;;;;;;;OASG;IACH,cAAc,CACV,QAA+B,EAC/B,kBAA0B,EAC1B,IAAa,EACb,oBAA6B;QAE7B,IAAI,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC;YACnD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC;YACrC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa,EAAE;YAChB,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CAAC;gBAC1D,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CAAC;gBAChD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,kBAAkB,CAAC,CAAC;SACtD;QACD,OAAO,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,aAAa,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3E,CAAC;IACD;;;;;OAKG;IACH,kBAAkB,CAAC,QAA+B,EAAE,IAAa;QAC7D,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3C,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,aAAa,EAAE,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;CACJ;AArDD,0CAqDC"}

package/dist/src/sync/common/generate/objectPage.d.ts

@@ -1,12 +1,14 @@
 import { ConverterOutput, EntityType } from '@sap-ux/vocabularies-types';
 import { FioriElementsVersion } from '../../../specification/common';
 import { FacetConfig, SectionType } from '..';
+import { EntitySet } from '@sap-ux/annotation-converter';
 /**
  * Adds definitions for forms in object page sections to the app schema
  * @param {SectionType} sectionType - prefix to distinguish Section and HeaderSection
  * @param {FacetConfig} section - facet or section in the FE core model
  * @param {object} appSchemaSection - current definition of facet or section in the JSON schema
  * @param {object} appSchema - app specific schema that gets enhanced
+ * @param {FioriElementsVersion} version - Fiori Elements version
  */
 export declare function handleForm(sectionType: SectionType, section: FacetConfig, appSchemaSection: object, appSchema: object, version: FioriElementsVersion, withActions?: boolean): void;
 /**
@@ -47,3 +49,10 @@ export declare function addHeaderActions(appSchema: object, entityType: EntityTy
  * @param entityType - current entity Type
  */
 export declare function addCommonHeaderSchema(appSchema: object, entityType: EntityType): void;
+/**
+ * Common logic to determine the EntitySet of a facet
+ * @param facet - current facet or section
+ * @param serviceAVT - AVT converter output, comprising all annotation information
+ * @returns the entity set as defined in AVT, if found
+ */
+export declare function determineEntitySetOfFacet(facet: FacetConfig, serviceAVT: ConverterOutput): EntitySet | undefined;

package/dist/src/sync/common/generate/objectPage.js

@@ -3,6 +3,57 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const StableIdHelper_1 = require("../../v4/utils/StableIdHelper");
 const common_1 = require("../../../specification/common");
 const __1 = require("..");
+/**
+ * Copies the field properties from the generic definition to the specific field definition
+ * @param {FioriElementsVersion} version - Fiori Elements version
+ * @param {object} appSchema - App schema in general
+ * @param {DataFieldAbstractTypes} field - field definition in parser output (AVT)
+ * @param {string} fieldDefinition - the unique ID for the given field definition
+ */
+function copyFieldProperties(version, appSchema, field, fieldDefinition) {
+    if (version === common_1.FioriElementsVersion.v4 && appSchema['definitions']['Field']) {
+        switch (field.$Type) {
+            case "com.sap.vocabularies.UI.v1.DataField" /* DataField */:
+            case "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* DataFieldForAnnotation */:
+            case "com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath" /* DataFieldWithNavigationPath */:
+            case "com.sap.vocabularies.UI.v1.DataFieldWithUrl" /* DataFieldWithUrl */: {
+                appSchema['definitions'][fieldDefinition]['properties'] =
+                    appSchema['definitions']['Field']['properties'];
+                break;
+            }
+        }
+    }
+    else if (version === common_1.FioriElementsVersion.v2 && appSchema['definitions']['Field']) {
+        switch (field.$Type) {
+            case "com.sap.vocabularies.UI.v1.DataField" /* DataField */:
+            case "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* DataFieldForAnnotation */:
+            case "com.sap.vocabularies.UI.v1.DataFieldWithUrl" /* DataFieldWithUrl */: {
+                appSchema['definitions'][fieldDefinition]['properties'] =
+                    appSchema['definitions']['Field']['properties'];
+                break;
+            }
+        }
+    }
+}
+/**
+ * Determines the name for a field definition in app schema
+ * @param {FioriElementsVersion} version - Fiori Elements version
+ * @param fieldReferenceId - the stable ID representation of the field
+ * @param {string} targetID - unique ID, identifies the parent object (form)
+ * @param fieldReference - the reference to the field definition in schema
+ * @returns the field definition name in schema
+ */
+function determineFieldDefinitionName(version, fieldReferenceId, targetID, fieldReference) {
+    const fieldReferenceType = version === common_1.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
+        ? fieldReferenceId.split('::')[0].replace('DataField', 'Field')
+        : undefined;
+    if (version === common_1.FioriElementsVersion.v2) {
+        return `${fieldReferenceType}<${targetID}::${fieldReference}>`;
+    }
+    else {
+        return `${targetID}::${fieldReference}`;
+    }
+}
 /**
  * Adds a field definition to the app specific schema
  * @param {string} sectionType - prefix to distinguish Section and HeaderSection
@@ -11,9 +62,11 @@ const __1 = require("..");
  * @param {string} targetID - unique ID, identifies the parent object (form)
  * @param {string} key - current field key
  * @param {SectionType} section - current section of the object page
+ * @param {FioriElementsVersion} version - Fiori Elements version
  */
 function addField(sectionType, appSchema, field, targetID, key, section, version, withActions = true) {
-    var _a, _b, _c, _d, _e;
+    var _a;
+    // Calculate field reference
     const fieldReferenceId = StableIdHelper_1.getStableIdPartFromDataField(field);
     const fieldReference = version === common_1.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
         ? fieldReferenceId
@@ -21,20 +74,16 @@ function addField(sectionType, appSchema, field, targetID, key, section, version
             .splice(1)
             .join('::')
         : fieldReferenceId;
-    const fieldReferenceType = version === common_1.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
-        ? fieldReferenceId.split('::')[0].replace('DataField', 'Field')
-        : undefined;
-    const fieldDefinition = version === common_1.FioriElementsVersion.v2
-        ? `${fieldReferenceType}<${targetID}::${fieldReference}>`
-        : `${targetID}::${fieldReference}`;
-    const fieldsDefinition = __1.prepareRef(`${sectionType}Fields<${targetID}>`);
-    const actionsDefinition = __1.prepareRef(`${sectionType}Actions<${targetID}>`);
+    // Determine field definition name
+    const fieldDefinition = determineFieldDefinitionName(version, fieldReferenceId, targetID, fieldReference);
+    // Evaluate field type, set field reference of properties of fields' or actions' definition
     if (!field || !field.$Type) {
         return;
     }
     else if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */ ||
         field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* DataFieldForIntentBasedNavigation */) {
         if (withActions && sectionType === __1.SectionType.Section) {
+            const actionsDefinition = __1.prepareRef(`${sectionType}Actions<${targetID}>`);
             appSchema['definitions'][actionsDefinition]['properties'][fieldReference] = {
                 $ref: __1.DEFINITION_LINK_PREFIX + fieldDefinition,
                 propertyIndex: parseInt(key)
@@ -42,50 +91,34 @@ function addField(sectionType, appSchema, field, targetID, key, section, version
         }
     }
     else {
+        const fieldsDefinition = __1.prepareRef(`${sectionType}Fields<${targetID}>`);
         appSchema['definitions'][fieldsDefinition]['properties'][fieldReference] = {
             $ref: __1.DEFINITION_LINK_PREFIX + fieldDefinition,
             propertyIndex: parseInt(key)
         };
     }
+    // Now set up the field definition
     appSchema['definitions'][fieldDefinition] = {
         type: 'object',
         isViewNode: true,
         properties: {},
         description: __1.getDatafieldDescription(field, section.entityType),
         additionalProperties: false,
-        annotationType: field.$Type
+        annotationType: field.$Type,
+        annotationPath: `/${section.entityType.fullyQualifiedName}/${field.fullyQualifiedName.split(section.entityType.fullyQualifiedName)[1]}`
     };
-    if (version === common_1.FioriElementsVersion.v4 && appSchema['definitions']['Field']) {
-        switch (field.$Type) {
-            case "com.sap.vocabularies.UI.v1.DataField" /* DataField */:
-            case "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* DataFieldForAnnotation */:
-            case "com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath" /* DataFieldWithNavigationPath */:
-            case "com.sap.vocabularies.UI.v1.DataFieldWithUrl" /* DataFieldWithUrl */: {
-                appSchema['definitions'][fieldDefinition]['properties'] =
-                    appSchema['definitions']['Field']['properties'];
-                break;
-            }
-        }
-    }
-    else if (version === common_1.FioriElementsVersion.v2 && appSchema['definitions']['Field']) {
-        switch (field.$Type) {
-            case "com.sap.vocabularies.UI.v1.DataField" /* DataField */:
-            case "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* DataFieldForAnnotation */:
-            case "com.sap.vocabularies.UI.v1.DataFieldWithUrl" /* DataFieldWithUrl */: {
-                appSchema['definitions'][fieldDefinition]['properties'] =
-                    appSchema['definitions']['Field']['properties'];
-                break;
-            }
-        }
-    }
+    __1.addDataTypeToDefinition(appSchema['definitions'][fieldDefinition], field);
+    // Copy the generic definition of field properties to the specific one
+    copyFieldProperties(version, appSchema, field, fieldDefinition);
     if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */ && ((_a = appSchema['definitions']) === null || _a === void 0 ? void 0 : _a['FormAction'])) {
         appSchema['definitions'][fieldDefinition]['properties'] = appSchema['definitions']['FormAction']['properties'];
     }
-    if ((_c = (_b = field['Value']) === null || _b === void 0 ? void 0 : _b.$target) === null || _c === void 0 ? void 0 : _c.type) {
-        appSchema['definitions'][fieldDefinition].dataType = (_e = (_d = field['Value']) === null || _d === void 0 ? void 0 : _d.$target) === null || _e === void 0 ? void 0 : _e.type.replace('Edm.', '');
-    }
-    appSchema['definitions'][fieldDefinition].annotationPath = `/${section.entityType.fullyQualifiedName}/${field.fullyQualifiedName.split(section.entityType.fullyQualifiedName)[1]}`;
 }
+/**
+ * The function determines the target ID that shall be used in the app schema for a form
+ * @param section - object describing the section or facet
+ * @returns the target ID (string)
+ */
 function determineTargetIdOfForm(section) {
     let targetID;
     if (section.target && section.target['qualifier'] && section.entityType) {
@@ -105,6 +138,7 @@ function determineTargetIdOfForm(section) {
  * @param {FacetConfig} section - facet or section in the FE core model
  * @param {object} appSchemaSection - current definition of facet or section in the JSON schema
  * @param {object} appSchema - app specific schema that gets enhanced
+ * @param {FioriElementsVersion} version - Fiori Elements version
  */
 function handleForm(sectionType, section, appSchemaSection, appSchema, version, withActions = true) {
     var _a;
@@ -229,7 +263,7 @@ exports.getActionNameAndId = getActionNameAndId;
  * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
 function addFooterActions(appSchema, entityType, oDataServiceAVT) {
-    appSchema['definitions']['ObjectPageFooter'] = JSON.parse(JSON.stringify(appSchema['definitions']['ObjectPageFooter<GenericFooterActions>']));
+    appSchema['definitions']['ObjectPageFooter'] = JSON.parse(JSON.stringify(appSchema['definitions']['ObjectPageFooter<ObjectPageFooterActions>']));
     // Change reference of footer
     appSchema['properties']['footer'] = {
         $ref: `${__1.DEFINITION_LINK_PREFIX}ObjectPageFooter`
@@ -257,9 +291,9 @@ function addFooterActions(appSchema, entityType, oDataServiceAVT) {
             if (item['Determining'] && item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */) {
                 const { actionName, actionId } = getActionNameAndId(item.Action, entityType);
                 const description = item.Label || actionName;
-                const actionDefinitionKey = __1.prepareRef(`FooterAction<${actionId}>`);
-                if (appSchema['definitions']['FooterAction']) {
-                    appSchema['definitions'][actionDefinitionKey] = Object.assign(Object.assign({}, JSON.parse(JSON.stringify(appSchema['definitions']['FooterAction']))), { description, annotationPath: `/${convertedIdentification}/${index}` });
+                const actionDefinitionKey = __1.prepareRef(`ObjectPageFooterAction<${actionId}>`);
+                if (appSchema['definitions']['ObjectPageFooterAction']) {
+                    appSchema['definitions'][actionDefinitionKey] = Object.assign(Object.assign({}, JSON.parse(JSON.stringify(appSchema['definitions']['ObjectPageFooterAction']))), { description, annotationPath: `/${convertedIdentification}/${index}` });
                 }
                 else {
                     appSchema['definitions'][actionDefinitionKey] = {
@@ -279,8 +313,8 @@ function addFooterActions(appSchema, entityType, oDataServiceAVT) {
     else {
         footerActions['annotationPath'] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`;
     }
-    delete appSchema['definitions']['GenericFooterActions'];
-    delete appSchema['definitions']['ObjectPageFooter<GenericFooterActions>'];
+    delete appSchema['definitions']['ObjectPageFooterActions'];
+    delete appSchema['definitions']['ObjectPageFooter<ObjectPageFooterActions>'];
 }
 exports.addFooterActions = addFooterActions;
 /**
@@ -333,4 +367,16 @@ function addCommonHeaderSchema(appSchema, entityType) {
     appSchema['definitions']['ObjectPageHeader'].annotationPath = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderInfo" /* HeaderInfo */}`;
 }
 exports.addCommonHeaderSchema = addCommonHeaderSchema;
+/**
+ * Common logic to determine the EntitySet of a facet
+ * @param facet - current facet or section
+ * @param serviceAVT - AVT converter output, comprising all annotation information
+ * @returns the entity set as defined in AVT, if found
+ */
+function determineEntitySetOfFacet(facet, serviceAVT) {
+    return facet.entityType
+        ? serviceAVT.entitySets.find((es) => es.entityType.name === facet.entityType.name || es.name === facet.entityType.name)
+        : undefined;
+}
+exports.determineEntitySetOfFacet = determineEntitySetOfFacet;
 //# sourceMappingURL=objectPage.js.map