Deal with first create action in a branch

getodk · Jun 12, 2024 · d714244 · d714244
1 parent 740235d
commit d714244
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/model/query/entities.js b/lib/model/query/entities.js
@@ -390,7 +390,8 @@ const _processSubmissionEvent = (event, parentEvent) => async ({ Audits, Dataset
 
   // Check for held submissions that follow this one in the same branch
   if (entityData.system.branchId != null) {
-    const currentBaseVersion = parseInt(entityData.system.baseVersion, 10);
+    // baseVersion could be '', meaning its a create
+    const currentBaseVersion = entityData.system.baseVersion === '' ? 1 : parseInt(entityData.system.baseVersion, 10);
     const nextSub = await _checkHeldSubmission(maybeOne, entityData.system.branchId, currentBaseVersion + 1);
     if (nextSub.isDefined()) {
       const { submissionId: nextSubmissionId, submissionDefId: nextSubmissionDefId } = nextSub.get();