diff --git a/src/components/query/ApertifResults.js b/src/components/query/ApertifResults.js index 0e3b158f7930a3a71357bb506da925a5a4996c90..01c940e8852ee90d1d396367e2f723c6864a62e1 100644 --- a/src/components/query/ApertifResults.js +++ b/src/components/query/ApertifResults.js @@ -8,10 +8,9 @@ import LoadingSpinner from "../LoadingSpinner"; import Paginate from "../Paginate"; import HandlePreview from "./HandlePreview"; import Preview from "./Preview"; -import SaveBasketButton from "../basket/SaveBasketButton"; import AddToBasket from "../basket/AddToBasketCheckBox"; -function SAMPBasketItem(record){ +function createBasketItem(record){ return { archive: "apertif", record: record, @@ -93,7 +92,7 @@ export default function ApertifResults({ catalog }) { <> <tr key={result.PID}> <td> - <AddToBasket id={result.id} item={SAMPBasketItem(result)} /> + <AddToBasket id={result.id} item={createBasketItem(result)} /> </td> <td>{result.name}</td> <td>{Number(result.RA).toFixed(1)}</td> diff --git a/src/components/query/RucioResults.js b/src/components/query/RucioResults.js index d7cf9577fd8db4d51b57edc443ccc30803231198..c1252c8d177cb7de152028eeed4f137535ce7d61 100644 --- a/src/components/query/RucioResults.js +++ b/src/components/query/RucioResults.js @@ -4,7 +4,14 @@ import { QueryContext } from "../../contexts/QueryContext"; // import { BasketContext } from "../../contexts/BasketContext"; import LoadingSpinner from "../LoadingSpinner"; import Paginate from "../Paginate"; -// import SaveBasketButton from "../basket/savebasket"; +import AddToBasket from "../basket/AddToBasketCheckBox"; + +function createBasketItem(record){ + return { + archive: "rucio", + record: record, + }; +} function titleCase(string) { var sentence = string.toLowerCase().split(" "); @@ -63,6 +70,7 @@ export default function RucioResults({ catalog }) { <InputGroup.Checkbox /> </InputGroup> </th> */} + <th>Basket</th> {headers} </tr> </thead> @@ -108,6 +116,9 @@ export default function RucioResults({ catalog }) { Link </a> </td>*/} + <td> + <AddToBasket id={result.id} item={createBasketItem(result)} /> + </td> {cells} </tr> ); diff --git a/src/components/query/VORegListResults.js b/src/components/query/VORegListResults.js index 01b8febdac3fe5d012d3045dffa63b8387e14895..bf4f333f2317aa858a1ca73b384e9356f968e35f 100644 --- a/src/components/query/VORegListResults.js +++ b/src/components/query/VORegListResults.js @@ -75,7 +75,6 @@ export default function VORegListResults({ catalog }) { /> </InputGroup> </th> - <th>Basket</th> <th>Resource</th> <th>Access URL</th> <th>Waveband</th> diff --git a/src/routes/Routes.js b/src/routes/Routes.js index 10a5add0b769bb7187f8c7c5d8b78c6b1cf70b42..28a5043a3a08239e708f8a1e6f6916a695c562d7 100644 --- a/src/routes/Routes.js +++ b/src/routes/Routes.js @@ -64,7 +64,7 @@ export default function Routes() { </Switch> - <footer><small>esap-gui version 29 jun 2021 - 16:00</small></footer> + <footer><small>esap-gui version 1 jul 2021 - 13:00</small></footer> </Router> ); }