Adding UI for publication workflow #1620
Conversation
|
@SarahBA can you attach some screenshots to this PR? |
webui/src/components/editfiles.jsx
Outdated
| @@ -266,6 +266,10 @@ export const EditFiles = React.createClass({ | |||
| } | |||
| }, | |||
|
|
|||
| componentWillReceiveProps(props) { | |||
| return props.readOnly !== this.props.readOnly; | |||
There was a problem hiding this comment.
I'm not sure what this does, I can't find any docs about a return value from componentWillReceiveProps, can you help?
There was a problem hiding this comment.
Right, I was going to use shouldComponentUpdate but there were some issue that I can't recall now, so I decided to use componentWillReceiveProps instead and some how got confused! I'll check it again.
webui/src/components/editrecord.jsx
Outdated
| @@ -99,6 +99,9 @@ const EditRecord = React.createClass({ | |||
| errors: {}, | |||
| dirty: false, | |||
| waitingForServer: false, | |||
| readOnly: false, | |||
| checkboxValue: null, | |||
There was a problem hiding this comment.
not a good name, which checkbox? is it about the confirmation for editing?
There was a problem hiding this comment.
The checkbox at the end of the edit draft. When it's true then the draft will be either sent for review or it's ready for publication. Maybe review_or_publish?
There was a problem hiding this comment.
yes, I would call it reviewOrPublishConfirmed
webui/src/components/editrecord.jsx
Outdated
| @@ -99,6 +99,9 @@ const EditRecord = React.createClass({ | |||
| errors: {}, | |||
| dirty: false, | |||
| waitingForServer: false, | |||
| readOnly: false, | |||
| checkboxValue: null, | |||
| revoking:false, | |||
There was a problem hiding this comment.
would help to add another word to this name, about what is being revoked -- I'm missing the context now
There was a problem hiding this comment.
revoking_submitted_draft? Or revoking_submitted_for_review?
There was a problem hiding this comment.
yes, revokeSubmitted or even unsubmit, your choice here
webui/src/components/editrecord.jsx
Outdated
| } else if (this.state.record && props.blockSchemas) { | ||
| const record = addEmptyMetadataBlocks(this.state.record, props.blockSchemas); | ||
| if (record) { | ||
| this.setState({record}); | ||
| } | ||
| } | ||
|
|
||
| // Record is submitted for review: the publication_state is 'submitted' and readonly should be True | ||
| if(this.props.community && this.state.record){ | ||
| if(this.props.community.getIn(["publication_workflow"]) == 'review_and_publish' && this.state.record.get('publication_state')=='submitted' && !this.state.revoking){ |
There was a problem hiding this comment.
this.props.community.getIn(["publication_workflow"]) -> this.props.community.get("publication_workflow")
webui/src/components/editrecord.jsx
Outdated
| const original = this.props.record.get('metadata').toJS(); | ||
| let updated = this.state.record.toJS(); | ||
| // checkbox is enabled and record is going to be "submitted" for review by community admin | ||
| if (prevState.record.getIn(['publication_state']) !== this.state.record.getIn(['publication_state']) && !this.state.revoking){ |
There was a problem hiding this comment.
you can replace getIn with get here
webui/src/components/editrecord.jsx
Outdated
| } | ||
| }, | ||
|
|
||
| applyPatch(patch, caseValue) { |
There was a problem hiding this comment.
Good function structure, but the name doesn't show an important part of its function: changing the browser state. I'd rename it to something like applyPatchAndUpdateBrowser (this is not a great name, maybe you can find a better one).
| <button type="submit" className={"btn btn-default btn-block "+klass} onClick={this.updateRecord}>{text}</button> | ||
| </div> | ||
| ); | ||
| if(this.props.community){ |
There was a problem hiding this comment.
I'd prefer an error here: if the community is not defined, the user cannot do anything anyway (the buttons are not rendered). This should not happen 😄
webui/src/components/editrecord.jsx
Outdated
| </div> | ||
| ); | ||
| } else { | ||
| const klass = this.state.waitingForServer ? 'disabled' : |
There was a problem hiding this comment.
I would try to merge these two branches and show the different texts depending on the state.
webui/src/components/editrecord.jsx
Outdated
| <button type="submit" className={"btn btn-default btn-block btn-primary btn-danger "} onClick={this.editSubmittedRecord}>Edit</button> | ||
| </div> | ||
| </div> | ||
| : |
There was a problem hiding this comment.
can we make this better? move to separate functions?
There was a problem hiding this comment.
I'm not sure what you mean. You mean moving the condition part to a separate function?
There was a problem hiding this comment.
I was thinking of moving the divs into separate functions, but that may make the code even more difficult to follow. Let's leave it for the moment.
create a new draft
save changes to the draft
ready to submit for review
submitted for review
editing and getting back to the draft mode
user profile
search
|
|
Thanks, it looks very nice! |
SarahBA
force-pushed
the
workflow
branch
2 times, most recently
from
76e7fcc to
85b7afb
Compare
|
The PR looks good to me, but since I didn't test it and it can potentially introduce important bugs in the UI I think it's better to leave it for the next team of developers to test and merge it. |
SarahBA
changed the title
Important notes:
TODO:
|
| communitiesList = communitiesListTemp.reduce(function(map, community){ | ||
| map[community.get('id').replace(new RegExp("-",'g'),"")] = community.get('name'); | ||
| return map; | ||
| },{}); |
|
Deployed to test instance |
No description provided.