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 Missing Publication Status Revert Function and Collapsing update … #1536

Merged
merged 6 commits into from
Feb 7, 2025
Merged

Fix Missing Publication Status Revert Function and Collapsing update … #1536

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9812084
Fix Missing Publication Status Revert Function and Collapsing update …
BirdMachine Jan 31, 2025
7d9b5be
Include changes made to publciations for setting the manual resetting…
BirdMachine Feb 3, 2025
9c55911
Merge branch 'main' into reversionFix
BirdMachine Feb 3, 2025
cf09674
Update Status Validation for rendering Reset interface to include INC…
BirdMachine Feb 3, 2025
a603e92
cleanup
BirdMachine Feb 3, 2025
6b7ee9c
Fix error passing undefined data to the Status Update feature on Publ…
BirdMachine Feb 4, 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
91 changes: 59 additions & 32 deletions src/src/components/ingest/publications_edit.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Dialog from "@material-ui/core/Dialog";
import DialogActions from "@material-ui/core/DialogActions";
import DialogContent from "@material-ui/core/DialogContent";
import Button from "@mui/material/Button";

import LoadingButton from '@mui/lab/LoadingButton';
import Collapse from '@mui/material/Collapse';
import FormGroup from '@mui/material/FormGroup';
import FormControlLabel from '@mui/material/FormControlLabel';
Expand Down Expand Up @@ -263,15 +263,12 @@ class PublicationEdit extends Component {
});
ingest_api_allowable_edit_states_statusless(
this.props.editingPublication.uuid,
JSON.parse(localStorage.getItem("info")).groups_token
)
JSON.parse(localStorage.getItem("info")).groups_token)
.then((resp) => {
this.setState({
has_version_priv: resp.results.has_write_priv,
});
if(this.state.has_admin_priv && (
this.props.editingPublication.status.toUpperCase()==="ERROR" ||
this.props.editingPublication.status.toUpperCase()==="INVALID")){
if(this.state.has_admin_priv && this.props.editingPublication.status.toUpperCase()!=="PUBLISHED"){
this.setState({has_manual_priv: true});
}
})
Expand Down Expand Up @@ -613,10 +610,7 @@ class PublicationEdit extends Component {

handleInputChange = (e) => {
var { id, value, name } = e.target;
//consoledebug("handleInputChange",name, id+": "+value);
// Strugglin to get the ID from the radio group
var checkName = (name==="publication_status") ? name : id;
// console.debug("checkName",checkName);
if(name==="groups"){
this.setState(prev => ({
selected_group: value,
Expand All @@ -627,13 +621,17 @@ class PublicationEdit extends Component {
}
}))
}else{
this.setState(prev => ({
editingPublication: {
...prev.editingPublication,
[checkName]: value
// [id]: valCap
}
}))
if(checkName === "newStatus"){
this.setState({newStatus: value});
}else{
this.setState(prev => ({
editingPublication: {
...prev.editingPublication,
[checkName]: value
// [id]: valCap
}
}))
}
}


Expand Down Expand Up @@ -953,6 +951,42 @@ class PublicationEdit extends Component {
window.location.reload();
};

handleStatusSet = (e) => {
this.setState({submittingUpdate:true});
var newStatus = this.state.newStatus;
entity_api_update_entity(
this.props.editingPublication.uuid,
{"status":newStatus},
JSON.parse(localStorage.getItem("info")).groups_token)
.then((response) => {
if (response.status < 300) {
this.setState({
submit_error:false,
submitting:false,
submittingUpdate:false,
});
this.props.onUpdated(response.results);
} else {
this.setState({
submit_error:true,
submitting:false,
submittingUpdate:false,
submitErrorResponse:response.results.statusText ? response.results.statusText : response.results.error,
fieldString:response.results.statusText ? response.results.statusText : response.results.error,
});
}
})
.catch((error) => {
this.setState({
submit_error:true,
submitting:false,
submitErrorResponse:error.toString(),
fieldString:error.toString(),
});
});
}


handleSubmit = (submitIntention) => {

this.setState({
Expand Down Expand Up @@ -1611,19 +1645,14 @@ class PublicationEdit extends Component {
{this.state.statusSetLabel}
</Button>
{this.state.toggleStatusSet && (
<Button
variant="contained"
<LoadingButton
className="mx-1"
onClick={() => this.handleStatusSet() }>
{this.state.submitting && (
<FontAwesomeIcon
className='inline-icon'
icon={faSpinner}
spin
/>
)}
{!this.state.submittingUpdate && "Update"}
</Button>
loading={this.state.submittingUpdate}
onClick={() => this.handleStatusSet()}
variant="contained">
Update
</LoadingButton>

)}
<Collapse in={this.state.toggleStatusSet} className="col-7">
<FormGroup controlId="status">
Expand Down Expand Up @@ -2342,7 +2371,7 @@ class PublicationEdit extends Component {
<div className="col-8">

{this.state.submit_error && (
<Alert severity="error">
<Alert severity="error" className="mb-2" >
{this.state.submitErrorResponse && (
<AlertTitle>{this.state.submitErrorStatus}</AlertTitle>
)} <strong>Details:</strong> The following fields are Invalid: {this.state.fieldString} {" "}
Expand All @@ -2365,9 +2394,7 @@ class PublicationEdit extends Component {
show={this.state.GroupSelectShow}
groups={this.state.groups}
hide={()=> this.hideGroupSelectModal()}
submit={() => this.handleSubmit("save")} // It'll only be askign which group pn create
// submit={this.handleSubmit}
// submit={this.handleSubmit} Modal only appears when theres no group, which only happens on new form. Intent is blank
submit={() => this.handleSubmit("save")}
handleInputChange={this.handleInputChange}
/>
<HIPPA show={this.state.show} handleClose={this.hideModal} />
Expand Down