Merge remote-tracking branch 'origin/esap-gui-dev' into dev-zooniverse

Merging remote bug fix.

src/components/query/QueryCatalogs.js

@@ -40,6 +40,10 @@ export default function QueryCatalogs() {
       default:
         setConfigName("esap_ivoa");
     }
+    return () => {
+      console.log("cleaned up");
+      setConfigName("esap_ivoa");
+    };
   }, [uri]);
 
   useEffect(() => {

src/contexts/GlobalContext.js

@@ -8,7 +8,7 @@ export function GlobalContextProvider({ children }) {
   console.log("ASTRON ESAP version 14 aug 2020");
   const api_host =
     process.env.NODE_ENV === "development"
-      ? "http://localhost:8000/esap-api/"
+      ? "http://localhost:15671/esap-api/"
       : "/esap-api/";
 
   const [config, setConfig] = useState();

src/utils/form/parseASTRONVOForm.js

 export default function ParseASTRONVOForm(formData) {
-  let catalogs = "astron_vo";
   let queries = [];
   // queries is an array of dictionaries, where each dictionary consists of
   // {"catalog": "catalogname",
@@ -20,25 +19,11 @@ export default function ParseASTRONVOForm(formData) {
   //  "status": "null|fetching|fetched",
   //  "results": null}
   let catalog = formInput.find(([key]) => key === "catalog")[1];
-  if (catalog === "all") {
-    console.log("Catalogs:", catalogs);
-    catalogs.map((catalog) => {
-      let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
-
-      queries.push({
-        catalog: catalog,
-        esapquery: esapquery,
-      });
-      return null;
-    });
-  } else {
-    let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
-
-    queries.push({
-      catalog: catalog,
-      esapquery: esapquery,
-    });
-  }
+  let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
+  queries.push({
+    catalog: catalog,
+    esapquery: esapquery,
+  });
   console.log("Queries:", queries);
   return queries;
 }

src/utils/form/parseApertifForm.js

 export default function ParseApertifForm(formData) {
-  let catalogs = "apertif";
   let queries = [];
   // queries is an array of dictionaries, where each dictionary consists of
   // {"catalog": "catalogname",
@@ -20,25 +19,11 @@ export default function ParseApertifForm(formData) {
   //  "status": "null|fetching|fetched",
   //  "results": null}
   let catalog = formInput.find(([key]) => key === "catalog")[1];
-  if (catalog === "all") {
-    console.log("Catalogs:", catalogs);
-    catalogs.map((catalog) => {
-      let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
-
-      queries.push({
-        catalog: catalog,
-        esapquery: esapquery,
-      });
-      return null;
-    });
-  } else {
-    let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
-
-    queries.push({
-      catalog: catalog,
-      esapquery: esapquery,
-    });
-  }
+  let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
+  queries.push({
+    catalog: catalog,
+    esapquery: esapquery,
+  });
   console.log("Queries:", queries);
   return queries;
 }

src/utils/form/parseLOFARForm.js

 export default function ParseLOFARForm(formData) {
-  let catalogs = "lofar";
   let queries = [];
   // queries is an array of dictionaries, where each dictionary consists of
   // {"catalog": "catalogname",
@@ -20,25 +19,11 @@ export default function ParseLOFARForm(formData) {
   //  "status": "null|fetching|fetched",
   //  "results": null}
   let catalog = formInput.find(([key]) => key === "catalog")[1];
-  if (catalog === "all") {
-    console.log("Catalogs:", catalogs);
-    catalogs.map((catalog) => {
-      let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
-
-      queries.push({
-        catalog: catalog,
-        esapquery: esapquery,
-      });
-      return null;
-    });
-  } else {
-    let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
-
-    queries.push({
-      catalog: catalog,
-      esapquery: esapquery,
-    });
-  }
+  let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
+  queries.push({
+    catalog: catalog,
+    esapquery: esapquery,
+  });
   console.log("Queries:", queries);
   return queries;
 }