Merge branch '99_CONCORDIA_framework' into 'master'

99 concordia framework

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

src/components/CONCORDIA.js

+import React from "react";
+
+export default function CONCORDIA() {
+  return (
+    <div className="embed-responsive embed-responsive-16by9">
+      <iframe
+        title="concordia"
+        className="embed-responsive-item"
+        allowFullScreen
+      ></iframe>
+    </div>
+  );
+}

src/components/query/QueryCatalogs.js

@@ -48,6 +48,9 @@ export default function QueryCatalogs() {
       case "ivoa":
         setConfigName("esap_ivoa");
         break;
+      case "esap_concordia":
+        setConfigName("esap_concordia");
+        break;
 
       default:
         break;

src/components/services/query_results/CONCORDIAResults.js

+import React, { useContext } from "react";
+import { Table, Alert, Form } from "react-bootstrap";
+import { QueryContext } from "../../../contexts/QueryContext";
+import LoadingSpinner from "../../LoadingSpinner";
+import Paginate from "../../Paginate";
+import AddToBasket from "../../basket/AddToBasketCheckBox";
+
+export default function DIRACResults({ catalog }) {
+  const context = useContext(QueryContext);
+  const { queryMap, page, setPage } = context;
+  const regex = /(<([^>]+)>)/ig;
+
+  if (!context.queryMap) return null;
+
+  if (context.queryMap.get(catalog).status === "fetched") {
+    if (context.queryMap.get(catalog).length === 0)
+      return <Alert variant="warning">No matching results found!</Alert>;
+    else if (catalog === "concordia") {
+      const concordiaResults = queryMap.get("concordia").results.results.map((hits, counter) => (
+
+           <>
+           Job submitted:
+           <br/>
+           JobID: {hits.JobID}
+           <br/>
+           Status: {hits.Status}
+           <br/>
+           Minor Status: {hits.MinorStatus}
+           <br/>
+           Site: {hits.Site}
+           </>
+
+
+      ));
+
+      return (
+
+       <>
+         {concordiaResults}
+       </>
+
+      ); 
+
+    }
+  }
+  else {
+    return <LoadingSpinner />;
+  }
+}
+

src/components/services/query_results/QueryResults.js

@@ -7,6 +7,7 @@ import LOFARResults from "./LOFARResults";
 import RucioResults from "./RucioResults";
 import ZenodoResults from "./ZenodoResults";
 import SampResults from "./SampResults";
+import CONCORDIAResults from "./CONCORDIAResults";
 
 export default function QueryResults({ catalog }) {
   switch (catalog) {
@@ -26,6 +27,8 @@ export default function QueryResults({ catalog }) {
       return <RucioResults catalog={catalog} />;
     case "zenodo":
       return <ZenodoResults catalog={catalog} />;
+    case "concordia":
+      return <CONCORDIAResults catalog={catalog} />;
     case "samp":
       return <SampResults catalog={catalog} />;
     default:

src/utils/form/parseCONCORDIAForm.js

+export default function parseCONCORDIAForm(formData) {
+  let formInput = Object.entries(formData);
+
+  let query = "";
+
+  for (let [key, value] of formInput) {
+    query += `${`${query}` ? "&" : ""}` + key + "=" + value;
+  }
+
+  let esapquery = [
+    query,
+    "archive_uri=esap_concordia",
+    `catalog=concordia`,
+  ].join("&");
+
+  console.log("CONCORDIA Job Submission (helloworld):", query);
+  return [{
+    catalog: "concordia",
+    esapquery: esapquery
+  }];
+}

src/utils/form/parseQueryForm.js

@@ -7,6 +7,7 @@ import parseASTRONVOForm from "./parseASTRONVOForm";
 import parseRucioForm from "./parseRucioForm";
 import parseZenodoForm from "./parseZenodoForm";
 import parseMultipleArchivesForm from "./parseMultipleArchivesForm";
+import parseCONCORDIAForm from "./parseCONCORDIAForm";
 
 export default function parseQueryForm(gui, formData) {
   switch (gui) {
@@ -28,6 +29,8 @@ export default function parseQueryForm(gui, formData) {
         return parseZenodoForm(formData);
     case "multiple_archives":
         return parseMultipleArchivesForm(formData);
+    case "concordia":
+        return parseCONCORDIAForm(formData);
     default:
       return null;
   }