Merge OverlayImageButton into CopyResponseButton

8 files changed, 15 insertions, 66 deletions

diff --git a/client/js/app/src/app/pages/querybuilder/Components/Buttons/AddQueryInputButton.jsx b/client/js/app/src/app/pages/querybuilder/Components/Buttons/AddQueryInputButton.jsx
index 8aeaff971bf..9b70c9a3dee 100644
--- a/client/js/app/src/app/pages/querybuilder/Components/Buttons/AddQueryInputButton.jsx
+++ b/client/js/app/src/app/pages/querybuilder/Components/Buttons/AddQueryInputButton.jsx
@@ -1,10 +1,10 @@
 import React, { useContext } from 'react';
-import { QueryInputContext } from '../Contexts/QueryInputContext';
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
 import Tooltip from 'react-bootstrap/Tooltip';
+import { QueryInputContext } from '../Contexts/QueryInputContext';
 
 export default function AddQueryInput() {
-  const { inputs, setInputs, id, setId } = useContext(QueryInputContext);
+  const { setInputs, id, setId } = useContext(QueryInputContext);
 
   /**
    * Adds a new element to inputs.
@@ -33,13 +33,7 @@ export default function AddQueryInput() {
       overlay={<Tooltip id="button-tooltip">Add row</Tooltip>}
     >
       <span>
-        <button
-          id="addRow"
-          className="addRow"
-          height="0"
-          width="0"
-          onClick={updateInputs}
-        >
+        <button id="addRow" className="addRow" onClick={updateInputs}>
           +
         </button>
       </span>
diff --git a/client/js/app/src/app/pages/querybuilder/Components/Buttons/CopyResponseButton.jsx b/client/js/app/src/app/pages/querybuilder/Components/Buttons/CopyResponseButton.jsx
index d01daa7b0d6..c3498e68b03 100644
--- a/client/js/app/src/app/pages/querybuilder/Components/Buttons/CopyResponseButton.jsx
+++ b/client/js/app/src/app/pages/querybuilder/Components/Buttons/CopyResponseButton.jsx
@@ -1,9 +1,8 @@
 import React, { useContext, useState } from 'react';
-import OverlayImageButton from './OverlayImageButton';
-
-import copyImage from '../../assets/img/copy.svg';
-import { ResponseContext } from '../Contexts/ResponseContext';
 import { OverlayTrigger, Tooltip } from 'react-bootstrap';
+import { ResponseContext } from '../Contexts/ResponseContext';
+import ImageButton from './ImageButton';
+import copyImage from 'app/pages/querybuilder/assets/img/copy.svg';
 
 export default function CopyResponseButton() {
   const { response } = useContext(ResponseContext);
@@ -20,18 +19,16 @@ export default function CopyResponseButton() {
   return (
     <OverlayTrigger
       placement="left-end"
-      show={show}
       overlay={
-        <Tooltip id="copy-tooltip">Response copied to clipboard</Tooltip>
+        <Tooltip>{show ? 'Response copied to clipboard' : 'Copy'}</Tooltip>
       }
     >
       <span>
-        <OverlayImageButton
+        <ImageButton
           className="intro-copy"
           image={copyImage}
-          height="30"
-          width="30"
-          tooltip="Copy"
+          height={30}
+          width={30}
           onClick={handleCopy}
         />
       </span>
diff --git a/client/js/app/src/app/pages/querybuilder/Components/Buttons/ImageButton.jsx b/client/js/app/src/app/pages/querybuilder/Components/Buttons/ImageButton.jsx
index f620146bea5..711229d82cd 100644
--- a/client/js/app/src/app/pages/querybuilder/Components/Buttons/ImageButton.jsx
+++ b/client/js/app/src/app/pages/querybuilder/Components/Buttons/ImageButton.jsx
@@ -4,14 +4,13 @@ export default function ImageButton({
   onClick,
   children,
   className,
-  id,
   image,
-  height = '15',
-  width = '15',
+  height = 15,
+  width = 15,
   style,
 }) {
   return (
-    <button id={id} className={className} onClick={onClick}>
+    <button className={className} onClick={onClick}>
       <img
         src={image}
         height={height}
diff --git a/client/js/app/src/app/pages/querybuilder/Components/Buttons/OverlayImageButton.jsx b/client/js/app/src/app/pages/querybuilder/Components/Buttons/OverlayImageButton.jsx
deleted file mode 100644
index 788d88fd0e6..00000000000
--- a/client/js/app/src/app/pages/querybuilder/Components/Buttons/OverlayImageButton.jsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from 'react';
-import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
-import Tooltip from 'react-bootstrap/Tooltip';
-import ImageButton from './ImageButton';
-
-export default function OverlayImageButton({
-  onClick,
-  children,
-  className,
-  id,
-  image,
-  height = '15',
-  width = '15',
-  style,
-  tooltip,
-}) {
-  return (
-    <OverlayTrigger
-      placement="right"
-      delay={{ show: 250, hide: 400 }}
-      overlay={<Tooltip id="button-tooltip">{tooltip}</Tooltip>}
-    >
-      <span>
-        <ImageButton
-          id={id}
-          className={className}
-          image={image}
-          height={height}
-          width={width}
-          style={style}
-          onClick={onClick}
-        >
-          {children}
-        </ImageButton>
-      </span>
-    </OverlayTrigger>
-  );
-}
diff --git a/client/js/app/src/app/pages/querybuilder/Components/Buttons/PasteJSONButton.jsx b/client/js/app/src/app/pages/querybuilder/Components/Buttons/PasteJSONButton.jsx
index 844b8ca4453..148b052bdb6 100644
--- a/client/js/app/src/app/pages/querybuilder/Components/Buttons/PasteJSONButton.jsx
+++ b/client/js/app/src/app/pages/querybuilder/Components/Buttons/PasteJSONButton.jsx
@@ -83,7 +83,6 @@ export default function PasteJSONButton() {
   return (
     <>
       <ImageButton
-        id="pasteJSON"
         className="pasteJSON"
         image={pasteImage}
         //style={{ marginTop: '-2px', marginRight: '3px' }}
diff --git a/client/js/app/src/app/pages/querybuilder/Components/Buttons/ShowQueryButton.jsx b/client/js/app/src/app/pages/querybuilder/Components/Buttons/ShowQueryButton.jsx
index a468ba409e5..8c7d3d77a35 100644
--- a/client/js/app/src/app/pages/querybuilder/Components/Buttons/ShowQueryButton.jsx
+++ b/client/js/app/src/app/pages/querybuilder/Components/Buttons/ShowQueryButton.jsx
@@ -15,7 +15,6 @@ export default function ShowQueryButton() {
       </button>
       {showQuery && (
         <textarea
-          id="jsonquery"
           className="responsebox"
           readOnly
           cols="70"
diff --git a/client/js/app/src/app/pages/querybuilder/Components/Text/QueryDropDownForm.jsx b/client/js/app/src/app/pages/querybuilder/Components/Text/QueryDropDownForm.jsx
index 285a29a2c3e..b7c84552434 100644
--- a/client/js/app/src/app/pages/querybuilder/Components/Text/QueryDropDownForm.jsx
+++ b/client/js/app/src/app/pages/querybuilder/Components/Text/QueryDropDownForm.jsx
@@ -62,11 +62,10 @@ export default function QueryDropdownForm({
 
   return (
     <SimpleDropDownForm
-      id={id}
       onChange={updateType}
       choices={choices}
       value={choice}
       initial={initial}
-    ></SimpleDropDownForm>
+    />
   );
 }
diff --git a/client/js/app/src/app/pages/querybuilder/Components/Text/SendQuery.jsx b/client/js/app/src/app/pages/querybuilder/Components/Text/SendQuery.jsx
index 67c9a1db997..3814905d481 100644
--- a/client/js/app/src/app/pages/querybuilder/Components/Text/SendQuery.jsx
+++ b/client/js/app/src/app/pages/querybuilder/Components/Text/SendQuery.jsx
@@ -69,7 +69,7 @@ export default function SendQuery() {
         return parseFloat(input);
 
       case 'Boolean':
-        return input.toLowerCase() === 'true' ? true : false;
+        return input.toLowerCase() === 'true';
 
       default:
         return input;