debugging

lib/model/query/forms.js

@@ -219,8 +219,8 @@ const createVersion = (partial, form, publish, duplicating = false) => async ({
   const [fields, parsedDataset] = await _parseFormXml(partial);
 
   // Check entities spec version
-  await Forms.checkDatasetWarnings(parsedDataset);
-  await Forms.rejectIfWarnings();
+  if (!duplicating)
+    await Forms.checkDatasetWarnings(parsedDataset);
 
   // Compute the intermediate schema ID
   let schemaId;
@@ -245,15 +245,17 @@ const createVersion = (partial, form, publish, duplicating = false) => async ({
 
       // skip checking for structural change if duplicating because user has already
       // been warning at the time of form definition upload
-      if (!duplicating) {
+      if (!duplicating)
         await Forms.checkStructuralChange(prevFields, fields);
-        await Forms.rejectIfWarnings();
-      }
+
       // If we haven't been rejected or warned yet, make a new schema id
       schemaId = await Forms._newSchema();
     }
   }
 
+  // Reject if there are dataset warnings or structural change warnings
+  await Forms.rejectIfWarnings();
+
   // If not publishing, check whether there is an existing draft that we have access to.
   // If not, generate a draft token and enketoId.
   let { draftToken, enketoId } = form.def;

test/integration/other/form-entities-version.js

@@ -52,7 +52,7 @@ const upgradedSimpleEntity = `<?xml version="1.0"?>
   </h:head>
 </h:html>`;
 
-describe('Update / migrate entities-version within form', () => {
+describe.only('Update / migrate entities-version within form', () => {
   describe('upgrading a 2023.1.0 update form', () => {
     it('should upgrade a form with only a published version', testService(async (service, container) => {
       const { Forms, Audits } = container;
@@ -114,7 +114,7 @@ describe('Update / migrate entities-version within form', () => {
         .then(({ text }) => text.should.equal(upgradedUpdateEntity));
     }));
 
-    it('should upgrade a form with a draft version and a published version', testService(async (service, container) => {
+    it.only('should upgrade a form with a draft version and a published version', testService(async (service, container) => {
       const { Forms, Audits } = container;
       const asAlice = await service.login('alice');
 
@@ -125,7 +125,9 @@ describe('Update / migrate entities-version within form', () => {
         .expect(200);
 
       // Convert the published form to a draft
-      await asAlice.post('/v1/projects/1/forms/updateEntity/draft');
+      await asAlice.post('/v1/projects/1/forms/updateEntity/draft')
+        .then(({ body }) => {  console.log(body); });
+      //  .expect(200);
 
       const { acteeId } = await Forms.getByProjectAndXmlFormId(1, 'updateEntity').then(o => o.get());
       await Audits.log(null, 'upgrade.process.form.entities_version', { acteeId });