diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 305d02170..a4b3a2c17 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -27,3 +27,4 @@ - @xen-orchestra/xapi minor - @xen-orchestra/backups minor - xo-server patch +- xo-web minor diff --git a/packages/xo-web/src/common/sorted-table/index.js b/packages/xo-web/src/common/sorted-table/index.js index d417daf96..02d34dff4 100644 --- a/packages/xo-web/src/common/sorted-table/index.js +++ b/packages/xo-web/src/common/sorted-table/index.js @@ -186,13 +186,14 @@ const CollapsedActions = decorate([ computed: { dropdownId: generateId, actions: (_, { actions, items, userData }) => - actions.map(({ disabled, grouped, handler, icon, label, redirectOnSuccess }) => { + actions.map(({ disabled, grouped, handler, icon, label, level, redirectOnSuccess }) => { const actionItems = Array.isArray(items) || !grouped ? items : [items] return { disabled: handleFnProps(disabled, actionItems, userData), handler: () => handler(actionItems, userData), icon: handleFnProps(icon, actionItems, userData), label: handleFnProps(label, actionItems, userData), + level: handleFnProps(level, actionItems, userData), redirectOnSuccess: handleFnProps(redirectOnSuccess, actionItems, userData), } }), @@ -204,7 +205,12 @@ const CollapsedActions = decorate([ {state.actions.map((action, key) => ( - effects.execute(action)}> + effects.execute(action)} + > {action.label} ))} diff --git a/packages/xo-web/src/xo-app/proxies/index.js b/packages/xo-web/src/xo-app/proxies/index.js index b6a38f080..bace17449 100644 --- a/packages/xo-web/src/xo-app/proxies/index.js +++ b/packages/xo-web/src/xo-app/proxies/index.js @@ -38,12 +38,14 @@ const HEADER = ( const ACTIONS = [ { + collapsed: true, handler: forgetProxyAppliances, icon: 'forget', label: _('forgetProxies'), level: 'danger', }, { + collapsed: true, handler: destroyProxyAppliances, icon: 'destroy', label: _('destroyProxies'), @@ -53,6 +55,7 @@ const ACTIONS = [ const INDIVIDUAL_ACTIONS = [ { + collapsed: true, handler: (proxy, { deployProxy }) => deployProxy({ proxy,