From 279558f5447cd4c2a5462783ae37d6a91ea93675 Mon Sep 17 00:00:00 2001 From: Gareth Hughes <gareth.hughes@cta-observatory.org> Date: Wed, 15 Jun 2022 09:53:27 +0200 Subject: [PATCH] query was set to query and not rucio --- .../services/query_results/RucioResults.js | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/components/services/query_results/RucioResults.js b/src/components/services/query_results/RucioResults.js index 4a93d51..7f262f4 100644 --- a/src/components/services/query_results/RucioResults.js +++ b/src/components/services/query_results/RucioResults.js @@ -7,6 +7,7 @@ import { QueryContext } from "../../../contexts/QueryContext"; import LoadingSpinner from "../../LoadingSpinner"; import Paginate from "../../Paginate"; import AddToBasket from "../../basket/AddToBasketCheckBox"; +//import { QueryCatalogs } from "../../query/QueryCatalogs"; function createBasketItem(record){ return { @@ -37,40 +38,42 @@ export default function RucioResults({ catalog }) { //// const basketContext = useContext(BasketContext); //const { queryMap, page, setPage } = context; + //const catalogs = useContext(QueryCatalogs); const context = useContext(QueryContext); const { queryMap } = context; const { api_host } = useContext(GlobalContext); const [page, setPage] = useState(queryMap.get(catalog).page); + //setConfigName("esap_rucio"); // console.log(queryMap, page, context.queryMap.get(catalog).status); useEffect(() => { queryMap.set(catalog, { - catalog: catalog, + catalog: "esap_rucio", page: page, - requested_page: page, + //requested_page: page, esapquery: queryMap.get(catalog).esapquery + `&requested_page=${page}`, }); - const url = api_host + "query/query/?" + queryMap.get(catalog).esapquery + const url = api_host + "rucio/rucio/?" + queryMap.get(catalog).esapquery axios .get(url) .then((queryResponse) => { - queryMap.set(catalog, { - catalog: catalog, - esapquery: queryMap.get(catalog).esapquery, + queryMap.set(catalog, { + catalog: "esap_rucio", page: page, - requested_page: page, + esapquery: queryMap.get(catalog).esapquery + `&requested_page=${page}`, + //requested_page: page, status: "fetched", results: queryResponse.data, }); }) .catch(() => { queryMap.set(catalog, { - catalog: catalog, - esapquery: queryMap.get(catalog).esapquery, + catalog: "esap_rucio", page: page, - requested_page: page, + esapquery: queryMap.get(catalog).esapquery + `&requested_page=${page}`, + //requested_page: page, status: "error", results: null, }); -- GitLab