Added another path for entity error message to appear (#717)

getodk · Jan 24, 2023 · a3cc539 · a3cc539
1 parent 89fec57
commit a3cc539
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/components/submission/feed-entry.vue b/src/components/submission/feed-entry.vue
@@ -159,8 +159,13 @@ export default {
       return '';
     },
     entityProblem(entry) {
-      if ('problem' in entry.details && 'problemDetails' in entry.details.problem)
+      if ('problem' in entry.details &&
+        'problemDetails' in entry.details.problem &&
+        'reason' in entry.details.problem.problemDetails)
         return entry.details.problem.problemDetails.reason;
+      if ('problem' in entry.details &&
+        'errorMessage' in entry.details)
+        return entry.details.errorMessage;
       return '';
     }
   }

diff --git a/test/components/submission/feed-entry.spec.js b/test/components/submission/feed-entry.spec.js
@@ -185,6 +185,20 @@ describe('SubmissionFeedEntry', () => {
         title.get('.entity-error-message').text().should.equal('ID empty or missing.');
         await title.get('.entity-error-message').should.have.textTooltip();
       });
+
+      it('renders entity creation error message when it is included as an errorMessage', async () => {
+        testData.extendedAudits.createPast(1, {
+          action: 'entity.create.error',
+          details: {
+            problem: { problemCode: 409.3, problemDetails: { foo: 'blah' } },
+            errorMessage: 'A resource already exists with uuid value(s) abc.'
+          }
+        });
+        const title = mountComponent().get('.title');
+        title.get('.submission-feed-entry-entity-error').text().should.equal('Problem creating Entity');
+        title.get('.entity-error-message').text().should.equal('A resource already exists with uuid value(s) abc.');
+        await title.get('.entity-error-message').should.have.textTooltip();
+      });
     });
   });