Do not filter out properties on inactive pages that also appear on active pages

package.json

@@ -14,7 +14,7 @@
     "lint": "npm run lint:js && npm run lint:sass",
     "lint:js": "eslint --quiet --ext .js --ext .jsx .",
     "lint:sass": "sass-lint -c test/config/sass-lint.yaml --verbose",
-    "test": "BABEL_ENV=test mocha --require test/config/unit-test-setup.js --require test/config/enzyme-setup.jsx --compilers js:babel-core/register ./test/**/*.spec.jsx",
+    "test": "BABEL_ENV=test mocha --require test/config/unit-test-setup.js --require test/config/enzyme-setup.jsx --compilers js:babel-core/register './test/**/*.spec.js?(x)' ",
     "webpack": "webpack"
   },
   "repository": {

src/js/helpers.js

@@ -5,6 +5,9 @@ import { deepEquals } from '@department-of-veterans-affairs/react-jsonschema-for
 import FormPage from './containers/FormPage';
 import ReviewPage from './review/ReviewPage';
 
+// An active page is one that will be shown to the user.
+// Pages become inactive if they are conditionally shown based
+// on answers to previous questions.
 export function isActivePage(page, data) {
   if (typeof page.depends === 'function') {
     return page.depends(data, page.index);
@@ -21,6 +24,16 @@ export function getActivePages(pages, data) {
   return pages.filter(page => isActivePage(page, data));
 }
 
+export function getActiveProperties(activePages) {
+  const allProperties = [];
+  activePages.forEach(page => {
+    if (page.schema) {
+      allProperties.push(...Object.keys(page.schema.properties));
+    }
+  });
+  return _.uniq(allProperties);
+}
+
 export function getInactivePages(pages, data) {
   return pages.filter(page => !isActivePage(page, data));
 }
@@ -212,11 +225,18 @@ export function filterViewFields(data) {
   }, {});
 }
 
-export function filterInactivePages(pages, form) {
-  return pages.reduce((formData, page) => {
+export function filterInactivePageData(inactivePages, activePages, form) {
+  const activeProperties = getActiveProperties(activePages);
+  let newData;
+
+  return inactivePages.reduce((formData, page) => {
     return Object.keys(page.schema.properties)
       .reduce((currentData, prop) => {
-        return _.unset(prop, currentData);
+        newData = currentData;
+        if (!activeProperties.includes(prop)) {
+          delete newData[prop];
+        }
+        return newData;
       }, formData);
   }, form.data);
 }
@@ -270,8 +290,9 @@ export function isInProgress(pathName) {
  * Normal transform for schemaform data
  */
 export function transformForSubmit(formConfig, form, replacer = stringifyFormReplacer) {
+  const activePages = getActivePages(createFormPageList(formConfig), form.data);
   const inactivePages = getInactivePages(createFormPageList(formConfig), form.data);
-  const withoutInactivePages = filterInactivePages(inactivePages, form);
+  const withoutInactivePages = filterInactivePageData(inactivePages, activePages, form);
   const withoutViewFields = filterViewFields(withoutInactivePages);
 
   return JSON.stringify(withoutViewFields, replacer) || '{}';

test/js/helpers.unit.spec.js

@@ -348,7 +348,12 @@ describe('Schemaform helpers:', () => {
           },
           chapter2: {
             pages: {
-              page2: {}
+              page2: {
+                schema: {
+                  type: 'object',
+                  properties: {}
+                }
+              }
             }
           }
         }
@@ -366,6 +371,60 @@ describe('Schemaform helpers:', () => {
         field: 'testing'
       });
     });
+    it('should not remove properties that are on both active and inactive pages', () => {
+      const formConfig = {
+        chapters: {
+          chapter1: {
+            pages: {
+              page1: {
+                schema: {
+                  type: 'object',
+                  properties: {
+                    otherField: {
+                      type: 'string'
+                    },
+                    anotherField: {
+                      type: 'string'
+                    }
+                  }
+                },
+                depends: {
+                  field: 'something'
+                }
+              },
+            }
+          },
+          chapter2: {
+            pages: {
+              page2: {
+                schema: {
+                  type: 'object',
+                  properties: {
+                    anotherField: {
+                      type: 'string'
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      };
+      const formData = {
+        data: {
+          otherField: 'testing2',
+          anotherField: 'testing3',
+          field: 'testing'
+        }
+      };
+
+      const output = JSON.parse(transformForSubmit(formConfig, formData));
+
+      expect(output).to.eql({
+        field: 'testing',
+        anotherField: 'testing3'
+      });
+    });
     it('should remove empty addresses', () => {
       const formConfig = {
         chapters: {