Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for rendering results of submission #1528

Merged
merged 2 commits into from
Jan 22, 2025
Merged

Fix for rendering results of submission #1528

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dba8fb5
Fix for rendering results of submission
BirdMachine Jan 22, 2025
4c4a64c
Render Submit for Testing button for *all* statuses
BirdMachine Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 43 additions & 18 deletions src/src/components/ingest/dataset_edit.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,9 +1240,21 @@ class DatasetEdit extends Component {
ingest_api_pipeline_test_submit(JSON.parse(localStorage.getItem("info")).groups_token, {"uuid":this.props.editingDataset.uuid})
.then((response) => {
console.debug('%c◉ SUBMITTED', 'color:#00ff7b', response);
let results = "";
let title = "";
if(response.status === 200){
title = "Submitted for Testing";
results = "Dataset submitted for test processing";
}else if(response.status === 500){
title = "Error";
results = "Unexpected error occurred, please ask an admin to check the ingest-api logs.";
}else{
title = "Submission Response: "+response.status;
results = response.results;
}
this.toggleFeedbackDialog(
"Testing Submitted",
response.results,
title,
results,
[{label:"Close", action:()=>{this.clearFeedbackDialog()}}]);
})
.catch((error) => {
Expand Down Expand Up @@ -1465,6 +1477,19 @@ class DatasetEdit extends Component {
}
}

renderSubmitForTestingButton(){
return (
<Button
style={{width:"230px"}}
className="btn btn-primary mr-1"
variant="contained"
fullWidth
onClick={ () => this.handleSubmitForTesting() }>
Submit for Testing
</Button>
)
}


renderManualStatusControl=()=>{
return(
Expand Down Expand Up @@ -1564,10 +1589,13 @@ class DatasetEdit extends Component {
// console.debug("CheckTwo",this.state.writeable === false && this.state.has_version_priv === false);
if (this.state.writeable === false ){
return (
<div className="buttonWrapRight">
{this.cancelButton()}
</div>
)
<div className="buttonWrapRight">
{(this.state.has_pipeline_testing_priv || this.state.has_admin_priv) && this.state.is_primary === true &&(
<div>{this.renderSubmitForTestingButton()}</div>
)}
{this.cancelButton()}
</div>
)
} else {
if (["NEW", "INVALID", "REOPENED", "ERROR", "SUBMITTED"].includes(
this.state.status.toUpperCase())) {
Expand All @@ -1588,33 +1616,30 @@ class DatasetEdit extends Component {
</div>
)}
{ (this.state.has_pipeline_testing_priv || this.state.has_admin_priv) && this.state.is_primary === true &&(
<div >
<Button
style={{width:"230px"}}
className="btn btn-primary mr-1"
variant="contained"
fullWidth
onClick={ () => this.handleSubmitForTesting() }>
Submit for Testing
</Button>
</div>
<div>{this.renderSubmitForTestingButton()}</div>
)}

{this.cancelButton()}
</div>
)
}
if (this.state.status.toUpperCase() === 'PUBLISHED' ) {
}else if (this.state.status.toUpperCase() === 'PUBLISHED' ) {
return (
<div className="buttonWrapRight">
{/* {this.renderNewVersionButtons()} */}
{this.aButton("reopened", "Reopen")}
{this.aButton("unpublished", "UnPublish")}
{(this.state.has_pipeline_testing_priv || this.state.has_admin_priv) && this.state.is_primary === true &&(
<div>{this.renderSubmitForTestingButton()}</div>
)}
{this.cancelButton()}
</div>
)
}else{
return(
<div className="buttonWrapRight">
{(this.state.has_pipeline_testing_priv || this.state.has_admin_priv) && this.state.is_primary === true &&(
<div>{this.renderSubmitForTestingButton()}</div>
)}
{this.cancelButton()}
</div>
)
Expand Down
Loading