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

Jump to bottom

Workflow default dialog alert #4100

Merged
merged 12 commits into from
Oct 24, 2017
Merged

Workflow default dialog alert #4100

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d2f9a3e
WIP: Add modal warning for removal of default workflow.
jelliotartz Oct 17, 2017
79a8bee
Refactor to use Promise.all() for requests.
jelliotartz Oct 16, 2017
b1f82a1
Cleanup linter errors.
jelliotartz Oct 17, 2017
335c892
Add unit tests for WorkflowDefaultDialog.
jelliotartz Oct 17, 2017
67ddefd
Address requested changes.
jelliotartz Oct 17, 2017
d420426
Bind getProjectAndWorkflows() in constructor.
jelliotartz Oct 18, 2017
d436d4f
Address requested changes.
jelliotartz Oct 18, 2017
3643627
WIP: manually handle modal form open/close state.
jelliotartz Oct 19, 2017
e32fbd0
Fix broken test. Close dialog in successful promise.
jelliotartz Oct 19, 2017
c334028
Address requested changes
jelliotartz Oct 20, 2017
52c8723
Get defaultWorkflowId from state.
jelliotartz Oct 20, 2017
c1d030c
Refactor defaultWorkflow filter.
jelliotartz Oct 23, 2017
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
21 changes: 14 additions & 7 deletions app/pages/admin/project-status.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class ProjectStatus extends Component {
this.handleDialogSuccess = this.handleDialogSuccess.bind(this);

this.state = {
defaultWorkflowId: null,
dialogIsOpen: false,
error: null,
project: null,
Expand Down Expand Up @@ -85,17 +86,21 @@ class ProjectStatus extends Component {
this.setState({ dialogIsOpen: false });
}

handleDialogSuccess(workflow) {
handleDialogSuccess() {
const defaultWorkflow = this.state.workflows.filter(workflow => workflow.id === this.state.defaultWorkflowId);
Copy link
Contributor Author

@jelliotartz jelliotartz Oct 20, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to call this variable workflow, but that raised a linter error ('workflow' is already declared in the upper scope), so I went with defaultWorkflow, which I guess is more explicit anyway...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good use of array.filter(), however, we can sidestep storing the default workflow id in the component state since it's already stored in the project resource:
const defaultWorkflow = this.state.workflows.filter(workflow => workflow.id === this.state.project.configuration.default_workflow);

this.state.project.update({ 'configuration.default_workflow': undefined }).save()
.then(() => {
workflow.update({ active: false }).save()
defaultWorkflow[0].update({ active: false }).save()
.then(() => {
this.getProjectAndWorkflows();
})
.catch(error => this.setState({ error }));
})
.then(() => {
this.setState({ dialogIsOpen: false });
this.setState({
defaultWorkflowId: null,
dialogIsOpen: false
});
})
.catch(error => this.setState({ error }));
}
Expand All @@ -106,7 +111,10 @@ class ProjectStatus extends Component {
const defaultWorkflowId = this.state.project.configuration.default_workflow;

if (defaultWorkflowId === workflow.id && workflow.active) {
this.setState({ dialogIsOpen: true });
this.setState({
defaultWorkflowId,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is redundant with the default_workflow already a property on the project resource which is already stored in the component state.

dialogIsOpen: true
});
}

if ((defaultWorkflowId !== workflow.id) || (defaultWorkflowId === workflow.id && !workflow.active)) {
Expand All @@ -125,8 +133,7 @@ class ProjectStatus extends Component {
{this.state.workflows.map((workflow) => {
return (
<li key={workflow.id} className="section-list__item">
{this.state.project.configuration.default_workflow === workflow.id ?
' * ' : ''}
{this.state.project.configuration.default_workflow === workflow.id ? ' * ' : ''}
<WorkflowToggle
workflow={workflow}
name="active"
Expand All @@ -136,7 +143,7 @@ class ProjectStatus extends Component {
{this.state.dialogIsOpen &&
<WorkflowDefaultDialog
onCancel={this.handleDialogCancel}
onSuccess={this.handleDialogSuccess.bind(null, workflow)}
onSuccess={this.handleDialogSuccess}
/>}
<label>
Level:{' '}
Expand Down