From 78e0c2d8faa62630b711ded5bd463d7460833958 Mon Sep 17 00:00:00 2001 From: "Rajaa.BARHTAOUI" Date: Thu, 26 Apr 2018 15:46:10 +0200 Subject: [PATCH] feat(xo-web/SortedTable): support link actions (#2893) --- packages/xo-web/src/common/action-button.js | 2 +- packages/xo-web/src/common/sorted-table/index.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/xo-web/src/common/action-button.js b/packages/xo-web/src/common/action-button.js index 5b1c44a41..5a7db92c0 100644 --- a/packages/xo-web/src/common/action-button.js +++ b/packages/xo-web/src/common/action-button.js @@ -90,7 +90,7 @@ export default class ActionButton extends Component { if (redirectOnSuccess) { return this.context.router.push( isFunction(redirectOnSuccess) - ? redirectOnSuccess(result) + ? redirectOnSuccess(result, handlerParam) : redirectOnSuccess ) } diff --git a/packages/xo-web/src/common/sorted-table/index.js b/packages/xo-web/src/common/sorted-table/index.js index a9937f73a..86a872510 100644 --- a/packages/xo-web/src/common/sorted-table/index.js +++ b/packages/xo-web/src/common/sorted-table/index.js @@ -197,6 +197,7 @@ const actionsShape = propTypes.arrayOf( icon: propTypes.string.isRequired, label: propTypes.node.isRequired, level: propTypes.oneOf(['primary', 'warning', 'danger']), + redirectOnSuccess: propTypes.oneOfType([propTypes.func, propTypes.string]), }) ) @@ -208,21 +209,23 @@ class IndividualAction extends Component { (disabled, item, userData) => isFunction(disabled) ? disabled(item, userData) : disabled ) - _executeAction = () => { const p = this.props return p.handler(p.item, p.userData) } render () { - const { icon, label, level } = this.props + const { icon, item, label, level, redirectOnSuccess, userData } = this.props return ( )