feat: use content disposition object

CHANGELOG.md

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Added
 
 - Multitenancy support
+- Support for `@Core.ContentDisposition.Filename` to specify filename
 
 ### Fixed
 

cds-plugin.js

@@ -140,7 +140,10 @@ function checkPrintParamsInEntity(entity) {
   if (files.length === 1) return true;
 
   files.forEach((file) => {
-    if (!file["@Core.ContentDisposition"]?.["="]) {
+    if (
+      !file["@Core.ContentDisposition"]?.["="] &&
+      !file["@Core.ContentDisposition.Filename"]?.["="]
+    ) {
       return cds.error(
         `No file name provided. Please add @Core.ContentDisposition to the ${file.name}.`,
       );
@@ -154,11 +157,15 @@ function getPrintParamsAttribute(entity, data) {
   let fileNameAttribute, contentAttribute;
   if (data[FILE_ELEMENT]) {
     contentAttribute = data[FILE_ELEMENT];
-    fileNameAttribute = entity.elements[contentAttribute]["@Core.ContentDisposition"]?.["="];
+    fileNameAttribute =
+      entity.elements[contentAttribute]["@Core.ContentDisposition"]?.["="] ??
+      entity.elements[contentAttribute]["@Core.ContentDisposition.Filename"]?.["="];
   } else {
     const content = Object.values(entity.elements).find((el) => el.type === "cds.LargeBinary");
     contentAttribute = content.name;
-    fileNameAttribute = content["@Core.ContentDisposition"]?.["="];
+    fileNameAttribute =
+      content["@Core.ContentDisposition"]?.["="] ??
+      content["@Core.ContentDisposition.Filename"]?.["="];
   }
 
   return {

srv/service.js

@@ -55,19 +55,25 @@ class PrintService extends cds.Service {
         .columns(
           ...largeBinaryFields.map(
             (f) =>
-              cds.model.definitions[entityName].elements[f.property]["@Core.ContentDisposition"][
+              cds.model.definitions[entityName].elements[f.property]["@Core.ContentDisposition"]?.[
                 "="
               ] ??
-              cds.model.definitions[entityName].elements[f.property]["@Core.ContentDisposition"],
+              cds.model.definitions[entityName].elements[f.property]["@Core.ContentDisposition"] ??
+              cds.model.definitions[entityName].elements[f.property][
+                "@Core.ContentDisposition.Filename"
+              ]?.["="],
           ),
         );
 
       largeBinaryFields.forEach((field) => {
         const { entityName, property } = field;
 
         const fileNameProp =
-          cds.model.definitions[entityName].elements[property]["@Core.ContentDisposition"]["="] ??
-          cds.model.definitions[entityName].elements[property]["@Core.ContentDisposition"];
+          cds.model.definitions[entityName].elements[property]["@Core.ContentDisposition"]?.["="] ??
+          cds.model.definitions[entityName].elements[property]["@Core.ContentDisposition"] ??
+          cds.model.definitions[entityName].elements[property][
+            "@Core.ContentDisposition.Filename"
+          ]?.["="];
         field.fileName = fileNames[fileNameProp];
         field.label = cds.i18n.labels.for(cds.model.definitions[entityName].elements[property]);
         field.label ??= property;

test/bookshop/app/print.cds

@@ -16,11 +16,11 @@ annotate service.Books with @(UI.FieldGroup #PrintFileGroup: {
   Data : [
     {
       $Type: 'UI.DataField',
-      Value: fileName,
+      Value: file,
     },
     {
       $Type: 'UI.DataField',
-      Value: fileName2,
+      Value: file2,
     }
   ]
 });
@@ -37,7 +37,7 @@ annotate service.BooksWithOneFile with @(UI.FieldGroup #PrintFileGroup: {
   $Type: 'UI.FieldGroupType',
   Data : [{
     $Type: 'UI.DataField',
-    Value: fileName,
+    Value: file,
   }, ]
 });
 

test/bookshop/db/init.js

@@ -78,8 +78,8 @@ module.exports = async function () {
           ...book,
           file: templatePDF,
           file2: templatePDF,
-          fileName: `Book_${book.ID}_Summary.pdf`,
-          fileName2: `Book_${book.ID}_Summary2.pdf`,
+          fileName: `Book_${book.ID}_Summary`,
+          fileName2: `Book_${book.ID}_Summary2`,
         })
         .then(() => {
           console.log(`Inserted book ${book.ID}: ${book.title}`);
@@ -88,7 +88,7 @@ module.exports = async function () {
         .entries({
           ...book,
           file: templatePDF,
-          fileName: `Book_${book.ID}_Summary.pdf`,
+          fileName: `Book_${book.ID}_Summary`,
         })
         .then(() => {
           console.log(`Inserted book ${book.ID}: ${book.title}`);
@@ -101,9 +101,9 @@ module.exports = async function () {
       ID: 1,
       ID2: 2,
       file: templatePDF,
-      fileName: `Book_Composite_Summary.pdf`,
+      fileName: `Book_Composite_Summary`,
       file2: templatePDF,
-      fileName2: `Book_Composite_Summary_2.pdf`,
+      fileName2: `Book_Composite_Summary_2`,
     }),
   );
 

test/bookshop/db/schema.cds

@@ -6,7 +6,10 @@ entity Books : managed, BooksWithOneFile {
   // Printing field2
   @Common.Label: '{i18n>Summary2} '
   @Core.MediaType: 'application/pdf'
-  @Core.ContentDisposition: fileName2
+  @Core.ContentDisposition: {
+    Filename: fileName2,
+    Type    : 'inline'
+  }
   file2 : LargeBinary ;
   @Common.Label: '{i18n>Summary2} '
   fileName2 : String  @readonly;
@@ -24,7 +27,10 @@ entity BooksWithOneFile {
   // Printing field
   @Common.Label: '{i18n>Summary} '
   @Core.MediaType: 'application/pdf'
-  @Core.ContentDisposition: fileName
+  @Core.ContentDisposition: {
+    Filename: fileName,
+    Type    : 'inline'
+  }
   file : LargeBinary ;
   @Common.Label: '{i18n>Summary} '
   fileName : String  @readonly;

test/bookshop/srv/admin-service.cds

@@ -2,6 +2,8 @@ using {sap.capire.bookshop as my} from '../db/schema';
 
 service AdminService @(requires: 'admin') {
   @PDF.Printable
+  @odata.draft.enabled
   entity Books   as projection on my.Books;
+
   entity Authors as projection on my.Authors;
 }

test/integration/files.test.js

@@ -19,14 +19,14 @@ describe("Print files VH tests", () => {
     expect(response.data.value[0]).toMatchObject({
       entityName: "CatalogService.Books",
       property: "file",
-      fileName: "Book_207_Summary.pdf",
+      fileName: "Book_207_Summary",
       label: "Summaryyy",
     });
 
     expect(response.data.value[1]).toMatchObject({
       entityName: "CatalogService.Books",
       property: "file2",
-      fileName: "Book_207_Summary2.pdf",
+      fileName: "Book_207_Summary2",
       label: "Summaryyy2",
     });
 
@@ -104,14 +104,14 @@ describe("Print files VH tests", () => {
     expect(response.data.value[0]).toMatchObject({
       entityName: "CatalogService.Books",
       property: "file",
-      fileName: "Book_207_Summary.pdf",
+      fileName: "Book_207_Summary",
       label: "Summaryyy",
     });
 
     expect(response.data.value[1]).toMatchObject({
       entityName: "CatalogService.Books",
       property: "file2",
-      fileName: "Book_207_Summary2.pdf",
+      fileName: "Book_207_Summary2",
       label: "Summaryyy2",
     });
 
@@ -129,14 +129,14 @@ describe("Print files VH tests", () => {
     expect(response.data.value[0]).toMatchObject({
       entityName: "CatalogService.CompositeKeys",
       property: "file",
-      fileName: "Book_Composite_Summary.pdf",
+      fileName: "Book_Composite_Summary",
       label: "Summaryyy",
     });
 
     expect(response.data.value[1]).toMatchObject({
       entityName: "CatalogService.CompositeKeys",
       property: "file2",
-      fileName: "Book_Composite_Summary_2.pdf",
+      fileName: "Book_Composite_Summary_2",
       label: "Summaryyy2",
     });