Fiori Tree Views towards GA (#839)

* Fiori Tree Views towards GA

* Also automate addition of Aggregation.RecursiveHierarchy

* Cleanup models for Genres Tree View

* Implementing @hierarchy shortcut

* .

* Formatting

* Using verbose config

fiori/app/genres/fiori-service.cds

@@ -1,3 +1,33 @@
-/*
-All annotations needed for UI5 Tree Table View are located in '../common'
-*/
+using { sap.capire.bookshop.Genres } from '@capire/bookstore';
+
+annotate Genres with @cds.search: {name};
+annotate Genres with @readonly;
+annotate Genres with {
+  name @title: '{i18n>Genre}';
+}
+
+// Lists
+annotate Genres with @(
+  Common.SemanticKey : [name],
+  UI.SelectionFields : [name],
+  UI.LineItem : [
+   { Value: name, Label: '{i18n>Name}' },
+  ],
+);
+
+// Details
+annotate Genres with @(UI : {
+  Identification : [{ Value: name }],
+  HeaderInfo     : {
+    TypeName       : '{i18n>Genre}',
+    TypeNamePlural : '{i18n>Genres}',
+    Title          : { Value: name },
+    Description    : { Value: ID }
+  }
+});
+
+
+// Tree Views
+// annotate AdminService.Genres with @hierarchy; // upcomming simplification
+using from './tree-view';
+using from './value-help';

fiori/app/genres/tree-view.cds

@@ -0,0 +1,42 @@
+using { AdminService } from '@capire/bookstore';
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Genres Tree View
+//
+
+// Tell Fiori about the structure of the hierarchy
+annotate AdminService.Genres with @Aggregation.RecursiveHierarchy #GenresHierarchy : {
+  ParentNavigationProperty : parent, // navigates to a node's parent
+  NodeProperty             : ID, // identifies a node, usually the key
+};
+
+// Fiori expects the following to be defined explicitly, even though they're always the same
+extend AdminService.Genres with @(
+  // The columns expected by Fiori to be present in hierarchy entities
+  Hierarchy.RecursiveHierarchy #GenresHierarchy : {
+    LimitedDescendantCount : LimitedDescendantCount,
+    DistanceFromRoot       : DistanceFromRoot,
+    DrillState             : DrillState,
+    LimitedRank            : LimitedRank
+  },
+  // Disallow filtering on these properties from Fiori UIs
+  Capabilities.FilterRestrictions.NonFilterableProperties: [
+    'LimitedDescendantCount',
+    'DistanceFromRoot',
+    'DrillState',
+    'LimitedRank'
+  ],
+  // Disallow sorting on these properties from Fiori UIs
+  Capabilities.SortRestrictions.NonSortableProperties    : [
+    'LimitedDescendantCount',
+    'DistanceFromRoot',
+    'DrillState',
+    'LimitedRank'
+  ],
+) columns { // Ensure we can query these fields from database
+  null as LimitedDescendantCount : Int16,
+  null as DistanceFromRoot       : Int16,
+  null as DrillState             : String,
+  null as LimitedRank            : Int16,
+};

fiori/app/genres/value-help.cds

@@ -0,0 +1,6 @@
+// Value help with Tree View
+using from '../admin-books/fiori-service';
+annotate AdminService.Books:genre with @Common.ValueList.PresentationVariantQualifier: 'VH';
+annotate AdminService.Genres with @UI.PresentationVariant #VH: {
+  RecursiveHierarchyQualifier : 'GenresHierarchy',
+};

fiori/app/genres/webapp/manifest.json

@@ -51,7 +51,7 @@
 					"earlyRequests": true,
 					"groupProperties": {
 						"default": {
-						  "submit": "Auto"
+							"submit": "Auto"
 						}
 					}
 				}
@@ -82,17 +82,17 @@
 								"Genres": {
 									"detail": {
 										"route": "GenresDetails"
-										}
+									}
 								}
 							},
 							"controlConfiguration": {
-                                "@com.sap.vocabularies.UI.v1.LineItem": {
-                                    "tableSettings": {
-                                        "hierarchyQualifier": "GenreHierarchy",
-                                        "type": "TreeTable"
-                                    }
-                                }
-                            }
+								"@com.sap.vocabularies.UI.v1.LineItem": {
+									"tableSettings": {
+										"hierarchyQualifier": "GenresHierarchy",
+										"type": "TreeTable"
+									}
+								}
+							}
 						}
 					}
 				},
@@ -121,4 +121,4 @@
 		"registrationIds": [],
 		"archeType": "transactional"
 	}
-}
+}