Skip to content
Snippets Groups Projects

130 inc batch async

Merged Gareth Hughes requested to merge 130_IncBatchAsync into master
Compare and Show latest version
4 files
+ 47
11
Compare changes
  • Side-by-side
  • Inline
Files
4
import React, { useState, useEffect, useContext } from "react";
import { Link } from 'react-router-dom';
import axios from "axios";
import { Button, Form, Container } from "react-bootstrap";
import { BATCHContext } from "../../contexts/BATCHContext";
@@ -6,7 +7,7 @@ import { GlobalContext } from "../../contexts/GlobalContext";
import "../../assets/Interactive.css";
import LoadingSpinner from "../LoadingSpinner";
export default function Batch() {
export default function Batch() {
const {batchSystemURL, setBatchSystemURL, workflowURL, setWorkflowURL, list_of_workflows, setList_of_workflows, list_of_batchSystems, setList_of_batchSystems, list_job_results, setList_job_results} = useContext(BATCHContext);
const { api_host } = useContext(GlobalContext);
@@ -85,8 +86,8 @@ export default function Batch() {
axios
.get(api_host + "batch/worker/query?jobID=" + jobValues.jobID)
.then((response) => {
setList_job_results("asdasd");
console.log(response.data);
setList_job_results(response.data);
})
.catch(function (error) {
console.log("Error when quering batch app api with job number");
@@ -170,6 +171,7 @@ export default function Batch() {
((typeof workflow.author === 'string') && workflow.author.toLowerCase().includes(searchTerm.toLocaleLowerCase())) ||
((typeof workflow.runtimePlatform === 'string') && workflow.runtimePlatform.toLowerCase().includes(searchTerm.toLocaleLowerCase())) ||
((typeof workflow.description === 'string') && workflow.description.toLowerCase().includes(searchTerm.toLocaleLowerCase()))
((typeof workflow.url === 'string') && workflow.url.toLowerCase().includes(searchTerm.toLocaleLowerCase()))
);
@@ -177,7 +179,7 @@ export default function Batch() {
//const workflow_results_sliced = workflow_results?.slice(0, state.numberOfitemsShown) || "";
const workflow_results_sliced = workflow_results;
console.log("HHHHHH" + list_job_results);
const job_results = list_job_results;
return (
@@ -225,9 +227,7 @@ export default function Batch() {
<div className="advanced-search">
Job ID: {jobValues.jobID}
<br/>
Job Status: {list_job_results?.map(item => (
<div>{item.runId}</div>
))}
Job Status: {job_results.phase}
</div>
: null }
@@ -263,7 +263,7 @@ export default function Batch() {
<label className="container workflow-checkbox"><input type="radio" name="workflow" onChange={setWorkflow} value={item.url} /> <span className="checkmark"></span></label><h5>{item.name}</h5><br/>
<span><b>Description: </b> <span dangerouslySetInnerHTML={{ __html: item.description }}></span></span><br/>
<span><b>Keywords: </b>{item.keywords}</span> <br/>
<span><b>.... stuff </b>{item.keywords}</span>
<span><b>Steering File: </b>{item.url}</span>
</li>
))}
@@ -303,8 +303,12 @@ export default function Batch() {
<div className="deploy-buttons">
{ state.showDeploy ?
//<Button className="deploy-button" href={api_host + "batch/deploy?facility=" + batchSystemURL + "&workflow=" + workflowURL} target="_blank">Deploy</Button>
<Button className="deploy-button" href={api_host + "batch/CONCORDIA"}>Next</Button>
<Link to={{ pathname: "batch/SubmitJob", state: {workflowfile: workflowURL, facility: batchSystemURL} }}>
<Button className="deploy-button">Deploy</Button>
</Link>
//<Button className="deploy-button" href="batch/SubmitJob" >Deploy</Button>
//<Button className="deploy-button" href={api_host + "batch/worker/load?workflowfile=" + workflowURL + "&facility=" + batchSystemURL} >Deploy</Button>
//<Button className="deploy-button" href={api_host + "batch/CONCORDIA"}>Next</Button>
: null }
</div>
@@ -314,7 +318,7 @@ export default function Batch() {
<ul className="facility-ul">
{facility_results?.map(item => (
<li className="facility-li">
<label className="container facility-checkbox"><input className="radio" onChange={setFacility} name="facility" type="radio" value={item.url} /> <span className="checkmark"></span></label><h5>{item.name}</h5><br/>
<label className="container facility-checkbox"><input className="radio" onChange={setFacility} name="facility" type="radio" value={item.facilitytype} /> <span className="checkmark"></span></label><h5>{item.name}</h5><br/>
<span><b>Description:</b> {item.description}</span> <br/>
<span><b>Runtime Engine: </b>{item.runtimeengine}</span>
Loading