clean-up, fix

Author: eugene-andreev

app/admin/fiori-service.cds

@@ -97,11 +97,11 @@ annotate AdminService.GenreHierarchy with {
   ID @UI.Hidden;
 };
 
-@Hierarchy.RecursiveHierarchyActions #GenreHierarchy: {
+annotate AdminService.GenreHierarchy with @Hierarchy.RecursiveHierarchyActions #GenreHierarchy: {
   $Type                  : 'Hierarchy.RecursiveHierarchyActionsType',
   // any name can be the action name with namespace/no bound action name
   ChangeNextSiblingAction: 'AdminService.moveSibling',
-}
+};
 
 annotate AdminService.GenreHierarchy with @UI: {
     PresentationVariant #VH: {

db/books.cds

@@ -1,13 +1,9 @@
 namespace my.bookshop;
 
-using {
-    Currency,
-    sap,
-    managed,
-    cuid
-} from '@sap/cds/common';
+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 {
@@ -50,17 +46,20 @@ annotate Authors with
 /**
  * Hierarchically organized Code List for Genres
  */
-entity Genres : sap.common.CodeList {
+entity Genres : sap.common.CodeList, Hierarchy {
     key ID          : UUID;
-        siblingRank : Integer; 
+        // move siblings
+        siblingRank : Integer;
         parent      : Association to Genres;
+        // for cascade delete
         children    : Composition of many Genres on children.parent = $self;
 }
 
+
 /**
  * Hierarchically organized entity for Contents
  */
-entity Contents {
+entity Contents: Hierarchy {
     key ID     : UUID;
         name   : String;
         page   : Integer;

srv/hierarchy.cds db/hierarchy.cdssrv/hierarchy.cds renamed to db/hierarchy.cds

@@ -4,8 +4,8 @@ aspect Hierarchy {
   virtual LimitedDescendantCount : Integer64;
   virtual DistanceFromRoot       : Integer64;
   virtual DrillState             : String;
-  virtual Matched                : Boolean;
-  virtual MatchedDescendantCount : Integer64;
+  virtual Matched                : Boolean; // not used
+  virtual MatchedDescendantCount : Integer64; // not used
   virtual LimitedRank            : Integer64;
 }
 

srv/admin-service.cds

@@ -1,11 +1,9 @@
 using {sap.common.Languages as CommonLanguages, cuid} from '@sap/cds/common';
 using {my.bookshop as my} from '../db/index';
 using {sap.changelog as changelog} from 'com.sap.cds/change-tracking';
-using {my.common.Hierarchy as Hierarchy} from './hierarchy';
 using {sap.attachments.Attachments} from 'com.sap.cds/cds-feature-attachments';
 
 extend my.Orders with changelog.changeTracked;
-extend my.Genres with Hierarchy;
 
 @path: 'admin'
 @odata.apply.transformations
@@ -26,12 +24,10 @@ service AdminService @(requires: 'admin') {
   entity GenreHierarchy as projection on my.Genres
     excluding {children} order by siblingRank
     actions {
-      // Experimental UI feature, see:
-      // https://github.com/SAP/odata-vocabularies/blob/main/vocabularies/Hierarchy.md#template_changenextsiblingaction-experimental
-      action moveSibling(NextSibling : NextSibling);
+      // HierarchySiblingActionHandler.java
+      action moveSibling(NextSibling : NextSibling); // to be implemented in custom handler 
     };
 
-  extend my.Contents with Hierarchy;
   entity ContentsHierarchy as projection on my.Contents;
 
   @cds.persistence.skip

srv/src/main/java/my/bookshop/handlers/AdminServiceHandler.java

@@ -29,7 +29,6 @@
 import com.sap.cds.services.ErrorStatuses;
 import com.sap.cds.services.EventContext;
 import com.sap.cds.services.ServiceException;
-import com.sap.cds.services.cds.CdsReadEventContext;
 import com.sap.cds.services.cds.CdsUpdateEventContext;
 import com.sap.cds.services.cds.CqnService;
 import com.sap.cds.services.draft.DraftCancelEventContext;
@@ -307,7 +306,7 @@ public void restoreCoversUpId(CqnStructuredTypeRef ref, BooksCovers cover) {
 	@On(event = CqnService.EVENT_READ, entity = Info_.CDS_NAME)
 	public Info readInfo() {
 		Info info = Info.create();
-		info.setHideTreeTable(!env.matchesProfiles("cloud"));
+		info.setHideTreeTable(!env.matchesProfiles("hybrid"));
 		return info;
 	}
 

srv/src/main/java/my/bookshop/handlers/HierarchySiblingActionHandler.java

@@ -26,7 +26,7 @@
 /**
  * Example of a custom handler for nextSiblingAction
  */
-@Profile("cloud")
+@Profile("hybrid")
 public class HierarchySiblingActionHandler implements EventHandler {
 
     private final PersistenceService db;