diff --git a/docs/en/develop/3-7-ModalAction-introduction.md b/docs/en/develop/3-7-ModalAction-introduction.md index f410e766..25a4d946 100644 --- a/docs/en/develop/3-7-ModalAction-introduction.md +++ b/docs/en/develop/3-7-ModalAction-introduction.md @@ -271,12 +271,16 @@ English | [简体中文](../../zh/develop/3-7-ModalAction-introduction.md) - `buttonType` - Static - - The type of button, support `primary`, `danger` - - When the button is to emphasize the risk of action, the button or the text on the button is generally red, use `danger` + - The type of button, support `primary`, `default`, `link` + +- `isDanger` + - Static + - Support boolean `false`, `true`, the default value is `false` + - When the button is to emphasize the risk of action, the button or the text on the button is generally red, use `true` - As the example of disable cinder service`src/pages/configuration/containers/SystemInfo/CinderService/actions/Disable.jsx` : ```javascript - static buttonType = 'danger'; + static isDanger = true; ``` - `modalSize` diff --git a/docs/en/develop/3-8-ConfirmAction-introduction.md b/docs/en/develop/3-8-ConfirmAction-introduction.md index 7eeef794..95162b7d 100644 --- a/docs/en/develop/3-8-ConfirmAction-introduction.md +++ b/docs/en/develop/3-8-ConfirmAction-introduction.md @@ -138,11 +138,21 @@ English | [简体中文](../../zh/develop/3-8-ConfirmAction-introduction.md) - `buttonType` - The type of button, support `primary`, `danger`, `default` - Default is `default` + - Take reset setting value as an example `src/pages/configuration/containers/Setting/actions/Reset.jsx` + + ```javascript + get buttonType() { + return 'primary'; + } + ``` + +- `isDanger` + - Support boolean `false`, `true`, the default value is `false` - When the button is to emphasize the risk of action, the button or the text on the button is generally red, use `danger` - Take stop instance as an example `src/pages/compute/containers/Instance/actions/Stop.jsx` : ```javascript - get buttonType() { + get isDanger() { return 'danger'; } ``` diff --git a/docs/zh/develop/3-7-ModalAction-introduction.md b/docs/zh/develop/3-7-ModalAction-introduction.md index 7715debd..4351eae2 100644 --- a/docs/zh/develop/3-7-ModalAction-introduction.md +++ b/docs/zh/develop/3-7-ModalAction-introduction.md @@ -271,12 +271,16 @@ - `buttonType` - 静态属性 - - 按钮的类型，支持`primary`、`danger` - - 当按钮要强调操作危险性时，按钮或按钮上的文字一般为红色，使用`danger` + - 按钮的类型，支持`primary`、`default`、`link` + +- `isDanger` + - 静态属性 + - 支持布尔值 `false`, `true` + - 当按钮要强调操作危险性时，按钮或按钮上的文字一般为红色，使用`true` - 以禁止 Cinder 服务`src/pages/configuration/containers/SystemInfo/CinderService/actions/Disable.jsx`为例 ```javascript - static buttonType = 'danger'; + static isDanger = true; ``` - `modalSize` diff --git a/docs/zh/develop/3-8-ConfirmAction-introduction.md b/docs/zh/develop/3-8-ConfirmAction-introduction.md index 189851cd..9ea30a94 100644 --- a/docs/zh/develop/3-8-ConfirmAction-introduction.md +++ b/docs/zh/develop/3-8-ConfirmAction-introduction.md @@ -138,12 +138,23 @@ - `buttonType` - 按钮的类型，支持`primary`、`danger`、`default` - 默认值为`default` + - 以重置系统配置初始值 `src/pages/configuration/containers/Setting/actions/Reset.jsx` 为例 + + ```javascript + get buttonType() { + return 'primary'; + } + ``` + +- `isDanger` + - 是否属于危险级别的按钮 + - 支持的值为：布尔值 `false`、`true`，默认值为`false` - 当按钮要强调操作危险性时，按钮或按钮上的文字一般为红色，使用`danger` - 以停止云主机`src/pages/compute/containers/Instance/actions/Stop.jsx`为例 ```javascript - get buttonType() { - return 'danger'; + get isDanger() { + return true; } ``` diff --git a/src/components/TableButton/index.jsx b/src/components/TableButton/index.jsx index ffda3adc..5d7cabaa 100644 --- a/src/components/TableButton/index.jsx +++ b/src/components/TableButton/index.jsx @@ -22,6 +22,7 @@ export default class TableButton extends Component { return { title: PropTypes.string.isRequired, buttonType: PropTypes.string, + isDanger: PropTypes.bool, data: PropTypes.array, columns: PropTypes.array, modalSize: PropTypes.string, @@ -33,6 +34,7 @@ export default class TableButton extends Component { static defaultProps = { buttonType: 'link', + isDanger: false, data: [], columns: [], modalSize: 'middle', @@ -47,9 +49,11 @@ export default class TableButton extends Component { }; render() { - const { buttonType, title, buttonText, modalSize, style } = this.props; + const { buttonType, isDanger, title, buttonText, modalSize, style } = + this.props; const configs = { buttonType, + isDanger, title, buttonText, modalSize, diff --git a/src/components/Tables/Base/BatchActionButtons/index.jsx b/src/components/Tables/Base/BatchActionButtons/index.jsx index 870d1765..2e287a3b 100644 --- a/src/components/Tables/Base/BatchActionButtons/index.jsx +++ b/src/components/Tables/Base/BatchActionButtons/index.jsx @@ -22,13 +22,14 @@ import { getActionsByPolicy } from '../Action'; import styles from './index.less'; const updateConf = (conf, selectedItems) => { - const { id, title, actionType, buttonType, buttonText } = conf; + const { id, title, actionType, buttonType, buttonText, isDanger } = conf; return { id, title, name: buttonText || title, actionType, buttonType, + isDanger, action: conf, isAllowed: selectedItems.length > 0, items: selectedItems, @@ -59,9 +60,9 @@ function DropdownActionButton({ const menuItems = actions.map((it) => { const key = `table-batch-more-${generateId()}`; const newConf = updateConf(it, selectedItems); - const { buttonType, name } = newConf; + const { isDanger, name } = newConf; newConf.onFinishAction = onFinishAction; - newConf.danger = buttonType === 'danger'; + newConf.danger = !!isDanger; if (!selectedItems.length) { return ( diff --git a/src/components/Tables/Base/ItemActionButtons/index.jsx b/src/components/Tables/Base/ItemActionButtons/index.jsx index 6d9b2e9c..cdf6dfe4 100644 --- a/src/components/Tables/Base/ItemActionButtons/index.jsx +++ b/src/components/Tables/Base/ItemActionButtons/index.jsx @@ -25,14 +25,14 @@ import styles from './index.less'; const { SubMenu } = Menu; function getActionConf(action) { - const { id, title, actionType, buttonText, buttonType } = action; + const { id, title, actionType, buttonText, isDanger = false } = action; return { id, title, name: buttonText || title, actionType, action, - danger: buttonType === 'danger', + danger: isDanger, }; } diff --git a/src/components/Tables/Base/PrimaryActionButtons/index.jsx b/src/components/Tables/Base/PrimaryActionButtons/index.jsx index ad3e7e78..fad57a52 100644 --- a/src/components/Tables/Base/PrimaryActionButtons/index.jsx +++ b/src/components/Tables/Base/PrimaryActionButtons/index.jsx @@ -101,12 +101,13 @@ export default class TablePrimaryButtons extends Component { } = this.props; const primaryActionButtons = this.actionList.map((it, index) => { const key = `primary-${generateId()}`; - const { id, title, buttonType, actionType, buttonText } = it; + const { id, title, buttonType, actionType, buttonText, isDanger } = it; const config = { id, title, name: buttonText || title, buttonType, + isDanger, actionType, action: it, }; diff --git a/src/containers/Action/ConfirmAction/index.jsx b/src/containers/Action/ConfirmAction/index.jsx index df98b7c0..d3531826 100644 --- a/src/containers/Action/ConfirmAction/index.jsx +++ b/src/containers/Action/ConfirmAction/index.jsx @@ -58,6 +58,10 @@ export default class ConfirmAction { return 'default'; } + get isDanger() { + return false; + } + get buttonText() { // action button text use buttonText || title return ''; diff --git a/src/containers/Action/FormAction/index.jsx b/src/containers/Action/FormAction/index.jsx index 50123a57..747b3bb4 100644 --- a/src/containers/Action/FormAction/index.jsx +++ b/src/containers/Action/FormAction/index.jsx @@ -24,6 +24,8 @@ export default class FormAction extends BaseForm { static buttonType = 'primary'; + static isDanger = false; + static path = '/'; static allowed() { diff --git a/src/containers/Action/ModalAction/index.jsx b/src/containers/Action/ModalAction/index.jsx index eddee90d..a07f5ab7 100644 --- a/src/containers/Action/ModalAction/index.jsx +++ b/src/containers/Action/ModalAction/index.jsx @@ -24,6 +24,8 @@ export default class ModalAction extends BaseForm { static buttonType = 'primary'; + static isDanger = false; + get name() { return t('Edit'); } diff --git a/src/containers/Action/StepAction/index.jsx b/src/containers/Action/StepAction/index.jsx index f5745b1f..e7308636 100644 --- a/src/containers/Action/StepAction/index.jsx +++ b/src/containers/Action/StepAction/index.jsx @@ -19,6 +19,8 @@ export default class StepAction extends StepForm { static buttonType = 'primary'; + static isDanger = false; + static id = 'step-action'; static title = 'StepAction'; diff --git a/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Delete.jsx b/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Delete.jsx index 218655b1..c2c1bdf2 100644 --- a/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Delete.jsx +++ b/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Delete.jsx @@ -28,8 +28,8 @@ export default class Delete extends ConfirmAction { return t('Delete Port'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Delete.jsx b/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Delete.jsx index b8935394..49e634a7 100644 --- a/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Delete.jsx +++ b/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Delete.jsx @@ -28,8 +28,8 @@ export default class Delete extends ConfirmAction { return t('Delete Port Group'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/compute/containers/BareMetalNode/actions/Delete.jsx b/src/pages/compute/containers/BareMetalNode/actions/Delete.jsx index 42041d10..abf99d9e 100644 --- a/src/pages/compute/containers/BareMetalNode/actions/Delete.jsx +++ b/src/pages/compute/containers/BareMetalNode/actions/Delete.jsx @@ -28,8 +28,8 @@ export default class Delete extends ConfirmAction { return t('Delete Node'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/compute/containers/Flavor/actions/Delete.jsx b/src/pages/compute/containers/Flavor/actions/Delete.jsx index d14b3d9e..3a46d6fe 100644 --- a/src/pages/compute/containers/Flavor/actions/Delete.jsx +++ b/src/pages/compute/containers/Flavor/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Flavor'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/compute/containers/HostAggregate/Aggregate/actions/Delete.jsx b/src/pages/compute/containers/HostAggregate/Aggregate/actions/Delete.jsx index 76056bfd..68795e28 100644 --- a/src/pages/compute/containers/HostAggregate/Aggregate/actions/Delete.jsx +++ b/src/pages/compute/containers/HostAggregate/Aggregate/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Host Aggregate'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/compute/containers/Hypervisors/ComputeHost/actions/Disable.jsx b/src/pages/compute/containers/Hypervisors/ComputeHost/actions/Disable.jsx index 25019e12..75a32854 100644 --- a/src/pages/compute/containers/Hypervisors/ComputeHost/actions/Disable.jsx +++ b/src/pages/compute/containers/Hypervisors/ComputeHost/actions/Disable.jsx @@ -23,7 +23,7 @@ export class DisableAction extends ModalAction { static buttonText = t('Disable'); - static buttonType = 'danger'; + static isDanger = true; init() { this.store = globalComputeHostStore; diff --git a/src/pages/compute/containers/Image/actions/Delete.jsx b/src/pages/compute/containers/Image/actions/Delete.jsx index 960799b1..837a90a1 100644 --- a/src/pages/compute/containers/Image/actions/Delete.jsx +++ b/src/pages/compute/containers/Image/actions/Delete.jsx @@ -25,8 +25,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Image'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/compute/containers/Instance/Detail/SecurityGroup/action/Detach.jsx b/src/pages/compute/containers/Instance/Detail/SecurityGroup/action/Detach.jsx index 43bcb379..92145d4a 100644 --- a/src/pages/compute/containers/Instance/Detail/SecurityGroup/action/Detach.jsx +++ b/src/pages/compute/containers/Instance/Detail/SecurityGroup/action/Detach.jsx @@ -24,8 +24,8 @@ export default class DetachAction extends ConfirmAction { return t('Detach Security Group'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/compute/containers/Instance/actions/DeleteIronic.jsx b/src/pages/compute/containers/Instance/actions/DeleteIronic.jsx index 2d7bc708..4f0196b9 100644 --- a/src/pages/compute/containers/Instance/actions/DeleteIronic.jsx +++ b/src/pages/compute/containers/Instance/actions/DeleteIronic.jsx @@ -29,8 +29,8 @@ export default class Delete extends ConfirmAction { return t('delete ironic instance'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get isAsyncAction() { diff --git a/src/pages/compute/containers/Instance/actions/Rebuild.jsx b/src/pages/compute/containers/Instance/actions/Rebuild.jsx index 6e67f181..0f377a4e 100644 --- a/src/pages/compute/containers/Instance/actions/Rebuild.jsx +++ b/src/pages/compute/containers/Instance/actions/Rebuild.jsx @@ -29,8 +29,8 @@ export default class Rebuild extends ConfirmAction { return t('Rebuild Instance'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get actionName() { diff --git a/src/pages/compute/containers/Instance/actions/SoftDelete.jsx b/src/pages/compute/containers/Instance/actions/SoftDelete.jsx index 66852da9..77296348 100644 --- a/src/pages/compute/containers/Instance/actions/SoftDelete.jsx +++ b/src/pages/compute/containers/Instance/actions/SoftDelete.jsx @@ -34,8 +34,8 @@ export default class SoftDelete extends ConfirmAction { return t('Delete Instance'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/compute/containers/Instance/actions/Start.jsx b/src/pages/compute/containers/Instance/actions/Start.jsx index 669e54f4..e93c8bf9 100644 --- a/src/pages/compute/containers/Instance/actions/Start.jsx +++ b/src/pages/compute/containers/Instance/actions/Start.jsx @@ -27,10 +27,6 @@ export default class StartAction extends ConfirmAction { return t('Start Instance'); } - get buttonType() { - return 'default'; - } - get buttonText() { return t('Start'); } diff --git a/src/pages/compute/containers/Instance/actions/Stop.jsx b/src/pages/compute/containers/Instance/actions/Stop.jsx index a01ffdd4..dca842b1 100644 --- a/src/pages/compute/containers/Instance/actions/Stop.jsx +++ b/src/pages/compute/containers/Instance/actions/Stop.jsx @@ -27,8 +27,8 @@ export default class Stop extends ConfirmAction { return t('Stop Instance'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/compute/containers/Keypair/actions/Delete.jsx b/src/pages/compute/containers/Keypair/actions/Delete.jsx index 6220440c..21da719e 100644 --- a/src/pages/compute/containers/Keypair/actions/Delete.jsx +++ b/src/pages/compute/containers/Keypair/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Keypair'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/compute/containers/ServerGroup/actions/Delete.jsx b/src/pages/compute/containers/ServerGroup/actions/Delete.jsx index acbc0389..a5543094 100644 --- a/src/pages/compute/containers/ServerGroup/actions/Delete.jsx +++ b/src/pages/compute/containers/ServerGroup/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Server Group'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/configuration/containers/Metadata/actions/Delete.jsx b/src/pages/configuration/containers/Metadata/actions/Delete.jsx index ff654892..cb5f8a73 100644 --- a/src/pages/configuration/containers/Metadata/actions/Delete.jsx +++ b/src/pages/configuration/containers/Metadata/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Metadata'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/configuration/containers/Setting/actions/Edit.jsx b/src/pages/configuration/containers/Setting/actions/Edit.jsx index a011ecae..b4bbfaa3 100644 --- a/src/pages/configuration/containers/Setting/actions/Edit.jsx +++ b/src/pages/configuration/containers/Setting/actions/Edit.jsx @@ -23,8 +23,6 @@ export class Edit extends ModalAction { return 'edit'; } - static buttonType = 'primary'; - get instanceName() { return this.item.key; } diff --git a/src/pages/configuration/containers/Setting/actions/Reset.jsx b/src/pages/configuration/containers/Setting/actions/Reset.jsx index f93a1f94..ada9fefc 100644 --- a/src/pages/configuration/containers/Setting/actions/Reset.jsx +++ b/src/pages/configuration/containers/Setting/actions/Reset.jsx @@ -25,7 +25,11 @@ export default class Reset extends ConfirmAction { } get buttonType() { - return 'danger'; + return 'primary'; + } + + get isDanger() { + return true; } get actionName() { diff --git a/src/pages/configuration/containers/Setting/actions/View.jsx b/src/pages/configuration/containers/Setting/actions/View.jsx index 25aafba6..875a1924 100644 --- a/src/pages/configuration/containers/Setting/actions/View.jsx +++ b/src/pages/configuration/containers/Setting/actions/View.jsx @@ -25,8 +25,6 @@ export class View extends ModalAction { static title = t('View Detail'); - static buttonType = 'primary'; - static readOnly = true; static enableSystemReader = true; diff --git a/src/pages/configuration/containers/SystemInfo/CinderService/actions/Disable.jsx b/src/pages/configuration/containers/SystemInfo/CinderService/actions/Disable.jsx index f06faa21..e616c5a8 100644 --- a/src/pages/configuration/containers/SystemInfo/CinderService/actions/Disable.jsx +++ b/src/pages/configuration/containers/SystemInfo/CinderService/actions/Disable.jsx @@ -23,7 +23,7 @@ export class DisableAction extends ModalAction { static buttonText = t('Disable'); - static buttonType = 'danger'; + static isDanger = true; init() { this.store = globalServiceStore; diff --git a/src/pages/configuration/containers/SystemInfo/CinderService/actions/Enable.jsx b/src/pages/configuration/containers/SystemInfo/CinderService/actions/Enable.jsx index d0f36416..e915c87c 100644 --- a/src/pages/configuration/containers/SystemInfo/CinderService/actions/Enable.jsx +++ b/src/pages/configuration/containers/SystemInfo/CinderService/actions/Enable.jsx @@ -24,10 +24,6 @@ export default class Enable extends ConfirmAction { return t('Enable Service'); } - get buttonType() { - return 'default'; - } - get buttonText() { return t('Enable'); } diff --git a/src/pages/configuration/containers/SystemInfo/ComputeService/actions/Disable.jsx b/src/pages/configuration/containers/SystemInfo/ComputeService/actions/Disable.jsx index 4bbb1968..3befaafa 100644 --- a/src/pages/configuration/containers/SystemInfo/ComputeService/actions/Disable.jsx +++ b/src/pages/configuration/containers/SystemInfo/ComputeService/actions/Disable.jsx @@ -23,7 +23,7 @@ export class DisableAction extends ModalAction { static buttonText = t('Disable'); - static buttonType = 'danger'; + static isDanger = true; init() { this.store = globalComputeHostStore; diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/actions/Remove.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/actions/Remove.jsx index ad72b8ac..45740aa6 100644 --- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/actions/Remove.jsx +++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/actions/Remove.jsx @@ -24,8 +24,8 @@ export default class RemoveAction extends ConfirmAction { return t('Remove Network'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/actions/Remove.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/actions/Remove.jsx index d4750362..c57313c9 100644 --- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/actions/Remove.jsx +++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/actions/Remove.jsx @@ -24,8 +24,8 @@ export default class RemoveAction extends ConfirmAction { return t('Remove Router'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/actions/Disable.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/actions/Disable.jsx index e882fe2a..4c1b5773 100644 --- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/actions/Disable.jsx +++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/actions/Disable.jsx @@ -24,8 +24,8 @@ export default class Disable extends ConfirmAction { return t('Disable Neutron Agent'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/actions/Enable.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/actions/Enable.jsx index 940bf886..39bb6a24 100644 --- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/actions/Enable.jsx +++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/actions/Enable.jsx @@ -24,10 +24,6 @@ export default class Enable extends ConfirmAction { return t('Enable Neutron Agent'); } - get buttonType() { - return 'default'; - } - get buttonText() { return t('Enable'); } diff --git a/src/pages/container-infra/containers/ClusterTemplates/actions/Delete.jsx b/src/pages/container-infra/containers/ClusterTemplates/actions/Delete.jsx index 7527fd96..cdd2cf55 100644 --- a/src/pages/container-infra/containers/ClusterTemplates/actions/Delete.jsx +++ b/src/pages/container-infra/containers/ClusterTemplates/actions/Delete.jsx @@ -19,15 +19,15 @@ export default class DeleteClusterTemplates extends ConfirmAction { } get title() { - return t('Delete Template') + return t('Delete Template'); } get actionName() { return t('Delete Clusters Templates'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/container-infra/containers/Clusters/actions/Delete.jsx b/src/pages/container-infra/containers/Clusters/actions/Delete.jsx index 5b58540e..7b01bd84 100644 --- a/src/pages/container-infra/containers/Clusters/actions/Delete.jsx +++ b/src/pages/container-infra/containers/Clusters/actions/Delete.jsx @@ -21,7 +21,7 @@ export default class DeleteClusters extends ConfirmAction { } get title() { - return t('Delete Clusters') + return t('Delete Clusters'); } get actionName() { @@ -32,8 +32,8 @@ export default class DeleteClusters extends ConfirmAction { return t('Delete'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } policy = 'container-infra:cluster:delete'; diff --git a/src/pages/container-service/containers/Capsules/actions/Delete.jsx b/src/pages/container-service/containers/Capsules/actions/Delete.jsx index 94d3612b..f2a5a11e 100644 --- a/src/pages/container-service/containers/Capsules/actions/Delete.jsx +++ b/src/pages/container-service/containers/Capsules/actions/Delete.jsx @@ -30,8 +30,8 @@ export default class DeleteCapsule extends ConfirmAction { return t('Delete'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } policy = 'container:capsule:delete'; diff --git a/src/pages/container-service/containers/Containers/actions/Delete.jsx b/src/pages/container-service/containers/Containers/actions/Delete.jsx index ed6d2571..4b1adaee 100644 --- a/src/pages/container-service/containers/Containers/actions/Delete.jsx +++ b/src/pages/container-service/containers/Containers/actions/Delete.jsx @@ -28,8 +28,8 @@ export default class DeleteContainer extends ConfirmAction { return t('Delete Container'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/database/containers/Backups/actions/Delete.jsx b/src/pages/database/containers/Backups/actions/Delete.jsx index f757a946..f5647198 100644 --- a/src/pages/database/containers/Backups/actions/Delete.jsx +++ b/src/pages/database/containers/Backups/actions/Delete.jsx @@ -28,8 +28,8 @@ export default class Delete extends ConfirmAction { return t('Delete Backup'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } allowedCheckFunction = () => true; diff --git a/src/pages/database/containers/Configurations/actions/Delete.jsx b/src/pages/database/containers/Configurations/actions/Delete.jsx index 7ea54b8f..c849af83 100644 --- a/src/pages/database/containers/Configurations/actions/Delete.jsx +++ b/src/pages/database/containers/Configurations/actions/Delete.jsx @@ -28,8 +28,8 @@ export default class Delete extends ConfirmAction { return t('Delete Configuration'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } allowedCheckFunction = () => true; diff --git a/src/pages/database/containers/Instances/Detail/DatabaseDelete.jsx b/src/pages/database/containers/Instances/Detail/DatabaseDelete.jsx index 18585350..0a79f976 100644 --- a/src/pages/database/containers/Instances/Detail/DatabaseDelete.jsx +++ b/src/pages/database/containers/Instances/Detail/DatabaseDelete.jsx @@ -28,8 +28,8 @@ export default class DatabaseDelete extends ConfirmAction { return t('Delete Database'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/database/containers/Instances/Detail/UserDelete.jsx b/src/pages/database/containers/Instances/Detail/UserDelete.jsx index 01f16963..3cfeaa81 100644 --- a/src/pages/database/containers/Instances/Detail/UserDelete.jsx +++ b/src/pages/database/containers/Instances/Detail/UserDelete.jsx @@ -28,8 +28,8 @@ export default class UserDelete extends ConfirmAction { return t('Delete User'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/database/containers/Instances/actions/Delete.jsx b/src/pages/database/containers/Instances/actions/Delete.jsx index 7fe87dea..4a1d6c79 100644 --- a/src/pages/database/containers/Instances/actions/Delete.jsx +++ b/src/pages/database/containers/Instances/actions/Delete.jsx @@ -28,8 +28,8 @@ export default class Delete extends ConfirmAction { return t('Delete'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } allowedCheckFunction = () => true; diff --git a/src/pages/heat/containers/Stack/actions/Abandon.jsx b/src/pages/heat/containers/Stack/actions/Abandon.jsx index e1555624..dba617ff 100644 --- a/src/pages/heat/containers/Stack/actions/Abandon.jsx +++ b/src/pages/heat/containers/Stack/actions/Abandon.jsx @@ -29,8 +29,8 @@ export default class Abandon extends ConfirmAction { return t('abandon stack'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get isAsyncAction() { diff --git a/src/pages/heat/containers/Stack/actions/Delete.jsx b/src/pages/heat/containers/Stack/actions/Delete.jsx index af819f82..81be6e00 100644 --- a/src/pages/heat/containers/Stack/actions/Delete.jsx +++ b/src/pages/heat/containers/Stack/actions/Delete.jsx @@ -29,8 +29,8 @@ export default class Delete extends ConfirmAction { return t('delete stack'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get isAsyncAction() { diff --git a/src/pages/identity/containers/Domain/actions/Delete.jsx b/src/pages/identity/containers/Domain/actions/Delete.jsx index 56819450..bc6982fc 100644 --- a/src/pages/identity/containers/Domain/actions/Delete.jsx +++ b/src/pages/identity/containers/Domain/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Domain'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/identity/containers/Project/actions/Delete.jsx b/src/pages/identity/containers/Project/actions/Delete.jsx index 6fdd5d77..b965f97d 100644 --- a/src/pages/identity/containers/Project/actions/Delete.jsx +++ b/src/pages/identity/containers/Project/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Project'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/identity/containers/Project/actions/Start.jsx b/src/pages/identity/containers/Project/actions/Start.jsx index be03babd..b0590cbf 100644 --- a/src/pages/identity/containers/Project/actions/Start.jsx +++ b/src/pages/identity/containers/Project/actions/Start.jsx @@ -24,10 +24,6 @@ export default class StartAction extends ConfirmAction { return t('Start'); } - get buttonType() { - return 'default'; - } - policy = 'identity:update_project'; confirmContext(data) { diff --git a/src/pages/identity/containers/User/actions/Delete.jsx b/src/pages/identity/containers/User/actions/Delete.jsx index e67714fc..3ec2b2d0 100644 --- a/src/pages/identity/containers/User/actions/Delete.jsx +++ b/src/pages/identity/containers/User/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete User'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/identity/containers/UserGroup/actions/Delete.jsx b/src/pages/identity/containers/UserGroup/actions/Delete.jsx index fc3ab120..413c7492 100644 --- a/src/pages/identity/containers/UserGroup/actions/Delete.jsx +++ b/src/pages/identity/containers/UserGroup/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Group'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/management/containers/RecycleBin/actions/Delete.jsx b/src/pages/management/containers/RecycleBin/actions/Delete.jsx index 18024ba6..72d8018f 100644 --- a/src/pages/management/containers/RecycleBin/actions/Delete.jsx +++ b/src/pages/management/containers/RecycleBin/actions/Delete.jsx @@ -28,8 +28,8 @@ export default class Delete extends ConfirmAction { return t('delete instance'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get isAsyncAction() { diff --git a/src/pages/network/containers/Certificate/actions/DeleteContainer.jsx b/src/pages/network/containers/Certificate/actions/DeleteContainer.jsx index 57ead9cc..96af1190 100644 --- a/src/pages/network/containers/Certificate/actions/DeleteContainer.jsx +++ b/src/pages/network/containers/Certificate/actions/DeleteContainer.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Certificate'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/Certificate/actions/DeleteSecret.jsx b/src/pages/network/containers/Certificate/actions/DeleteSecret.jsx index 14414dde..ff62f816 100644 --- a/src/pages/network/containers/Certificate/actions/DeleteSecret.jsx +++ b/src/pages/network/containers/Certificate/actions/DeleteSecret.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Certificate'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/FloatingIp/Detail/PortForwarding/actions/Delete.jsx b/src/pages/network/containers/FloatingIp/Detail/PortForwarding/actions/Delete.jsx index c3f390bb..c5f3f365 100644 --- a/src/pages/network/containers/FloatingIp/Detail/PortForwarding/actions/Delete.jsx +++ b/src/pages/network/containers/FloatingIp/Detail/PortForwarding/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete DNAT Rule'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/FloatingIp/actions/Release.jsx b/src/pages/network/containers/FloatingIp/actions/Release.jsx index e15257ae..fd88da9c 100644 --- a/src/pages/network/containers/FloatingIp/actions/Release.jsx +++ b/src/pages/network/containers/FloatingIp/actions/Release.jsx @@ -27,8 +27,8 @@ export default class Release extends ConfirmAction { return t('Release'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/LoadBalancers/Listener/Actions/DeleteListener.jsx b/src/pages/network/containers/LoadBalancers/Listener/Actions/DeleteListener.jsx index 77b0d555..c7967b35 100644 --- a/src/pages/network/containers/LoadBalancers/Listener/Actions/DeleteListener.jsx +++ b/src/pages/network/containers/LoadBalancers/Listener/Actions/DeleteListener.jsx @@ -25,8 +25,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Listener'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/LoadBalancers/Listener/Actions/DeletePool.jsx b/src/pages/network/containers/LoadBalancers/Listener/Actions/DeletePool.jsx index 6075e26b..430aaa69 100644 --- a/src/pages/network/containers/LoadBalancers/Listener/Actions/DeletePool.jsx +++ b/src/pages/network/containers/LoadBalancers/Listener/Actions/DeletePool.jsx @@ -25,8 +25,8 @@ export default class DeletePoolAction extends ConfirmAction { return t('Delete Default Pool'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/DeleteMember.jsx b/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/DeleteMember.jsx index a415b0e4..9e0590e1 100644 --- a/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/DeleteMember.jsx +++ b/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/DeleteMember.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Member'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/Delete.jsx b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/Delete.jsx index 810dd257..e9761abb 100644 --- a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/Delete.jsx +++ b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/Delete.jsx @@ -26,8 +26,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Load Balancer'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/Network/Detail/subnetActions/DeleteSubnet.jsx b/src/pages/network/containers/Network/Detail/subnetActions/DeleteSubnet.jsx index 12e2388e..6d6e2d3d 100644 --- a/src/pages/network/containers/Network/Detail/subnetActions/DeleteSubnet.jsx +++ b/src/pages/network/containers/Network/Detail/subnetActions/DeleteSubnet.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Subnet'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/Network/actions/Delete.jsx b/src/pages/network/containers/Network/actions/Delete.jsx index cfe9688f..1fa7ed03 100644 --- a/src/pages/network/containers/Network/actions/Delete.jsx +++ b/src/pages/network/containers/Network/actions/Delete.jsx @@ -26,8 +26,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Network'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/QoSPolicy/actions/Delete.jsx b/src/pages/network/containers/QoSPolicy/actions/Delete.jsx index 8ca9ed75..3446f1a6 100644 --- a/src/pages/network/containers/QoSPolicy/actions/Delete.jsx +++ b/src/pages/network/containers/QoSPolicy/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete QoS Policy'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/QoSPolicy/actions/DeleteBandwidthEgressRules.jsx b/src/pages/network/containers/QoSPolicy/actions/DeleteBandwidthEgressRules.jsx index 6ac44ac3..606c0dff 100644 --- a/src/pages/network/containers/QoSPolicy/actions/DeleteBandwidthEgressRules.jsx +++ b/src/pages/network/containers/QoSPolicy/actions/DeleteBandwidthEgressRules.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Bandwidth Egress Rules'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/QoSPolicy/actions/DeleteBandwidthIngressRules.jsx b/src/pages/network/containers/QoSPolicy/actions/DeleteBandwidthIngressRules.jsx index 5e6c102d..0a8b7e59 100644 --- a/src/pages/network/containers/QoSPolicy/actions/DeleteBandwidthIngressRules.jsx +++ b/src/pages/network/containers/QoSPolicy/actions/DeleteBandwidthIngressRules.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Bandwidth Ingress Rules'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/QoSPolicy/actions/DeleteDSCPMarkingRules.jsx b/src/pages/network/containers/QoSPolicy/actions/DeleteDSCPMarkingRules.jsx index b22836af..b9013435 100644 --- a/src/pages/network/containers/QoSPolicy/actions/DeleteDSCPMarkingRules.jsx +++ b/src/pages/network/containers/QoSPolicy/actions/DeleteDSCPMarkingRules.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete DSCP Marking Rules'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/Router/StaticRouter/actions/Delete.jsx b/src/pages/network/containers/Router/StaticRouter/actions/Delete.jsx index b4a83593..b207127e 100644 --- a/src/pages/network/containers/Router/StaticRouter/actions/Delete.jsx +++ b/src/pages/network/containers/Router/StaticRouter/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Static Route'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/Router/actions/Delete.jsx b/src/pages/network/containers/Router/actions/Delete.jsx index cc4869a6..f2e1c2eb 100644 --- a/src/pages/network/containers/Router/actions/Delete.jsx +++ b/src/pages/network/containers/Router/actions/Delete.jsx @@ -25,8 +25,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Router'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/SecurityGroup/Detail/Rule/actions/Delete.jsx b/src/pages/network/containers/SecurityGroup/Detail/Rule/actions/Delete.jsx index 2037847e..e935e443 100644 --- a/src/pages/network/containers/SecurityGroup/Detail/Rule/actions/Delete.jsx +++ b/src/pages/network/containers/SecurityGroup/Detail/Rule/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Rule'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/SecurityGroup/actions/Delete.jsx b/src/pages/network/containers/SecurityGroup/actions/Delete.jsx index 5785a56c..8b186730 100644 --- a/src/pages/network/containers/SecurityGroup/actions/Delete.jsx +++ b/src/pages/network/containers/SecurityGroup/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Security Group'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/VPN/EndpointGroup/actions/Delete.jsx b/src/pages/network/containers/VPN/EndpointGroup/actions/Delete.jsx index c37b9d72..3a6310b7 100644 --- a/src/pages/network/containers/VPN/EndpointGroup/actions/Delete.jsx +++ b/src/pages/network/containers/VPN/EndpointGroup/actions/Delete.jsx @@ -27,8 +27,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete VPN EndPoint Groups'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/VPN/IKEPolicy/actions/Delete.jsx b/src/pages/network/containers/VPN/IKEPolicy/actions/Delete.jsx index 874aeab1..b264998a 100644 --- a/src/pages/network/containers/VPN/IKEPolicy/actions/Delete.jsx +++ b/src/pages/network/containers/VPN/IKEPolicy/actions/Delete.jsx @@ -27,8 +27,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete VPN IKE Policy'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/VPN/IPsecPolicy/actions/Delete.jsx b/src/pages/network/containers/VPN/IPsecPolicy/actions/Delete.jsx index 2fa81b9a..ff18b846 100644 --- a/src/pages/network/containers/VPN/IPsecPolicy/actions/Delete.jsx +++ b/src/pages/network/containers/VPN/IPsecPolicy/actions/Delete.jsx @@ -27,8 +27,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete VPN IPsec Policy'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Delete.jsx b/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Delete.jsx index 9ae7f362..078d45f2 100644 --- a/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Delete.jsx +++ b/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Delete.jsx @@ -26,8 +26,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete IPsec Site Connection'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/VPN/VPNGateway/actions/Delete.jsx b/src/pages/network/containers/VPN/VPNGateway/actions/Delete.jsx index 3b88c3d5..7bbf7afa 100644 --- a/src/pages/network/containers/VPN/VPNGateway/actions/Delete.jsx +++ b/src/pages/network/containers/VPN/VPNGateway/actions/Delete.jsx @@ -27,8 +27,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete VPN'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/VirtualAdapter/Detail/AllowedAddressPair/actions/Delete.jsx b/src/pages/network/containers/VirtualAdapter/Detail/AllowedAddressPair/actions/Delete.jsx index d46da281..1ea0e5e4 100644 --- a/src/pages/network/containers/VirtualAdapter/Detail/AllowedAddressPair/actions/Delete.jsx +++ b/src/pages/network/containers/VirtualAdapter/Detail/AllowedAddressPair/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Allowed Address Pair'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/VirtualAdapter/Detail/FixedIPs/actions/ReleaseIP.jsx b/src/pages/network/containers/VirtualAdapter/Detail/FixedIPs/actions/ReleaseIP.jsx index ffcbca8b..11691ab8 100644 --- a/src/pages/network/containers/VirtualAdapter/Detail/FixedIPs/actions/ReleaseIP.jsx +++ b/src/pages/network/containers/VirtualAdapter/Detail/FixedIPs/actions/ReleaseIP.jsx @@ -28,8 +28,8 @@ export default class DeleteAction extends ConfirmAction { return t('Release'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get actionName() { diff --git a/src/pages/network/containers/VirtualAdapter/Detail/SecurityGroups/actions/Detach.jsx b/src/pages/network/containers/VirtualAdapter/Detail/SecurityGroups/actions/Detach.jsx index ab6e99c6..a69a5d23 100644 --- a/src/pages/network/containers/VirtualAdapter/Detail/SecurityGroups/actions/Detach.jsx +++ b/src/pages/network/containers/VirtualAdapter/Detail/SecurityGroups/actions/Detach.jsx @@ -24,8 +24,8 @@ export default class DetachAction extends ConfirmAction { return t('Detach Security Group'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/network/containers/VirtualAdapter/actions/Delete.jsx b/src/pages/network/containers/VirtualAdapter/actions/Delete.jsx index 3a9f96ca..3427d651 100644 --- a/src/pages/network/containers/VirtualAdapter/actions/Delete.jsx +++ b/src/pages/network/containers/VirtualAdapter/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Virtual Adapter'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/share/containers/Share/Detail/AccessRule/actions/Delete.jsx b/src/pages/share/containers/Share/Detail/AccessRule/actions/Delete.jsx index 2e322a49..4c737b79 100644 --- a/src/pages/share/containers/Share/Detail/AccessRule/actions/Delete.jsx +++ b/src/pages/share/containers/Share/Detail/AccessRule/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class Delete extends ConfirmAction { return t('Delete Share Access Rule'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/share/containers/Share/Detail/Metadata/actions/Delete.jsx b/src/pages/share/containers/Share/Detail/Metadata/actions/Delete.jsx index da46f00b..24a5ec21 100644 --- a/src/pages/share/containers/Share/Detail/Metadata/actions/Delete.jsx +++ b/src/pages/share/containers/Share/Detail/Metadata/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class Delete extends ConfirmAction { return t('Delete Share Metadata'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/share/containers/Share/actions/Delete.jsx b/src/pages/share/containers/Share/actions/Delete.jsx index f40fafca..e94073a3 100644 --- a/src/pages/share/containers/Share/actions/Delete.jsx +++ b/src/pages/share/containers/Share/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class Delete extends ConfirmAction { return t('Delete Share'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/share/containers/ShareGroup/actions/Delete.jsx b/src/pages/share/containers/ShareGroup/actions/Delete.jsx index 082b6eb1..d854f159 100644 --- a/src/pages/share/containers/ShareGroup/actions/Delete.jsx +++ b/src/pages/share/containers/ShareGroup/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class Delete extends ConfirmAction { return t('Delete Share Group'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/share/containers/ShareGroupType/Detail/ExtraSpec/actions/Delete.jsx b/src/pages/share/containers/ShareGroupType/Detail/ExtraSpec/actions/Delete.jsx index 530a53db..9c93c327 100644 --- a/src/pages/share/containers/ShareGroupType/Detail/ExtraSpec/actions/Delete.jsx +++ b/src/pages/share/containers/ShareGroupType/Detail/ExtraSpec/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class Delete extends ConfirmAction { return t('Delete Extra Specs'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/share/containers/ShareGroupType/actions/Delete.jsx b/src/pages/share/containers/ShareGroupType/actions/Delete.jsx index 002f3a08..78b02d90 100644 --- a/src/pages/share/containers/ShareGroupType/actions/Delete.jsx +++ b/src/pages/share/containers/ShareGroupType/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class Delete extends ConfirmAction { return t('Delete Share Group Type'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/share/containers/ShareInstance/actions/Delete.jsx b/src/pages/share/containers/ShareInstance/actions/Delete.jsx index 3d932eb2..3333e397 100644 --- a/src/pages/share/containers/ShareInstance/actions/Delete.jsx +++ b/src/pages/share/containers/ShareInstance/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class Delete extends ConfirmAction { return t('Force Delete Share Instance'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/share/containers/ShareNetwork/actions/Delete.jsx b/src/pages/share/containers/ShareNetwork/actions/Delete.jsx index 9b2fd70a..32b05848 100644 --- a/src/pages/share/containers/ShareNetwork/actions/Delete.jsx +++ b/src/pages/share/containers/ShareNetwork/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class Delete extends ConfirmAction { return t('Delete Share Network'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/share/containers/ShareServer/actions/Delete.jsx b/src/pages/share/containers/ShareServer/actions/Delete.jsx index ea553fcd..334df42f 100644 --- a/src/pages/share/containers/ShareServer/actions/Delete.jsx +++ b/src/pages/share/containers/ShareServer/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class Delete extends ConfirmAction { return t('Delete Share Server'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/share/containers/ShareType/Detail/ExtraSpec/actions/Delete.jsx b/src/pages/share/containers/ShareType/Detail/ExtraSpec/actions/Delete.jsx index c5ad4c6f..28582b9b 100644 --- a/src/pages/share/containers/ShareType/Detail/ExtraSpec/actions/Delete.jsx +++ b/src/pages/share/containers/ShareType/Detail/ExtraSpec/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class Delete extends ConfirmAction { return t('Delete Extra Specs'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/share/containers/ShareType/actions/Delete.jsx b/src/pages/share/containers/ShareType/actions/Delete.jsx index 47df4a9a..af7dbe9b 100644 --- a/src/pages/share/containers/ShareType/actions/Delete.jsx +++ b/src/pages/share/containers/ShareType/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class Delete extends ConfirmAction { return t('Delete Share Type'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/storage/containers/Backup/actions/Delete.jsx b/src/pages/storage/containers/Backup/actions/Delete.jsx index f318db49..3b953b0d 100644 --- a/src/pages/storage/containers/Backup/actions/Delete.jsx +++ b/src/pages/storage/containers/Backup/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Backup'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/storage/containers/Container/Detail/actions/Delete.jsx b/src/pages/storage/containers/Container/Detail/actions/Delete.jsx index 81f1e916..f3680644 100644 --- a/src/pages/storage/containers/Container/Detail/actions/Delete.jsx +++ b/src/pages/storage/containers/Container/Detail/actions/Delete.jsx @@ -37,8 +37,8 @@ export default class Delete extends ConfirmAction { return this.title; } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/storage/containers/Container/actions/Delete.jsx b/src/pages/storage/containers/Container/actions/Delete.jsx index 1d6379d7..2bfcd524 100644 --- a/src/pages/storage/containers/Container/actions/Delete.jsx +++ b/src/pages/storage/containers/Container/actions/Delete.jsx @@ -29,8 +29,8 @@ export default class Delete extends ConfirmAction { return t('Delete Container'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/storage/containers/Snapshot/actions/Delete.jsx b/src/pages/storage/containers/Snapshot/actions/Delete.jsx index abbc7e1a..c449c297 100644 --- a/src/pages/storage/containers/Snapshot/actions/Delete.jsx +++ b/src/pages/storage/containers/Snapshot/actions/Delete.jsx @@ -25,8 +25,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Snapshot'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/storage/containers/Volume/actions/Delete.jsx b/src/pages/storage/containers/Volume/actions/Delete.jsx index f40f3c67..ee8802e1 100644 --- a/src/pages/storage/containers/Volume/actions/Delete.jsx +++ b/src/pages/storage/containers/Volume/actions/Delete.jsx @@ -28,8 +28,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Volume'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/storage/containers/Volume/actions/Detach.jsx b/src/pages/storage/containers/Volume/actions/Detach.jsx index ebd64b21..cbaa75e9 100644 --- a/src/pages/storage/containers/Volume/actions/Detach.jsx +++ b/src/pages/storage/containers/Volume/actions/Detach.jsx @@ -28,7 +28,7 @@ export class Detach extends ModalAction { static title = t('Detach'); - static buttonType = 'danger'; + static isDanger = true; get name() { return t('Detach'); diff --git a/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/actions/Delete.jsx b/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/actions/Delete.jsx index 79f3d2ca..56474892 100644 --- a/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/actions/Delete.jsx +++ b/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Extra Specs'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/storage/containers/VolumeType/QosSpec/actions/Delete.jsx b/src/pages/storage/containers/VolumeType/QosSpec/actions/Delete.jsx index 531650e5..3d4fd7ae 100644 --- a/src/pages/storage/containers/VolumeType/QosSpec/actions/Delete.jsx +++ b/src/pages/storage/containers/VolumeType/QosSpec/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete QoS Spec'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/actions/Delete.jsx b/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/actions/Delete.jsx index f438cbab..bb4cc236 100644 --- a/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/actions/Delete.jsx +++ b/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Extra Specs'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/storage/containers/VolumeType/VolumeType/actions/Delete.jsx b/src/pages/storage/containers/VolumeType/VolumeType/actions/Delete.jsx index 125591ff..ac13c02b 100644 --- a/src/pages/storage/containers/VolumeType/VolumeType/actions/Delete.jsx +++ b/src/pages/storage/containers/VolumeType/VolumeType/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Volume Type'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/storage/containers/VolumeType/VolumeType/actions/DeleteEncryption.jsx b/src/pages/storage/containers/VolumeType/VolumeType/actions/DeleteEncryption.jsx index 77622dec..16fb3d1c 100644 --- a/src/pages/storage/containers/VolumeType/VolumeType/actions/DeleteEncryption.jsx +++ b/src/pages/storage/containers/VolumeType/VolumeType/actions/DeleteEncryption.jsx @@ -24,8 +24,8 @@ export default class DeleteEncryptionAction extends ConfirmAction { return t('Delete Encryption'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/src/pages/user-center/containers/Credentials/actions/Delete.jsx b/src/pages/user-center/containers/Credentials/actions/Delete.jsx index a06be2df..80c135c5 100644 --- a/src/pages/user-center/containers/Credentials/actions/Delete.jsx +++ b/src/pages/user-center/containers/Credentials/actions/Delete.jsx @@ -24,8 +24,8 @@ export default class DeleteAction extends ConfirmAction { return t('Delete Application Credential'); } - get buttonType() { - return 'danger'; + get isDanger() { + return true; } get buttonText() { diff --git a/test/e2e/support/form-commands.js b/test/e2e/support/form-commands.js index acb99037..fb38cc07 100644 --- a/test/e2e/support/form-commands.js +++ b/test/e2e/support/form-commands.js @@ -32,7 +32,7 @@ function getIdReset(formItemName) { } Cypress.Commands.add('closeNotice', () => { - cy.get('.ant-notification-topRight') + cy.get('.ant-notification-topRight', { timeout: 30000 }) .first() .find('.anticon-check-circle') .should('exist');