From 53c6296fd597483091dc3c8cdfc40bd80054df13 Mon Sep 17 00:00:00 2001 From: Nico Vermaas <vermaas@astron.nl> Date: Fri, 4 Jun 2021 11:00:51 +0200 Subject: [PATCH] abandoned the shoppingbasket mechanism for VOReg (functionality is too inmature) --- src/components/query/VORegListResults.js | 15 ++------------- src/components/query/VOServiceResults.js | 3 +++ src/components/query/samp/SampGrid.js | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/components/query/VORegListResults.js b/src/components/query/VORegListResults.js index 2997f22..01b8feb 100644 --- a/src/components/query/VORegListResults.js +++ b/src/components/query/VORegListResults.js @@ -4,15 +4,6 @@ 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); @@ -60,7 +51,7 @@ export default function VORegListResults({ catalog }) { numAdjacent={3} numPages={numPages} /> - <SaveBasket /> + <Table className="mt-3" responsive> <thead> <tr className="bg-light"> @@ -110,9 +101,7 @@ 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/components/query/VOServiceResults.js b/src/components/query/VOServiceResults.js index 3d8147c..1ea90cb 100644 --- a/src/components/query/VOServiceResults.js +++ b/src/components/query/VOServiceResults.js @@ -33,6 +33,7 @@ export default function VORegistryResults({ catalog }) { numAdjacent={3} numPages={numPages} /> + <Table className="mt-3" responsive> <thead> <tr className="bg-light"> @@ -61,7 +62,9 @@ export default function VORegistryResults({ catalog }) { return ( <> <tr key={queryResult[queryMap.get(catalog).vo_table_schema.fields.findIndex((item) => item.name === "access_url")]}> + {queryResult.map((field, index) => { + if (indice.includes(index)) { if (queryMap.get(catalog).vo_table_schema.fields[index].name === "access_url") { return (<td><a href={field} rel="noopener noreferrer" download>Download data</a></td>); diff --git a/src/components/query/samp/SampGrid.js b/src/components/query/samp/SampGrid.js index 84ede83..e1104f4 100644 --- a/src/components/query/samp/SampGrid.js +++ b/src/components/query/samp/SampGrid.js @@ -37,7 +37,7 @@ export default function SampResults(props) { {data.map((record, index) => { let id = `samp${index}` - if (index > 10) { + if (index > 1000) { return } return ( -- GitLab