diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-08-08 14:20:58 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-08-10 09:32:32 +0200 |
commit | 2c1cac2dcbda9cb52a27d7818095cdbefa6204a1 (patch) | |
tree | b472a12f20e4a944d71ae14530234b2addcc0d39 /client/js/app/src | |
parent | 77b011ac29f968d041835cd67e81171c2ecbf375 (diff) |
Remove SimpleButton
Diffstat (limited to 'client/js/app/src')
7 files changed, 15 insertions, 47 deletions
diff --git a/client/js/app/src/app/pages/querybuilder/Components/Buttons/AddPropertyButton.jsx b/client/js/app/src/app/pages/querybuilder/Components/Buttons/AddPropertyButton.jsx index 70f20ddd673..b5f512bcf37 100644 --- a/client/js/app/src/app/pages/querybuilder/Components/Buttons/AddPropertyButton.jsx +++ b/client/js/app/src/app/pages/querybuilder/Components/Buttons/AddPropertyButton.jsx @@ -1,6 +1,5 @@ import React, { useContext, useState } from 'react'; import { QueryInputContext } from '../Contexts/QueryInputContext'; -import SimpleButton from './SimpleButton'; import { childMap } from 'app/pages/querybuilder/parameters'; export default function AddPropertyButton({ id }) { @@ -36,12 +35,8 @@ export default function AddPropertyButton({ id }) { }; return ( - <SimpleButton - id={`propb${id}`} - className={'addpropsbutton'} - onClick={addChildProperty} - > + <button className="addpropsbutton" onClick={addChildProperty}> + Add property - </SimpleButton> + </button> ); } diff --git a/client/js/app/src/app/pages/querybuilder/Components/Buttons/DownloadJSONButton.jsx b/client/js/app/src/app/pages/querybuilder/Components/Buttons/DownloadJSONButton.jsx index 7ec6683afa3..b4a3d8e8cf0 100644 --- a/client/js/app/src/app/pages/querybuilder/Components/Buttons/DownloadJSONButton.jsx +++ b/client/js/app/src/app/pages/querybuilder/Components/Buttons/DownloadJSONButton.jsx @@ -1,7 +1,6 @@ import React, { useContext } from 'react'; import { ResponseContext } from '../Contexts/ResponseContext'; import transform from '../../TransformVespaTrace'; -import SimpleButton from './SimpleButton'; export default function DownloadJSONButton({ children }) { const { response } = useContext(ResponseContext); @@ -40,5 +39,5 @@ export default function DownloadJSONButton({ children }) { } }; - return <SimpleButton onClick={handleClick}>{children}</SimpleButton>; + return <button onClick={handleClick}>{children}</button>; } 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 789fc387b38..a468ba409e5 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 @@ -1,6 +1,5 @@ -import React, { useContext, useState } from 'react'; +import React, { useContext } from 'react'; import { QueryContext } from '../Contexts/QueryContext'; -import SimpleButton from './SimpleButton'; export default function ShowQueryButton() { const { query, showQuery, setShowQuery } = useContext(QueryContext); @@ -11,9 +10,9 @@ export default function ShowQueryButton() { return ( <> - <SimpleButton className="showJSON" onClick={handleClick}> + <button className="showJSON" onClick={handleClick}> Show query JSON - </SimpleButton> + </button> {showQuery && ( <textarea id="jsonquery" diff --git a/client/js/app/src/app/pages/querybuilder/Components/Buttons/SimpleButton.jsx b/client/js/app/src/app/pages/querybuilder/Components/Buttons/SimpleButton.jsx deleted file mode 100644 index a153c9577e4..00000000000 --- a/client/js/app/src/app/pages/querybuilder/Components/Buttons/SimpleButton.jsx +++ /dev/null @@ -1,9 +0,0 @@ -import React from 'react'; - -export default function SimpleButton({ onClick, children, className, id }) { - return ( - <button id={id} className={className} onClick={onClick}> - {children} - </button> - ); -} diff --git a/client/js/app/src/app/pages/querybuilder/Components/Text/QueryInput.jsx b/client/js/app/src/app/pages/querybuilder/Components/Text/QueryInput.jsx index fb760b2060a..e037b86e8cd 100644 --- a/client/js/app/src/app/pages/querybuilder/Components/Text/QueryInput.jsx +++ b/client/js/app/src/app/pages/querybuilder/Components/Text/QueryInput.jsx @@ -1,7 +1,6 @@ import React, { useContext } from 'react'; import { OverlayTrigger, Tooltip } from 'react-bootstrap'; import AddPropertyButton from '../Buttons/AddPropertyButton'; -import SimpleButton from '../Buttons/SimpleButton'; import { QueryInputContext } from '../Contexts/QueryInputContext'; import QueryDropdownForm from './QueryDropDownForm'; import QueryInputChild from './QueryInputChild'; @@ -36,7 +35,7 @@ export default function QueryInput() { const inputList = inputs.map((value) => { return ( - <div key={value.id + value.typeof} id={value.id} className="queryinput"> + <div key={value.id + value.typeof} className="queryinput"> <QueryDropdownForm choices={levelZeroParameters} id={value.id} @@ -49,7 +48,6 @@ export default function QueryInput() { </> ) : ( <SimpleForm - id={`v${value.id}`} size="30" onChange={updateInput} placeholder={setPlaceholder(value.id)} @@ -62,13 +60,9 @@ export default function QueryInput() { overlay={<Tooltip id="button-tooltip">Remove row</Tooltip>} > <span> - <SimpleButton - id={`b${value.id}`} - className="removeRow" - onClick={() => removeRow(value.id)} - > + <button className="removeRow" onClick={() => removeRow(value.id)}> - - </SimpleButton> + </button> </span> </OverlayTrigger> <br /> diff --git a/client/js/app/src/app/pages/querybuilder/Components/Text/QueryInputChild.jsx b/client/js/app/src/app/pages/querybuilder/Components/Text/QueryInputChild.jsx index 60afc3050d3..10e3d06eac3 100644 --- a/client/js/app/src/app/pages/querybuilder/Components/Text/QueryInputChild.jsx +++ b/client/js/app/src/app/pages/querybuilder/Components/Text/QueryInputChild.jsx @@ -1,7 +1,6 @@ import React, { useContext } from 'react'; import { OverlayTrigger, Tooltip } from 'react-bootstrap'; import AddPropertyButton from '../Buttons/AddPropertyButton'; -import SimpleButton from '../Buttons/SimpleButton'; import { QueryInputContext } from '../Contexts/QueryInputContext'; import QueryDropdownForm from './QueryDropDownForm'; import SimpleForm from './SimpleForm'; @@ -123,13 +122,9 @@ export default function QueryInputChild({ id }) { overlay={<Tooltip id="button-tooltip">Remove row</Tooltip>} > <span> - <SimpleButton - id={`b${child.id}`} - className="removeRow" - onClick={() => removeRow(child.id)} - > + <button className="removeRow" onClick={() => removeRow(child.id)}> - - </SimpleButton> + </button> </span> </OverlayTrigger> <br /> @@ -176,13 +171,9 @@ function Child({ child, type, onChange, placeholder, removeRow }) { overlay={<Tooltip id="button-tooltip">Remove row</Tooltip>} > <span> - <SimpleButton - id={`b${child.id}`} - className="removeRow" - onClick={() => removeRow(child.id)} - > + <button className="removeRow" onClick={() => removeRow(child.id)}> - - </SimpleButton> + </button> </span> </OverlayTrigger> <br /> 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 a3714f27fb5..67c9a1db997 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 @@ -1,5 +1,4 @@ import React, { useContext, useEffect, useState } from 'react'; -import SimpleButton from '../Buttons/SimpleButton'; import { QueryInputContext } from '../Contexts/QueryInputContext'; import { ResponseContext } from '../Contexts/ResponseContext'; import { QueryContext } from '../Contexts/QueryContext'; @@ -97,9 +96,9 @@ export default function SendQuery() { size="30" onChange={updateUrl} /> - <SimpleButton id="send" className="button" onClick={handleClick}> + <button className="button" onClick={handleClick}> Send - </SimpleButton> + </button> </> ); } |