Merge branch 'dev-nico' into 'master'

Dev nico

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

src/components/NavBar.js

@@ -3,6 +3,7 @@ import { Navbar, Nav } from "react-bootstrap";
 import { NavLink } from "react-router-dom";
 import AuthControl from "./auth/authControl";
 import MyBasketButton from "./basket/MyBasketButton"
+import SaveBasketButton from "./basket/SaveBasketButton"
 import { QueryContext } from "../contexts/QueryContext";
 import { GlobalContext } from "../contexts/GlobalContext";
 
@@ -34,6 +35,7 @@ export default function NavBar() {
         <Nav.Link key="my basket" as={NavLink} to="/basket">
             <MyBasketButton />
         </Nav.Link>
+        <SaveBasketButton/>
       <Nav>
 
         <AuthControl />

src/components/basket/MyBasketButton.js

@@ -5,7 +5,6 @@ import { BasketContext } from "../../contexts/BasketContext";
 import { getShoppingIcon } from "../../utils/styling";
 import { loadBasket } from "./LoadBasket";
 
-
 export default function MyBasketButton(props) {
     const { api_host, isAuthenticated } = useContext(GlobalContext);
     const basketContext = useContext(BasketContext);

src/components/basket/MyBasketPage.js

@@ -3,7 +3,6 @@ import { Table, Container, Alert } from "react-bootstrap";
 import { IDAContext } from "../../contexts/IDAContext";
 
 import { BasketContext } from "../../contexts/BasketContext";
-import SaveBasketButton from "./SaveBasketButton";
 import AddToBasket from "./AddToBasketCheckBox";
 
 export default function MyBasketPage() {
@@ -40,7 +39,6 @@ export default function MyBasketPage() {
         <>
         <Container fluid>
             <h3>Data Checkout</h3>
-            <SaveBasketButton />
 
             <Table className="mt-3" responsive>
                 <thead>

src/components/basket/SaveBasketButton.js

@@ -40,16 +40,19 @@ export default function SaveBasketButton(props) {
   //let authenticated = isAuthenticated || (process.env.NODE_ENV === "development")
   let authenticated = isAuthenticated
 
-  if(authenticated) {
-
-    return (
-        <Button
-          type="button"
-          variant="primary"
-          onClick={() => saveBasket(basketContext.datasets)}
-          {...props}>
-            {getShoppingIcon("save_cart")} Save Basket</Button>
-    );
+  if (authenticated)  {
+      if (hasChanged) {
+          return (
+              <Button
+                  type="button"
+                  variant="primary"
+                  onClick={() => saveBasket(basketContext.datasets)}
+                  {...props}>
+                  {getShoppingIcon("save_cart")} Save Basket</Button>
+          )
+      } else {
+          return null
+      }
   }
   else{
     return (<>

src/components/query/ApertifResults.js

@@ -71,7 +71,7 @@ export default function ApertifResults({ catalog }) {
           numAdjacent={3}
           numPages={numPages}
         />
-        <SaveBasketButton />
+
         <Table className="mt-3" responsive>
           <thead>
             <tr className="bg-light">

src/components/query/ZooniverseResults.js

@@ -140,7 +140,7 @@ function ZooniverseProjectResults(context) {
         numPages={numPages}
       />
       <Form>
-        <SaveBasketButton />
+
         <Table className="mt-3" responsive>
           <thead>
             <tr className="bg-light">

src/components/query/samp/SampPage.js

@@ -96,7 +96,6 @@ export default function SampPage(props) {
                 <p>Start a SAMP enabled application (like Topcat), register to the hub and transmit data from Topcat.</p>
                 <button variant="outline-warning" onClick={() => register()}>register</button>&nbsp;
                 <button variant="outline-warning" onClick={() => unregister()}>unregister</button>&nbsp;
-                <SaveBasketButton />
 
                 {renderSampGrid}
             </div>

src/routes/Routes.js

@@ -64,7 +64,7 @@ export default function Routes() {
 
         </Switch>
 
-      <footer><small>esap-gui version 18 jun 2021 - 8:00</small></footer>
+      <footer><small>esap-gui version 18 jun 2021 - 12:00</small></footer>
     </Router>
   );
 }

src/utils/styling.js

@@ -25,7 +25,7 @@ export const getShoppingIcon = (type) => {
     if (type === 'must_save_cart') {
         icon = faShoppingCart
         size = "md"
-        color = "yellow"
+        color = "red"
     }
 
     if (type === 'save_cart') {