Specify mediaFile type for entity lists in manifest (#1147)

getodk · May 23, 2024 · e1c74de · e1c74de
1 parent fecb067
commit e1c74de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/formats/openrosa.js b/lib/formats/openrosa.js
@@ -62,7 +62,7 @@ const formManifestTemplate = template(200, `<?xml version="1.0" encoding="UTF-8"
   <manifest xmlns="http://openrosa.org/xforms/xformsManifest">
   {{#attachments}}
     {{#hasSource}}
-    <mediaFile>
+    <mediaFile{{#isDataset}} type="entityList"{{/isDataset}}>
       <filename>{{name}}</filename>
       <hash>md5:{{openRosaHash}}</hash>
       <downloadUrl>{{{domain}}}{{{basePath}}}/attachments/{{urlName}}</downloadUrl>
@@ -76,7 +76,8 @@ const formManifest = (data) => formManifestTemplate(mergeRight(data, {
   attachments: data.attachments.map((attachment) =>
     attachment.with({
       hasSource: attachment.blobId || attachment.datasetId,
-      urlName: encodeURIComponent(attachment.name)
+      urlName: encodeURIComponent(attachment.name),
+      isDataset: attachment.datasetId != null
     }))
 }));
 

diff --git a/test/integration/api/datasets.js b/test/integration/api/datasets.js
@@ -1884,7 +1884,7 @@ describe('datasets and entities', () => {
         const domain = config.get('default.env.domain');
         manifest.should.equal(`<?xml version="1.0" encoding="UTF-8"?>
   <manifest xmlns="http://openrosa.org/xforms/xformsManifest">
-    <mediaFile>
+    <mediaFile type="entityList">
       <filename>goodone.csv</filename>
       <hash>md5:${etag.replace(/"/g, '')}</hash>
       <downloadUrl>${domain}/v1/projects/1/forms/withAttachments/attachments/goodone.csv</downloadUrl>
@@ -1968,7 +1968,7 @@ describe('datasets and entities', () => {
         const domain = config.get('default.env.domain');
         manifest.should.equal(`<?xml version="1.0" encoding="UTF-8"?>
   <manifest xmlns="http://openrosa.org/xforms/xformsManifest">
-    <mediaFile>
+    <mediaFile type="entityList">
       <filename>goodone.csv</filename>
       <hash>md5:${etag.replace(/"/g, '')}</hash>
       <downloadUrl>${domain}/v1/projects/1/forms/withAttachments/attachments/goodone.csv</downloadUrl>
@@ -2843,7 +2843,7 @@ describe('datasets and entities', () => {
             const domain = config.get('default.env.domain');
             text.should.be.eql(`<?xml version="1.0" encoding="UTF-8"?>
   <manifest xmlns="http://openrosa.org/xforms/xformsManifest">
-    <mediaFile>
+    <mediaFile type="entityList">
       <filename>people.csv</filename>
       <hash>md5:${etag.replace(/"/g, '')}</hash>
       <downloadUrl>${domain}/v1/projects/1/forms/withAttachments/attachments/people.csv</downloadUrl>