Merge branch 'dev-nico' into 'master'

Dev nico

See merge request astron-sdc/esap-gui!34

src/components/basket/AddToBasketCheckBox.js

@@ -5,7 +5,7 @@ import { GlobalContext } from "../../contexts/GlobalContext";
 import { BasketContext } from "../../contexts/BasketContext";
 import { getTrashIcon } from "../../utils/styling";
 
-export default function AddToBasket(props) {
+export default function AddToCheckout(props) {
   const { api_host, isAuthenticated } = useContext(GlobalContext);
   const basketContext = useContext(BasketContext);
 

src/components/basket/MyBasketPage.js

-import React, { useEffect, useContext } from "react";
+import React, { useState, useEffect, useContext } from "react";
 import { Table, Container, Alert } from "react-bootstrap";
 
 import { BasketContext } from "../../contexts/BasketContext";
@@ -11,7 +11,9 @@ export default function MyBasketPage() {
     const { api_host, isAuthenticated } = useContext(GlobalContext);
     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) {
         return null
     }

src/components/basket/SaveBasketButton.js

@@ -16,7 +16,10 @@ export default function SaveBasketButton(props) {
 
     const profileUrl = api_host + "accounts/user-profiles/";
     axios
-      .get(profileUrl, {withCredentials: true})
+      .get(profileUrl, {
+          withCredentials: true,
+          //headers : {"Access-Control-Allow-Origin": "*"}
+      })
       .then((response) => {
         console.log(response.data)
         const userProfileUrl = profileUrl + response.data.results[0].user_name + "/";

src/contexts/BasketContext.js

@@ -3,26 +3,34 @@ import React, { useState, createContext } from "react";
 export const BasketContext = createContext();
 
 export function BasketContextProvider({ children }) {
-  const [datasets, setDatasets] = useState([]);
-  const [hasChanged, setHasChanged] = useState(false);
+    const [datasets, setDatasets] = useState([]);
 
-  function handleAddDataset(dataset) {
-    setDatasets([...datasets, dataset]);
-    setHasChanged(true)
-  }
+    const [hasChanged, setHasChanged] = useState(false);
 
-  function handleRemoveDataset(dataset) {
-    const copy = [...datasets];
-    const index = copy.findIndex((ds) => ds === dataset);
-    copy.splice(index, 1);
-    setDatasets(copy);
-    setHasChanged(true)
-  }
+    function handleAddDataset(dataset) {
+      setDatasets([...datasets, dataset]);
+      setHasChanged(true)
+    }
 
-  return (
-    <BasketContext.Provider
-      value={{ datasets, setDatasets, hasChanged, setHasChanged, add: handleAddDataset, remove: handleRemoveDataset }}
-    >
+    function handleRemoveDataset(dataset) {
+      const copy = [...datasets];
+      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}
     </BasketContext.Provider>
   );

src/routes/Routes.js

@@ -72,7 +72,7 @@ export default function Routes() {
 
         </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>
   );
 }