small changes

getodk · Nov 20, 2024 · 7c2173d · 7c2173d
1 parent f54f4ae
commit 7c2173d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/data/dataset.js b/lib/data/dataset.js
@@ -82,13 +82,13 @@ const getDataset = (xml) =>
     else if (!semverSatisfies(version.get(), '2022.1.0 - 2024.1.x'))
       throw Problem.user.invalidEntityForm({ reason: `Entities specification version [${version.get()}] is not supported.` });
 
-    let warnings;
-    if (semverSatisfies(version.get(), '<2024.1.x'))
-      warnings = {
+    const warnings = semverSatisfies(version.get(), '>=2024.1.x')
+      ? null
+      : [{
         type: 'oldEntityVersion',
         details: { version: version.get() },
         reason: `Entities specification version [${version.get()}] is not compatible with Offline Entities. Please use version 2024.1.0 or later.`
-      };
+      }];
 
     const strippedAttrs = Object.create(null);
     for (const [name, value] of Object.entries(entityAttrs.get()))

diff --git a/lib/model/query/forms.js b/lib/model/query/forms.js
@@ -767,7 +767,7 @@ const checkDatasetWarnings = (dataset) => ({ context }) => {
 
   if (dataset.isDefined() && dataset.get().warnings != null) {
     if (!context.transitoryData.has('workflowWarnings')) context.transitoryData.set('workflowWarnings', []);
-    context.transitoryData.get('workflowWarnings').push(dataset.get().warnings);
+    context.transitoryData.get('workflowWarnings').push(...dataset.get().warnings);
   }
   return resolve();
 };