From 1469a7a37e5be1bbebcfcf64a7151c73ecd0180f Mon Sep 17 00:00:00 2001
From: Mike Stone <mikestone14@gmail.com>
Date: Wed, 9 Nov 2016 11:44:58 -0500
Subject: [PATCH] formData mimics query attribute names (#461)

This fixes a bug that allowed users to submit the form to update a
query when no changes were made
---
 frontend/components/forms/queries/QueryForm/QueryForm.jsx   | 4 ++--
 .../components/forms/queries/QueryForm/QueryForm.tests.jsx  | 6 +++---
 frontend/components/forms/queries/QueryForm/helpers.js      | 2 +-
 .../queries/QueryComposer/QueryComposer.tests.jsx           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/components/forms/queries/QueryForm/QueryForm.jsx b/frontend/components/forms/queries/QueryForm/QueryForm.jsx
index 1f03236d8b..3e7da6ca1d 100644
--- a/frontend/components/forms/queries/QueryForm/QueryForm.jsx
+++ b/frontend/components/forms/queries/QueryForm/QueryForm.jsx
@@ -35,7 +35,7 @@ class QueryForm extends Component {
       formData: {
         description,
         name,
-        queryText,
+        query: queryText,
       },
     };
   }
@@ -48,7 +48,7 @@ class QueryForm extends Component {
       formData: {
         description,
         name,
-        queryText,
+        query: queryText,
       },
     });
   }
diff --git a/frontend/components/forms/queries/QueryForm/QueryForm.tests.jsx b/frontend/components/forms/queries/QueryForm/QueryForm.tests.jsx
index 9f6fceff23..22a38149f6 100644
--- a/frontend/components/forms/queries/QueryForm/QueryForm.tests.jsx
+++ b/frontend/components/forms/queries/QueryForm/QueryForm.tests.jsx
@@ -37,7 +37,7 @@ describe('QueryForm - component', () => {
       formData: {
         description: 'new description',
         name: 'new name',
-        queryText,
+        query: queryText,
       },
     });
   });
@@ -78,7 +78,7 @@ describe('QueryForm - component', () => {
     expect(onSaveChangesSpy).toHaveBeenCalledWith({
       description: query.description,
       name: 'New query name',
-      queryText,
+      query: queryText,
     });
   });
 
@@ -130,7 +130,7 @@ describe('QueryForm - component', () => {
     expect(onSaveAsNewSpy).toHaveBeenCalledWith({
       description: query.description,
       name: 'New query name',
-      queryText,
+      query: queryText,
     });
   });
 
diff --git a/frontend/components/forms/queries/QueryForm/helpers.js b/frontend/components/forms/queries/QueryForm/helpers.js
index 7989cdab3d..0214eb85b0 100644
--- a/frontend/components/forms/queries/QueryForm/helpers.js
+++ b/frontend/components/forms/queries/QueryForm/helpers.js
@@ -3,7 +3,7 @@ import { isEmpty } from 'lodash';
 const formChanged = (formData, query) => {
   return formData.name !== query.name ||
     formData.description !== query.description ||
-    formData.queryText !== query.query;
+    formData.query !== query.query;
 };
 
 const canSaveAsNew = (formData, query) => {
diff --git a/frontend/components/queries/QueryComposer/QueryComposer.tests.jsx b/frontend/components/queries/QueryComposer/QueryComposer.tests.jsx
index 676f8f24d0..af727784c0 100644
--- a/frontend/components/queries/QueryComposer/QueryComposer.tests.jsx
+++ b/frontend/components/queries/QueryComposer/QueryComposer.tests.jsx
@@ -69,7 +69,7 @@ describe('QueryComposer - component', () => {
     expect(onSaveQueryFormSubmitSpy).toHaveBeenCalledWith({
       description: 'My query description',
       name: 'My query name',
-      queryText,
+      query: queryText,
     });
   });
 
@@ -111,7 +111,7 @@ describe('QueryComposer - component', () => {
     expect(onSaveChangesSpy).toHaveBeenCalledWith({
       description: query.description,
       name: 'My new query name',
-      queryText: query.query,
+      query: query.query,
     });
   });