Merge "refactor: Refactor danger from buttonType to isDanger"

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`

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';
     }
     ```

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`

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;
     }
     ```
 

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,

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 (
         <Menu.Item key={key} disabled style={{ textAlign: 'center' }}>

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,
   };
 }
 

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,
       };

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 '';

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() {

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');
   }

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';

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() {

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() {

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() {

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() {

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() {

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;

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() {

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() {

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() {

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() {

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() {

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');
   }

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() {

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() {

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() {

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() {

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;
   }

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() {

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;

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;

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');
   }

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;

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() {

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() {

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() {

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');
   }

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() {

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';

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';

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() {

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;

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;

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() {

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() {

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;

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() {

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() {

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() {

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() {

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) {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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');

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() {