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

Enable retrying failed/cancelled workflow runs #1009

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Enable retrying failed/cancelled workflow runs #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions rodan-client/code/src/js/Controllers/ControllerWorkflowRun.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export default class ControllerWorkflowRun extends BaseController
Radio.channel('rodan').on(RODAN_EVENTS.EVENT__WORKFLOWRUN_DELETED, options => this._handleEventWorkflowRunDeleteResponse(options));
Radio.channel('rodan').on(RODAN_EVENTS.EVENT__WORKFLOWRUN_SAVED, options => this._handleEventWorkflowRunSaveResponse(options));
Radio.channel('rodan').on(RODAN_EVENTS.EVENT__WORKFLOWRUN_STARTED, options => this._handleEventWorkflowRunStartResponse(options));
Radio.channel('rodan').on(RODAN_EVENTS.EVENT__WORKFLOWRUN_RETRIED, options => this._handleEventWorkflowRunRetryResponse(options));

// Requests.
Radio.channel('rodan').on(RODAN_EVENTS.EVENT__WORKFLOWRUN_SELECTED_COLLECTION, options => this._handleEventCollectionSelected(options), this);
Expand All @@ -33,6 +34,7 @@ export default class ControllerWorkflowRun extends BaseController
Radio.channel('rodan').reply(RODAN_EVENTS.REQUEST__WORKFLOWRUN_DELETE, options => this._handleRequestWorkflowRunDelete(options), this);
Radio.channel('rodan').reply(RODAN_EVENTS.REQUEST__WORKFLOWRUN_SAVE, options => this._handleRequestWorkflowRunSave(options), this);
Radio.channel('rodan').reply(RODAN_EVENTS.REQUEST__WORKFLOWRUN_START, options => this._handleRequestWorkflowRunStart(options), this);
Radio.channel('rodan').reply(RODAN_EVENTS.REQUEST__WORKFLOWRUN_RETRY, options => this._handleRequestWorkflowRunRetry(options), this);
}

///////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -166,6 +168,13 @@ export default class ControllerWorkflowRun extends BaseController
});
}

_handleEventWorkflowRunRetryResponse(options)
{
Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_HIDE);
const project = Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__PROJECT_GET_ACTIVE);
Radio.channel('rodan').trigger(RODAN_EVENTS.EVENT__WORKFLOWRUN_SELECTED_COLLECTION, {project: project});
}

/**
* Handle request create WorkflowRun.
*/
Expand Down Expand Up @@ -214,6 +223,17 @@ export default class ControllerWorkflowRun extends BaseController
{patch: true, success: (model) => Radio.channel('rodan').trigger(RODAN_EVENTS.EVENT__WORKFLOWRUN_STARTED, {workflowrun: model})});
}

/**
* Handle request retry WorkflowRun.
*/
_handleRequestWorkflowRunRetry(options)
{
Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_SHOW_IMPORTANT, {title: 'Restarting Workflow Run', content: 'Please wait...'});
options.workflowrun.set({status: 31});
options.workflowrun.save(options.workflowrun.changed,
{patch: true, success: (model) => Radio.channel('rodan').trigger(RODAN_EVENTS.EVENT__WORKFLOWRUN_RETRIED, {workflowrun: model})});
}

///////////////////////////////////////////////////////////////////////////////////////
// PRIVATE METHODS
///////////////////////////////////////////////////////////////////////////////////////
Expand Down
4 changes: 4 additions & 0 deletions rodan-client/code/src/js/Shared/RODAN_EVENTS.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,8 @@ class RODAN_EVENTS
this.EVENT__WORKFLOWRUN_SAVED = 'EVENT__WORKFLOWRUN_SAVED';
/** Triggered when WorkflowRun started. Sends {workflowrun: WorkflowRun}. */
this.EVENT__WORKFLOWRUN_STARTED = 'EVENT__WORKFLOWRUN_STARTED';
/** Triggered when WorkflowRun retried. Sends {workflowrun: WorkflowRun}. */
this.EVENT__WORKFLOWRUN_RETRIED = 'EVENT__WORKFLOWRUN_RETRIED';
/** Triggered when the user selects an individual WorkflowRun. Sends {workflow: WorkflowRun}. */
this.EVENT__WORKFLOWRUN_SELECTED = 'EVENT__WORKFLOWRUN_SELECTED';
/** Triggered when the user selects to see all available WorkflowRuns. Sends {project: Project (Project associated with WorkflowRunCollection)}. */
Expand All @@ -524,6 +526,8 @@ class RODAN_EVENTS
this.REQUEST__WORKFLOWRUN_SAVE = 'REQUEST__WORKFLOWRUN_SAVE';
/** Request a WorkflowRun be started. Takes {model: WorkflowRun}. */
this.REQUEST__WORKFLOWRUN_START = 'REQUEST__WORKFLOWRUN_START';
/** Request a failed or cancelled WorkflowRun be retried. Takes {model: WorkflowRun}. */
this.REQUEST__WORKFLOWRUN_RETRY = 'REQUEST__WORKFLOWRUN_RETRY';

///////////////////////////////////////////////////////////////////////////////////////
// VERSION COMPATIBILITY CHECKS
Expand Down
13 changes: 11 additions & 2 deletions ...t/code/src/js/Views/Master/Main/WorkflowRun/Individual/LayoutViewIndividualWorkflowRun.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,14 @@ export default class LayoutViewIndividualWorkflowRun extends Marionette.View
{
Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__WORKFLOWRUN_DELETE, {workflowrun: this.model});
}

/**
* Handle retry button.
*/
_handleButtonRetry()
{
Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__WORKFLOWRUN_RETRY, {workflowrun: this.model});
}
}
LayoutViewIndividualWorkflowRun.prototype.modelEvents = {
'all': 'render'
Expand All @@ -124,14 +132,15 @@ LayoutViewIndividualWorkflowRun.prototype.ui = {
buttonShowRunJobs: '#button-runjobs_show',
buttonSave: '#button-save_workflowrun',
buttonDelete: '#button-delete_workflowrun',
buttonRetry: '#button-retry_workflowrun',
textName: '#text-workflowrun_name',
textDescription: '#text-workflowrun_description'
};
LayoutViewIndividualWorkflowRun.prototype.events = {
'click @ui.buttonShowResources': '_showResources',
'click @ui.buttonShowRunJobs': '_showRunJobs',
'click @ui.buttonSave': '_handleButtonSave',
'click @ui.buttonDelete': '_handleButtonDelete'

'click @ui.buttonDelete': '_handleButtonDelete',
'click @ui.buttonRetry': '_handleButtonRetry',
};
LayoutViewIndividualWorkflowRun.prototype.template = _.template($('#template-main_workflowrun_individual').text());
3 changes: 3 additions & 0 deletions ...plates/Views/Master/Main/WorkflowRun/Individual/template-main_workflowrun_individual.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ <h3>Workflow Run</h3>
Updated on: <%= _.formatFromUTC(updated) %><br/>
URL: <%= url %><br>
Status: <%= statusText %><br/>
<% if (status === -1 || status === 9) { %>
<button class="btn btn-xs btn-warning" id="button-retry_workflowrun">Retry</button>
<% } %>
<button class="btn btn-xs btn-warning" id="button-save_workflowrun">Save</button>
<button class="btn btn-xs btn-danger" id="button-delete_workflowrun">Delete</button>
</div>
Expand Down