Use @hierarchy annotation (#601)

Co-authored-by: Evgeny Andreev <evgeny.andreev@sap.com>
Co-authored-by: Markus Ofterdinger <markus.ofterdinger@sap.com>

Author: 3 people

app/admin/fiori-service.cds

@@ -94,7 +94,7 @@ annotate AdminService.GenreHierarchy with {
   ID @UI.Hidden;
 };
 
-annotate AdminService.GenreHierarchy with @Hierarchy.RecursiveHierarchyActions #GenreHierarchy: {
+annotate AdminService.GenreHierarchy with @Hierarchy.RecursiveHierarchyActions #GenreHierarchyHierarchy: {
   $Type                  : 'Hierarchy.RecursiveHierarchyActionsType',
   // any name can be the action name with namespace/no bound action name
   ChangeNextSiblingAction: 'AdminService.moveSibling',
@@ -104,7 +104,7 @@ annotate AdminService.GenreHierarchy with @UI: {
     PresentationVariant #VH: {
         $Type                      : 'UI.PresentationVariantType',
         Visualizations             : ['@UI.LineItem'],
-        RecursiveHierarchyQualifier: 'GenreHierarchy'
+        RecursiveHierarchyQualifier: 'GenreHierarchyHierarchy'
     },
     LineItem               : [{
         $Type: 'UI.DataField',
@@ -196,19 +196,7 @@ annotate AdminService.Books.texts {
 //
 //  Annotations for hierarchy ContentsHierarchy
 //
-annotate AdminService.ContentsHierarchy with @Aggregation.RecursiveHierarchy#ContentsHierarchy: {
-    $Type: 'Aggregation.RecursiveHierarchyType',
-    NodeProperty: ID, // identifies a node
-    ParentNavigationProperty: parent // navigates to a node's parent
-  };
-
-annotate AdminService.ContentsHierarchy with @Hierarchy.RecursiveHierarchy#ContentsHierarchy: {
-  $Type: 'Hierarchy.RecursiveHierarchyType',
-  LimitedDescendantCount: LimitedDescendantCount,
-  DistanceFromRoot: DistanceFromRoot,
-  DrillState: DrillState,
-  LimitedRank: LimitedRank
-};
+annotate AdminService.ContentsHierarchy with @hierarchy;
 
 annotate AdminService.Books actions {
     @(

app/admin/webapp/manifest.json

@@ -124,7 +124,7 @@
                             "controlConfiguration": {
                                 "contents/@com.sap.vocabularies.UI.v1.LineItem": {
                                     "tableSettings": {
-                                        "hierarchyQualifier": "ContentsHierarchy",
+                                        "hierarchyQualifier": "ContentsHierarchyHierarchy",
                                         "type": "TreeTable"
                                     }
                                 }

app/browse-genres/fiori-service.cds

@@ -5,16 +5,5 @@
 using CatalogService from '../../srv/cat-service';
 
 
-annotate CatalogService.GenreHierarchy with @Aggregation.RecursiveHierarchy#GenreHierarchy: {
-    $Type: 'Aggregation.RecursiveHierarchyType',
-    NodeProperty: ID, // identifies a node
-    ParentNavigationProperty: parent // navigates to a node's parent
-  };
+annotate CatalogService.GenreHierarchy with @hierarchy;
 
-annotate CatalogService.GenreHierarchy with @Hierarchy.RecursiveHierarchy#GenreHierarchy: {
-  $Type: 'Hierarchy.RecursiveHierarchyType',
-  LimitedDescendantCount: LimitedDescendantCount,
-  DistanceFromRoot: DistanceFromRoot,
-  DrillState: DrillState,
-  LimitedRank: LimitedRank
-};

app/browse-genres/webapp/manifest.json

@@ -88,7 +88,7 @@
 							"controlConfiguration": {
                                 "@com.sap.vocabularies.UI.v1.LineItem": {
                                     "tableSettings": {
-                                        "hierarchyQualifier": "GenreHierarchy",
+                                        "hierarchyQualifier": "GenreHierarchyHierarchy",
                                         "type": "TreeTable"
                                     }
                                 }

app/genres/fiori-service.cds

@@ -5,17 +5,4 @@
 using AdminService from '../../srv/admin-service';
 
 
-annotate AdminService.GenreHierarchy with @Aggregation.RecursiveHierarchy#GenreHierarchy: {
-    $Type: 'Aggregation.RecursiveHierarchyType',
-    NodeProperty: ID, // identifies a node
-    ParentNavigationProperty: parent // navigates to a node's parent
-  };
-
-  annotate AdminService.GenreHierarchy with @Hierarchy.RecursiveHierarchy#GenreHierarchy: {
-  $Type: 'Hierarchy.RecursiveHierarchyType',
-  // ExternalKey           : null,
-  LimitedDescendantCount: LimitedDescendantCount,
-  DistanceFromRoot: DistanceFromRoot,
-  DrillState: DrillState,
-  LimitedRank: LimitedRank
-};
+annotate AdminService.GenreHierarchy with @hierarchy;

app/genres/webapp/manifest.json

@@ -93,7 +93,7 @@
 							"controlConfiguration": {
                                 "@com.sap.vocabularies.UI.v1.LineItem": {
                                     "tableSettings": {
-                                        "hierarchyQualifier": "GenreHierarchy",
+                                        "hierarchyQualifier": "GenreHierarchyHierarchy",
                                         "type": "TreeTable"
                                     }
                                 }

db/books.cds

@@ -3,7 +3,6 @@ namespace my.bookshop;
 using {Currency, sap, managed, cuid} from '@sap/cds/common';
 using my.bookshop.Reviews from './reviews';
 using my.bookshop.TechnicalBooleanFlag from './common';
-using {my.common.Hierarchy as Hierarchy} from './hierarchy';
 
 @fiori.draft.enabled
 entity Books : cuid, managed {
@@ -46,7 +45,7 @@ annotate Authors with
 /**
  * Hierarchically organized Code List for Genres
  */
-entity Genres : sap.common.CodeList, Hierarchy {
+entity Genres : sap.common.CodeList {
     key ID          : UUID;
         // move siblings
         siblingRank : Integer;
@@ -59,7 +58,7 @@ entity Genres : sap.common.CodeList, Hierarchy {
 /**
  * Hierarchically organized entity for Contents
  */
-entity Contents: Hierarchy {
+entity Contents {
     key ID     : UUID;
         name   : String;
         page   : Integer;