Skip to content
Snippets Groups Projects
Commit b15ef39b authored by Nico Vermaas's avatar Nico Vermaas
Browse files

Merge branch 'dev-nico' into 'master'

Dev nico

See merge request astron-sdc/esap-gui!34
parents b9a9e7cf 5870ce66
No related branches found
No related tags found
2 merge requests!42Don't provide default URLs for IDA services,!34Dev nico
Pipeline #15022 passed
...@@ -5,7 +5,7 @@ import { GlobalContext } from "../../contexts/GlobalContext"; ...@@ -5,7 +5,7 @@ import { GlobalContext } from "../../contexts/GlobalContext";
import { BasketContext } from "../../contexts/BasketContext"; import { BasketContext } from "../../contexts/BasketContext";
import { getTrashIcon } from "../../utils/styling"; import { getTrashIcon } from "../../utils/styling";
export default function AddToBasket(props) { export default function AddToCheckout(props) {
const { api_host, isAuthenticated } = useContext(GlobalContext); const { api_host, isAuthenticated } = useContext(GlobalContext);
const basketContext = useContext(BasketContext); const basketContext = useContext(BasketContext);
......
import React, { useEffect, useContext } from "react"; import React, { useState, useEffect, useContext } from "react";
import { Table, Container, Alert } from "react-bootstrap"; import { Table, Container, Alert } from "react-bootstrap";
import { BasketContext } from "../../contexts/BasketContext"; import { BasketContext } from "../../contexts/BasketContext";
...@@ -11,7 +11,9 @@ export default function MyBasketPage() { ...@@ -11,7 +11,9 @@ export default function MyBasketPage() {
const { api_host, isAuthenticated } = useContext(GlobalContext); const { api_host, isAuthenticated } = useContext(GlobalContext);
const basketContext = useContext(BasketContext); const basketContext = useContext(BasketContext);
let items = basketContext.datasets // work on a local copy of datasets, to be able (un)(re)select items before saving
const [items, setItems] = useState(basketContext.datasets);
if (!items) { if (!items) {
return null return null
} }
......
...@@ -16,7 +16,10 @@ export default function SaveBasketButton(props) { ...@@ -16,7 +16,10 @@ export default function SaveBasketButton(props) {
const profileUrl = api_host + "accounts/user-profiles/"; const profileUrl = api_host + "accounts/user-profiles/";
axios axios
.get(profileUrl, {withCredentials: true}) .get(profileUrl, {
withCredentials: true,
//headers : {"Access-Control-Allow-Origin": "*"}
})
.then((response) => { .then((response) => {
console.log(response.data) console.log(response.data)
const userProfileUrl = profileUrl + response.data.results[0].user_name + "/"; const userProfileUrl = profileUrl + response.data.results[0].user_name + "/";
......
...@@ -3,26 +3,34 @@ import React, { useState, createContext } from "react"; ...@@ -3,26 +3,34 @@ import React, { useState, createContext } from "react";
export const BasketContext = createContext(); export const BasketContext = createContext();
export function BasketContextProvider({ children }) { export function BasketContextProvider({ children }) {
const [datasets, setDatasets] = useState([]); const [datasets, setDatasets] = useState([]);
const [hasChanged, setHasChanged] = useState(false);
function handleAddDataset(dataset) { const [hasChanged, setHasChanged] = useState(false);
setDatasets([...datasets, dataset]);
setHasChanged(true)
}
function handleRemoveDataset(dataset) { function handleAddDataset(dataset) {
const copy = [...datasets]; setDatasets([...datasets, dataset]);
const index = copy.findIndex((ds) => ds === dataset); setHasChanged(true)
copy.splice(index, 1); }
setDatasets(copy);
setHasChanged(true)
}
return ( function handleRemoveDataset(dataset) {
<BasketContext.Provider const copy = [...datasets];
value={{ datasets, setDatasets, hasChanged, setHasChanged, add: handleAddDataset, remove: handleRemoveDataset }} const index = copy.findIndex((ds) => ds === dataset);
> copy.splice(index, 1);
setDatasets(copy);
setHasChanged(true)
}
return (
<BasketContext.Provider
value={{
datasets,
setDatasets,
hasChanged,
setHasChanged,
add: handleAddDataset,
remove: handleRemoveDataset,
}}
>
{children} {children}
</BasketContext.Provider> </BasketContext.Provider>
); );
......
...@@ -72,7 +72,7 @@ export default function Routes() { ...@@ -72,7 +72,7 @@ export default function Routes() {
</Switch> </Switch>
<footer><small>esap-gui version 6 jul 2021 - 8:00</small></footer> <footer><small>esap-gui version 9 jul 2021 - 11:00</small></footer>
</Router> </Router>
); );
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment