review and ui fix

etimr · etimr · commit f9f6d175f7c8 · 2025-02-27T09:38:46.000+01:00
diff --git a/app/admin/webapp/manifest.json b/app/admin/webapp/manifest.json
@@ -74,7 +74,7 @@
                     "target": "BooksDetails"
                 },
                 {
-                    "pattern": "Books({key}/contents({key2}):?query:",
+                    "pattern": "Books({key})/contents({key2}):?query:",
                     "name": "ContentsDetails",
                     "target": "ContentsDetails"
                 }
@@ -138,7 +138,7 @@
                     "name": "sap.fe.templates.ObjectPage",
                     "options": {
                         "settings": {
-                            "entitySet": "ContentsHierarchy"
+                            "contextPath": "/Books/contents"
                         }
                     }
                 }
diff --git a/app/common.cds b/app/common.cds
@@ -206,8 +206,6 @@ annotate my.Genres with
 //	Genres Elements
 //
 annotate my.Genres with {
-    ID
-    @title : '{i18n>ID}';
     name
     @title : '{i18n>Genre}';
 }
diff --git a/db/books.cds b/db/books.cds
@@ -64,6 +64,6 @@ entity Contents {
         name   : String;
         page   : Integer;
         parent : Association to Contents @odata.draft.enclosed;
-        book   : Association to Books @odata.draft.enclosed;
+        book   : Association to Books;
 }
 
diff --git a/db/data/my.bookshop-Contents.csv b/db/data/my.bookshop-Contents.csv
@@ -20,4 +20,45 @@ f846b0b9-01d4-4f6d-82a4-d79204f62531;f846b0b9-01d4-4f6d-82a4-d79204f62530;Sectio
 f846b0b9-01d4-4f6d-82a4-d79204f62532;f846b0b9-01d4-4f6d-82a4-d79204f62530;Section 2.2;25;51061ce3-ddde-4d70-a2dc-6314afbcc73e
 f846b0b9-01d4-4f6d-82a4-d79204f62533;f846b0b9-01d4-4f6d-82a4-d79204f62530;Section 2.3;27;51061ce3-ddde-4d70-a2dc-6314afbcc73e
 f846b0b9-01d4-4f6d-82a4-d79204f62534;;Chapter 3;30;51061ce3-ddde-4d70-a2dc-6314afbcc73e
-f846b0b9-01d4-4f6d-82a4-d79204f62535;;Endnotes;41;51061ce3-ddde-4d70-a2dc-6314afbcc73e
+f846b0b9-01d4-4f6d-82a4-d79204f62535;;Endnotes;41;51061ce3-ddde-4d70-a2dc-6314afbcc73e
+f846b0b9-01d4-4f6d-82a4-d79204f62551;;Acknowledgements;1;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62552;;The Flight;2;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62553;;Hexwood Farm;8;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62554;f846b0b9-01d4-4f6d-82a4-d79204f62553;Castle Saburac;13;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62555;f846b0b9-01d4-4f6d-82a4-d79204f62553;The Curse of Rapkyn;27;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62556;f846b0b9-01d4-4f6d-82a4-d79204f62553;The Mannikin;35;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62557;;The Eye of Time;44;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62558;;The Enchanting;59;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62559;f846b0b9-01d4-4f6d-82a4-d79204f62558;The Telling Bone;73;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62560;f846b0b9-01d4-4f6d-82a4-d79204f62558;The Power of Adamcos;86;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62561;f846b0b9-01d4-4f6d-82a4-d79204f62558;The House of the Sorcerer;98;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62562;;The Changeling;105;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62563;f846b0b9-01d4-4f6d-82a4-d79204f62562;The Flying Broomsticks;118;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62564;f846b0b9-01d4-4f6d-82a4-d79204f62563;The Fish Out of Water;126;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62565;;The Final Magic;138;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62566;;Copyright;159;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62567;;Editor's Note;1;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62568;;Chapter I;2;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62569;;Chapter II;31;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62570;f846b0b9-01d4-4f6d-82a4-d79204f62569;Section II.I;47;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62571;f846b0b9-01d4-4f6d-82a4-d79204f62569;Section II.II;62;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62572;f846b0b9-01d4-4f6d-82a4-d79204f62569;Section II.III;75;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62573;f846b0b9-01d4-4f6d-82a4-d79204f62569;Section II.IV;87;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62574;;Chapter III;105;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62575;f846b0b9-01d4-4f6d-82a4-d79204f62574;Section III.I;128;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62576;f846b0b9-01d4-4f6d-82a4-d79204f62575;Subsection III.I.I;156;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62577;f846b0b9-01d4-4f6d-82a4-d79204f62575;Subsection III.I.II;173;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62578;f846b0b9-01d4-4f6d-82a4-d79204f62574;Section III.II;185;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62579;;Chapter IV;203;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62580;;Acknowledgments;250;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62582;;Foreword;1;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62583;;Chapter 1;3;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62584;f846b0b9-01d4-4f6d-82a4-d79204f62583;Section 1.1;5;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62585;f846b0b9-01d4-4f6d-82a4-d79204f62583;Section 1.2;8;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62586;;Chapter 2;10;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62587;f846b0b9-01d4-4f6d-82a4-d79204f62586;Section 2.1;12;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62588;f846b0b9-01d4-4f6d-82a4-d79204f62587;Subsection 2.1.1;14;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62589;f846b0b9-01d4-4f6d-82a4-d79204f62587;Subsection 2.1.2;16;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62590;f846b0b9-01d4-4f6d-82a4-d79204f62586;Section 2.2;18;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62591;f846b0b9-01d4-4f6d-82a4-d79204f62590;Subsection 2.2.1;21;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62592;;Endnotes;25;aebdfc8a-0dfa-4468-bd36-48aabd65e663
diff --git a/db/data/my.bookshop-Genres.csv b/db/data/my.bookshop-Genres.csv
@@ -1,18 +1,35 @@
 ID;parent_ID;name;siblingRank
 f846b0b9-01d4-4f6d-82a4-d79204f62369;;Fiction;1000
-f846b0b9-01d4-4f6d-82a4-d79204f62570;f846b0b9-01d4-4f6d-82a4-d79204f62369;Drama;2000
-f846b0b9-01d4-4f6d-82a4-d79204f62571;f846b0b9-01d4-4f6d-82a4-d79204f62369;Poetry;3000
-f846b0b9-01d4-4f6d-82a4-d79204f62572;f846b0b9-01d4-4f6d-82a4-d79204f62369;Fantasy;4000
-f846b0b9-01d4-4f6d-82a4-d79204f62592;f846b0b9-01d4-4f6d-82a4-d79204f62572;Epic fantasy;5000
-f846b0b9-01d4-4f6d-82a4-d79204f62593;f846b0b9-01d4-4f6d-82a4-d79204f62572;High fantasy;6000
-f846b0b9-01d4-4f6d-82a4-d79204f62573;f846b0b9-01d4-4f6d-82a4-d79204f62369;Science Fiction;7000
-f846b0b9-01d4-4f6d-82a4-d79204f62574;f846b0b9-01d4-4f6d-82a4-d79204f62369;Romance;8000
-f846b0b9-01d4-4f6d-82a4-d79204f62575;f846b0b9-01d4-4f6d-82a4-d79204f62369;Mystery;9000
-f846b0b9-01d4-4f6d-82a4-d79204f62576;f846b0b9-01d4-4f6d-82a4-d79204f62369;Thriller;10000
-f846b0b9-01d4-4f6d-82a4-d79204f62577;f846b0b9-01d4-4f6d-82a4-d79204f62369;Dystopia;11000
-f846b0b9-01d4-4f6d-82a4-d79204f62578;f846b0b9-01d4-4f6d-82a4-d79204f62369;Fairy Tale;12000
-d846b0b9-01d4-4f6d-82a4-d79204f62487;;Non-Fiction;13000
-d846b0b9-01d4-4f6d-82a4-d79204f62588;d846b0b9-01d4-4f6d-82a4-d79204f62487;Biography;14000
-d846b0b9-01d4-4f6d-82a4-d79204f62589;d846b0b9-01d4-4f6d-82a4-d79204f62588;Autobiography;15000
-d846b0b9-01d4-4f6d-82a4-d79204f62590;d846b0b9-01d4-4f6d-82a4-d79204f62487;Essay;16000
-d846b0b9-01d4-4f6d-82a4-d79204f62591;d846b0b9-01d4-4f6d-82a4-d79204f62487;Speech;17000
+f846b0b9-01d4-4f6d-82a4-d79204f62360;f846b0b9-01d4-4f6d-82a4-d79204f62369;Action;2000
+f846b0b9-01d4-4f6d-82a4-d79204f62359;f846b0b9-01d4-4f6d-82a4-d79204f62369;Adventure;3000
+f846b0b9-01d4-4f6d-82a4-d79204f62570;f846b0b9-01d4-4f6d-82a4-d79204f62369;Drama;4000
+f846b0b9-01d4-4f6d-82a4-d79204f62571;f846b0b9-01d4-4f6d-82a4-d79204f62369;Poetry;5000
+f846b0b9-01d4-4f6d-82a4-d79204f62572;f846b0b9-01d4-4f6d-82a4-d79204f62369;Fantasy;6000
+f846b0b9-01d4-4f6d-82a4-d79204f62592;f846b0b9-01d4-4f6d-82a4-d79204f62572;Epic fantasy;7000
+f846b0b9-01d4-4f6d-82a4-d79204f62593;f846b0b9-01d4-4f6d-82a4-d79204f62572;High fantasy;8000
+f846b0b9-01d4-4f6d-82a4-d79204f62573;f846b0b9-01d4-4f6d-82a4-d79204f62369;Science Fiction;9000
+f846b0b9-01d4-4f6d-82a4-d79204f62357;f846b0b9-01d4-4f6d-82a4-d79204f62573;Utopian and Dystopian;10000
+f846b0b9-01d4-4f6d-82a4-d79204f62355;f846b0b9-01d4-4f6d-82a4-d79204f62357;Dystopia;11000
+f846b0b9-01d4-4f6d-82a4-d79204f62353;f846b0b9-01d4-4f6d-82a4-d79204f62355;Cyberpunk;12000
+f846b0b9-01d4-4f6d-82a4-d79204f62351;f846b0b9-01d4-4f6d-82a4-d79204f62353;Steampunk;13000
+f846b0b9-01d4-4f6d-82a4-d79204f62574;f846b0b9-01d4-4f6d-82a4-d79204f62369;Romance;14000
+f846b0b9-01d4-4f6d-82a4-d79204f62575;f846b0b9-01d4-4f6d-82a4-d79204f62369;Mystery;15000
+f846b0b9-01d4-4f6d-82a4-d79204f62515;f846b0b9-01d4-4f6d-82a4-d79204f62369;Graphic Novel;16000
+f846b0b9-01d4-4f6d-82a4-d79204f62576;f846b0b9-01d4-4f6d-82a4-d79204f62369;Thriller;17000
+f846b0b9-01d4-4f6d-82a4-d79204f62520;f846b0b9-01d4-4f6d-82a4-d79204f62576;Suspense;18000
+f846b0b9-01d4-4f6d-82a4-d79204f62523;f846b0b9-01d4-4f6d-82a4-d79204f62576;Crime thriller;19000
+f846b0b9-01d4-4f6d-82a4-d79204f62525;f846b0b9-01d4-4f6d-82a4-d79204f62576;Spy thriller;20000
+f846b0b9-01d4-4f6d-82a4-d79204f62527;f846b0b9-01d4-4f6d-82a4-d79204f62576;Political thriller;21000
+f846b0b9-01d4-4f6d-82a4-d79204f62577;f846b0b9-01d4-4f6d-82a4-d79204f62369;Dystopia;22000
+f846b0b9-01d4-4f6d-82a4-d79204f62512;f846b0b9-01d4-4f6d-82a4-d79204f62369;Short Story;23000
+f846b0b9-01d4-4f6d-82a4-d79204f62578;f846b0b9-01d4-4f6d-82a4-d79204f62369;Fairy Tale;24000
+f846b0b9-01d4-4f6d-82a4-d79204f62529;f846b0b9-01d4-4f6d-82a4-d79204f62369;Horror;25000
+f846b0b9-01d4-4f6d-82a4-d79204f62531;f846b0b9-01d4-4f6d-82a4-d79204f62369;Historical Fiction;26000
+f846b0b9-01d4-4f6d-82a4-d79204f62533;f846b0b9-01d4-4f6d-82a4-d79204f62369;Contemporary Fiction;27000
+f846b0b9-01d4-4f6d-82a4-d79204f62535;f846b0b9-01d4-4f6d-82a4-d79204f62369;Magical Realism;28000
+f846b0b9-01d4-4f6d-82a4-d79204f62537;f846b0b9-01d4-4f6d-82a4-d79204f62369;Literary Fiction;29000
+d846b0b9-01d4-4f6d-82a4-d79204f62487;;Non-Fiction;30000
+d846b0b9-01d4-4f6d-82a4-d79204f62588;d846b0b9-01d4-4f6d-82a4-d79204f62487;Biography;31000
+d846b0b9-01d4-4f6d-82a4-d79204f62589;d846b0b9-01d4-4f6d-82a4-d79204f62588;Autobiography;32000
+d846b0b9-01d4-4f6d-82a4-d79204f62590;d846b0b9-01d4-4f6d-82a4-d79204f62487;Essay;33000
+d846b0b9-01d4-4f6d-82a4-d79204f62591;d846b0b9-01d4-4f6d-82a4-d79204f62487;Speech;34000
diff --git a/srv/admin-service.cds b/srv/admin-service.cds
@@ -1,4 +1,4 @@
-using {sap.common.Languages as CommonLanguages} from '@sap/cds/common';
+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';
@@ -22,12 +22,12 @@ service AdminService @(requires: 'admin') {
   entity Orders         as select from my.Orders;
   extend my.Genres with Hierarchy;
 
-  type NextSibling {
-    ID : UUID; 
-  }
+  type NextSibling : cuid { };
   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 moveSiblingAction(NextSibling : NextSibling);
     };
 
diff --git a/srv/src/main/java/my/bookshop/handlers/HierarchyExpandHandler.java b/srv/src/main/java/my/bookshop/handlers/HierarchyExpandHandler.java

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@`
`74`	`74`	`"target": "BooksDetails"`
`75`	`75`	`},`
`76`	`76`	`{`
`77`		`- "pattern": "Books({key}/contents({key2}):?query:",`
	`77`	`+ "pattern": "Books({key})/contents({key2}):?query:",`
`78`	`78`	`"name": "ContentsDetails",`
`79`	`79`	`"target": "ContentsDetails"`
`80`	`80`	`}`
`@@ -138,7 +138,7 @@`
`138`	`138`	`"name": "sap.fe.templates.ObjectPage",`
`139`	`139`	`"options": {`
`140`	`140`	`"settings": {`
`141`		`- "entitySet": "ContentsHierarchy"`
	`141`	`+ "contextPath": "/Books/contents"`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,8 +206,6 @@ annotate my.Genres with`
`206`	`206`	`// Genres Elements`
`207`	`207`	`//`
`208`	`208`	`annotate my.Genres with {`
`209`		`- ID`
`210`		`- @title : '{i18n>ID}';`
`211`	`209`	`name`
`212`	`210`	`@title : '{i18n>Genre}';`
`213`	`211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,6 @@ entity Contents {`
`64`	`64`	`name : String;`
`65`	`65`	`page : Integer;`
`66`	`66`	`parent : Association to Contents @odata.draft.enclosed;`
`67`		`- book : Association to Books @odata.draft.enclosed;`
	`67`	`+ book : Association to Books;`
`68`	`68`	`}`
`69`	`69`