@sap/cds-dk 9.4.3 → 9.5.0

package/lib/init/template/sample/files/app/admin-books/fiori-service.cds

@@ -1,61 +1,74 @@
-using {AdminService} from '../../srv/admin-service.cds';
+using { AdminService } from '../../srv/admin-service';
+using from '../common'; // to help UI linter get the complete annotations
+
+
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Object Page
 //
 
-annotate AdminService.Books with @(UI: {
-  HeaderInfo         : {
-    TypeName      : '{i18n>Book}',
-    TypeNamePlural: '{i18n>Books}',
-    Title         : {Value: title},
-    Description   : {Value: author.name}
-  },
-  Facets             : [
-    {
-      $Type : 'UI.ReferenceFacet',
-      Label : '{i18n>General}',
-      Target: '@UI.FieldGroup#General'
-    },
-    {
-      $Type : 'UI.ReferenceFacet',
-      Label : '{i18n>Translations}',
-      Target: 'texts/@UI.LineItem'
+annotate AdminService.Books with @(
+  UI: {
+    Facets: [
+      {$Type: 'UI.ReferenceFacet', Label: '{i18n>General}', Target: '@UI.FieldGroup#General'},
+      {$Type: 'UI.ReferenceFacet', Label: '{i18n>Translations}', Target:  'texts/@UI.LineItem'},
+      {$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
+      {$Type: 'UI.ReferenceFacet', Label: '{i18n>Admin}', Target: '@UI.FieldGroup#Admin'},
+    ],
+    FieldGroup#General: {
+      Data: [
+        {Value: title},
+        {Value: author_ID},
+        {Value: genre_ID},
+        {Value: descr},
+      ]
     },
-    {
-      $Type : 'UI.ReferenceFacet',
-      Label : '{i18n>Details}',
-      Target: '@UI.FieldGroup#Details'
+    FieldGroup#Details: {
+      Data: [
+        {Value: stock},
+        {Value: price},
+      ]
     },
-    {
-      $Type : 'UI.ReferenceFacet',
-      Label : '{i18n>Admin}',
-      Target: '@UI.FieldGroup#Admin'
-    },
-  ],
-  FieldGroup #General: {Data: [
-    {Value: title},
-    {Value: author_ID},
-    {Value: genre_ID},
-    {Value: descr},
-  ]},
-  FieldGroup #Details: {Data: [
-    {Value: stock},
-    {Value: price},
-    {
-      Value: currency_code,
-      Label: '{i18n>Currency}'
-    },
-  ]},
-  FieldGroup #Admin  : {Data: [
-    {Value: createdBy},
-    {Value: createdAt},
-    {Value: modifiedBy},
-    {Value: modifiedAt}
-  ]}
-});
+    FieldGroup#Admin: {
+      Data: [
+        {Value: createdBy},
+        {Value: createdAt},
+        {Value: modifiedBy},
+        {Value: modifiedAt}
+      ]
+    }
+  }
+);
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Value Help for Tree Table
+//
+annotate AdminService.Books with {
+  genre @(Common: {
+    Label    : 'Genre',
+    ValueList: {
+      CollectionPath                : 'Genres',
+        Parameters                  : [
+        {
+            $Type            : 'Common.ValueListParameterDisplayOnly',
+            ValueListProperty: 'name',
+        },
+        {
+            $Type            : 'Common.ValueListParameterInOut',
+            LocalDataProperty: genre_ID,
+            ValueListProperty: 'ID',
+        }
+      ],
+    }
+  });
+}
 
+// Hide ID because of the ValueHelp
+annotate AdminService.Genres with {
+  ID @UI.Hidden;
+};
 
 ////////////////////////////////////////////////////////////
 //
@@ -65,54 +78,34 @@ annotate AdminService.Books with @(UI: {
 annotate sap.capire.bookshop.Books with @fiori.draft.enabled;
 annotate AdminService.Books with @odata.draft.enabled;
 
-annotate AdminService.Books.texts with @(UI: {
-  Identification : [{Value: title}],
-  SelectionFields: [
-    locale,
-    title
-  ],
-  LineItem       : [
-    {
-      Value: locale,
-      Label: '{i18n>Locale}'
-    },
-    {
-      Value: title,
-      Label: '{i18n>Title}'
-    },
-    {
-      Value: descr,
-      Label: '{i18n>Description}'
-    },
-  ]
-});
+annotate AdminService.Books.texts with @(
+  UI: {
+    Identification: [{Value:title}],
+    SelectionFields: [ locale, title ],
+    LineItem: [
+      {Value: locale, Label: 'Locale'},
+      {Value: title, Label: 'Title'},
+      {Value: descr, Label: 'Description'},
+    ]
+  }
+);
 
 annotate AdminService.Books.texts with {
-  ID       @UI.Hidden;
-  ID_texts @UI.Hidden;
+    ID       @UI.Hidden;
+    ID_texts @UI.Hidden;
 };
 
 // Add Value Help for Locales
 annotate AdminService.Books.texts {
   locale @(
-    ValueList.entity: 'Languages',
-    Common.ValueListWithFixedValues, //show as drop down, not a dialog
+    ValueList.entity:'Languages', Common.ValueListWithFixedValues, //show as drop down, not a dialog
   )
-};
-
+}
 // In addition we need to expose Languages through AdminService as a target for ValueList
-using {sap} from '@sap/cds/common';
-
+using { sap } from '@sap/cds/common';
 extend service AdminService {
-  @readonly
-  entity Languages as projection on sap.common.Languages;
+  @readonly entity Languages as projection on sap.common.Languages;
 }
 
-// Workaround for Fiori popups for asking user to enter a valid UUID on Create
-annotate AdminService.Authors : ID with  @Core.Computed;
-annotate AdminService.Books : ID with  @Core.Computed;
-
-// Show Genre as drop down, not a dialog
-annotate AdminService.Books with {
-  genre @Common.ValueListWithFixedValues;
-}
+// Workaround for Fiori popup for asking user to enter a new UUID on Create
+annotate AdminService.Books with { ID @Core.Computed; }

package/lib/init/template/sample/files/app/admin-books/webapp/Component.js.hbs

@@ -0,0 +1,3 @@
+sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("{{appName}}.{{app}}.Component", {
+  metadata:{ manifest:'json' }
+}))

package/lib/init/template/sample/files/app/admin-books/webapp/i18n/i18n.properties

@@ -1,3 +1,11 @@
+# This is the resource bundle of itelo
+# __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
+
+# JCI app descriptor contains lower case TITLE
 appTitle=Manage Books
-appSubTitle=Manage bookshop inventory
-appDescription=Manage your bookshop inventory with ease.
+
+# JCI app descriptor contains lower case DESCRIPTION
+appSubTitle=CAP Sample Application
+
+# JCI app descriptor contains lower case DESCRIPTION
+appDescription=CDS Sample Service

package/lib/init/template/sample/files/app/admin-books/webapp/manifest.json

@@ -1,14 +1,14 @@
 {
-  "_version": "1.49.0",
+  "_version": "1.8.0",
   "sap.app": {
-    "id": "admin-books",
-    "applicationVersion": {
-      "version": "1.0.0"
-    },
+    "id": "books",
     "type": "application",
     "title": "{{appTitle}}",
     "description": "{{appDescription}}",
     "i18n": "i18n/i18n.properties",
+    "applicationVersion": {
+      "version": "1.0.0"
+    },
     "dataSources": {
       "AdminService": {
         "uri": "odata/v4/admin/",
@@ -20,29 +20,24 @@
     },
     "crossNavigation": {
       "inbounds": {
-        "intent-Books-manage": {
+        "Books-manage": {
           "signature": {
             "parameters": {},
             "additionalParameters": "allowed"
           },
           "semanticObject": "Books",
-          "action": "manage"
+          "action": "manage",
+          "title": "{{appTitle}}",
+          "info": "{{appInfo}}",
+          "subTitle": "{{appSubTitle}}",
+          "icon": "sap-icon://course-book"
         }
       }
     }
   },
-  "sap.ui": {
-    "technology": "UI5",
-    "fullWidth": false,
-    "deviceTypes": {
-      "desktop": true,
-      "tablet": true,
-      "phone": true
-    }
-  },
   "sap.ui5": {
     "dependencies": {
-      "minUI5Version": "1.115.1",
+      "minUI5Version": "1.136.0",
       "libs": {
         "sap.fe.templates": {}
       }
@@ -55,14 +50,10 @@
       "": {
         "dataSource": "AdminService",
         "settings": {
+          "synchronizationMode": "None",
           "operationMode": "Server",
           "autoExpandSelect": true,
-          "earlyRequests": true,
-          "groupProperties": {
-            "default": {
-              "submit": "Auto"
-            }
-          }
+          "earlyRequests": true
         }
       }
     },
@@ -77,11 +68,6 @@
           "pattern": "Books({key}):?query:",
           "name": "BooksDetails",
           "target": "BooksDetails"
-        },
-        {
-          "pattern": "Books({key}/author({key2}):?query:",
-          "name": "AuthorsDetails",
-          "target": "AuthorsDetails"
         }
       ],
       "targets": {
@@ -92,7 +78,7 @@
           "options": {
             "settings": {
               "entitySet": "Books",
-              "initialLoad": true,
+              "liveMode": true,
               "navigation": {
                 "Books": {
                   "detail": {
@@ -109,25 +95,7 @@
           "name": "sap.fe.templates.ObjectPage",
           "options": {
             "settings": {
-              "entitySet": "Books",
-              "editableHeaderContent": false,
-              "navigation": {
-                "Authors": {
-                  "detail": {
-                    "route": "AuthorsDetails"
-                  }
-                }
-              }
-            }
-          }
-        },
-        "AuthorsDetails": {
-          "type": "Component",
-          "id": "AuthorsDetailsList",
-          "name": "sap.fe.templates.ObjectPage",
-          "options": {
-            "settings": {
-              "entitySet": "Authors"
+              "entitySet": "Books"
             }
           }
         }
@@ -138,6 +106,14 @@
       "cozy": true
     }
   },
+  "sap.ui": {
+    "technology": "UI5",
+    "deviceTypes": {
+      "desktop": true,
+      "phone": true,
+      "tablet": true
+    }
+  },
   "sap.fiori": {
     "registrationIds": [],
     "archeType": "transactional"

package/lib/init/template/sample/files/app/appconfig/fioriSandboxConfig.json

@@ -3,7 +3,6 @@
     "LaunchPage": {
       "adapter": {
         "config": {
-          "catalogs": [],
           "groups": [
             {
               "id": "Bookshop",
@@ -19,6 +18,14 @@
                     "title": "Browse Books",
                     "targetURL": "#Books-display"
                   }
+                },
+                {
+                  "id": "BrowseGenres",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Browse Genres",
+                    "targetURL": "#Genres-display"
+                  }
                 }
               ]
             },
@@ -36,6 +43,14 @@
                     "title": "Manage Books",
                     "targetURL": "#Books-manage"
                   }
+                },
+                {
+                  "id": "ManageAuthors",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Manage Authors",
+                    "targetURL": "#Authors-manage"
+                  }
                 }
               ]
             }
@@ -70,7 +85,43 @@
               "resolutionResult": {
                 "applicationType": "SAPUI5",
                 "additionalInformation": "SAPUI5.Component=bookshop",
-                "url": "browse/webapp"
+                "url": "/browse/webapp"
+              }
+            },
+            "BrowseAuthors": {
+              "semanticObject": "Authors",
+              "action": "manage",
+              "title": "Browse Authors",
+              "signature": {
+                "parameters": {
+                  "Books.author.ID":{
+                    "renameTo": "ID"
+                  }
+                },
+                "additionalParameters": "ignored"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=authors",
+                "url": "/admin-authors/webapp"
+              }
+            },
+            "BrowseGenres": {
+              "semanticObject": "Genres",
+              "action": "display",
+              "title": "Browse Genres",
+              "signature": {
+                "parameters": {
+                  "Genre.ID": {
+                    "renameTo": "ID"
+                  }
+                },
+                "additionalParameters": "ignored"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=genres",
+                "url": "/genres/webapp"
               }
             },
             "ManageBooks": {
@@ -84,7 +135,7 @@
               "resolutionResult": {
                 "applicationType": "SAPUI5",
                 "additionalInformation": "SAPUI5.Component=books",
-                "url": "admin-books/webapp"
+                "url": "/admin-books/webapp"
               }
             }
           }

package/lib/init/template/sample/files/app/browse/fiori-service.cds

@@ -1,57 +1,57 @@
-using {CatalogService} from '../../srv/cat-service.cds';
+using CatalogService from '../../srv/cat-service';
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Object Page
 //
-annotate CatalogService.Books with @(UI: {
-  HeaderInfo       : {
-    TypeName      : '{i18n>Book}',
-    TypeNamePlural: '{i18n>Books}',
-    Title         : {Value: title},
-    Description   : {Value: author}
+annotate CatalogService.Books with @(UI : {
+  HeaderInfo        : {
+    TypeName        : '{i18n>Book}',
+    TypeNamePlural  : '{i18n>Books}',
+    Description     : {Value : author}
   },
-  HeaderFacets     : [{
-    $Type : 'UI.ReferenceFacet',
-    Label : '{i18n>Description}',
-    Target: '@UI.FieldGroup#Descr'
+  HeaderFacets      : [{
+    $Type  : 'UI.ReferenceFacet',
+    Label  : '{i18n>Description}',
+    Target : '@UI.FieldGroup#Descr'
   }, ],
-  Facets           : [{
-    $Type : 'UI.ReferenceFacet',
-    Label : '{i18n>Details}',
-    Target: '@UI.FieldGroup#Price'
+  Facets            : [{
+    $Type  : 'UI.ReferenceFacet',
+    Label  : '{i18n>Details}',
+    Target : '@UI.FieldGroup#Price'
   }, ],
-  FieldGroup #Descr: {Data: [{Value: descr}, ]},
-  FieldGroup #Price: {Data: [
-    {Value: price},
+  FieldGroup #Descr : {Data : [{Value : descr}, ]},
+  FieldGroup #Price : {Data : [
+    {Value : price},
     {
-      Value: currency.symbol,
-      Label: '{i18n>Currency}'
+      Value : currency.symbol,
+      Label : '{i18n>Currency}'
     },
   ]},
 });
 
+
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books List Page
 //
-annotate CatalogService.Books with @(UI: {
-  SelectionFields: [
+annotate CatalogService.Books with @(UI : {
+  SelectionFields : [
     ID,
     price,
     currency_code
   ],
-  LineItem       : [
+  LineItem        : [
     {
-      Value: ID,
-      Label: '{i18n>Title}'
+      Value : ID,
+      Label : '{i18n>Title}'
     },
     {
-      Value: author,
-      Label: '{i18n>Author}'
+      Value : author,
+      Label : '{i18n>Author}'
     },
-    {Value: genre.name},
-    {Value: price},
-    {Value: currency.symbol},
+    {Value : genre.name},
+    {Value : price},
+    {Value : currency.symbol},
   ]
 });

package/lib/init/template/sample/files/app/browse/webapp/Component.js.hbs

@@ -0,0 +1,3 @@
+sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("{{appName}}.{{app}}.Component", {
+  metadata:{ manifest:'json' }
+}))

package/lib/init/template/sample/files/app/browse/webapp/i18n/i18n.properties

@@ -1,4 +1,11 @@
+# This is the resource bundle of itelo
+# __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
+
+# JCI app descriptor contains lower case TITLE
 appTitle=Browse Books
-appSubTitle=All books in one place
-appDescription=This application lets you find the next books you want to read.
-appInfo=Find your favorite books
+
+# JCI app descriptor contains lower case DESCRIPTION
+appSubTitle=CAP Sample Application
+
+# JCI app descriptor contains lower case DESCRIPTION
+appDescription=CDS Sample Service

package/lib/init/template/sample/files/app/browse/webapp/manifest.json

@@ -1,14 +1,14 @@
 {
-  "_version": "1.49.0",
+  "_version": "1.28.0",
   "sap.app": {
-    "id": "browse-books",
-    "applicationVersion": {
-      "version": "1.0.0"
-    },
+    "id": "browse",
     "type": "application",
     "title": "{{appTitle}}",
     "description": "{{appDescription}}",
     "i18n": "i18n/i18n.properties",
+    "applicationVersion": {
+      "version": "1.0.0"
+    },
     "dataSources": {
       "CatalogService": {
         "uri": "odata/v4/catalog/",
@@ -30,7 +30,7 @@
                 "renameTo": "ID"
               }
             },
-            "additionalParameters": "allowed"
+            "additionalParameters": "ignored"
           },
           "semanticObject": "Books",
           "action": "display",
@@ -47,18 +47,9 @@
       }
     }
   },
-  "sap.ui": {
-    "technology": "UI5",
-    "fullWidth": false,
-    "deviceTypes": {
-      "desktop": true,
-      "tablet": true,
-      "phone": true
-    }
-  },
   "sap.ui5": {
     "dependencies": {
-      "minUI5Version": "1.115.1",
+      "minUI5Version": "1.136.0",
       "libs": {
         "sap.fe.templates": {}
       }
@@ -71,14 +62,10 @@
       "": {
         "dataSource": "CatalogService",
         "settings": {
+          "synchronizationMode": "None",
           "operationMode": "Server",
           "autoExpandSelect": true,
-          "earlyRequests": true,
-          "groupProperties": {
-            "default": {
-              "submit": "Auto"
-            }
-          }
+          "earlyRequests": true
         }
       }
     },
@@ -103,7 +90,7 @@
           "options": {
             "settings": {
               "entitySet": "Books",
-              "initialLoad": true,
+              "liveMode": true,
               "navigation": {
                 "Books": {
                   "detail": {
@@ -131,6 +118,14 @@
       "cozy": true
     }
   },
+  "sap.ui": {
+    "technology": "UI5",
+    "deviceTypes": {
+      "desktop": true,
+      "tablet": true,
+      "phone": true
+    }
+  },
   "sap.fiori": {
     "registrationIds": [],
     "archeType": "transactional"