Merge pull request #4811 from kobotoolbox/fix-could-not-find-attachment

`Could not find attachment` fix with filenames which contain non-latin characters.
kobotoolbox · Jan 24, 2024 · b38e778 · b38e778
2 parents a06c73e + c2f56d7
commit b38e778
Show file tree

Hide file tree

Showing 13 changed files with 154 additions and 47 deletions.
diff --git a/jsapp/js/components/processing/singleProcessingSubmissionDetails.tsx b/jsapp/js/components/processing/singleProcessingSubmissionDetails.tsx
@@ -8,6 +8,7 @@ import {
 import singleProcessingStore from 'js/components/processing/singleProcessingStore';
 import SubmissionDataList from 'js/components/submissions/submissionDataList';
 import {
+  getQuestionXPath,
   getRowData,
   getMediaAttachment,
 } from 'js/components/submissions/submissionUtils';
@@ -81,8 +82,13 @@ export default class SingleProcessingSubmissionDetails extends React.Component<S
       return null;
     }
 
-    // Attachment needs to be object with urls.
-    const attachment = getMediaAttachment(submissionData, rowData);
+    // Attachment needs to be an object with urls.
+    const questionXPath = getQuestionXPath(
+      this.props.assetContent.survey,
+      singleProcessingStore.currentQuestionName
+    );
+
+    const attachment = getMediaAttachment(submissionData, rowData, questionXPath);
     if (typeof attachment === 'string') {
       return;
     }

diff --git a/jsapp/js/components/submissions/submissionDataTable.tsx b/jsapp/js/components/submissions/submissionDataTable.tsx
@@ -60,10 +60,10 @@ class SubmissionDataTable extends React.Component<SubmissionDataTableProps> {
         );
       }
     }
-
   }
 
   renderGroup(item: DisplayGroup, itemIndex?: number) {
+
     return (
       <bem.SubmissionDataTable__row
         m={['group', `type-${item.type}`]}
@@ -202,7 +202,7 @@ class SubmissionDataTable extends React.Component<SubmissionDataTableProps> {
       case QUESTION_TYPES.audio.id:
       case QUESTION_TYPES.video.id:
       case QUESTION_TYPES.file.id:
-        return this.renderAttachment(item.type, item.data, item.name);
+        return this.renderAttachment(item.type, item.data, item.name, item.xpath);
       case QUESTION_TYPES.geotrace.id:
         return this.renderMultiplePointsData(item.data);
       case QUESTION_TYPES.geoshape.id:
@@ -260,8 +260,8 @@ class SubmissionDataTable extends React.Component<SubmissionDataTableProps> {
     ));
   }
 
-  renderAttachment(type: string, filename: string, name: string) {
-    const attachment = getMediaAttachment(this.props.submissionData, filename);
+  renderAttachment(type: string, filename: string, name: string, xpath: string) {
+    const attachment = getMediaAttachment(this.props.submissionData, filename, xpath);
     if (attachment && attachment instanceof Object) {
       if (type === QUESTION_TYPES.audio.id) {
         return (