Merge branch 'main' into v3.5

Author: mofterdinger

README.md

@@ -15,7 +15,7 @@ Welcome to the bookshop-java project. It demonstrates how to build business appl
   - [Demonstrated Features](#demonstrated-features)
 - [Getting Started](#getting-started)
   - [Prerequisites](#prerequisites)
-  - [Clone Build & Run](#clone-build--run)
+  - [Clone Build & Run](#clone-build-run)
   - [Using VS Code](#using-vs-code)
   - [Using Eclipse](#using-eclipse)
     - [Building and Running](#building-and-running)

app/_i18n/i18n.properties

@@ -7,6 +7,7 @@ ModifiedBy = Modified By
 General = General
 Details = Details
 Admin = Administrative
+Translations = Translations
 
 ID = ID
 Currency = Currency
@@ -68,3 +69,11 @@ AddReview = Add Review
 Notes = Notes
 Note = Note
 ISBN = ISBN
+
+attachment_content = Content
+attachment_mimeType = MIME Type
+attachment_fileName = File Name
+attachment_status = Status
+attachment_note = Note
+attachment = Cover
+attachments = Covers

app/_i18n/i18n_de.properties

@@ -7,6 +7,7 @@ ModifiedBy = Bearbeitet von
 General = Generelles
 Details = Details
 Admin = Administratives
+Translations = Übersetzungen
 
 ID = ID
 Currency = W\u00E4hrung
@@ -68,3 +69,11 @@ AddReview = Rezension hinzufügen
 Notes = Notizen
 Note = Notiz
 ISBN = ISBN
+
+attachment_content = Inhalt
+attachment_mimeType = MIME-Typ
+attachment_fileName = Dateiname
+attachment_status = Status
+attachment_note = Notiz
+attachment = Buchcover
+attachments = Buchcovers

app/admin/fiori-service.cds

@@ -26,11 +26,16 @@ annotate AdminService.Books with @(UI : {
             Label : '{i18n>Details}',
             Target : '@UI.FieldGroup#Details'
         },
+        {
+            $Type  : 'UI.ReferenceFacet',
+            ID     : 'AttachmentsFacet',
+            Target : 'covers/@UI.LineItem'
+        },
         {
             $Type : 'UI.ReferenceFacet',
             Label : '{i18n>Admin}',
             Target : '@UI.FieldGroup#Admin'
-        },
+        }
     ],
     FieldGroup #General : {Data : [
         {Value : title},
@@ -131,3 +136,6 @@ annotate AdminService.Books actions {
     quantity @title : '{i18n>Quantity}'
     )
 }
+
+// Hides technical field up__ID in View Setitings dialog for Books.covers
+annotate AdminService.Books.covers:up_ with @UI.Hidden;

app/fiori.html

@@ -14,8 +14,8 @@
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.129.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.129.0/resources/sap-ui-core.js"
+	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.131.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.131.0/resources/sap-ui-core.js"
 			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
 			data-sap-ui-compatVersion="edge"
 			data-sap-ui-theme="sap_horizon"

pom.xml

@@ -28,6 +28,7 @@
 		<xsuaa.version>3.5.3</xsuaa.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>
 		<cds.cdsdk-version>8.5.0</cds.cdsdk-version>
+		<cds-feature-attachments.version>1.0.5</cds-feature-attachments.version>
 	</properties>
 
 	<modules>

srv/admin-service.cds

@@ -1,6 +1,7 @@
 using {sap.common.Languages as CommonLanguages} from '@sap/cds/common';
 using {my.bookshop as my} from '../db/index';
 using {sap.changelog as changelog} from 'com.sap.cds/change-tracking';
+using {sap.attachments.Attachments} from `com.sap.cds/cds-feature-attachments`;
 
 extend my.Orders with changelog.changeTracked;
 
@@ -63,3 +64,8 @@ annotate AdminService.OrderItems with @changelog: [
     parent.OrderNo,
     book.title,
   ];
+
+// Extends the Books entity with the Attachments composition
+extend my.Books with {
+    covers : Composition of many Attachments;
+};

srv/pom.xml

@@ -58,6 +58,13 @@
 			<scope>runtime</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>com.sap.cds</groupId>
+			<artifactId>cds-feature-attachments</artifactId>
+			<version>${cds-feature-attachments.version}</version>
+			<scope>runtime</scope>
+		</dependency>
+
 		<!-- CLOUD SDK dependencies -->
 		<dependency>
 			<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
@@ -213,10 +220,8 @@
 						<configuration>
 							<commands>
 								<command>build --for java</command>
-								<command>deploy --to h2 --with-mocks --dry &gt;
-									"${project.basedir}/src/main/resources/schema.sql"</command>
-								<command>deploy --to h2 --dry &gt;
-									"${project.basedir}/src/main/resources/schema-nomocks.sql"</command>
+								<command>deploy --to h2 --with-mocks --dry --out "${project.basedir}/src/main/resources/schema.sql"</command>
+								<command>deploy --to h2 --dry --out "${project.basedir}/src/main/resources/schema-nomocks.sql"</command>
 								<command>compile srv/cat-service.cds -2 openapi --openapi:url /api/browse &gt;
 									"${project.basedir}/src/main/resources/swagger/openapi.json"</command>
 							</commands>