From 1cdb8e28e55cac4d02e43d2860d318bd290f2ce8 Mon Sep 17 00:00:00 2001
From: Nils Strelow <nils.strelow@student.hpi.de>
Date: Fri, 9 Feb 2018 16:20:55 +0100
Subject: [PATCH 1/2] Upgrade react-dnd

---
 frontend/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 8501db8f73..8e0332352f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -40,8 +40,8 @@
     "react": "^15.4.2",
     "react-addons-test-utils": "^15.3.1",
     "react-datepicker": "0.32.0",
-    "react-dnd": "^2.1.4",
-    "react-dnd-html5-backend": "^2.1.2",
+    "react-dnd": "^2.5.4",
+    "react-dnd-html5-backend": "^2.5.4",
     "react-dom": "^15.4.2",
     "react-dropzone": "^3.12.2",
     "react-hot-loader": "^3.1.3",

From eb4328c3bc0ce81c1dd7578b8ce5c352c2f796ea Mon Sep 17 00:00:00 2001
From: Nils Strelow <nils.strelow@student.hpi.de>
Date: Fri, 9 Feb 2018 16:21:52 +0100
Subject: [PATCH 2/2] Only draggable when not editing. Fixes (#56)

---
 frontend/lib/js/previous-queries/list/PreviousQuery.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/lib/js/previous-queries/list/PreviousQuery.js b/frontend/lib/js/previous-queries/list/PreviousQuery.js
index 0a6f02adf4..9a38359675 100644
--- a/frontend/lib/js/previous-queries/list/PreviousQuery.js
+++ b/frontend/lib/js/previous-queries/list/PreviousQuery.js
@@ -68,8 +68,9 @@ const PreviousQuery = (props) => {
   const executedAt = moment(query.createdAt).fromNow();
   const label = query.label || query.id.toString();
   const mayEditQuery = query.own || query.shared;
+  const isNotEditing = !(query.editingLabel || query.editingTags);
 
-  return props.connectDragSource(
+  const content = (
     <div className={classnames('previous-query', {
       'previous-query--own': !!query.own,
       'previous-query--shared': !!query.shared,
@@ -168,6 +169,7 @@ const PreviousQuery = (props) => {
       }
     </div>
   );
+  return isNotEditing ? props.connectDragSource(content) : content;
 };
 
 PreviousQuery.propTypes = {