From a0a7b276a63fe1da065a474e318f825df6499e70 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Thu, 1 Jul 2021 13:15:24 +0200
Subject: [PATCH] add shopping_basket functionality to rucio results
---
src/components/query/ApertifResults.js | 5 ++---
src/components/query/RucioResults.js | 13 ++++++++++++-
src/components/query/VORegListResults.js | 1 -
src/routes/Routes.js | 2 +-
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/components/query/ApertifResults.js b/src/components/query/ApertifResults.js
index 0e3b158..01c940e 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 d7cf957..c1252c8 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 01b8feb..bf4f333 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 10a5add..28a5043 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>
);
}
--
GitLab