@sap/open.fe 1.97.0 → 1.98.0

package/packages/sap.fe.macros/test/sap/fe/macros/jest/data/CollectionField.cds

@@ -14,13 +14,19 @@ entity Items @(
         name                              : String;
 		toSubItems                 : Association to many SubItems on toSubItems.lineItem = $self;
 		toSubItems2                 : Association to many SubItems2 on toSubItems2.lineItem = $self;
+		toSingleSubItem: Association to SubItems;
 }
 
 @cds.autoexpose
-entity SubItems {
+entity SubItems @(
+                		Capabilities : {
+                		         DeleteRestrictions : {Deletable : name},
+                			  }
+                    ) {
     key ID       		: Integer @(Common.Text : name);
         name     		: String  @(title : 'Name');
         lineItem 		: Association to Items;
+        toOneSubSubItem:  Association to SubSubItems;
         toSubSubItems   : Association to many SubSubItems on toSubSubItems.parent = $self;
 }
 
@@ -33,7 +39,7 @@ entity SubSubItems {
 
 @cds.autoexpose
 entity SubItems2 {
-    key ID       : Integer ;
+    key ID       : Integer @(Common.Text : name);
         name     : String  @(title : 'Name');
         lineItem : Association to Items;
 }
@@ -43,7 +49,9 @@ annotate Items with @(UI : {
     {Value : ID},
     {Value : toSubItems.name},
     {Value : toSubItems.ID},
-    {Value : toSubItems2.name}
+    {Value : toSubItems2.name},
+    {Value : toSubItems.toOneSubSubItem.ID},
+    {Value: toSingleSubItem.toSubSubItems.ID},
     ]
 });
 

package/packages/sap.fe.macros/test/sap/fe/macros/jest/data/FieldMacroDataFieldTypes.cds

@@ -24,6 +24,7 @@ service JestService {
             name                   : String;
             criticality            : Integer;
             integer                : Integer64;
+            binary                 : Binary(16);
             decimal                : Decimal(4, 2);
             decimal2               : Decimal(4, 2);
             quantity1              : Integer64         @Measures.Unit        : unit1;
@@ -209,6 +210,10 @@ service JestService {
                 Title         : 'Usage Progress (Decimal)',
                 Visualization : #Number
             },
+            DataPoint #binary                   : {
+                Value         : binary,
+                Title         : 'Binary'
+            },            
             DataPoint #criticalityProperty      : {
                 Value       : name,
                 Title       : 'criticality',

package/packages/sap.fe.macros/test/sap/fe/macros/jest/data/FieldMacroWithSemanticKey.cds

@@ -2,29 +2,34 @@ namespace sap.fe.test;
 
 entity Items                           @(Common : {SemanticKey : [
     ID,
-    keyWithSemanticObject
+    keyWithSemanticObject,
+	keyWithSemanticObjectPathDefined
 ]}) {
-    key ID                    : Integer;
-        name                  : String;
-        usageProgress         : Decimal(4, 2);
-        keyWithSemanticObject : String @(Common : {SemanticObject : 'SubItems'});
-        toSubItems            : Association to SubItems
-                                    on toSubItems.lineItem = $self;
+    key ID                    				: Integer;
+        name                  				: String;
+        usageProgress         				: Decimal(4, 2);
+        keyWithSemanticObject 				: String @(Common : {SemanticObject : 'SubItems'});
+		keyWithSemanticObjectPathDefined	: String  @(Common : {SemanticObject : nameForSemanticObject});
+        toSubItems            				: Association to SubItems
+                                   				 on toSubItems.lineItem = $self;
 }
 
 @cds.autoexpose
 entity SubItems                         @(Common : {SemanticKey : [ID]}) {
-    key ID                    : Integer @(title : 'ID');
-        name                  : String  @(title : 'Name');
-        keyWithSemanticObject : String  @(Common : {SemanticObject : 'SubItems'});
-        lineItem              : Association to one Items;
+    key ID                    				: Integer @(title : 'ID');
+        name                  				: String  @(title : 'Name');
+        keyWithSemanticObject 				: String  @(Common : {SemanticObject : 'SubItems'});
+		keyWithSemanticObjectPathDefined	: String  @(Common : {SemanticObject : nameForSemanticObject});
+		nameForSemanticObject 				: String;
+        lineItem              				: Association to one Items;
 }
 
 annotate Items with @(
     UI     : {
         LineItem                   : [
             {Value : ID},
-            {Value : keyWithSemanticObject}
+            {Value : keyWithSemanticObject},
+			{Value : keyWithSemanticObjectPathDefined}
         ],
         DataPoint #withValueFormat : {
             Value       : usageProgress,

package/packages/sap.fe.macros/test/sap/fe/macros/jest/data/FilterBarMacro.cds

@@ -68,7 +68,24 @@ annotate RootEntity with @(UI : {
         PropertyWithUnit,
         PropertyWithCurrency,
         PropertyWithValueHelp
-    ]
+    ],
+    SelectionVariant    : {
+        Text          : 'String Property',
+            SelectOptions : [{
+                PropertyName : StringProperty,
+                Ranges       : [{
+                    Option : #EQ,
+                    Low    : 'abc'
+            }]
+        },
+		{
+                PropertyName : IntegerProperty,
+                Ranges       : [{
+                    Option : #EQ,
+                    Low    : 1
+            }]
+        }]
+    }
 });
 
 entity ValueHelpEntity  @(cds.autoexpose) {

package/packages/sap.fe.macros/test/sap/fe/macros/jest/data/FilterBarMacroWithDefaultAnnotation.cds

@@ -0,0 +1,155 @@
+namespace sap.fe.test;
+
+entity RootEntity {
+    key ID                                		: Integer @Common.Label : 'ID';
+    StringProperty                              : String @Common.Label: 'String Property';
+    IntegerProperty                             : Integer @Common.Label: 'Integer Property';
+    NumberProperty                              : Decimal(4, 2) @Common.Label: 'Number Property';
+    BooleanProperty                             : Boolean @Common.Label: 'Boolean Property';
+    DateProperty                              	: Date @Common.Label: 'Date Property';
+    TimeProperty                              	: Time @Common.Label: 'Time Property';
+    PropertyWithUnit                    	  	: Integer64	@Common.Label: 'Property With Unit' @Measures.Unit : Unit;
+    PropertyWithCurrency                   	  	: Integer64	@Common.Label: 'Property With Currency' @Measures.ISOCurrency : Currency;
+    Unit                            			: String;
+    Currency                             		: String;
+    TextProperty                             	: String;
+    TextArrangementTextOnlyProperty				: String 	@Common : {
+																		  Text            : TextProperty,
+																		  TextArrangement : #TextOnly
+																	  };
+	TextArrangementTextLastProperty				: String 	@Common : {
+																			  Text            : TextProperty,
+																			  TextArrangement : #TextLast
+																		  };
+	TextArrangementTextFirstProperty				: String 	@Common : {
+																			  Text            : TextProperty,
+																			  TextArrangement : #TextFirst
+																		  };
+	TextArrangementTextSeparateProperty				: String 	@Common : {
+    																			  Text            : TextProperty,
+    																			  TextArrangement : #TextSeparate
+    																		  };
+	  PropertyWithValueHelp				 : String @(
+		  Common         : {
+		  	  Label : 'Property with Value Help',
+			  ValueList                : {
+				  Label          : 'Value with Value Help',
+				  CollectionPath : 'ValueHelpEntity',
+				  Parameters     : [
+					  {
+						  $Type             : 'Common.ValueListParameterInOut',
+						  LocalDataProperty : PropertyWithValueHelp,
+						  ValueListProperty : 'KeyProp'
+					  },
+					  {
+						  $Type             : 'Common.ValueListParameterDisplayOnly',
+						  ValueListProperty : 'Description'
+					  }
+				  ]
+			  }
+		  });
+	Criticality : Integer @(
+            Common         : {
+                FilterDefaultValue                     : 1  
+            }
+        );
+}
+
+annotate RootEntity with @(UI : {
+    SelectionFields #SF1                                : [
+        StringProperty,
+        IntegerProperty,
+        NumberProperty,
+        DateProperty,
+        PropertyWithValueHelp
+    ],
+    SelectionFields                                 : [
+        StringProperty,
+        IntegerProperty,
+        NumberProperty,
+        DateProperty,
+        TimeProperty,
+        PropertyWithUnit,
+        PropertyWithCurrency,
+        PropertyWithValueHelp
+    ],
+    SelectionVariant    : {
+        Text          : 'String Property',
+            SelectOptions : [{
+                PropertyName : StringProperty,
+                Ranges       : [{
+                    Option : #EQ,
+                    Low    : 'abc'
+            }]
+        },
+		{
+                PropertyName : IntegerProperty,
+                Ranges       : [{
+                    Option : #EQ,
+                    Low    : 1
+            }]
+        }]
+    }
+});
+
+entity ValueHelpEntity  @(cds.autoexpose) {
+    key KeyProp      : String(1) @(
+		Common : {
+			Text            : Description,
+			TextArrangement : #TextFirst
+		},
+		title  : 'Value Help Key'
+	);
+	Description : String(20)@(
+		Core.Immutable : true,
+		Common         : {
+			Label     : 'Value Help Description'
+		}
+	);
+}
+
+annotate ValueHelpEntity with @(UI : {
+    SelectionFields #SF2                               : [
+        StringProperty,
+        IntegerProperty,
+        NumberProperty,
+        DateProperty,
+        PropertyWithValueHelp
+    ],
+    SelectionFields                                 : [
+        StringProperty,
+        IntegerProperty,
+        NumberProperty,
+        DateProperty,
+        TimeProperty,
+        PropertyWithUnit,
+        PropertyWithCurrency,
+        PropertyWithValueHelp
+    ]
+});
+
+
+service JestService {
+    @odata.draft.enabled
+    entity RootEntity as
+        select from test.RootEntity {
+            *
+        };
+	entity ValueHelpEntity as
+		select from test.ValueHelpEntity {
+			*
+		};
+    @odata.draft.enabled
+    entity SearchRestrictionsEntity {
+        key ID   : Integer;
+            name : String;
+    }	
+}
+
+annotate JestService.ValueHelpEntity with @Capabilities : {
+     SearchRestrictions : {Searchable : true}
+};
+annotate JestService.SearchRestrictionsEntity with @Capabilities : {
+     SearchRestrictions : {Searchable : false}
+};
+

package/packages/sap.fe.macros/test/sap/fe/macros/jest/data/FilterBarMacroWithSVandAnnotation.cds

@@ -0,0 +1,155 @@
+namespace sap.fe.test;
+
+entity RootEntity {
+    key ID                                		: Integer @Common.Label : 'ID';
+    StringProperty                              : String @Common.Label: 'String Property';
+    IntegerProperty                             : Integer @Common.Label: 'Integer Property';
+    NumberProperty                              : Decimal(4, 2) @Common.Label: 'Number Property';
+    BooleanProperty                             : Boolean @Common.Label: 'Boolean Property';
+    DateProperty                              	: Date @Common.Label: 'Date Property';
+    TimeProperty                              	: Time @Common.Label: 'Time Property';
+    PropertyWithUnit                    	  	: Integer64	@Common.Label: 'Property With Unit' @Measures.Unit : Unit;
+    PropertyWithCurrency                   	  	: Integer64	@Common.Label: 'Property With Currency' @Measures.ISOCurrency : Currency;
+    Unit                            			: String;
+    Currency                             		: String;
+    TextProperty                             	: String;
+    TextArrangementTextOnlyProperty				: String 	@Common : {
+																		  Text            : TextProperty,
+																		  TextArrangement : #TextOnly
+																	  };
+	TextArrangementTextLastProperty				: String 	@Common : {
+																			  Text            : TextProperty,
+																			  TextArrangement : #TextLast
+																		  };
+	TextArrangementTextFirstProperty				: String 	@Common : {
+																			  Text            : TextProperty,
+																			  TextArrangement : #TextFirst
+																		  };
+	TextArrangementTextSeparateProperty				: String 	@Common : {
+    																			  Text            : TextProperty,
+    																			  TextArrangement : #TextSeparate
+    																		  };
+	  PropertyWithValueHelp				 : String @(
+		  Common         : {
+		  	  Label : 'Property with Value Help',
+			  ValueList                : {
+				  Label          : 'Value with Value Help',
+				  CollectionPath : 'ValueHelpEntity',
+				  Parameters     : [
+					  {
+						  $Type             : 'Common.ValueListParameterInOut',
+						  LocalDataProperty : PropertyWithValueHelp,
+						  ValueListProperty : 'KeyProp'
+					  },
+					  {
+						  $Type             : 'Common.ValueListParameterDisplayOnly',
+						  ValueListProperty : 'Description'
+					  }
+				  ]
+			  }
+		  });
+	Criticality : Integer @(
+            Common         : {
+                FilterDefaultValue                     : 1  
+            }
+        );
+}
+
+annotate RootEntity with @(UI : {
+    SelectionFields #SF1                                : [
+        StringProperty,
+        IntegerProperty,
+        NumberProperty,
+        DateProperty,
+        PropertyWithValueHelp
+    ],
+    SelectionFields                                 : [
+        StringProperty,
+        IntegerProperty,
+        NumberProperty,
+        DateProperty,
+        TimeProperty,
+        PropertyWithUnit,
+        PropertyWithCurrency,
+        PropertyWithValueHelp
+    ],
+    SelectionVariant    : {
+        Text          : 'String Property',
+            SelectOptions : [{
+                PropertyName : StringProperty,
+                Ranges       : [{
+                    Option : #EQ,
+                    Low    : 'abc'
+            }]
+        },
+		{
+                PropertyName : IntegerProperty,
+                Ranges       : [{
+                    Option : #EQ,
+                    Low    : 1
+            }]
+        }]
+    }
+});
+
+entity ValueHelpEntity  @(cds.autoexpose) {
+    key KeyProp      : String(1) @(
+		Common : {
+			Text            : Description,
+			TextArrangement : #TextFirst
+		},
+		title  : 'Value Help Key'
+	);
+	Description : String(20)@(
+		Core.Immutable : true,
+		Common         : {
+			Label     : 'Value Help Description'
+		}
+	);
+}
+
+annotate ValueHelpEntity with @(UI : {
+    SelectionFields #SF2                               : [
+        StringProperty,
+        IntegerProperty,
+        NumberProperty,
+        DateProperty,
+        PropertyWithValueHelp
+    ],
+    SelectionFields                                 : [
+        StringProperty,
+        IntegerProperty,
+        NumberProperty,
+        DateProperty,
+        TimeProperty,
+        PropertyWithUnit,
+        PropertyWithCurrency,
+        PropertyWithValueHelp
+    ]
+});
+
+
+service JestService {
+    @odata.draft.enabled
+    entity RootEntity as
+        select from test.RootEntity {
+            *
+        };
+	entity ValueHelpEntity as
+		select from test.ValueHelpEntity {
+			*
+		};
+    @odata.draft.enabled
+    entity SearchRestrictionsEntity {
+        key ID   : Integer;
+            name : String;
+    }	
+}
+
+annotate JestService.ValueHelpEntity with @Capabilities : {
+     SearchRestrictions : {Searchable : true}
+};
+annotate JestService.SearchRestrictionsEntity with @Capabilities : {
+     SearchRestrictions : {Searchable : false}
+};
+

package/packages/sap.fe.macros/test/sap/fe/macros/jest/data/FilterFieldMacro.cds

@@ -1,6 +1,17 @@
 namespace sap.fe.test;
 
-entity Items                                   @(Common : {SemanticKey : [ID]}) {
+entity Items                                   @(
+    Capabilities: {
+        FilterRestrictions     : {FilterExpressionRestrictions : [{
+            Property           : 'headerDate',
+            AllowedExpressions : 'SingleRange'
+        },
+        {
+            Property           : 'multiRangeDate',
+            AllowedExpressions : 'MultiRange'
+        }]}
+    },
+    Common : {SemanticKey : [ID]}) {
     key ID                     : Integer  @(Common : {QuickInfo: 'tooltip for ID'});
         name                   : String;
         propWithText           : String        @(Common : {
@@ -29,6 +40,7 @@ entity Items                                   @(Common : {SemanticKey : [ID]})
         emailAddress           : String        @Communication.IsEmailAddress;
         phoneNumber            : String        @Communication.IsPhoneNumber;
         headerDate             : Date;
+        multiRangeDate         : Date;
         quantity1              : Integer64     @Measures.Unit        : unit1;
         quantity2              : Decimal(10, 2)@Measures.Unit        : unit2;
         quantityWithStaticUnit : Integer64     @Measures.Unit        : 'mass-gram';

package/packages/sap.fe.macros/test/sap/fe/macros/jest/data/QuickViewForm.cds

@@ -2,17 +2,42 @@ using {managed} from '@sap/cds/common';
 
 namespace sap.fe.test;
 
-entity LineItems @(Communication.Contact : {
-    email : [{
-        type    : #work,
-        address : emailAddress
-    }],
-    fn    : dataFieldForAnnotationContact,
-    tel   : [{
-        type : #fax,
-        uri  : phoneNumber
-    }]
-}, ) : managed {
+entity LineItems @(
+	Communication.Contact : {
+		email : [{
+			type    : #work,
+			address : emailAddress
+		}],
+		fn    : dataFieldForAnnotationContact,
+		tel   : [{
+			type : #fax,
+			uri  : phoneNumber
+		}],
+		adr	  : [{
+			type     : #work,
+			code     : PostalCode,
+			country  : Country,
+			locality : CityName
+		}]
+	},
+	 Communication.Contact#WithLabelInAddress : {
+		email : [{
+			type    : #work,
+			address : emailAddress
+		}],
+		fn    : dataFieldForAnnotationContact,
+		tel   : [{
+			type : #fax,
+			uri  : phoneNumber
+		}],
+		adr	  : [{
+			type     : #work,
+			code     : PostalCode,
+			country  : Country,
+			locality : CityName,
+			label    : FormattedAddress
+		}]
+	}) : managed {
     key ID                            : Integer;
         name                          : String;
         emailAddress                  : String;

package/packages/sap.fe.macros/test/sap/fe/macros/jest/data/TableFieldLabel.cds

@@ -22,6 +22,8 @@ service JestService {
             BusinessPartner        : String(10) @(Common : {
                 Label              : 'Business Partner'
             });
+            Progress        : Decimal(4, 1)@title : 'Progress';
+            Rating          : Decimal(4, 1)@title : 'Rating';
             FullName        : String(80)   @(title : 'Full Name');
             ReferencedSalesOrderID     : UUID;
             _ReferencedSalesOrder      : Association to SalesOrder on _ReferencedSalesOrder.ID = ReferencedSalesOrderID;
@@ -63,6 +65,14 @@ annotate JestService.SalesOrderItem with @UI : {
 		$Type  : 'UI.DataFieldForAnnotation',
 		Target : '@UI.DataPoint#DataPointwoTitle'
 	},
+    {
+        $Type  : 'UI.DataFieldForAnnotation',
+        Target : '@UI.DataPoint#Progress'
+    },
+    {
+        $Type  : 'UI.DataFieldForAnnotation',
+        Target : '@UI.DataPoint#Rating'
+    },
     {
         $Type  : 'UI.DataField',
         Label  : 'Simple DataField Label',
@@ -112,10 +122,21 @@ annotate JestService.SalesOrderItem with @UI : {
         Value : Material,
         Title : 'DataPoint Title'
     },
+    DataPoint #Progress             : {
+        Value         : Progress,
+        TargetValue   : 100,
+        Title         : 'Progress',
+        Visualization : #Progress
+    },
+    DataPoint #Rating                : {
+        Value                : Rating,
+        TargetValue          : 5.0,
+        Title                : 'Rating',
+        Visualization        : #Rating
+    },
     DataPoint #DataPointwoTitle           : {
         Value : Material
     },
-
     Chart #Chart                     : {
         $Type             : 'UI.ChartDefinitionType',
         Title             : 'Chart Title',

package/packages/sap.fe.macros/test/sap/fe/macros/jest/data/simpleFieldMacro.cds

@@ -10,7 +10,7 @@ entity Items                                   @(Common : {SemanticKey : [ID]})
         propWithTextText       : String;
         imageURL               : String        @UI                   : {IsImageURL : true};
         imageURLStream         : String        @(
-            Core.MediaType : 'image/jpg',
+            Core.MediaType : 'image/jpeg',
             Core.IsURL
         );
         mediaType              : String        @Core.IsMediaType;
@@ -22,7 +22,11 @@ entity Items                                   @(Common : {SemanticKey : [ID]})
             Core.MediaType : 'application/octet-stream'
         );
         stream                 : LargeBinary;
-        preferredItem          : Boolean;
+		streamWithTypeAndSizeRestriction : Binary(1024)  @(
+			Core.MediaType                   : 'text/plain',
+   			Core.AcceptableMediaTypes        : ['text/plain']
+		);
+		preferredItem          : Boolean;
         creationDate           : Timestamp;
         usageStartTime         : Time;
         usageCoefficient       : Double;
@@ -67,7 +71,8 @@ annotate Items with @(
             {Value : quantity2},
             {Value : amount1},
             {Value : quantityWithStaticUnit},
-			{Value : streamNoImage}
+			{Value : streamNoImage},
+			{Value : streamWithTypeAndSizeRestriction}
 
         ],
         LineItem #bis               : [