feat(#10904): route file attachments to correct sub-docs in report fo…

.gitignore

@@ -42,6 +42,7 @@ config/*/forms/contact/*.xlsx
 /**/*/.snapshots/local.json
 tests/integration/results/
 allure*
+tests/config-temp
 tests/utils/config-temp
 .eslintcache
 doc-conflicts/
@@ -61,4 +62,4 @@ user-password-change.csv
 /tests/e2e/visual/images/*.png
 .envrc
 release-notes.md
-/scripts/build/helm/values.yaml
+/scripts/build/helm/values.yaml

eslint.config.js

@@ -51,7 +51,6 @@ module.exports = defineConfig([
     'shared-libs/cht-datasource/docs/**/*',
     'tests/scalability/report*/**/*',
     'tests/scalability/jmeter/**/*',
-    'webapp/src/ts/providers/xpath-element-path.provider.ts',
     'webapp/dist/**/*',
     '.github/**/compiled/index.js'
   ]),

tests/e2e/default/contacts/contact-attachments.wdio-spec.js

@@ -14,7 +14,6 @@ const { CONTACT_TYPES } = require('@medic/constants');
 describe('Contact form attachments', () => {
   const photoPngPath = path.join(__dirname, '../enketo/images/photo-for-upload-form.png');
   const layersPngPath = path.join(__dirname, '../../../../webapp/src/img/layers.png');
-
   const places = placeFactory.generateHierarchy();
   const healthCenter = places.get(CONTACT_TYPES.HEALTH_CENTER);
 
@@ -44,42 +43,15 @@ describe('Contact form attachments', () => {
     'contact.type.person_with_attachments.edit': 'Edit Person With Attachments'
   };
 
-  const createFormXml = fs.readFileSync(
-    path.join(__dirname, 'forms/person-with-attachments-create.xml'),
-    'utf8'
+  const createFormDoc = commonPage.createFormDoc(
+    path.join(__dirname, 'forms/person-with-attachments-create'),
+    'contact:person_with_attachments:create'
   );
-
-  const editFormXml = fs.readFileSync(
-    path.join(__dirname, 'forms/person-with-attachments-edit.xml'),
-    'utf8'
+  const editFormDoc = commonPage.createFormDoc(
+    path.join(__dirname, 'forms/person-with-attachments-edit'),
+    'contact:person_with_attachments:edit'
   );
 
-  const createFormDoc = {
-    _id: 'form:contact:person_with_attachments:create',
-    internalId: 'contact:person_with_attachments:create',
-    title: 'New Person With Attachments',
-    type: 'form',
-    _attachments: {
-      xml: {
-        content_type: 'application/octet-stream',
-        data: Buffer.from(createFormXml).toString('base64'),
-      }
-    }
-  };
-
-  const editFormDoc = {
-    _id: 'form:contact:person_with_attachments:edit',
-    internalId: 'contact:person_with_attachments:edit',
-    title: 'Edit Person With Attachments',
-    type: 'form',
-    _attachments: {
-      xml: {
-        content_type: 'application/octet-stream',
-        data: Buffer.from(editFormXml).toString('base64'),
-      }
-    }
-  };
-
   const createContactWithAttachment = (contactName, imagePath = photoPngPath) => {
     const imageBuffer = fs.readFileSync(imagePath);
     const imageBase64 = imageBuffer.toString('base64');
@@ -128,37 +100,6 @@ describe('Contact form attachments', () => {
     await commonPage.waitForPageLoaded();
   });
 
-  it('should create contact with image attachment', async () => {
-    const contactName = 'Test Person With Photo';
-
-    await commonPage.goToPeople(healthCenter._id);
-    await commonPage.clickFastActionFAB({ actionId: personWithAttachmentsType.id });
-
-    await commonEnketoPage.setInputValue('Full name', contactName);
-    await commonEnketoPage.addFileInputValue('Photo', photoPngPath);
-
-    await genericForm.submitForm();
-    await commonPage.waitForPageLoaded();
-    await contactPage.waitForContactLoaded();
-
-    const contactId = await contactPage.getCurrentContactId();
-    expect(contactId).to.exist;
-
-    const createdContact = await utils.getDoc(contactId);
-
-    expect(createdContact).to.exist;
-    expect(createdContact.name).to.equal(contactName);
-    expect(createdContact._attachments).to.exist;
-
-    const attachmentNames = Object.keys(createdContact._attachments);
-    expect(attachmentNames).to.have.lengthOf(1);
-    expect(attachmentNames[0]).to.match(/^user-file-photo-for-upload-form.*\.png$/);
-
-    const attachment = createdContact._attachments[attachmentNames[0]];
-    expect(attachment.content_type).to.equal('image/png');
-    expect(attachment.length, 'Attachment should have a valid size').to.be.greaterThan(0);
-  });
-
   it('should create contact with multiple attachments (image + document)', async () => {
     const contactName = 'Test Person With Multiple Files';
 
@@ -183,7 +124,7 @@ describe('Contact form attachments', () => {
     expect(createdContact._attachments).to.exist;
 
     const attachmentNames = Object.keys(createdContact._attachments);
-    expect(attachmentNames).to.have.lengthOf(2);
+    expect(attachmentNames).to.have.lengthOf(3);
 
     const photoAttachment = attachmentNames.find(name => name.match(/^user-file-photo-for-upload-form.*\.png$/));
     const documentAttachment = attachmentNames.find(name => name.match(/^user-file-layers.*\.png$/));
@@ -198,6 +139,9 @@ describe('Contact form attachments', () => {
     expect(createdContact._attachments[documentAttachment].content_type).to.equal('image/png');
     expect(createdContact._attachments[documentAttachment].length, 'Document should have a valid size')
       .to.be.greaterThan(0);
+
+    expect(createdContact._attachments['user-file/badge'].content_type).to.equal('image/png');
+    expect(createdContact._attachments['user-file/badge'].length).to.be.greaterThan(0);
   });
 
   it('should preserve attachments when editing contact', async () => {
@@ -221,7 +165,9 @@ describe('Contact form attachments', () => {
     const contactBefore = await utils.getDoc(contactId);
     expect(contactBefore._attachments).to.exist;
     const originalAttachments = Object.keys(contactBefore._attachments);
-    expect(originalAttachments).to.have.lengthOf(1);
+    expect(originalAttachments).to.have.lengthOf(2);
+    expect(originalAttachments[0]).to.match(/^user-file-photo-for-upload-form.*\.png$/);
+    expect(originalAttachments[1]).to.equal('user-file/badge');
 
     await commonPage.accessEditOption();
 
@@ -237,10 +183,11 @@ describe('Contact form attachments', () => {
     expect(contactAfter._attachments).to.exist;
 
     const attachmentsAfter = Object.keys(contactAfter._attachments);
-    expect(attachmentsAfter).to.have.lengthOf(1);
-    expect(attachmentsAfter[0]).to.equal(originalAttachments[0]);
+    expect(attachmentsAfter).to.deep.equal(originalAttachments);
     expect(contactAfter._attachments[attachmentsAfter[0]].length, 'Preserved attachment should have a valid size')
       .to.be.greaterThan(0);
+    expect(contactAfter._attachments[attachmentsAfter[1]].length, 'Preserved attachment should have a valid size')
+      .to.be.greaterThan(0);
   });
 
   it('should remove attachment when editing contact', async () => {

tests/e2e/default/contacts/forms/health_center-with-attachments-create.xml

@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jr="http://openrosa.org/javarosa" xmlns:orx="http://openrosa.org/xforms" xmlns:odk="http://www.opendatakit.org/xforms" xmlns:cht="https://communityhealthtoolkit.org">
+  <h:head>
+    <h:title>New Health Center</h:title>
+    <model odk:xforms-version="1.0.0">
+      <itext>
+        <translation lang="en">
+          <text id="/data/parent:label">
+            <value>Parent District Hospital</value>
+          </text>
+          <text id="/data/parent/name:label">
+            <value>Parent Name</value>
+          </text>
+          <text id="/data/parent/badge:label">
+            <value>Parent Badge</value>
+          </text>
+          <text id="/data/parent/photo:label">
+            <value>Parent Photo</value>
+          </text>
+          <text id="/data/contact:label">
+            <value>Primary Contact for Heath Center</value>
+          </text>
+          <text id="/data/contact/name:label">
+            <value>Contact Name</value>
+          </text>
+          <text id="/data/contact/badge:label">
+            <value>Contact Badge</value>
+          </text>
+          <text id="/data/contact/photo:label">
+            <value>Contact Photo</value>
+          </text>
+          <text id="/data/health_center_with_attachments:label">
+            <value>Heath Center</value>
+          </text>
+          <text id="/data/health_center_with_attachments/name:label">
+            <value>Health Center Name</value>
+          </text>
+          <text id="/data/health_center_with_attachments/badge:label">
+            <value>Health Center Badge</value>
+          </text>
+          <text id="/data/health_center_with_attachments/photo:label">
+            <value>Health Center Photo</value>
+          </text>
+          <text id="/data/repeat:label">
+            <value>Add Clinics</value>
+          </text>
+          <text id="/data/repeat/child:label">
+            <value>Clinic</value>
+          </text>
+          <text id="/data/repeat/child/name:label">
+            <value>Child Name</value>
+          </text>
+          <text id="/data/repeat/child/badge:label">
+            <value>Child Badge</value>
+          </text>
+          <text id="/data/repeat/child/photo:label">
+            <value>Child Photo</value>
+          </text>
+        </translation>
+      </itext>
+      <instance>
+        <data id="contact:health_center-with-attachments:create" version="2026-08-05  11-44" prefix="J1!contact:health_center-with-attachments:create!" delimiter="#">
+          <parent>
+            <type/>
+            <name/>
+            <badge type="binary"/>
+            <photo/>
+          </parent>
+          <contact>
+            <parent>PARENT</parent>
+            <type/>
+            <name/>
+            <badge type="binary"/>
+            <photo/>
+          </contact>
+          <health_center_with_attachments>
+            <parent/>
+            <type/>
+            <contact/>
+            <name/>
+            <badge type="binary"/>
+            <photo/>
+          </health_center_with_attachments>
+          <repeat>
+            <child jr:template="">
+              <type/>
+              <name/>
+              <badge type="binary"/>
+              <photo/>
+            </child>
+          </repeat>
+          <meta tag="hidden">
+            <instanceID/>
+          </meta>
+        </data>
+      </instance>
+      <bind nodeset="/data/parent/type" type="string" calculate="&quot;district_hospital&quot;"/>
+      <bind nodeset="/data/parent/name" type="string" required="true()"/>
+      <bind nodeset="/data/parent/badge" type="string"/>
+      <bind nodeset="/data/parent/photo" type="binary"/>
+      <bind nodeset="/data/contact/parent" type="string"/>
+      <bind nodeset="/data/contact/type" type="string" calculate="&quot;person&quot;"/>
+      <bind nodeset="/data/contact/name" type="string" required="true()"/>
+      <bind nodeset="/data/contact/badge" type="string"/>
+      <bind nodeset="/data/contact/photo" type="binary"/>
+      <bind nodeset="/data/health_center_with_attachments/parent" type="string" calculate="&quot;NEW&quot;"/>
+      <bind nodeset="/data/health_center_with_attachments/type" type="string"/>
+      <bind nodeset="/data/health_center_with_attachments/contact" type="string" calculate="&quot;NEW&quot;"/>
+      <bind nodeset="/data/health_center_with_attachments/name" type="string" required="true()"/>
+      <bind nodeset="/data/health_center_with_attachments/badge" type="string"/>
+      <bind nodeset="/data/health_center_with_attachments/photo" type="binary"/>
+      <bind nodeset="/data/repeat/child/type" type="string" calculate="&quot;clinic&quot;"/>
+      <bind nodeset="/data/repeat/child/name" type="string" required="true()"/>
+      <bind nodeset="/data/repeat/child/badge" type="string"/>
+      <bind nodeset="/data/repeat/child/photo" type="binary"/>
+      <bind nodeset="/data/meta/instanceID" type="string" readonly="true()" jr:preload="uid"/>
+    </model>
+  </h:head>
+  <h:body>
+    <group ref="/data/parent">
+      <label ref="jr:itext('/data/parent:label')"/>
+      <input ref="/data/parent/name">
+        <label ref="jr:itext('/data/parent/name:label')"/>
+      </input>
+      <input ref="/data/parent/badge">
+        <label ref="jr:itext('/data/parent/badge:label')"/>
+      </input>
+      <upload ref="/data/parent/photo" mediatype="image/*">
+        <label ref="jr:itext('/data/parent/photo:label')"/>
+      </upload>
+    </group>
+    <group ref="/data/contact">
+      <label ref="jr:itext('/data/contact:label')"/>
+      <input ref="/data/contact/name">
+        <label ref="jr:itext('/data/contact/name:label')"/>
+      </input>
+      <input ref="/data/contact/badge">
+        <label ref="jr:itext('/data/contact/badge:label')"/>
+      </input>
+      <upload ref="/data/contact/photo" mediatype="image/*">
+        <label ref="jr:itext('/data/contact/photo:label')"/>
+      </upload>
+    </group>
+    <group ref="/data/health_center_with_attachments">
+      <label ref="jr:itext('/data/health_center_with_attachments:label')"/>
+      <input ref="/data/health_center_with_attachments/name">
+        <label ref="jr:itext('/data/health_center_with_attachments/name:label')"/>
+      </input>
+      <input ref="/data/health_center_with_attachments/badge">
+        <label ref="jr:itext('/data/health_center_with_attachments/badge:label')"/>
+      </input>
+      <upload ref="/data/health_center_with_attachments/photo" mediatype="image/*">
+        <label ref="jr:itext('/data/health_center_with_attachments/photo:label')"/>
+      </upload>
+    </group>
+    <group ref="/data/repeat">
+      <label ref="jr:itext('/data/repeat:label')"/>
+      <group ref="/data/repeat/child">
+        <label ref="jr:itext('/data/repeat/child:label')"/>
+        <repeat nodeset="/data/repeat/child">
+          <input ref="/data/repeat/child/name">
+            <label ref="jr:itext('/data/repeat/child/name:label')"/>
+          </input>
+          <input ref="/data/repeat/child/badge">
+            <label ref="jr:itext('/data/repeat/child/badge:label')"/>
+          </input>
+          <upload ref="/data/repeat/child/photo" mediatype="image/*">
+            <label ref="jr:itext('/data/repeat/child/photo:label')"/>
+          </upload>
+        </repeat>
+      </group>
+    </group>
+  </h:body>
+</h:html>