RowSpan as annotation to DataField

SAP · Jun 25, 2024 · 3dc9e41 · 3dc9e41
1 parent 00fd0d7
commit 3dc9e41
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/vocabularies/HTML5.xml b/vocabularies/HTML5.xml
@@ -88,11 +88,13 @@
         </Annotation>
       </TypeDefinition>
 
-      <Term Name="MergeDuplicateValuesInColumns" Type="Collection(Edm.PropertyPath)" Nullable="false">
+      <Term Name="RowSpanForDuplicateValues" Type="Core.Tag" Nullable="false" DefaultValue="true" AppliesTo="Record">
         <Annotation Term="Common.Experimental" />
-        <Annotation Term="Core.Description" String="For these properties adjacent column cells will be merged if the values are the same." />
+        <Annotation Term="Core.Description" String="The annotated UI.DataField might use a rowSpan for adjacent duplicate values if used in a table." />
         <Annotation Term="Core.LongDescription">
-          <String>In order to achieve a good user experience the respective columns should be sorted.</String>
+          <String>In order to achieve a good user experience the respective columns should be sorted.
+            Applicability of this term is governed by [`Validation.ApplicableTerms`](https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Validation.V1.html#ApplicableTerms) annotations.
+          </String>
         </Annotation>
       </Term>
 

diff --git a/vocabularies/UI.xml b/vocabularies/UI.xml
@@ -147,11 +147,6 @@ a collection of business object instances, e.g. as a list or table.</String>
       <Term Name="LineItem" Type="Collection(UI.DataFieldAbstract)" Nullable="false" AppliesTo="EntityType">
         <Annotation Term="Core.Description" String="Collection of data fields for representation in a table or list" />
         <Annotation Term="UI.ThingPerspective" />
-        <Annotation Term="Validation.ApplicableTerms">
-          <Collection>
-            <String>HTML5.MergeDuplicateValuesInColumns</String>
-          </Collection>
-        </Annotation>
       </Term>
 
       <Term Name="StatusInfo" Type="Collection(UI.DataFieldAbstract)" Nullable="false" AppliesTo="EntityType">
@@ -1598,6 +1593,7 @@ or `204 No Content` if the request included a `Prefer` header with a value of `r
             <String>UI.Importance</String>
             <String>UI.PartOfPreview</String>
             <String>HTML5.CssDefaults</String>
+            <String>HTML5.RowSpanForDuplicateValues</String>
             <String>Common.FieldControl</String>
           </Collection>
         </Annotation>