fixing some bugs (and introducting new ones)

src/components/archives/ArchiveCard.js

@@ -6,14 +6,6 @@ import { NavLink } from "react-router-dom";
 export default function ArchiveCard({ archive }) {
   return (
     <Card>
-        <Button
-            className="mt-3"
-            as={NavLink}
-            variant="outline-primary"
-            to={`/archives/${archive.uri}`}
-        >
-            Visit {archive.name} Archives
-        </Button>
 
       <Card.Body>
         <Card.Title className="h2">{archive.name}</Card.Title>
@@ -38,7 +30,14 @@ export default function ArchiveCard({ archive }) {
             
           </Row>
         </Container> */}
-
+          <Button
+              className="mt-3"
+              as={NavLink}
+              variant="outline-primary"
+              to={`/archives/${archive.uri}`}
+          >
+              Visit {archive.name} Archives
+          </Button>
       </Card.Body>
     </Card>
   );

src/components/query/ASTRONVOResults.js

@@ -7,7 +7,6 @@ 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){
@@ -70,7 +69,7 @@ export default function ASTRONVOResults({ catalog }) {
           numAdjacent={3}
           numPages={numPages}
         />
-        <SaveBasketButton />
+
         <Table className="mt-3" responsive>
           <thead>
             <tr className="bg-light">

src/components/query/QueryCatalogs.js

@@ -42,20 +42,27 @@ export default function QueryCatalogs() {
       case "lofar":
         setConfigName("lofar");
         break;
+      case "ivoa":
+        setConfigName("esap_ivoa");
+        break;
       default:
         break;
     }
+
     return () => {
       console.log("cleaned up");
       queryMap.clear();
       setFormData();
-      setConfigName(defaultConf);
+      //setConfigName(defaultConf);
     };
   }, [uri]);
 
   useEffect(() => {
     console.log(config.query_schema);
-    if (!formData) return;
+    if (!formData) {
+      return;
+    }
+
     queryMap.clear();
     const gui = config.query_schema.name;
     const queries = parseQueryForm(gui, formData);

src/contexts/QueryContext.js

@@ -27,6 +27,7 @@ export function QueryContextProvider({ children }) {
     axios
       .get(api_host + "query/configuration" + configNameString)
       .then((response) => {
+        //alert(configNameString)
         let config = response.data["configuration"];
         let props = config.query_schema.properties;
         console.log("config props: ", props);
@@ -63,6 +64,7 @@ export function QueryContextProvider({ children }) {
         collection,
         setCollection,
         config,
+        configName,
         setConfigName,
         defaultConf,
         ds9,

src/routes/Routes.js

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

src/utils/styling.js

@@ -16,35 +16,35 @@ import {
 export const getShoppingIcon = (type) => {
     let icon = undefined
     let color = "darkgreen"
-    let size = 'md'
+    let size = 'sm'
 
     if (type === 'cart') {
         icon = faShoppingCart
-        size = "md"
+        size = "sm"
         color = "white"
     }
 
     if (type === 'cart_dark_large') {
         icon = faShoppingCart
-        size = "md"
+        size = "sm"
         color = "blue"
     }
 
     if (type === 'must_save_cart') {
         icon = faShoppingCart
-        size = "md"
+        size = "sm"
         color = "red"
     }
 
     if (type === 'save_cart') {
         icon = faCartArrowDown
-        size = "md"
+        size = "sm"
         color = "white"
     }
 
     if (type === 'plus_cart') {
         icon = faCartPlus
-        size = "md"
+        size = "sm"
         color = "white"
     }
 
@@ -54,7 +54,7 @@ export const getShoppingIcon = (type) => {
 export const getThumbnailIcon = () => {
     let icon = faImage
     let color = "white"
-    let size = 'md'
+    let size = 'sm'
 
     return <FontAwesomeIcon size={size} icon={icon} color={color}/>
 }
@@ -62,7 +62,7 @@ export const getThumbnailIcon = () => {
 export const getQueryIcon = () => {
     let icon = faSearchPlus
     let color = "white"
-    let size = 'md'
+    let size = 'sm'
 
     return <FontAwesomeIcon size={size} icon={icon} color={color}/>
 }
@@ -70,7 +70,7 @@ export const getQueryIcon = () => {
 export const getTrashIcon = (color) => {
     let icon = faTrashAlt
     //let color = "white"
-    let size = 'md'
+    let size = 'sm'
 
     return <FontAwesomeIcon size={size} icon={icon} color={color}/>
 }