diff --git a/src/components/query/ASTRONVOResults.js b/src/components/query/ASTRONVOResults.js index c52549672f77dc93ed8033029a7258c1b63889a3..1cc01a5d81e1fc4fd1d9440ad8d9cadca4d1cb93 100644 --- a/src/components/query/ASTRONVOResults.js +++ b/src/components/query/ASTRONVOResults.js @@ -7,6 +7,15 @@ import LoadingSpinner from "../LoadingSpinner"; import Paginate from "../Paginate"; import HandlePreview from "./HandlePreview"; import Preview from "./Preview"; +import SaveBasket from "../basket/savebasket"; +import AddToBasket from "../basket/addtobasket"; + +function SAMPBasketItem(record){ + return { + archive: "astron_vo", + record: record, + }; +} export default function ASTRONVOResults({ catalog }) { const { queryMap, preview } = useContext(QueryContext); @@ -61,14 +70,11 @@ export default function ASTRONVOResults({ catalog }) { numAdjacent={3} numPages={numPages} /> + <SaveBasket /> <Table className="mt-3" responsive> <thead> <tr className="bg-light"> - {/* <th> - <InputGroup> - <InputGroup.Checkbox /> - </InputGroup> - </th> */} + <th>Basket</th> <th>Collection</th> <th>RA</th> <th>Dec</th> @@ -85,11 +91,9 @@ export default function ASTRONVOResults({ catalog }) { return ( <> <tr key={result.url}> - {/* <th> - <InputGroup> - <InputGroup.Checkbox /> - </InputGroup> - </th> */} + <td> + <AddToBasket id={result.id} item={SAMPBasketItem(result)} /> + </td> <td>{result.obs_collection}</td> <td>{Number(result.ra).toFixed(1)}</td> <td>{Number(result.dec).toFixed(1)}</td> diff --git a/src/components/query/ApertifResults.js b/src/components/query/ApertifResults.js index a6ec4f308542b2d5f3a4acf2b913c117ee41f4ee..1cef4f23243c4320054c5da5aec12c259ceee931 100644 --- a/src/components/query/ApertifResults.js +++ b/src/components/query/ApertifResults.js @@ -3,7 +3,7 @@ import { Table, Alert } from "react-bootstrap"; import axios from "axios"; import { QueryContext } from "../../contexts/QueryContext"; import { GlobalContext } from "../../contexts/GlobalContext"; -import { BasketContext } from "../../contexts/BasketContext"; + import LoadingSpinner from "../LoadingSpinner"; import Paginate from "../Paginate"; import HandlePreview from "./HandlePreview"; diff --git a/src/components/query/VORegListResults.js b/src/components/query/VORegListResults.js index 19c6f2a23877f25cea921000ab15f62bd2eca8b6..2997f22128a6854c15ee1fb172149eec1e85896a 100644 --- a/src/components/query/VORegListResults.js +++ b/src/components/query/VORegListResults.js @@ -4,6 +4,15 @@ import { QueryContext } from "../../contexts/QueryContext"; import LoadingSpinner from "../LoadingSpinner"; import Paginate from "../Paginate"; import { IVOAContext } from "../../contexts/IVOAContext"; +import SaveBasket from "../basket/savebasket"; +import AddToBasket from "../basket/addtobasket"; + +function SAMPBasketItem(record){ + return { + archive: "ivoa", + record: record, + }; +} export default function VORegListResults({ catalog }) { const { queryMap } = useContext(QueryContext); @@ -51,6 +60,7 @@ export default function VORegListResults({ catalog }) { numAdjacent={3} numPages={numPages} /> + <SaveBasket /> <Table className="mt-3" responsive> <thead> <tr className="bg-light"> @@ -74,6 +84,7 @@ export default function VORegListResults({ catalog }) { /> </InputGroup> </th> + <th>Basket</th> <th>Resource</th> <th>Access URL</th> <th>Waveband</th> @@ -99,6 +110,9 @@ export default function VORegListResults({ catalog }) { /> </InputGroup> </th> + <td> + <AddToBasket id={result.id} item={SAMPBasketItem(result)} /> + </td> <td>{result.short_name}</td> <td>{result.access_url}</td> <td>{result.waveband}</td> diff --git a/src/routes/Routes.js b/src/routes/Routes.js index 4f5b39fe92f3d6c108e85c236362eefbc1f986d2..2de334972a991c8ecff4f2129b1e80992a55bb13 100644 --- a/src/routes/Routes.js +++ b/src/routes/Routes.js @@ -56,7 +56,7 @@ export default function Routes() { </BasketContextProvider> </Route> </Switch> - <footer><small>esap-gui version 3 jun 2021 - 11:30</small></footer> + <footer><small>esap-gui version 4 jun 2021 - 10:00</small></footer> </Router> ); }