From 3defbe8330c99715fb07706f1ed82ea2c6f389f7 Mon Sep 17 00:00:00 2001
From: yangao <yang.ao@99cloud.net>
Date: Tue, 17 May 2022 10:34:44 +0800
Subject: [PATCH] fix: Decorator style for refactored components

Decorator style for refactored components

Change-Id: Ib85517474ace19967b4901e388800c1258f246be
---
 src/components/FormItem/VolumeSelectTable/index.jsx         | 6 +++---
 src/components/Layout/GlobalHeader/AvatarDropdown.jsx       | 6 ++----
 src/components/Layout/GlobalHeader/OpenRc.jsx               | 6 +++---
 src/components/Layout/GlobalHeader/Password.jsx             | 6 +++---
 src/components/Layout/GlobalHeader/ProjectDropdown.jsx      | 6 +++---
 src/components/Layout/GlobalHeader/ProjectTable.jsx         | 6 +++---
 src/components/Layout/GlobalHeader/Token.jsx                | 6 +++---
 src/components/Tables/Base/ActionButton/index.jsx           | 6 ++----
 src/components/Tables/Base/ItemActionButtons/index.jsx      | 5 +++--
 src/components/Tables/Base/index.jsx                        | 5 +++--
 src/layouts/Base/Right.jsx                                  | 6 ++----
 src/layouts/Basic/index.jsx                                 | 6 ++----
 src/layouts/Blank/index.jsx                                 | 6 ++----
 src/pages/auth/containers/ChangePassword/index.jsx          | 6 +++---
 .../containers/AdminOverview/components/ComputeService.jsx  | 6 ++----
 .../containers/AdminOverview/components/NetworkService.jsx  | 6 ++----
 .../compute/containers/BareMetalNode/Detail/BaseDetail.jsx  | 6 +++---
 .../containers/BareMetalNode/Detail/Port/actions/Create.jsx | 6 +++---
 .../containers/BareMetalNode/Detail/Port/actions/Edit.jsx   | 6 +++---
 .../compute/containers/BareMetalNode/Detail/Port/index.jsx  | 6 +++---
 .../BareMetalNode/Detail/PortGroup/actions/Create.jsx       | 6 +++---
 .../BareMetalNode/Detail/PortGroup/actions/Edit.jsx         | 6 +++---
 .../containers/BareMetalNode/Detail/PortGroup/index.jsx     | 6 +++---
 src/pages/compute/containers/BareMetalNode/Detail/index.jsx | 6 +++---
 .../containers/BareMetalNode/actions/Create/DriveInfo.jsx   | 6 +++---
 .../BareMetalNode/actions/Create/DriveInterface.jsx         | 6 +++---
 .../containers/BareMetalNode/actions/Create/NodeInfo.jsx    | 6 +++---
 .../containers/BareMetalNode/actions/Create/index.jsx       | 6 +++---
 src/pages/compute/containers/BareMetalNode/actions/Edit.jsx | 6 +++---
 .../containers/BareMetalNode/actions/ManageState.jsx        | 6 +++---
 .../containers/BareMetalNode/actions/SetBootDevice.jsx      | 6 +++---
 .../containers/BareMetalNode/actions/SetMaintenance.jsx     | 6 +++---
 src/pages/compute/containers/BareMetalNode/index.jsx        | 6 +++---
 src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx   | 6 +++---
 src/pages/compute/containers/Flavor/actions/Edit.jsx        | 6 +++---
 .../compute/containers/Flavor/actions/ManageAccess.jsx      | 6 +++---
 .../compute/containers/Flavor/actions/ManageMetadata.jsx    | 6 +++---
 .../Flavor/actions/StepCreate/AccessTypeSetting.jsx         | 6 +++---
 .../compute/containers/Flavor/actions/StepCreate/index.jsx  | 6 ++----
 src/pages/compute/containers/Flavor/index.jsx               | 6 +++---
 .../containers/HostAggregate/Aggregate/actions/Create.jsx   | 6 +++---
 .../containers/HostAggregate/Aggregate/actions/Edit.jsx     | 6 +++---
 .../HostAggregate/Aggregate/actions/ManageHost.jsx          | 6 +++---
 .../HostAggregate/Aggregate/actions/ManageMetadata.jsx      | 6 +++---
 .../compute/containers/HostAggregate/Aggregate/index.jsx    | 6 +++---
 .../containers/HostAggregate/AvailabilityZone/index.jsx     | 6 +++---
 src/pages/compute/containers/HostAggregate/index.jsx        | 6 +++---
 .../containers/Hypervisors/ComputeHost/actions/Disable.jsx  | 6 +++---
 .../compute/containers/Hypervisors/ComputeHost/index.jsx    | 6 +++---
 src/pages/compute/containers/Hypervisors/index.jsx          | 6 +++---
 .../compute/containers/Image/actions/CreateInstance.jsx     | 6 +++---
 src/pages/compute/containers/Image/actions/Edit.jsx         | 6 ++----
 src/pages/compute/containers/Image/actions/ManageAccess.jsx | 6 +++---
 .../compute/containers/Image/actions/ManageMetadata.jsx     | 6 +++---
 src/pages/compute/containers/Image/index.jsx                | 6 +++---
 .../compute/containers/Instance/Detail/ActionLog/index.jsx  | 6 +++---
 .../compute/containers/Instance/actions/AssociateFip.jsx    | 6 +++---
 .../compute/containers/Instance/actions/AttachInterface.jsx | 6 +++---
 .../compute/containers/Instance/actions/ChangePassword.jsx  | 6 +++---
 .../compute/containers/Instance/actions/CreateImage.jsx     | 6 +++---
 .../compute/containers/Instance/actions/DetachInterface.jsx | 6 +++---
 .../compute/containers/Instance/actions/DisassociateFip.jsx | 6 +++---
 src/pages/compute/containers/Instance/actions/Edit.jsx      | 6 +++---
 .../compute/containers/Instance/actions/LiveMigrate.jsx     | 6 +++---
 .../containers/Instance/actions/ManageSecurityGroup.jsx     | 6 +++---
 src/pages/compute/containers/Instance/actions/Migrate.jsx   | 6 +++---
 .../compute/containers/Instance/actions/ModifyTags.jsx      | 6 +++---
 src/pages/compute/containers/Keypair/Detail/BaseDetail.jsx  | 6 +++---
 src/pages/compute/containers/Keypair/Detail/index.jsx       | 6 +++---
 src/pages/compute/containers/Keypair/actions/Create.jsx     | 6 +++---
 src/pages/compute/containers/Keypair/index.jsx              | 6 +++---
 src/pages/compute/containers/ServerGroup/Detail/index.jsx   | 6 +++---
 src/pages/compute/containers/ServerGroup/actions/Create.jsx | 6 +++---
 src/pages/compute/containers/ServerGroup/index.jsx          | 6 +++---
 .../configuration/containers/Metadata/Detail/BaseDetail.jsx | 6 +++---
 .../configuration/containers/Metadata/Detail/index.jsx      | 6 +++---
 .../configuration/containers/Metadata/actions/Create.jsx    | 6 +++---
 .../configuration/containers/Metadata/actions/Edit.jsx      | 6 +++---
 .../configuration/containers/Metadata/actions/Manage.jsx    | 6 +++---
 src/pages/configuration/containers/Metadata/index.jsx       | 6 +++---
 src/pages/configuration/containers/SystemInfo/Catalog.jsx   | 6 +++---
 .../containers/SystemInfo/CinderService/actions/Disable.jsx | 6 +++---
 .../containers/SystemInfo/CinderService/index.jsx           | 6 +++---
 .../SystemInfo/ComputeService/actions/Disable.jsx           | 6 +++---
 .../containers/SystemInfo/ComputeService/index.jsx          | 6 +++---
 .../configuration/containers/SystemInfo/HeatService.jsx     | 6 +++---
 .../SystemInfo/NeutronAgent/Detail/BaseDetail.jsx           | 6 +++---
 .../SystemInfo/NeutronAgent/Detail/Network/actions/Add.jsx  | 6 +++---
 .../SystemInfo/NeutronAgent/Detail/Network/index.jsx        | 6 +++---
 .../SystemInfo/NeutronAgent/Detail/Router/actions/Add.jsx   | 6 +++---
 .../SystemInfo/NeutronAgent/Detail/Router/index.jsx         | 6 +++---
 .../containers/SystemInfo/NeutronAgent/Detail/index.jsx     | 6 +++---
 .../containers/SystemInfo/NeutronAgent/index.jsx            | 6 +++---
 src/pages/configuration/containers/SystemInfo/index.jsx     | 6 +++---
 src/pages/heat/containers/Stack/Detail/BaseDetail.jsx       | 6 +++---
 src/pages/heat/containers/Stack/Detail/Event.jsx            | 6 +++---
 src/pages/heat/containers/Stack/Detail/Template.jsx         | 6 +++---
 src/pages/heat/containers/Stack/actions/Edit.jsx            | 6 +++---
 src/pages/identity/containers/Domain/Detail/index.jsx       | 6 +++---
 src/pages/identity/containers/Domain/actions/Create.jsx     | 6 ++----
 src/pages/identity/containers/Domain/actions/Edit.jsx       | 6 ++----
 src/pages/identity/containers/Domain/index.jsx              | 6 +++---
 .../identity/containers/Project/actions/ModifyTags.jsx      | 6 +++---
 src/pages/identity/containers/Role/Detail/BaseDetail.jsx    | 6 +++---
 src/pages/identity/containers/Role/index.jsx                | 6 +++---
 src/pages/management/containers/RecycleBin/index.jsx        | 6 +++---
 src/pages/monitor/containers/OpenstackService/index.jsx     | 5 ++---
 src/pages/monitor/containers/OtherService/index.jsx         | 5 ++---
 .../FloatingIp/Detail/PortForwarding/actions/Edit.jsx       | 6 +++---
 .../containers/FloatingIp/Detail/PortForwarding/index.jsx   | 6 +++---
 .../network/containers/FloatingIp/actions/CreateDNAT.jsx    | 6 +++---
 .../LoadBalancers/Listener/Actions/CreateListener.jsx       | 6 +++---
 .../LoadBalancers/Listener/Actions/CreatePool.jsx           | 6 ++----
 .../containers/LoadBalancers/Listener/Actions/Edit.jsx      | 6 +++---
 .../LoadBalancers/Listener/Actions/EditHealthMonitor.jsx    | 6 ++----
 .../LoadBalancers/Listener/Actions/EditPoolInfo.jsx         | 6 ++----
 .../containers/LoadBalancers/Listener/Detail/BaseDetail.jsx | 6 +++---
 .../Listener/Detail/Member/Actions/CreateMember.jsx         | 6 +++---
 .../Listener/Detail/Member/Actions/EditMember.jsx           | 6 ++----
 .../LoadBalancers/Listener/Detail/Member/index.jsx          | 6 +++---
 .../containers/LoadBalancers/Listener/Detail/index.jsx      | 6 +++---
 .../network/containers/LoadBalancers/Listener/index.jsx     | 6 +++---
 .../LoadBalancers/LoadBalancerInstance/Detail/index.jsx     | 6 +++---
 .../LoadBalancerInstance/actions/AssociateFIP.jsx           | 6 +++---
 .../LoadBalancers/LoadBalancerInstance/actions/Edit.jsx     | 6 +++---
 .../actions/StepCreate/BaseStep/index.jsx                   | 6 +++---
 .../LoadBalancerInstance/actions/StepCreate/index.jsx       | 6 ++----
 .../containers/LoadBalancers/LoadBalancerInstance/index.jsx | 6 +++---
 .../StepCreateComponents/HealthMonitorStep/index.jsx        | 6 +++---
 .../StepCreateComponents/ListenerStep/index.jsx             | 6 +++---
 .../LoadBalancers/StepCreateComponents/MemberStep/index.jsx | 6 +++---
 .../LoadBalancers/StepCreateComponents/PoolStep/index.jsx   | 6 +++---
 src/pages/network/containers/LoadBalancers/index.jsx        | 6 +++---
 src/pages/network/containers/Network/Detail/Detail.jsx      | 6 +++---
 src/pages/network/containers/Network/Detail/Subnets.jsx     | 6 +++---
 .../containers/Network/Detail/subnetActions/EditSubnet.jsx  | 6 +++---
 .../network/containers/Network/actions/CreateSubnet.jsx     | 6 +++---
 src/pages/network/containers/Network/actions/Edit.jsx       | 6 +++---
 src/pages/network/containers/Network/index.jsx              | 6 +++---
 .../network/containers/QoSPolicy/Detail/BaseDetail.jsx      | 6 +++---
 src/pages/network/containers/QoSPolicy/Detail/index.jsx     | 6 +++---
 src/pages/network/containers/QoSPolicy/actions/Create.jsx   | 5 ++---
 .../QoSPolicy/actions/CreateBandwidthLimitRule.jsx          | 6 +++---
 .../containers/QoSPolicy/actions/CreateDSCPMarkingRules.jsx | 6 +++---
 src/pages/network/containers/QoSPolicy/actions/Edit.jsx     | 6 +++---
 .../QoSPolicy/actions/EditBandwidthEgressRule.jsx           | 6 +++---
 .../QoSPolicy/actions/EditBandwidthIngressRule.jsx          | 6 +++---
 .../containers/QoSPolicy/actions/EditDSCPMarkingRule.jsx    | 5 ++---
 src/pages/network/containers/QoSPolicy/index.jsx            | 6 +++---
 .../network/containers/Router/Port/Detail/BaseDetail.jsx    | 6 +++---
 src/pages/network/containers/Router/Port/index.jsx          | 6 +++---
 .../containers/Router/StaticRouter/actions/Create.jsx       | 6 +++---
 src/pages/network/containers/Router/StaticRouter/index.jsx  | 6 +++---
 .../network/containers/Router/actions/AssociateFip.jsx      | 6 +++---
 .../network/containers/Router/actions/ConnectSubnet.jsx     | 6 +++---
 .../network/containers/Router/actions/DisconnectSubnet.jsx  | 6 +++---
 src/pages/network/containers/Router/actions/Edit.jsx        | 6 +++---
 .../containers/SecurityGroup/Detail/Rule/actions/Create.jsx | 6 +++---
 .../network/containers/SecurityGroup/actions/Create.jsx     | 6 +++---
 src/pages/network/containers/SecurityGroup/actions/Edit.jsx | 6 +++---
 src/pages/network/containers/Topology/index.jsx             | 6 +++---
 .../network/containers/VPN/EndpointGroup/actions/Create.js  | 6 +++---
 .../network/containers/VPN/EndpointGroup/actions/Edit.js    | 6 +++---
 src/pages/network/containers/VPN/EndpointGroup/index.jsx    | 6 +++---
 .../network/containers/VPN/IKEPolicy/actions/Create.js      | 6 +++---
 src/pages/network/containers/VPN/IKEPolicy/actions/Edit.jsx | 6 +++---
 src/pages/network/containers/VPN/IKEPolicy/index.jsx        | 6 +++---
 .../network/containers/VPN/IPsecPolicy/actions/Create.js    | 6 +++---
 .../network/containers/VPN/IPsecPolicy/actions/Edit.jsx     | 6 +++---
 src/pages/network/containers/VPN/IPsecPolicy/index.jsx      | 6 +++---
 .../VPN/IPsecSiteConnection/Detail/BaseDetail.jsx           | 6 +++---
 .../containers/VPN/IPsecSiteConnection/Detail/index.jsx     | 6 +++---
 .../containers/VPN/IPsecSiteConnection/actions/Create.jsx   | 5 ++---
 .../containers/VPN/IPsecSiteConnection/actions/Edit.js      | 6 +++---
 .../network/containers/VPN/IPsecSiteConnection/index.jsx    | 6 +++---
 .../network/containers/VPN/VPNGateway/actions/Create.js     | 6 +++---
 src/pages/network/containers/VPN/VPNGateway/actions/Edit.js | 6 +++---
 src/pages/network/containers/VPN/VPNGateway/index.jsx       | 6 +++---
 src/pages/network/containers/VPN/index.jsx                  | 6 +++---
 .../AllowedAddressPair/actions/CreateAllowedAddressPair.jsx | 6 +++---
 .../VirtualAdapter/Detail/AllowedAddressPair/index.jsx      | 6 +++---
 .../containers/VirtualAdapter/Detail/BaseDetail/index.jsx   | 6 +++---
 .../containers/VirtualAdapter/Detail/FixedIPs/index.jsx     | 6 +++---
 .../containers/VirtualAdapter/actions/AllocateIP.jsx        | 6 +++---
 .../containers/VirtualAdapter/actions/AssociateFIP.jsx      | 6 +++---
 .../containers/VirtualAdapter/actions/DisAssociateFIP.jsx   | 6 +++---
 .../VirtualAdapter/actions/ManageSecurityGroup.jsx          | 6 +++---
 src/pages/storage/containers/Backup/Detail/BaseDetail.jsx   | 6 +++---
 src/pages/storage/containers/Backup/Detail/index.jsx        | 6 +++---
 src/pages/storage/containers/Backup/actions/Create.jsx      | 6 +++---
 .../storage/containers/Backup/actions/CreateVolume.jsx      | 6 +++---
 src/pages/storage/containers/Backup/actions/Edit.jsx        | 6 +++---
 src/pages/storage/containers/Backup/actions/Restore.jsx     | 6 +++---
 src/pages/storage/containers/Backup/index.jsx               | 6 +++---
 .../containers/Container/Detail/actions/CreateFolder.jsx    | 6 +++---
 .../storage/containers/Container/Detail/actions/Edit.jsx    | 6 +++---
 .../storage/containers/Container/Detail/actions/Rename.jsx  | 6 +++---
 .../containers/Container/Detail/actions/UploadFile.jsx      | 6 +++---
 src/pages/storage/containers/Container/Detail/index.jsx     | 6 +++---
 src/pages/storage/containers/Container/actions/Access.jsx   | 6 +++---
 src/pages/storage/containers/Container/actions/Create.jsx   | 6 +++---
 src/pages/storage/containers/Container/index.jsx            | 6 +++---
 src/pages/storage/containers/Snapshot/actions/Edit.jsx      | 6 +++---
 src/pages/storage/containers/Storage/index.jsx              | 6 +++---
 .../containers/Volume/actions/AcceptVolumeTransfer.jsx      | 6 +++---
 src/pages/storage/containers/Volume/actions/Bootable.jsx    | 6 +++---
 src/pages/storage/containers/Volume/actions/CloneVolume.jsx | 6 +++---
 .../storage/containers/Volume/actions/CreateInstance.jsx    | 6 +++---
 .../storage/containers/Volume/actions/CreateSnapshot.jsx    | 6 +++---
 .../storage/containers/Volume/actions/CreateTransfer.jsx    | 6 +++---
 src/pages/storage/containers/Volume/actions/Edit.jsx        | 6 +++---
 src/pages/storage/containers/Volume/actions/Migrate.jsx     | 6 +++---
 .../storage/containers/Volume/actions/UpdateStatus.jsx      | 6 +++---
 .../VolumeType/QosSpec/Detail/ExtraSpec/actions/Create.jsx  | 6 +++---
 .../VolumeType/QosSpec/Detail/ExtraSpec/actions/Edit.jsx    | 6 +++---
 .../VolumeType/QosSpec/Detail/ExtraSpec/index.jsx           | 6 +++---
 .../storage/containers/VolumeType/QosSpec/Detail/index.jsx  | 6 +++---
 .../containers/VolumeType/QosSpec/actions/Create.jsx        | 6 +++---
 .../containers/VolumeType/QosSpec/actions/EditConsumer.jsx  | 6 +++---
 src/pages/storage/containers/VolumeType/QosSpec/index.jsx   | 6 +++---
 .../containers/VolumeType/VolumeType/Detail/BaseDetail.jsx  | 6 +++---
 .../VolumeType/Detail/ExtraSpec/actions/Create.jsx          | 6 +++---
 .../VolumeType/VolumeType/Detail/ExtraSpec/actions/Edit.jsx | 6 +++---
 .../VolumeType/VolumeType/Detail/ExtraSpec/index.jsx        | 6 +++---
 .../containers/VolumeType/VolumeType/Detail/index.jsx       | 6 +++---
 .../containers/VolumeType/VolumeType/actions/Create.jsx     | 6 +++---
 .../VolumeType/VolumeType/actions/CreateEncryption.jsx      | 6 +++---
 .../containers/VolumeType/VolumeType/actions/Edit.jsx       | 6 +++---
 .../VolumeType/VolumeType/actions/ManageAccess.jsx          | 6 +++---
 .../containers/VolumeType/VolumeType/actions/ManageQos.jsx  | 6 +++---
 .../storage/containers/VolumeType/VolumeType/index.jsx      | 6 +++---
 src/pages/storage/containers/VolumeType/index.jsx           | 6 +++---
 232 files changed, 675 insertions(+), 710 deletions(-)

diff --git a/src/components/FormItem/VolumeSelectTable/index.jsx b/src/components/FormItem/VolumeSelectTable/index.jsx
index 722cf773..7f1eb105 100644
--- a/src/components/FormItem/VolumeSelectTable/index.jsx
+++ b/src/components/FormItem/VolumeSelectTable/index.jsx
@@ -22,9 +22,7 @@ import {
   volumeSortProps,
 } from 'resources/cinder/volume';
 
-@inject('rootStore')
-@observer
-export default class VolumeSelectTable extends Component {
+export class VolumeSelectTable extends Component {
   constructor(props) {
     super(props);
     this.stores = {
@@ -148,3 +146,5 @@ export default class VolumeSelectTable extends Component {
     );
   }
 }
+
+export default inject('rootStore')(observer(VolumeSelectTable));
diff --git a/src/components/Layout/GlobalHeader/AvatarDropdown.jsx b/src/components/Layout/GlobalHeader/AvatarDropdown.jsx
index 8b597ad1..080fa2c7 100644
--- a/src/components/Layout/GlobalHeader/AvatarDropdown.jsx
+++ b/src/components/Layout/GlobalHeader/AvatarDropdown.jsx
@@ -26,9 +26,7 @@ import styles from './index.less';
 
 const { getLocale, setLocale } = i18n;
 
-@inject('rootStore')
-@observer
-class AvatarDropdown extends React.Component {
+export class AvatarDropdown extends React.Component {
   get rootStore() {
     return this.props.rootStore || {};
   }
@@ -160,4 +158,4 @@ class AvatarDropdown extends React.Component {
   }
 }
 
-export default AvatarDropdown;
+export default inject('rootStore')(observer(AvatarDropdown));
diff --git a/src/components/Layout/GlobalHeader/OpenRc.jsx b/src/components/Layout/GlobalHeader/OpenRc.jsx
index 1397e633..3c290d0e 100644
--- a/src/components/Layout/GlobalHeader/OpenRc.jsx
+++ b/src/components/Layout/GlobalHeader/OpenRc.jsx
@@ -22,9 +22,7 @@ import {
 } from 'resources/keystone/openstack-rc';
 import FileSaver from 'file-saver';
 
-@inject('rootStore')
-@observer
-export default class OpenRc extends ModalAction {
+export class OpenRc extends ModalAction {
   init() {
     this.store = globalAuthCatalogStore;
   }
@@ -129,3 +127,5 @@ export default class OpenRc extends ModalAction {
     });
   };
 }
+
+export default inject('rootStore')(observer(OpenRc));
diff --git a/src/components/Layout/GlobalHeader/Password.jsx b/src/components/Layout/GlobalHeader/Password.jsx
index 46d3d161..be0249dd 100644
--- a/src/components/Layout/GlobalHeader/Password.jsx
+++ b/src/components/Layout/GlobalHeader/Password.jsx
@@ -17,9 +17,7 @@ import { ModalAction } from 'containers/Action';
 import { getPasswordOtherRule } from 'utils/validate';
 import globalUserStore from 'stores/keystone/user';
 
-@inject('rootStore')
-@observer
-export default class Password extends ModalAction {
+export class Password extends ModalAction {
   static id = 'update-user-password';
 
   static title = t('Update User Password');
@@ -84,3 +82,5 @@ export default class Password extends ModalAction {
     });
   };
 }
+
+export default inject('rootStore')(observer(Password));
diff --git a/src/components/Layout/GlobalHeader/ProjectDropdown.jsx b/src/components/Layout/GlobalHeader/ProjectDropdown.jsx
index bf5dd78e..3de2fcd2 100644
--- a/src/components/Layout/GlobalHeader/ProjectDropdown.jsx
+++ b/src/components/Layout/GlobalHeader/ProjectDropdown.jsx
@@ -20,9 +20,7 @@ import ItemActionButtons from 'components/Tables/Base/ItemActionButtons';
 import styles from './index.less';
 import ProjectSelect from './ProjectTable';
 
-@inject('rootStore')
-@observer
-export default class ProjectDropdown extends React.Component {
+export class ProjectDropdown extends React.Component {
   get user() {
     const { user } = this.props.rootStore;
     return user;
@@ -72,3 +70,5 @@ export default class ProjectDropdown extends React.Component {
     );
   }
 }
+
+export default inject('rootStore')(observer(ProjectDropdown));
diff --git a/src/components/Layout/GlobalHeader/ProjectTable.jsx b/src/components/Layout/GlobalHeader/ProjectTable.jsx
index e3e29c59..51d6a68e 100644
--- a/src/components/Layout/GlobalHeader/ProjectTable.jsx
+++ b/src/components/Layout/GlobalHeader/ProjectTable.jsx
@@ -17,9 +17,7 @@ import { ModalAction } from 'containers/Action';
 import { allCanReadPolicy } from 'resources/skyline/policy';
 import globalUserStore from 'stores/keystone/user';
 
-@inject('rootStore')
-@observer
-export default class ProjectSelect extends ModalAction {
+export class ProjectSelect extends ModalAction {
   static id = 'project-id';
 
   static title = t('Switch Project');
@@ -165,3 +163,5 @@ export default class ProjectSelect extends ModalAction {
     }
   };
 }
+
+export default inject('rootStore')(observer(ProjectSelect));
diff --git a/src/components/Layout/GlobalHeader/Token.jsx b/src/components/Layout/GlobalHeader/Token.jsx
index 1cd400c7..1325c16f 100644
--- a/src/components/Layout/GlobalHeader/Token.jsx
+++ b/src/components/Layout/GlobalHeader/Token.jsx
@@ -22,9 +22,7 @@ import styles from './index.less';
 
 const { Paragraph } = Typography;
 
-@inject('rootStore')
-@observer
-export default class Token extends ModalAction {
+export class Token extends ModalAction {
   static id = 'get-token';
 
   static title = t('Get Token');
@@ -140,3 +138,5 @@ export default class Token extends ModalAction {
 
   onSubmit = () => Promise.resolve();
 }
+
+export default inject('rootStore')(observer(Token));
diff --git a/src/components/Tables/Base/ActionButton/index.jsx b/src/components/Tables/Base/ActionButton/index.jsx
index cb0d4869..53decebb 100644
--- a/src/components/Tables/Base/ActionButton/index.jsx
+++ b/src/components/Tables/Base/ActionButton/index.jsx
@@ -52,9 +52,7 @@ function getDefaultMsg(action, data) {
   };
 }
 
-@inject('rootStore')
-@observer
-class ActionButton extends Component {
+export class ActionButton extends Component {
   static propTypes() {
     return {
       title: PropTypes.string.isRequired,
@@ -536,4 +534,4 @@ class ActionButton extends Component {
   }
 }
 
-export default ActionButton;
+export default inject('rootStore')(observer(ActionButton));
diff --git a/src/components/Tables/Base/ItemActionButtons/index.jsx b/src/components/Tables/Base/ItemActionButtons/index.jsx
index 6c093923..6d9b2e9c 100644
--- a/src/components/Tables/Base/ItemActionButtons/index.jsx
+++ b/src/components/Tables/Base/ItemActionButtons/index.jsx
@@ -243,8 +243,7 @@ function getActionList(actions, item, containerProps) {
   };
 }
 
-@inject('rootStore')
-export default class ItemActionButtons extends Component {
+export class ItemActionButtons extends Component {
   constructor(props) {
     super(props);
     this.actionList = [];
@@ -337,3 +336,5 @@ export default class ItemActionButtons extends Component {
     );
   }
 }
+
+export default inject('rootStore')(ItemActionButtons);
diff --git a/src/components/Tables/Base/index.jsx b/src/components/Tables/Base/index.jsx
index 95f2de66..8dcceb6d 100644
--- a/src/components/Tables/Base/index.jsx
+++ b/src/components/Tables/Base/index.jsx
@@ -55,8 +55,7 @@ import Download from './Download';
 
 import styles from './index.less';
 
-@inject('rootStore')
-export default class BaseTable extends React.Component {
+export class BaseTable extends React.Component {
   static propTypes = {
     data: PropTypes.oneOfType([PropTypes.array, PropTypes.object]).isRequired,
     columns: PropTypes.array.isRequired,
@@ -937,3 +936,5 @@ export default class BaseTable extends React.Component {
     );
   }
 }
+
+export default inject('rootStore')(BaseTable);
diff --git a/src/layouts/Base/Right.jsx b/src/layouts/Base/Right.jsx
index ddcdcffe..fac5ae6e 100644
--- a/src/layouts/Base/Right.jsx
+++ b/src/layouts/Base/Right.jsx
@@ -25,9 +25,7 @@ import styles from './index.less';
 
 const { Content } = Layout;
 
-@inject('rootStore')
-@observer
-class Right extends Component {
+export class Right extends Component {
   constructor(props) {
     super(props);
     this.routes = props.route.routes;
@@ -193,4 +191,4 @@ class Right extends Component {
   }
 }
 
-export default Right;
+export default inject('rootStore')(observer(Right));
diff --git a/src/layouts/Basic/index.jsx b/src/layouts/Basic/index.jsx
index 0710dc0f..a28ae89e 100644
--- a/src/layouts/Basic/index.jsx
+++ b/src/layouts/Basic/index.jsx
@@ -16,9 +16,7 @@ import { Component } from 'react';
 import { inject, observer } from 'mobx-react';
 import renderRoutes from 'utils/RouterConfig';
 
-@inject('rootStore')
-@observer
-class BaseLayout extends Component {
+export class BaseLayout extends Component {
   constructor(props) {
     super(props);
 
@@ -32,4 +30,4 @@ class BaseLayout extends Component {
   }
 }
 
-export default BaseLayout;
+export default inject('rootStore')(observer(BaseLayout));
diff --git a/src/layouts/Blank/index.jsx b/src/layouts/Blank/index.jsx
index 92d886d1..0e54f430 100644
--- a/src/layouts/Blank/index.jsx
+++ b/src/layouts/Blank/index.jsx
@@ -19,9 +19,7 @@ import i18n from 'core/i18n';
 import DocumentTitle from 'react-document-title';
 import styles from './index.less';
 
-@inject('rootStore')
-@observer
-class BlankLayout extends Component {
+export class BlankLayout extends Component {
   constructor(props) {
     super(props);
     console.log('props', props);
@@ -54,4 +52,4 @@ class BlankLayout extends Component {
   }
 }
 
-export default BlankLayout;
+export default inject('rootStore')(observer(BlankLayout));
diff --git a/src/pages/auth/containers/ChangePassword/index.jsx b/src/pages/auth/containers/ChangePassword/index.jsx
index 630c8e7c..6b794502 100644
--- a/src/pages/auth/containers/ChangePassword/index.jsx
+++ b/src/pages/auth/containers/ChangePassword/index.jsx
@@ -25,9 +25,7 @@ import Notify from 'components/Notify';
 import SimpleForm from 'components/SimpleForm';
 import styles from './index.less';
 
-@inject('rootStore')
-@observer
-export default class Password extends Component {
+export class Password extends Component {
   formRef = null;
 
   constructor(props) {
@@ -215,3 +213,5 @@ export default class Password extends Component {
     );
   }
 }
+
+export default inject('rootStore')(observer(Password));
diff --git a/src/pages/base/containers/AdminOverview/components/ComputeService.jsx b/src/pages/base/containers/AdminOverview/components/ComputeService.jsx
index b61cba49..84a218e4 100644
--- a/src/pages/base/containers/AdminOverview/components/ComputeService.jsx
+++ b/src/pages/base/containers/AdminOverview/components/ComputeService.jsx
@@ -22,9 +22,7 @@ import {
 } from '@ant-design/icons/lib/icons';
 import styles from '../style.less';
 
-@inject('rootStore')
-@observer
-class ComputeService extends Component {
+export class ComputeService extends Component {
   componentDidMount() {
     this.props.store.getComputeService();
   }
@@ -83,4 +81,4 @@ ComputeService.propTypes = {
   store: PropTypes.object.isRequired,
 };
 
-export default ComputeService;
+export default inject('rootStore')(observer(ComputeService));
diff --git a/src/pages/base/containers/AdminOverview/components/NetworkService.jsx b/src/pages/base/containers/AdminOverview/components/NetworkService.jsx
index 333046db..75347fe7 100644
--- a/src/pages/base/containers/AdminOverview/components/NetworkService.jsx
+++ b/src/pages/base/containers/AdminOverview/components/NetworkService.jsx
@@ -22,9 +22,7 @@ import {
 } from '@ant-design/icons/lib/icons';
 import styles from '../style.less';
 
-@inject('rootStore')
-@observer
-class NetworkService extends Component {
+export class NetworkService extends Component {
   componentDidMount() {
     this.props.store.getNetworkService();
   }
@@ -83,4 +81,4 @@ NetworkService.propTypes = {
   store: PropTypes.object.isRequired,
 };
 
-export default NetworkService;
+export default inject('rootStore')(observer(NetworkService));
diff --git a/src/pages/compute/containers/BareMetalNode/Detail/BaseDetail.jsx b/src/pages/compute/containers/BareMetalNode/Detail/BaseDetail.jsx
index 84d7dc08..fa54b495 100644
--- a/src/pages/compute/containers/BareMetalNode/Detail/BaseDetail.jsx
+++ b/src/pages/compute/containers/BareMetalNode/Detail/BaseDetail.jsx
@@ -17,9 +17,7 @@ import { inject, observer } from 'mobx-react';
 import Base from 'containers/BaseDetail';
 import SimpleTable from 'components/Tables/SimpleTable';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   get leftCards() {
     const cards = [
       this.baseInfoCard,
@@ -180,3 +178,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Create.jsx b/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Create.jsx
index 538ae211..7d916507 100644
--- a/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Create.jsx
+++ b/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Create.jsx
@@ -22,9 +22,7 @@ import { isEmpty } from 'lodash';
 import { macAddressValidate } from 'utils/validate';
 import { updateAddSelectValueToObj } from 'utils/index';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'CreatePort';
 
   static title = t('Create Port');
@@ -171,3 +169,5 @@ export default class Create extends ModalAction {
     return globalIronicPortStore.create(body);
   };
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Edit.jsx b/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Edit.jsx
index 7ed79c3a..e972cb85 100644
--- a/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Edit.jsx
+++ b/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Edit.jsx
@@ -23,9 +23,7 @@ import { macAddressValidate } from 'utils/validate';
 import { updateObjToAddSelectArray } from 'utils/index';
 import { getDifFromAddSelectValue } from 'resources/ironic/ironic';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'EditPort';
 
   static title = t('Edit Port');
@@ -231,3 +229,5 @@ export default class Edit extends ModalAction {
     return globalIronicPortStore.edit({ id: this.item.uuid }, body);
   };
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/compute/containers/BareMetalNode/Detail/Port/index.jsx b/src/pages/compute/containers/BareMetalNode/Detail/Port/index.jsx
index 774d3ef8..e0a62d30 100644
--- a/src/pages/compute/containers/BareMetalNode/Detail/Port/index.jsx
+++ b/src/pages/compute/containers/BareMetalNode/Detail/Port/index.jsx
@@ -17,9 +17,7 @@ import Base from 'containers/List';
 import { IronicPortStore } from 'stores/ironic/port';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class BareMetalNodePort extends Base {
+export class BareMetalNodePort extends Base {
   init() {
     this.store = new IronicPortStore();
   }
@@ -75,3 +73,5 @@ export default class BareMetalNodePort extends Base {
     return rest;
   };
 }
+
+export default inject('rootStore')(observer(BareMetalNodePort));
diff --git a/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Create.jsx b/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Create.jsx
index 273affce..34faeb6d 100644
--- a/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Create.jsx
+++ b/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Create.jsx
@@ -21,9 +21,7 @@ import { isEmpty } from 'lodash';
 import { macAddressValidate } from 'utils/validate';
 import { updateAddSelectValueToObj } from 'utils/index';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'CreatePort';
 
   static title = t('Create Port Group');
@@ -128,3 +126,5 @@ export default class Create extends ModalAction {
     return globalIronicPortGroupStore.create(body);
   };
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Edit.jsx b/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Edit.jsx
index f7a22251..b0f513c0 100644
--- a/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Edit.jsx
+++ b/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Edit.jsx
@@ -22,9 +22,7 @@ import { macAddressValidate } from 'utils/validate';
 import { updateObjToAddSelectArray } from 'utils/index';
 import { getDifFromAddSelectValue } from 'resources/ironic/ironic';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'EditPortGroup';
 
   static title = t('Edit Port Group');
@@ -193,3 +191,5 @@ export default class Edit extends ModalAction {
     return globalIronicPortGroupStore.edit({ id: this.item.uuid }, body);
   };
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/index.jsx b/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/index.jsx
index 8c7d1d99..96ef2127 100644
--- a/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/index.jsx
+++ b/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/index.jsx
@@ -17,9 +17,7 @@ import Base from 'containers/List';
 import { IronicPortGroupStore } from 'stores/ironic/port-group';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class BareMetalNodePortGroup extends Base {
+export class BareMetalNodePortGroup extends Base {
   init() {
     this.store = new IronicPortGroupStore();
   }
@@ -75,3 +73,5 @@ export default class BareMetalNodePortGroup extends Base {
     return rest;
   };
 }
+
+export default inject('rootStore')(observer(BareMetalNodePortGroup));
diff --git a/src/pages/compute/containers/BareMetalNode/Detail/index.jsx b/src/pages/compute/containers/BareMetalNode/Detail/index.jsx
index 18fd8ea6..d318cd31 100644
--- a/src/pages/compute/containers/BareMetalNode/Detail/index.jsx
+++ b/src/pages/compute/containers/BareMetalNode/Detail/index.jsx
@@ -22,9 +22,7 @@ import Port from './Port';
 import PortGroup from './PortGroup';
 import actionConfigs from '../actions';
 
-@inject('rootStore')
-@observer
-export default class Detail extends Base {
+export class Detail extends Base {
   get name() {
     return t('bare metal node');
   }
@@ -109,3 +107,5 @@ export default class Detail extends Base {
     this.store = new IronicStore();
   }
 }
+
+export default inject('rootStore')(observer(Detail));
diff --git a/src/pages/compute/containers/BareMetalNode/actions/Create/DriveInfo.jsx b/src/pages/compute/containers/BareMetalNode/actions/Create/DriveInfo.jsx
index bb9dd756..6f5ad74c 100644
--- a/src/pages/compute/containers/BareMetalNode/actions/Create/DriveInfo.jsx
+++ b/src/pages/compute/containers/BareMetalNode/actions/Create/DriveInfo.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import Base from 'components/Form';
 import { ImageStore } from 'stores/glance/image';
 
-@inject('rootStore')
-@observer
-export default class NodeInfo extends Base {
+export class NodeInfo extends Base {
   init() {
     this.imageStore = new ImageStore();
     this.getImages();
@@ -164,3 +162,5 @@ export default class NodeInfo extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(NodeInfo));
diff --git a/src/pages/compute/containers/BareMetalNode/actions/Create/DriveInterface.jsx b/src/pages/compute/containers/BareMetalNode/actions/Create/DriveInterface.jsx
index 7d357524..c51b28f5 100644
--- a/src/pages/compute/containers/BareMetalNode/actions/Create/DriveInterface.jsx
+++ b/src/pages/compute/containers/BareMetalNode/actions/Create/DriveInterface.jsx
@@ -15,9 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import Base from 'components/Form';
 
-@inject('rootStore')
-@observer
-export default class NodeInterface extends Base {
+export class NodeInterface extends Base {
   get bootInterfaces() {
     return [
       { value: 'pxe', label: t('PXE') },
@@ -125,3 +123,5 @@ export default class NodeInterface extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(NodeInterface));
diff --git a/src/pages/compute/containers/BareMetalNode/actions/Create/NodeInfo.jsx b/src/pages/compute/containers/BareMetalNode/actions/Create/NodeInfo.jsx
index df52cff7..c1feb70a 100644
--- a/src/pages/compute/containers/BareMetalNode/actions/Create/NodeInfo.jsx
+++ b/src/pages/compute/containers/BareMetalNode/actions/Create/NodeInfo.jsx
@@ -21,9 +21,7 @@ import globalIronicStore from 'stores/ironic/ironic';
 
 const filterCustomTrait = (item) => item.indexOf('CUSTOM_') < 0;
 
-@inject('rootStore')
-@observer
-export default class NodeInfo extends Base {
+export class NodeInfo extends Base {
   init() {
     this.getTraits();
   }
@@ -245,3 +243,5 @@ export default class NodeInfo extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(NodeInfo));
diff --git a/src/pages/compute/containers/BareMetalNode/actions/Create/index.jsx b/src/pages/compute/containers/BareMetalNode/actions/Create/index.jsx
index 212c766e..abe65e60 100644
--- a/src/pages/compute/containers/BareMetalNode/actions/Create/index.jsx
+++ b/src/pages/compute/containers/BareMetalNode/actions/Create/index.jsx
@@ -26,9 +26,7 @@ import DriveInterface from './DriveInterface';
 import DriveInfo from './DriveInfo';
 import NodeInfo from './NodeInfo';
 
-@inject('rootStore')
-@observer
-export default class Create extends StepAction {
+export class Create extends StepAction {
   static id = 'create';
 
   static title = t('Create Node');
@@ -222,3 +220,5 @@ export default class Create extends StepAction {
     return this.store.edit({ id: this.id }, body);
   };
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/compute/containers/BareMetalNode/actions/Edit.jsx b/src/pages/compute/containers/BareMetalNode/actions/Edit.jsx
index c41a9417..b208b36b 100644
--- a/src/pages/compute/containers/BareMetalNode/actions/Edit.jsx
+++ b/src/pages/compute/containers/BareMetalNode/actions/Edit.jsx
@@ -15,9 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import Create from './Create';
 
-@inject('rootStore')
-@observer
-export default class Edit extends Create {
+export class Edit extends Create {
   static id = 'edit-node';
 
   static title = t('Edit Bare Metal Node');
@@ -40,3 +38,5 @@ export default class Edit extends Create {
     return Promise.resolve(true);
   }
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/compute/containers/BareMetalNode/actions/ManageState.jsx b/src/pages/compute/containers/BareMetalNode/actions/ManageState.jsx
index 480c36f6..7f4db755 100644
--- a/src/pages/compute/containers/BareMetalNode/actions/ManageState.jsx
+++ b/src/pages/compute/containers/BareMetalNode/actions/ManageState.jsx
@@ -18,9 +18,7 @@ import { ModalAction } from 'containers/Action';
 import { provisioningState, canChangeStatus } from 'resources/ironic/ironic';
 import { getOptions } from 'utils/index';
 
-@inject('rootStore')
-@observer
-export default class ManageState extends ModalAction {
+export class ManageState extends ModalAction {
   static id = 'ManageState';
 
   static title = t('Manage State');
@@ -95,3 +93,5 @@ export default class ManageState extends ModalAction {
     return globalIronicStore.changeProvision(uuid, body);
   };
 }
+
+export default inject('rootStore')(observer(ManageState));
diff --git a/src/pages/compute/containers/BareMetalNode/actions/SetBootDevice.jsx b/src/pages/compute/containers/BareMetalNode/actions/SetBootDevice.jsx
index d6845375..6c8efefb 100644
--- a/src/pages/compute/containers/BareMetalNode/actions/SetBootDevice.jsx
+++ b/src/pages/compute/containers/BareMetalNode/actions/SetBootDevice.jsx
@@ -17,9 +17,7 @@ import { IronicStore } from 'stores/ironic/ironic';
 import { ModalAction } from 'containers/Action';
 import { yesNoOptions } from 'utils/constants';
 
-@inject('rootStore')
-@observer
-export default class SetBootDevice extends ModalAction {
+export class SetBootDevice extends ModalAction {
   static id = 'SetBootDevice';
 
   static title = t('Set Boot Device');
@@ -107,3 +105,5 @@ export default class SetBootDevice extends ModalAction {
     return this.store.setBootDevice(uuid, body);
   };
 }
+
+export default inject('rootStore')(observer(SetBootDevice));
diff --git a/src/pages/compute/containers/BareMetalNode/actions/SetMaintenance.jsx b/src/pages/compute/containers/BareMetalNode/actions/SetMaintenance.jsx
index 48a6671e..c0e216bb 100644
--- a/src/pages/compute/containers/BareMetalNode/actions/SetMaintenance.jsx
+++ b/src/pages/compute/containers/BareMetalNode/actions/SetMaintenance.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import globalIronicStore from 'stores/ironic/ironic';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class SetMaintenance extends ModalAction {
+export class SetMaintenance extends ModalAction {
   static id = 'SetMaintenance';
 
   static title = t('Enter Maintenance Mode');
@@ -64,3 +62,5 @@ export default class SetMaintenance extends ModalAction {
     return globalIronicStore.setMaintenance(uuid, body);
   };
 }
+
+export default inject('rootStore')(observer(SetMaintenance));
diff --git a/src/pages/compute/containers/BareMetalNode/index.jsx b/src/pages/compute/containers/BareMetalNode/index.jsx
index b9ad8eca..425128a5 100644
--- a/src/pages/compute/containers/BareMetalNode/index.jsx
+++ b/src/pages/compute/containers/BareMetalNode/index.jsx
@@ -20,9 +20,7 @@ import { ironicOriginEndpoint } from 'client/client/constants';
 import { getOptions } from 'utils';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class BareMetalNode extends Base {
+export class BareMetalNode extends Base {
   init() {
     this.store = globalIronicStore;
   }
@@ -123,3 +121,5 @@ export default class BareMetalNode extends Base {
     return rest;
   };
 }
+
+export default inject('rootStore')(observer(BareMetalNode));
diff --git a/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx b/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx
index e5231031..f97b1b88 100644
--- a/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx
+++ b/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx
@@ -26,9 +26,7 @@ import {
   isBareMetal,
 } from 'resources/nova/flavor';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   get leftCards() {
     const { category, disk, usbType } = this.detailData;
     const isGPUType = isGpuCategory(category);
@@ -269,3 +267,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/compute/containers/Flavor/actions/Edit.jsx b/src/pages/compute/containers/Flavor/actions/Edit.jsx
index 688f15f7..f0884a3f 100644
--- a/src/pages/compute/containers/Flavor/actions/Edit.jsx
+++ b/src/pages/compute/containers/Flavor/actions/Edit.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import globalFlavorStore from 'stores/nova/flavor';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit-flavor';
 
   static title = t('Edit Flavor');
@@ -33,3 +31,5 @@ export default class Edit extends ModalAction {
 
   static allowed = () => Promise.resolve(true);
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/compute/containers/Flavor/actions/ManageAccess.jsx b/src/pages/compute/containers/Flavor/actions/ManageAccess.jsx
index 1798becd..442a1bad 100644
--- a/src/pages/compute/containers/Flavor/actions/ManageAccess.jsx
+++ b/src/pages/compute/containers/Flavor/actions/ManageAccess.jsx
@@ -18,9 +18,7 @@ import { ModalAction } from 'containers/Action';
 import { ProjectStore } from 'stores/keystone/project';
 import { projectTableOptions } from 'resources/keystone/project';
 
-@inject('rootStore')
-@observer
-export default class ManageAccess extends ModalAction {
+export class ManageAccess extends ModalAction {
   static id = 'manage-access';
 
   static title = t('Manage Access');
@@ -117,3 +115,5 @@ export default class ManageAccess extends ModalAction {
     return globalFlavorStore.updateAccess(id, adds, dels);
   };
 }
+
+export default inject('rootStore')(observer(ManageAccess));
diff --git a/src/pages/compute/containers/Flavor/actions/ManageMetadata.jsx b/src/pages/compute/containers/Flavor/actions/ManageMetadata.jsx
index cc7cf17a..393237a2 100644
--- a/src/pages/compute/containers/Flavor/actions/ManageMetadata.jsx
+++ b/src/pages/compute/containers/Flavor/actions/ManageMetadata.jsx
@@ -19,9 +19,7 @@ import KeyValueInput from 'components/FormItem/KeyValueInput';
 import { MetadataStore } from 'stores/glance/metadata';
 import { isEmpty, has } from 'lodash';
 
-@inject('rootStore')
-@observer
-export default class ManageMetadata extends ModalAction {
+export class ManageMetadata extends ModalAction {
   static id = 'ManageMetadata';
 
   static title = t('Manage Metadata');
@@ -213,3 +211,5 @@ export default class ManageMetadata extends ModalAction {
     return this.store.updateExtraSpecs(this.item.id, adds, replaces, removes);
   };
 }
+
+export default inject('rootStore')(observer(ManageMetadata));
diff --git a/src/pages/compute/containers/Flavor/actions/StepCreate/AccessTypeSetting.jsx b/src/pages/compute/containers/Flavor/actions/StepCreate/AccessTypeSetting.jsx
index 23836645..12a3685f 100644
--- a/src/pages/compute/containers/Flavor/actions/StepCreate/AccessTypeSetting.jsx
+++ b/src/pages/compute/containers/Flavor/actions/StepCreate/AccessTypeSetting.jsx
@@ -17,9 +17,7 @@ import Base from 'components/Form';
 import { ProjectStore } from 'stores/keystone/project';
 import { projectTableOptions } from 'resources/keystone/project';
 
-@inject('rootStore')
-@observer
-export default class AccessTypeSetting extends Base {
+export class AccessTypeSetting extends Base {
   init() {
     this.projectStore = new ProjectStore();
     this.getProjects();
@@ -78,3 +76,5 @@ export default class AccessTypeSetting extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(AccessTypeSetting));
diff --git a/src/pages/compute/containers/Flavor/actions/StepCreate/index.jsx b/src/pages/compute/containers/Flavor/actions/StepCreate/index.jsx
index 368dc57b..1a607a61 100644
--- a/src/pages/compute/containers/Flavor/actions/StepCreate/index.jsx
+++ b/src/pages/compute/containers/Flavor/actions/StepCreate/index.jsx
@@ -27,9 +27,7 @@ import { parse } from 'qs';
 import AccessTypeSetting from './AccessTypeSetting';
 import ParamSetting from './ParamSetting';
 
-@inject('rootStore')
-@observer
-class StepCreate extends StepAction {
+export class StepCreate extends StepAction {
   static id = 'flavor-create';
 
   static title = t('Create Flavor');
@@ -200,4 +198,4 @@ class StepCreate extends StepAction {
   };
 }
 
-export default StepCreate;
+export default inject('rootStore')(observer(StepCreate));
diff --git a/src/pages/compute/containers/Flavor/index.jsx b/src/pages/compute/containers/Flavor/index.jsx
index 5166e4ac..0ecec792 100644
--- a/src/pages/compute/containers/Flavor/index.jsx
+++ b/src/pages/compute/containers/Flavor/index.jsx
@@ -22,9 +22,7 @@ import Arm from './Arm';
 import BareMetal from './BareMetal';
 import Other from './Other';
 
-@inject('rootStore')
-@observer
-export default class Flavor extends Base {
+export class Flavor extends Base {
   init() {
     this.settingStore = globalSettingStore;
     this.getSettings();
@@ -54,3 +52,5 @@ export default class Flavor extends Base {
     }));
   }
 }
+
+export default inject('rootStore')(observer(Flavor));
diff --git a/src/pages/compute/containers/HostAggregate/Aggregate/actions/Create.jsx b/src/pages/compute/containers/HostAggregate/Aggregate/actions/Create.jsx
index a3756f62..ab366e09 100644
--- a/src/pages/compute/containers/HostAggregate/Aggregate/actions/Create.jsx
+++ b/src/pages/compute/containers/HostAggregate/Aggregate/actions/Create.jsx
@@ -18,9 +18,7 @@ import { ModalAction } from 'containers/Action';
 import globalAvailabilityZoneStore from 'stores/nova/zone';
 import { getYesNoList } from 'utils/index';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create';
 
   static title = t('Create Host Aggregate');
@@ -110,3 +108,5 @@ export default class Create extends ModalAction {
     return globalAggregateStore.create(data);
   };
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/compute/containers/HostAggregate/Aggregate/actions/Edit.jsx b/src/pages/compute/containers/HostAggregate/Aggregate/actions/Edit.jsx
index 16e7a3b4..439b2b64 100644
--- a/src/pages/compute/containers/HostAggregate/Aggregate/actions/Edit.jsx
+++ b/src/pages/compute/containers/HostAggregate/Aggregate/actions/Edit.jsx
@@ -18,9 +18,7 @@ import { ModalAction } from 'containers/Action';
 import globalAvailabilityZoneStore from 'stores/nova/zone';
 import { getYesNoList } from 'utils/index';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit';
 
   static title = t('Edit Host Aggregate');
@@ -131,3 +129,5 @@ export default class Edit extends ModalAction {
     return globalAggregateStore.edit({ id }, data);
   };
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageHost.jsx b/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageHost.jsx
index 48b1ca58..edd22658 100644
--- a/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageHost.jsx
+++ b/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageHost.jsx
@@ -18,9 +18,7 @@ import globalComputeHostStore from 'stores/nova/compute-host';
 import { ModalAction } from 'containers/Action';
 import { serviceStatus, serviceState } from 'resources/nova/service';
 
-@inject('rootStore')
-@observer
-export default class ManageHost extends ModalAction {
+export class ManageHost extends ModalAction {
   static id = 'ManageHost';
 
   static title = t('Manage Host');
@@ -149,3 +147,5 @@ export default class ManageHost extends ModalAction {
     return this.store.manageHost({ id, adds, dels });
   };
 }
+
+export default inject('rootStore')(observer(ManageHost));
diff --git a/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageMetadata.jsx b/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageMetadata.jsx
index d027e671..11f4179a 100644
--- a/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageMetadata.jsx
+++ b/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageMetadata.jsx
@@ -19,9 +19,7 @@ import KeyValueInput from 'components/FormItem/KeyValueInput';
 import { MetadataStore } from 'stores/glance/metadata';
 import { isEmpty, has } from 'lodash';
 
-@inject('rootStore')
-@observer
-export default class ManageMetadata extends ModalAction {
+export class ManageMetadata extends ModalAction {
   static id = 'ManageMetadata';
 
   static title = t('Manage Metadata');
@@ -178,3 +176,5 @@ export default class ManageMetadata extends ModalAction {
     return this.store.manageMetadata({ id, metadata });
   };
 }
+
+export default inject('rootStore')(observer(ManageMetadata));
diff --git a/src/pages/compute/containers/HostAggregate/Aggregate/index.jsx b/src/pages/compute/containers/HostAggregate/Aggregate/index.jsx
index 00e9f4cb..9ac38ca5 100644
--- a/src/pages/compute/containers/HostAggregate/Aggregate/index.jsx
+++ b/src/pages/compute/containers/HostAggregate/Aggregate/index.jsx
@@ -19,9 +19,7 @@ import { isEmpty } from 'lodash';
 import globalAggregateStore from 'stores/nova/aggregate';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class HostAggregate extends Base {
+export class HostAggregate extends Base {
   init() {
     this.store = globalAggregateStore;
   }
@@ -103,3 +101,5 @@ export default class HostAggregate extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(HostAggregate));
diff --git a/src/pages/compute/containers/HostAggregate/AvailabilityZone/index.jsx b/src/pages/compute/containers/HostAggregate/AvailabilityZone/index.jsx
index d13de428..cc128dd5 100644
--- a/src/pages/compute/containers/HostAggregate/AvailabilityZone/index.jsx
+++ b/src/pages/compute/containers/HostAggregate/AvailabilityZone/index.jsx
@@ -18,9 +18,7 @@ import Base from 'containers/List';
 import { isEmpty } from 'lodash';
 import globalAvailabilityZoneStore from 'stores/nova/zone';
 
-@inject('rootStore')
-@observer
-export default class AvailabilityZone extends Base {
+export class AvailabilityZone extends Base {
   init() {
     this.store = globalAvailabilityZoneStore;
   }
@@ -80,3 +78,5 @@ export default class AvailabilityZone extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(AvailabilityZone));
diff --git a/src/pages/compute/containers/HostAggregate/index.jsx b/src/pages/compute/containers/HostAggregate/index.jsx
index 97c7514d..a2309480 100644
--- a/src/pages/compute/containers/HostAggregate/index.jsx
+++ b/src/pages/compute/containers/HostAggregate/index.jsx
@@ -17,9 +17,7 @@ import Base from 'containers/TabList';
 import Aggregate from './Aggregate';
 import AvailabilityZone from './AvailabilityZone';
 
-@inject('rootStore')
-@observer
-export default class Index extends Base {
+export class HostAggregate extends Base {
   get tabs() {
     const tabs = [
       {
@@ -36,3 +34,5 @@ export default class Index extends Base {
     return tabs;
   }
 }
+
+export default inject('rootStore')(observer(HostAggregate));
diff --git a/src/pages/compute/containers/Hypervisors/ComputeHost/actions/Disable.jsx b/src/pages/compute/containers/Hypervisors/ComputeHost/actions/Disable.jsx
index 891fd5c4..25019e12 100644
--- a/src/pages/compute/containers/Hypervisors/ComputeHost/actions/Disable.jsx
+++ b/src/pages/compute/containers/Hypervisors/ComputeHost/actions/Disable.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import globalComputeHostStore from 'stores/nova/compute-host';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class DisableAction extends ModalAction {
+export class DisableAction extends ModalAction {
   static id = 'disable-host';
 
   static title = t('Disable Compute Host');
@@ -85,3 +83,5 @@ export default class DisableAction extends ModalAction {
     return globalComputeHostStore.disable(body);
   };
 }
+
+export default inject('rootStore')(observer(DisableAction));
diff --git a/src/pages/compute/containers/Hypervisors/ComputeHost/index.jsx b/src/pages/compute/containers/Hypervisors/ComputeHost/index.jsx
index 968936da..7bbd143a 100644
--- a/src/pages/compute/containers/Hypervisors/ComputeHost/index.jsx
+++ b/src/pages/compute/containers/Hypervisors/ComputeHost/index.jsx
@@ -20,9 +20,7 @@ import { onlyAdminCanReadPolicy } from 'resources/skyline/policy';
 import { getOptions } from 'utils';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class ComputeHost extends Base {
+export class ComputeHost extends Base {
   init() {
     this.store = globalComputeHostStore;
   }
@@ -105,3 +103,5 @@ export default class ComputeHost extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(ComputeHost));
diff --git a/src/pages/compute/containers/Hypervisors/index.jsx b/src/pages/compute/containers/Hypervisors/index.jsx
index 922b2940..094b067b 100644
--- a/src/pages/compute/containers/Hypervisors/index.jsx
+++ b/src/pages/compute/containers/Hypervisors/index.jsx
@@ -17,9 +17,7 @@ import Base from 'containers/TabList';
 import Hypervisor from './Hypervisor';
 import ComputeHost from './ComputeHost';
 
-@inject('rootStore')
-@observer
-export default class Index extends Base {
+export class Hypervisors extends Base {
   get tabs() {
     const tabs = [
       {
@@ -36,3 +34,5 @@ export default class Index extends Base {
     return tabs;
   }
 }
+
+export default inject('rootStore')(observer(Hypervisors));
diff --git a/src/pages/compute/containers/Image/actions/CreateInstance.jsx b/src/pages/compute/containers/Image/actions/CreateInstance.jsx
index 0e95d544..9dbb2536 100644
--- a/src/pages/compute/containers/Image/actions/CreateInstance.jsx
+++ b/src/pages/compute/containers/Image/actions/CreateInstance.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import CreateInstance from 'pages/compute/containers/Instance/actions/StepCreate';
 import { canImageCreateInstance } from 'resources/glance/image';
 
-@inject('rootStore')
-@observer
-export default class StepCreate extends CreateInstance {
+export class StepCreate extends CreateInstance {
   static id = 'instance-create';
 
   static title = t('Create Instance');
@@ -34,3 +32,5 @@ export default class StepCreate extends CreateInstance {
     return Promise.resolve(!isAdminPage && canImageCreateInstance(item));
   }
 }
+
+export default inject('rootStore')(observer(StepCreate));
diff --git a/src/pages/compute/containers/Image/actions/Edit.jsx b/src/pages/compute/containers/Image/actions/Edit.jsx
index 2d23badd..c99df8d6 100644
--- a/src/pages/compute/containers/Image/actions/Edit.jsx
+++ b/src/pages/compute/containers/Image/actions/Edit.jsx
@@ -21,9 +21,7 @@ import { isActive } from 'resources/nova/instance';
 import { NoSetValue, getOptionsWithNoSet } from 'utils/index';
 import { cpuPolicyList, cpuThreadPolicyList } from 'resources/nova/flavor';
 
-@inject('rootStore')
-@observer
-class Edit extends ModalAction {
+export class Edit extends ModalAction {
   init() {
     this.store = globalImageStore;
   }
@@ -254,4 +252,4 @@ class Edit extends ModalAction {
   };
 }
 
-export default Edit;
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/compute/containers/Image/actions/ManageAccess.jsx b/src/pages/compute/containers/Image/actions/ManageAccess.jsx
index 59bb4e05..7a7f96e2 100644
--- a/src/pages/compute/containers/Image/actions/ManageAccess.jsx
+++ b/src/pages/compute/containers/Image/actions/ManageAccess.jsx
@@ -18,9 +18,7 @@ import { ModalAction } from 'containers/Action';
 import { ProjectStore } from 'stores/keystone/project';
 import { projectTableOptions } from 'resources/keystone/project';
 
-@inject('rootStore')
-@observer
-export default class ManageAccess extends ModalAction {
+export class ManageAccess extends ModalAction {
   static id = 'manage-access';
 
   static title = t('Manage Access');
@@ -114,3 +112,5 @@ export default class ManageAccess extends ModalAction {
     return globalImageStore.updateMembers(id, adds, dels);
   };
 }
+
+export default inject('rootStore')(observer(ManageAccess));
diff --git a/src/pages/compute/containers/Image/actions/ManageMetadata.jsx b/src/pages/compute/containers/Image/actions/ManageMetadata.jsx
index cae30093..6306290f 100644
--- a/src/pages/compute/containers/Image/actions/ManageMetadata.jsx
+++ b/src/pages/compute/containers/Image/actions/ManageMetadata.jsx
@@ -20,9 +20,7 @@ import { MetadataStore } from 'stores/glance/metadata';
 import { isEmpty, has } from 'lodash';
 import { isOwner } from 'resources/glance/image';
 
-@inject('rootStore')
-@observer
-export default class ManageMetadata extends ModalAction {
+export class ManageMetadata extends ModalAction {
   static id = 'ManageMetadata';
 
   static title = t('Manage Metadata');
@@ -259,3 +257,5 @@ export default class ManageMetadata extends ModalAction {
     return this.store.update({ id: this.item.id }, changeValues);
   };
 }
+
+export default inject('rootStore')(observer(ManageMetadata));
diff --git a/src/pages/compute/containers/Image/index.jsx b/src/pages/compute/containers/Image/index.jsx
index 253f2920..0ba9cb67 100644
--- a/src/pages/compute/containers/Image/index.jsx
+++ b/src/pages/compute/containers/Image/index.jsx
@@ -16,9 +16,7 @@ import { observer, inject } from 'mobx-react';
 import Base from 'containers/TabList';
 import Image from './Image';
 
-@inject('rootStore')
-@observer
-export default class TabImage extends Base {
+export class TabImage extends Base {
   get tabs() {
     const tabs = [
       {
@@ -47,3 +45,5 @@ export default class TabImage extends Base {
     return tabs;
   }
 }
+
+export default inject('rootStore')(observer(TabImage));
diff --git a/src/pages/compute/containers/Instance/Detail/ActionLog/index.jsx b/src/pages/compute/containers/Instance/Detail/ActionLog/index.jsx
index 8cfd001a..70add70f 100644
--- a/src/pages/compute/containers/Instance/Detail/ActionLog/index.jsx
+++ b/src/pages/compute/containers/Instance/Detail/ActionLog/index.jsx
@@ -3,9 +3,7 @@ import Base from 'containers/List';
 import globalActionLogStore from 'stores/nova/action-log';
 import { actionColumn } from 'resources/nova/instance';
 
-@inject('rootStore')
-@observer
-export default class ActionLog extends Base {
+export class ActionLog extends Base {
   init() {
     this.store = globalActionLogStore;
   }
@@ -24,3 +22,5 @@ export default class ActionLog extends Base {
     return true;
   }
 }
+
+export default inject('rootStore')(observer(ActionLog));
diff --git a/src/pages/compute/containers/Instance/actions/AssociateFip.jsx b/src/pages/compute/containers/Instance/actions/AssociateFip.jsx
index 32ecb173..f1489e14 100644
--- a/src/pages/compute/containers/Instance/actions/AssociateFip.jsx
+++ b/src/pages/compute/containers/Instance/actions/AssociateFip.jsx
@@ -24,9 +24,7 @@ import {
 } from 'resources/neutron/floatingip';
 import { getPortsAndReasons } from 'resources/neutron/port';
 
-@inject('rootStore')
-@observer
-export default class AssociateFip extends ModalAction {
+export class AssociateFip extends ModalAction {
   static id = 'AssociateFip';
 
   static title = t('Associate Floating IP');
@@ -194,3 +192,5 @@ export default class AssociateFip extends ModalAction {
     });
   };
 }
+
+export default inject('rootStore')(observer(AssociateFip));
diff --git a/src/pages/compute/containers/Instance/actions/AttachInterface.jsx b/src/pages/compute/containers/Instance/actions/AttachInterface.jsx
index f869c809..dddc12e7 100644
--- a/src/pages/compute/containers/Instance/actions/AttachInterface.jsx
+++ b/src/pages/compute/containers/Instance/actions/AttachInterface.jsx
@@ -27,9 +27,7 @@ import { ipValidate } from 'utils/validate';
 
 const { isIPv4, isIpv6, isIpInRangeAll } = ipValidate;
 
-@inject('rootStore')
-@observer
-export default class AttachInterface extends ModalAction {
+export class AttachInterface extends ModalAction {
   static id = 'attach-interface';
 
   static title = t('Attach Interface');
@@ -235,3 +233,5 @@ export default class AttachInterface extends ModalAction {
     return this.store.addInterface({ id, body });
   };
 }
+
+export default inject('rootStore')(observer(AttachInterface));
diff --git a/src/pages/compute/containers/Instance/actions/ChangePassword.jsx b/src/pages/compute/containers/Instance/actions/ChangePassword.jsx
index 009624df..7af69ddb 100644
--- a/src/pages/compute/containers/Instance/actions/ChangePassword.jsx
+++ b/src/pages/compute/containers/Instance/actions/ChangePassword.jsx
@@ -22,9 +22,7 @@ import {
   isIronicInstance,
 } from 'resources/nova/instance';
 
-@inject('rootStore')
-@observer
-export default class ChangePassword extends ModalAction {
+export class ChangePassword extends ModalAction {
   static id = 'change-password';
 
   static title = t('Change Password');
@@ -98,3 +96,5 @@ export default class ChangePassword extends ModalAction {
     return this.store.changePassword({ id, password });
   };
 }
+
+export default inject('rootStore')(observer(ChangePassword));
diff --git a/src/pages/compute/containers/Instance/actions/CreateImage.jsx b/src/pages/compute/containers/Instance/actions/CreateImage.jsx
index 39a7aedf..11bb4cd6 100644
--- a/src/pages/compute/containers/Instance/actions/CreateImage.jsx
+++ b/src/pages/compute/containers/Instance/actions/CreateImage.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import globalServerStore from 'stores/nova/instance';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class CreateImage extends ModalAction {
+export class CreateImage extends ModalAction {
   static id = 'create-image';
 
   static title = t('Create Image');
@@ -87,3 +85,5 @@ export default class CreateImage extends ModalAction {
     return this.store.createImage({ id, image });
   };
 }
+
+export default inject('rootStore')(observer(CreateImage));
diff --git a/src/pages/compute/containers/Instance/actions/DetachInterface.jsx b/src/pages/compute/containers/Instance/actions/DetachInterface.jsx
index 3482aa1f..f840abfb 100644
--- a/src/pages/compute/containers/Instance/actions/DetachInterface.jsx
+++ b/src/pages/compute/containers/Instance/actions/DetachInterface.jsx
@@ -19,9 +19,7 @@ import { ModalAction } from 'containers/Action';
 import { portStatus } from 'resources/neutron/port';
 import { isActiveOrShutOff, isNotLocked } from 'resources/nova/instance';
 
-@inject('rootStore')
-@observer
-export default class DetachInterface extends ModalAction {
+export class DetachInterface extends ModalAction {
   static id = 'detach-interface';
 
   static title = t('Detach Interface');
@@ -139,3 +137,5 @@ export default class DetachInterface extends ModalAction {
     return this.store.detachInterface({ id, ports: selectedRowKeys });
   };
 }
+
+export default inject('rootStore')(observer(DetachInterface));
diff --git a/src/pages/compute/containers/Instance/actions/DisassociateFip.jsx b/src/pages/compute/containers/Instance/actions/DisassociateFip.jsx
index a45e9642..a9c8d18a 100644
--- a/src/pages/compute/containers/Instance/actions/DisassociateFip.jsx
+++ b/src/pages/compute/containers/Instance/actions/DisassociateFip.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { FloatingIpStore } from 'stores/neutron/floatingIp';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class DisassociateFip extends ModalAction {
+export class DisassociateFip extends ModalAction {
   static id = 'DisassociateFip';
 
   static title = t('Disassociate Floating Ip');
@@ -83,3 +81,5 @@ export default class DisassociateFip extends ModalAction {
     return this.store.disassociateFip({ id: results[0].id });
   };
 }
+
+export default inject('rootStore')(observer(DisassociateFip));
diff --git a/src/pages/compute/containers/Instance/actions/Edit.jsx b/src/pages/compute/containers/Instance/actions/Edit.jsx
index 4fd60c93..c8d2dac6 100644
--- a/src/pages/compute/containers/Instance/actions/Edit.jsx
+++ b/src/pages/compute/containers/Instance/actions/Edit.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalServerStore from 'stores/nova/instance';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit-server';
 
   static title = t('Edit Instance');
@@ -57,3 +55,5 @@ export default class Edit extends ModalAction {
     return globalServerStore.edit({ id }, body);
   };
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/compute/containers/Instance/actions/LiveMigrate.jsx b/src/pages/compute/containers/Instance/actions/LiveMigrate.jsx
index aa658129..60f3473e 100644
--- a/src/pages/compute/containers/Instance/actions/LiveMigrate.jsx
+++ b/src/pages/compute/containers/Instance/actions/LiveMigrate.jsx
@@ -27,9 +27,7 @@ import {
   hypervisorFilters,
 } from 'resources/nova/hypervisor';
 
-@inject('rootStore')
-@observer
-export default class LiveMigrate extends ModalAction {
+export class LiveMigrate extends ModalAction {
   static id = 'LiveMigrate';
 
   static title = t('Live Migrate');
@@ -148,3 +146,5 @@ export default class LiveMigrate extends ModalAction {
     return this.store.migrateLive({ id, body });
   };
 }
+
+export default inject('rootStore')(observer(LiveMigrate));
diff --git a/src/pages/compute/containers/Instance/actions/ManageSecurityGroup.jsx b/src/pages/compute/containers/Instance/actions/ManageSecurityGroup.jsx
index 5e85230f..583820d0 100644
--- a/src/pages/compute/containers/Instance/actions/ManageSecurityGroup.jsx
+++ b/src/pages/compute/containers/Instance/actions/ManageSecurityGroup.jsx
@@ -26,9 +26,7 @@ import {
 } from 'resources/neutron/security-group';
 import { toJS } from 'mobx';
 
-@inject('rootStore')
-@observer
-export default class ManageSecurityGroup extends ModalAction {
+export class ManageSecurityGroup extends ModalAction {
   static id = 'manage-security-group';
 
   static title = t('Manage Security Group');
@@ -212,3 +210,5 @@ export default class ManageSecurityGroup extends ModalAction {
     return this.securityGroupStore.updatePortSecurityGroup({ id, reqBody });
   };
 }
+
+export default inject('rootStore')(observer(ManageSecurityGroup));
diff --git a/src/pages/compute/containers/Instance/actions/Migrate.jsx b/src/pages/compute/containers/Instance/actions/Migrate.jsx
index ed37c1a5..4a3e0b25 100644
--- a/src/pages/compute/containers/Instance/actions/Migrate.jsx
+++ b/src/pages/compute/containers/Instance/actions/Migrate.jsx
@@ -27,9 +27,7 @@ import {
   hypervisorFilters,
 } from 'resources/nova/hypervisor';
 
-@inject('rootStore')
-@observer
-export default class LiveMigrate extends ModalAction {
+export class LiveMigrate extends ModalAction {
   static id = 'migrate';
 
   static title = t('Migrate');
@@ -138,3 +136,5 @@ export default class LiveMigrate extends ModalAction {
     return this.store.migrate({ id, body });
   };
 }
+
+export default inject('rootStore')(observer(LiveMigrate));
diff --git a/src/pages/compute/containers/Instance/actions/ModifyTags.jsx b/src/pages/compute/containers/Instance/actions/ModifyTags.jsx
index ac035cff..12d8185a 100644
--- a/src/pages/compute/containers/Instance/actions/ModifyTags.jsx
+++ b/src/pages/compute/containers/Instance/actions/ModifyTags.jsx
@@ -19,9 +19,7 @@ import Tags from 'components/Tags';
 import globalTagStore from 'stores/nova/tag';
 import { isEqual } from 'lodash';
 
-@inject('rootStore')
-@observer
-export default class ModifyTags extends ModalAction {
+export class ModifyTags extends ModalAction {
   static id = 'modify-instance-tags';
 
   static title = t('Modify Instance Tags');
@@ -111,3 +109,5 @@ export default class ModifyTags extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(ModifyTags));
diff --git a/src/pages/compute/containers/Keypair/Detail/BaseDetail.jsx b/src/pages/compute/containers/Keypair/Detail/BaseDetail.jsx
index b93c7e18..82067595 100644
--- a/src/pages/compute/containers/Keypair/Detail/BaseDetail.jsx
+++ b/src/pages/compute/containers/Keypair/Detail/BaseDetail.jsx
@@ -15,9 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import Base from 'containers/BaseDetail';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   get leftCards() {
     return [this.keypairInfoCard];
   }
@@ -44,3 +42,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/compute/containers/Keypair/Detail/index.jsx b/src/pages/compute/containers/Keypair/Detail/index.jsx
index 8337c975..116af7d7 100644
--- a/src/pages/compute/containers/Keypair/Detail/index.jsx
+++ b/src/pages/compute/containers/Keypair/Detail/index.jsx
@@ -18,9 +18,7 @@ import Base from 'containers/TabDetail';
 import BaseDetail from './BaseDetail';
 import actionConfigs from '../actions';
 
-@inject('rootStore')
-@observer
-export default class KeypairDetail extends Base {
+export class KeypairDetail extends Base {
   get name() {
     return t('keypair');
   }
@@ -70,3 +68,5 @@ export default class KeypairDetail extends Base {
     this.store = new KeypairStore();
   }
 }
+
+export default inject('rootStore')(observer(KeypairDetail));
diff --git a/src/pages/compute/containers/Keypair/actions/Create.jsx b/src/pages/compute/containers/Keypair/actions/Create.jsx
index 080847e6..f39acf8d 100644
--- a/src/pages/compute/containers/Keypair/actions/Create.jsx
+++ b/src/pages/compute/containers/Keypair/actions/Create.jsx
@@ -17,9 +17,7 @@ import { ModalAction } from 'containers/Action';
 import globalKeypairStore from 'stores/nova/keypair';
 import FileSaver from 'file-saver';
 
-@inject('rootStore')
-@observer
-export default class CreateKeypair extends ModalAction {
+export class CreateKeypair extends ModalAction {
   static id = 'create-keypair';
 
   static title = t('Create Keypair');
@@ -93,3 +91,5 @@ export default class CreateKeypair extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(CreateKeypair));
diff --git a/src/pages/compute/containers/Keypair/index.jsx b/src/pages/compute/containers/Keypair/index.jsx
index 2c082047..9e9499fe 100644
--- a/src/pages/compute/containers/Keypair/index.jsx
+++ b/src/pages/compute/containers/Keypair/index.jsx
@@ -17,9 +17,7 @@ import Base from 'containers/List';
 import keypairStore from 'stores/nova/keypair';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class Keypair extends Base {
+export class Keypair extends Base {
   init() {
     this.store = keypairStore;
   }
@@ -66,3 +64,5 @@ export default class Keypair extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Keypair));
diff --git a/src/pages/compute/containers/ServerGroup/Detail/index.jsx b/src/pages/compute/containers/ServerGroup/Detail/index.jsx
index c1c4f087..b50e7c4d 100644
--- a/src/pages/compute/containers/ServerGroup/Detail/index.jsx
+++ b/src/pages/compute/containers/ServerGroup/Detail/index.jsx
@@ -19,9 +19,7 @@ import Members from 'pages/compute/containers/Instance';
 import policyType from 'resources/nova/server-group';
 import actionConfigs from '../actions';
 
-@inject('rootStore')
-@observer
-export default class ServerGroupDetail extends Base {
+export class ServerGroupDetail extends Base {
   get name() {
     return t('server group');
   }
@@ -79,3 +77,5 @@ export default class ServerGroupDetail extends Base {
     this.store = new ServerGroupStore();
   }
 }
+
+export default inject('rootStore')(observer(ServerGroupDetail));
diff --git a/src/pages/compute/containers/ServerGroup/actions/Create.jsx b/src/pages/compute/containers/ServerGroup/actions/Create.jsx
index fe68770d..20905fbe 100644
--- a/src/pages/compute/containers/ServerGroup/actions/Create.jsx
+++ b/src/pages/compute/containers/ServerGroup/actions/Create.jsx
@@ -18,9 +18,7 @@ import globalServerGroupStore from 'stores/nova/server-group';
 import { ModalAction } from 'containers/Action';
 import policyType from 'resources/nova/server-group';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create';
 
   static title = t('Create Server Group');
@@ -92,3 +90,5 @@ export default class Create extends ModalAction {
 
   onSubmit = (values) => globalServerGroupStore.create(values);
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/compute/containers/ServerGroup/index.jsx b/src/pages/compute/containers/ServerGroup/index.jsx
index 112a8fe1..c8d2def2 100644
--- a/src/pages/compute/containers/ServerGroup/index.jsx
+++ b/src/pages/compute/containers/ServerGroup/index.jsx
@@ -19,9 +19,7 @@ import policyType from 'resources/nova/server-group';
 import { getOptions } from 'utils';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class ServerGroup extends Base {
+export class ServerGroup extends Base {
   init() {
     this.store = globalServerGroupStore;
   }
@@ -86,3 +84,5 @@ export default class ServerGroup extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(ServerGroup));
diff --git a/src/pages/configuration/containers/Metadata/Detail/BaseDetail.jsx b/src/pages/configuration/containers/Metadata/Detail/BaseDetail.jsx
index c907df8e..c9be30e2 100644
--- a/src/pages/configuration/containers/Metadata/Detail/BaseDetail.jsx
+++ b/src/pages/configuration/containers/Metadata/Detail/BaseDetail.jsx
@@ -17,9 +17,7 @@ import { inject, observer } from 'mobx-react';
 import Base from 'containers/BaseDetail';
 import styles from './styles.less';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   get leftCards() {
     return [this.baseInfoCard, this.resourceCard];
   }
@@ -83,3 +81,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/configuration/containers/Metadata/Detail/index.jsx b/src/pages/configuration/containers/Metadata/Detail/index.jsx
index e70baacf..44f6bddb 100644
--- a/src/pages/configuration/containers/Metadata/Detail/index.jsx
+++ b/src/pages/configuration/containers/Metadata/Detail/index.jsx
@@ -18,9 +18,7 @@ import Base from 'containers/TabDetail';
 import BaseDetail from './BaseDetail';
 import actionConfigs from '../actions';
 
-@inject('rootStore')
-@observer
-export default class MetadataDetail extends Base {
+export class MetadataDetail extends Base {
   get name() {
     return t('metadata');
   }
@@ -71,3 +69,5 @@ export default class MetadataDetail extends Base {
     this.store = new MetadataStore();
   }
 }
+
+export default inject('rootStore')(observer(MetadataDetail));
diff --git a/src/pages/configuration/containers/Metadata/actions/Create.jsx b/src/pages/configuration/containers/Metadata/actions/Create.jsx
index cb81614e..4265ca85 100644
--- a/src/pages/configuration/containers/Metadata/actions/Create.jsx
+++ b/src/pages/configuration/containers/Metadata/actions/Create.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import globalMetadataStore from 'stores/glance/metadata';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create';
 
   static title = t('Import Metadata');
@@ -72,3 +70,5 @@ export default class Create extends ModalAction {
     return this.store.create(body);
   };
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/configuration/containers/Metadata/actions/Edit.jsx b/src/pages/configuration/containers/Metadata/actions/Edit.jsx
index 2d927ddd..cda44247 100644
--- a/src/pages/configuration/containers/Metadata/actions/Edit.jsx
+++ b/src/pages/configuration/containers/Metadata/actions/Edit.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import globalMetadataStore from 'stores/glance/metadata';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit';
 
   static title = t('Edit Metadata');
@@ -86,3 +84,5 @@ export default class Edit extends ModalAction {
     return globalMetadataStore.edit({ id: namespace }, body);
   };
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/configuration/containers/Metadata/actions/Manage.jsx b/src/pages/configuration/containers/Metadata/actions/Manage.jsx
index 8b5805b9..e8999460 100644
--- a/src/pages/configuration/containers/Metadata/actions/Manage.jsx
+++ b/src/pages/configuration/containers/Metadata/actions/Manage.jsx
@@ -19,9 +19,7 @@ import { MetadataStore } from 'stores/glance/metadata';
 import { ModalAction } from 'containers/Action';
 import { Input } from 'antd';
 
-@inject('rootStore')
-@observer
-export default class Manage extends ModalAction {
+export class Manage extends ModalAction {
   static id = 'manage';
 
   static title = t('Manage Resource Types');
@@ -178,3 +176,5 @@ export default class Manage extends ModalAction {
     return this.store.manageResourceTypes(namespace, dels, adds);
   };
 }
+
+export default inject('rootStore')(observer(Manage));
diff --git a/src/pages/configuration/containers/Metadata/index.jsx b/src/pages/configuration/containers/Metadata/index.jsx
index 868a4e7d..7ee23ee9 100644
--- a/src/pages/configuration/containers/Metadata/index.jsx
+++ b/src/pages/configuration/containers/Metadata/index.jsx
@@ -19,9 +19,7 @@ import Base from 'containers/List';
 import globalMetadataStore from 'stores/glance/metadata';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class Metadata extends Base {
+export class Metadata extends Base {
   init() {
     this.store = globalMetadataStore;
   }
@@ -92,3 +90,5 @@ export default class Metadata extends Base {
     },
   ];
 }
+
+export default inject('rootStore')(observer(Metadata));
diff --git a/src/pages/configuration/containers/SystemInfo/Catalog.jsx b/src/pages/configuration/containers/SystemInfo/Catalog.jsx
index 041d694b..6ceeb270 100644
--- a/src/pages/configuration/containers/SystemInfo/Catalog.jsx
+++ b/src/pages/configuration/containers/SystemInfo/Catalog.jsx
@@ -19,9 +19,7 @@ import { generateId } from 'utils/index';
 
 import globalAuthCatalogStore from 'stores/keystone/catalog';
 
-@inject('rootStore')
-@observer
-export default class Catalog extends Base {
+export class Catalog extends Base {
   init() {
     this.store = globalAuthCatalogStore;
   }
@@ -84,3 +82,5 @@ export default class Catalog extends Base {
     return [];
   }
 }
+
+export default inject('rootStore')(observer(Catalog));
diff --git a/src/pages/configuration/containers/SystemInfo/CinderService/actions/Disable.jsx b/src/pages/configuration/containers/SystemInfo/CinderService/actions/Disable.jsx
index 91190d5f..f06faa21 100644
--- a/src/pages/configuration/containers/SystemInfo/CinderService/actions/Disable.jsx
+++ b/src/pages/configuration/containers/SystemInfo/CinderService/actions/Disable.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import globalServiceStore from 'stores/cinder/service';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class DisableAction extends ModalAction {
+export class DisableAction extends ModalAction {
   static id = 'disable-service';
 
   static title = t('Disable Cinder Service');
@@ -86,3 +84,5 @@ export default class DisableAction extends ModalAction {
     return globalServiceStore.disable(body);
   };
 }
+
+export default inject('rootStore')(observer(DisableAction));
diff --git a/src/pages/configuration/containers/SystemInfo/CinderService/index.jsx b/src/pages/configuration/containers/SystemInfo/CinderService/index.jsx
index cfd07c1c..670d5ece 100644
--- a/src/pages/configuration/containers/SystemInfo/CinderService/index.jsx
+++ b/src/pages/configuration/containers/SystemInfo/CinderService/index.jsx
@@ -19,9 +19,7 @@ import globalServiceStore from 'stores/cinder/service';
 import { getOptions } from 'utils';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class CinderService extends Base {
+export class CinderService extends Base {
   init() {
     this.store = globalServiceStore;
   }
@@ -104,3 +102,5 @@ export default class CinderService extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(CinderService));
diff --git a/src/pages/configuration/containers/SystemInfo/ComputeService/actions/Disable.jsx b/src/pages/configuration/containers/SystemInfo/ComputeService/actions/Disable.jsx
index 407a07d9..4bbb1968 100644
--- a/src/pages/configuration/containers/SystemInfo/ComputeService/actions/Disable.jsx
+++ b/src/pages/configuration/containers/SystemInfo/ComputeService/actions/Disable.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import globalComputeHostStore from 'stores/nova/compute-host';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class DisableAction extends ModalAction {
+export class DisableAction extends ModalAction {
   static id = 'disable-host';
 
   static title = t('Disable Compute Service');
@@ -88,3 +86,5 @@ export default class DisableAction extends ModalAction {
     return globalComputeHostStore.disable(body);
   };
 }
+
+export default inject('rootStore')(observer(DisableAction));
diff --git a/src/pages/configuration/containers/SystemInfo/ComputeService/index.jsx b/src/pages/configuration/containers/SystemInfo/ComputeService/index.jsx
index aafa794a..f1fbec9b 100644
--- a/src/pages/configuration/containers/SystemInfo/ComputeService/index.jsx
+++ b/src/pages/configuration/containers/SystemInfo/ComputeService/index.jsx
@@ -19,9 +19,7 @@ import { ComputeHostStore } from 'stores/nova/compute-host';
 import { getOptions } from 'utils';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class ComputeService extends Base {
+export class ComputeService extends Base {
   init() {
     this.store = new ComputeHostStore();
   }
@@ -105,3 +103,5 @@ export default class ComputeService extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(ComputeService));
diff --git a/src/pages/configuration/containers/SystemInfo/HeatService.jsx b/src/pages/configuration/containers/SystemInfo/HeatService.jsx
index 3a9e36af..f19a2092 100644
--- a/src/pages/configuration/containers/SystemInfo/HeatService.jsx
+++ b/src/pages/configuration/containers/SystemInfo/HeatService.jsx
@@ -18,9 +18,7 @@ import { serviceState } from 'resources/nova/service';
 import { getOptions } from 'utils';
 import globalHeatServiceStore from 'stores/heat/service';
 
-@inject('rootStore')
-@observer
-export default class HeatService extends Base {
+export class HeatService extends Base {
   init() {
     this.store = globalHeatServiceStore;
   }
@@ -79,3 +77,5 @@ export default class HeatService extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(HeatService));
diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/BaseDetail.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/BaseDetail.jsx
index 4e460e4e..b429e7a0 100644
--- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/BaseDetail.jsx
+++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/BaseDetail.jsx
@@ -16,9 +16,7 @@ import React from 'react';
 import { inject, observer } from 'mobx-react';
 import Base from 'containers/BaseDetail';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   get leftCards() {
     return [this.baseCard];
   }
@@ -77,3 +75,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/actions/Add.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/actions/Add.jsx
index 6befe7c2..b563e1bc 100644
--- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/actions/Add.jsx
+++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/actions/Add.jsx
@@ -20,9 +20,7 @@ import { networkColumns, networkSortProps } from 'resources/neutron/network';
 import { yesNoOptions } from 'utils/constants';
 import { projectRender } from 'utils/table';
 
-@inject('rootStore')
-@observer
-export default class AddNetwork extends ModalAction {
+export class AddNetwork extends ModalAction {
   static id = 'add-network';
 
   static title = t('Add Network');
@@ -155,3 +153,5 @@ export default class AddNetwork extends ModalAction {
     return this.store.add({ agentId }, data);
   };
 }
+
+export default inject('rootStore')(observer(AddNetwork));
diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/index.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/index.jsx
index 6a50c216..e935744d 100644
--- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/index.jsx
+++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/index.jsx
@@ -19,9 +19,7 @@ import { NeutronAgentNetworkStore } from 'stores/neutron/agent-network';
 import { yesNoOptions } from 'utils/constants';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class Networks extends Base {
+export class Networks extends Base {
   init() {
     this.store = new NeutronAgentNetworkStore();
   }
@@ -79,3 +77,5 @@ export default class Networks extends Base {
     };
   };
 }
+
+export default inject('rootStore')(observer(Networks));
diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/actions/Add.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/actions/Add.jsx
index 2289b0f3..93f640ad 100644
--- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/actions/Add.jsx
+++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/actions/Add.jsx
@@ -23,9 +23,7 @@ import {
 } from 'resources/neutron/router';
 import { projectRender } from 'utils/table';
 
-@inject('rootStore')
-@observer
-export default class AddRouter extends ModalAction {
+export class AddRouter extends ModalAction {
   static id = 'add-router';
 
   static title = t('Add Router');
@@ -141,3 +139,5 @@ export default class AddRouter extends ModalAction {
     return this.store.add({ agentId }, data);
   };
 }
+
+export default inject('rootStore')(observer(AddRouter));
diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/index.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/index.jsx
index 068e04a7..53857b3b 100644
--- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/index.jsx
+++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/index.jsx
@@ -18,9 +18,7 @@ import { getRouterColumns, routerFilters } from 'resources/neutron/router';
 import { NeutronAgentRouterStore } from 'stores/neutron/agent-router';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class Router extends Base {
+export class Router extends Base {
   init() {
     this.store = new NeutronAgentRouterStore();
   }
@@ -59,3 +57,5 @@ export default class Router extends Base {
     };
   };
 }
+
+export default inject('rootStore')(observer(Router));
diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/index.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/index.jsx
index e2592a2e..c4c3cb58 100644
--- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/index.jsx
+++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/index.jsx
@@ -24,9 +24,7 @@ import Router from './Router';
 import Network from './Network';
 import actionConfigs from '../actions';
 
-@inject('rootStore')
-@observer
-export default class KeypairDetail extends Base {
+export class KeypairDetail extends Base {
   get name() {
     return t('neutron agent');
   }
@@ -106,3 +104,5 @@ export default class KeypairDetail extends Base {
     this.store = new NeutronAgentStore();
   }
 }
+
+export default inject('rootStore')(observer(KeypairDetail));
diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/index.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/index.jsx
index d4097c87..3613a4cd 100644
--- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/index.jsx
+++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/index.jsx
@@ -21,9 +21,7 @@ import {
 import globalNeutronAgentStore from 'stores/neutron/agent';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class NeutronAgent extends Base {
+export class NeutronAgent extends Base {
   init() {
     this.store = globalNeutronAgentStore;
   }
@@ -110,3 +108,5 @@ export default class NeutronAgent extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(NeutronAgent));
diff --git a/src/pages/configuration/containers/SystemInfo/index.jsx b/src/pages/configuration/containers/SystemInfo/index.jsx
index a859a049..8c2fd793 100644
--- a/src/pages/configuration/containers/SystemInfo/index.jsx
+++ b/src/pages/configuration/containers/SystemInfo/index.jsx
@@ -20,9 +20,7 @@ import CinderService from './CinderService';
 import NeutronAgent from './NeutronAgent';
 import HeatService from './HeatService';
 
-@inject('rootStore')
-@observer
-export default class Service extends Base {
+export class Service extends Base {
   get enableCinder() {
     return this.props.rootStore.checkEndpoint('cinder');
   }
@@ -60,3 +58,5 @@ export default class Service extends Base {
     return tabs;
   }
 }
+
+export default inject('rootStore')(observer(Service));
diff --git a/src/pages/heat/containers/Stack/Detail/BaseDetail.jsx b/src/pages/heat/containers/Stack/Detail/BaseDetail.jsx
index 29d03f8e..a5ed76d2 100644
--- a/src/pages/heat/containers/Stack/Detail/BaseDetail.jsx
+++ b/src/pages/heat/containers/Stack/Detail/BaseDetail.jsx
@@ -17,9 +17,7 @@ import { inject, observer } from 'mobx-react';
 import Base from 'containers/BaseDetail';
 import { rollbackTip } from 'resources/heat/stack';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   get leftCards() {
     return [this.startCard, this.outputCard];
   }
@@ -84,3 +82,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/heat/containers/Stack/Detail/Event.jsx b/src/pages/heat/containers/Stack/Detail/Event.jsx
index b145d82e..3cdb5c30 100644
--- a/src/pages/heat/containers/Stack/Detail/Event.jsx
+++ b/src/pages/heat/containers/Stack/Detail/Event.jsx
@@ -18,9 +18,7 @@ import Base from 'containers/List';
 import { StackEventStore } from 'stores/heat/event';
 import { stackStatus } from 'resources/heat/stack';
 
-@inject('rootStore')
-@observer
-export default class Event extends Base {
+export class Event extends Base {
   init() {
     this.store = new StackEventStore();
   }
@@ -76,3 +74,5 @@ export default class Event extends Base {
     },
   ];
 }
+
+export default inject('rootStore')(observer(Event));
diff --git a/src/pages/heat/containers/Stack/Detail/Template.jsx b/src/pages/heat/containers/Stack/Detail/Template.jsx
index 949915e0..1aa3b605 100644
--- a/src/pages/heat/containers/Stack/Detail/Template.jsx
+++ b/src/pages/heat/containers/Stack/Detail/Template.jsx
@@ -19,9 +19,7 @@ import yaml from 'js-yaml';
 import { Card } from 'antd';
 import CodeEditor from 'components/CodeEditor';
 
-@inject('rootStore')
-@observer
-export default class Template extends Component {
+export class Template extends Component {
   constructor(props) {
     super(props);
     this.store = new StackStore();
@@ -61,3 +59,5 @@ export default class Template extends Component {
     );
   }
 }
+
+export default inject('rootStore')(observer(Template));
diff --git a/src/pages/heat/containers/Stack/actions/Edit.jsx b/src/pages/heat/containers/Stack/actions/Edit.jsx
index 51247449..8a6b1f96 100644
--- a/src/pages/heat/containers/Stack/actions/Edit.jsx
+++ b/src/pages/heat/containers/Stack/actions/Edit.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { getPath } from 'utils/route-map';
 import Create from './Create';
 
-@inject('rootStore')
-@observer
-export default class Edit extends Create {
+export class Edit extends Create {
   static id = 'edit-template';
 
   static title = t('Update Template');
@@ -44,3 +42,5 @@ export default class Edit extends Create {
     return Promise.resolve(true);
   }
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/identity/containers/Domain/Detail/index.jsx b/src/pages/identity/containers/Domain/Detail/index.jsx
index 7249a9b2..9d9af224 100644
--- a/src/pages/identity/containers/Domain/Detail/index.jsx
+++ b/src/pages/identity/containers/Domain/Detail/index.jsx
@@ -19,9 +19,7 @@ import { DomainStore } from 'stores/keystone/domain';
 import Base from 'containers/TabDetail';
 import User from '../../User';
 
-@inject('rootStore')
-@observer
-export default class DomainDetail extends Base {
+export class DomainDetail extends Base {
   get name() {
     return t('domain');
   }
@@ -84,3 +82,5 @@ export default class DomainDetail extends Base {
     this.store = new DomainStore();
   }
 }
+
+export default inject('rootStore')(observer(DomainDetail));
diff --git a/src/pages/identity/containers/Domain/actions/Create.jsx b/src/pages/identity/containers/Domain/actions/Create.jsx
index 4e9dfe54..ea0d60d1 100644
--- a/src/pages/identity/containers/Domain/actions/Create.jsx
+++ b/src/pages/identity/containers/Domain/actions/Create.jsx
@@ -17,9 +17,7 @@ import globalDomainStore from 'stores/keystone/domain';
 import { FormAction } from 'containers/Action';
 import { statusTypes } from 'utils/constants';
 
-@inject('rootStore')
-@observer
-class CreateForm extends FormAction {
+export class CreateForm extends FormAction {
   init() {
     this.store = globalDomainStore;
   }
@@ -102,4 +100,4 @@ class CreateForm extends FormAction {
   };
 }
 
-export default CreateForm;
+export default inject('rootStore')(observer(CreateForm));
diff --git a/src/pages/identity/containers/Domain/actions/Edit.jsx b/src/pages/identity/containers/Domain/actions/Edit.jsx
index 19d16545..a46915f9 100644
--- a/src/pages/identity/containers/Domain/actions/Edit.jsx
+++ b/src/pages/identity/containers/Domain/actions/Edit.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { FormAction } from 'containers/Action';
 import globalDomainStore from 'stores/keystone/domain';
 
-@inject('rootStore')
-@observer
-class EditForm extends FormAction {
+export class EditForm extends FormAction {
   init() {
     this.store = globalDomainStore;
   }
@@ -141,4 +139,4 @@ class EditForm extends FormAction {
   };
 }
 
-export default EditForm;
+export default inject('rootStore')(observer(EditForm));
diff --git a/src/pages/identity/containers/Domain/index.jsx b/src/pages/identity/containers/Domain/index.jsx
index 26f32b3c..66afa125 100644
--- a/src/pages/identity/containers/Domain/index.jsx
+++ b/src/pages/identity/containers/Domain/index.jsx
@@ -16,9 +16,7 @@ import { observer, inject } from 'mobx-react';
 import Base from 'containers/List';
 import globalDomainStore from 'stores/keystone/domain';
 
-@inject('rootStore')
-@observer
-export default class Domains extends Base {
+export class Domains extends Base {
   init() {
     this.store = globalDomainStore;
   }
@@ -67,3 +65,5 @@ export default class Domains extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Domains));
diff --git a/src/pages/identity/containers/Project/actions/ModifyTags.jsx b/src/pages/identity/containers/Project/actions/ModifyTags.jsx
index 1be8d782..40c6e058 100644
--- a/src/pages/identity/containers/Project/actions/ModifyTags.jsx
+++ b/src/pages/identity/containers/Project/actions/ModifyTags.jsx
@@ -19,9 +19,7 @@ import Tags from 'components/Tags';
 import globalTagStore from 'stores/keystone/tag';
 import { isEqual } from 'lodash';
 
-@inject('rootStore')
-@observer
-export default class ModifyTags extends ModalAction {
+export class ModifyTags extends ModalAction {
   static id = 'modify-project-tags';
 
   static title = t('Modify Project Tags');
@@ -111,3 +109,5 @@ export default class ModifyTags extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(ModifyTags));
diff --git a/src/pages/identity/containers/Role/Detail/BaseDetail.jsx b/src/pages/identity/containers/Role/Detail/BaseDetail.jsx
index 0de02556..ddb19680 100644
--- a/src/pages/identity/containers/Role/Detail/BaseDetail.jsx
+++ b/src/pages/identity/containers/Role/Detail/BaseDetail.jsx
@@ -18,9 +18,7 @@ import Base from 'containers/BaseDetail';
 import { toJS } from 'mobx';
 import rolePermission from 'resources/keystone/role';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   init() {
     this.store = globalRoleStore;
   }
@@ -105,3 +103,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/identity/containers/Role/index.jsx b/src/pages/identity/containers/Role/index.jsx
index 46c20007..c34ca2db 100644
--- a/src/pages/identity/containers/Role/index.jsx
+++ b/src/pages/identity/containers/Role/index.jsx
@@ -16,9 +16,7 @@ import { observer, inject } from 'mobx-react';
 import Base from 'containers/List';
 import globalRoleStore from 'stores/keystone/role';
 
-@inject('rootStore')
-@observer
-export default class Role extends Base {
+export class Role extends Base {
   init() {
     this.store = globalRoleStore;
   }
@@ -75,3 +73,5 @@ export default class Role extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Role));
diff --git a/src/pages/management/containers/RecycleBin/index.jsx b/src/pages/management/containers/RecycleBin/index.jsx
index 07b3e0bf..4b797514 100644
--- a/src/pages/management/containers/RecycleBin/index.jsx
+++ b/src/pages/management/containers/RecycleBin/index.jsx
@@ -21,9 +21,7 @@ import globalRecycleBinStore, {
 import ImageType from 'components/ImageType';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class RecycleBin extends Base {
+export class RecycleBin extends Base {
   init() {
     this.store = globalRecycleBinStore;
     this.downloadStore = new RecycleBinStore();
@@ -154,3 +152,5 @@ export default class RecycleBin extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(RecycleBin));
diff --git a/src/pages/monitor/containers/OpenstackService/index.jsx b/src/pages/monitor/containers/OpenstackService/index.jsx
index d8e6f4ed..74921dbc 100644
--- a/src/pages/monitor/containers/OpenstackService/index.jsx
+++ b/src/pages/monitor/containers/OpenstackService/index.jsx
@@ -21,8 +21,7 @@ import globalRootStore from 'stores/root';
 import Services from './Services';
 import styles from './index.less';
 
-@observer
-class OpenstackService extends Component {
+export class OpenstackService extends Component {
   constructor(props) {
     super(props);
     const { Store = OpenstackServiceStore } = props;
@@ -88,4 +87,4 @@ class OpenstackService extends Component {
   }
 }
 
-export default OpenstackService;
+export default observer(OpenstackService);
diff --git a/src/pages/monitor/containers/OtherService/index.jsx b/src/pages/monitor/containers/OtherService/index.jsx
index 771a2c13..2c0576d0 100644
--- a/src/pages/monitor/containers/OtherService/index.jsx
+++ b/src/pages/monitor/containers/OtherService/index.jsx
@@ -20,8 +20,7 @@ import RabbitMQ from './components/RabbitMQ';
 import Memcache from './components/Memcache';
 import styles from './index.less';
 
-@observer
-class OtherService extends Component {
+export class OtherService extends Component {
   constructor(props) {
     super(props);
     this.state = {
@@ -78,4 +77,4 @@ class OtherService extends Component {
   }
 }
 
-export default OtherService;
+export default observer(OtherService);
diff --git a/src/pages/network/containers/FloatingIp/Detail/PortForwarding/actions/Edit.jsx b/src/pages/network/containers/FloatingIp/Detail/PortForwarding/actions/Edit.jsx
index 63185335..cff2a00b 100644
--- a/src/pages/network/containers/FloatingIp/Detail/PortForwarding/actions/Edit.jsx
+++ b/src/pages/network/containers/FloatingIp/Detail/PortForwarding/actions/Edit.jsx
@@ -22,9 +22,7 @@ import { getPortFormItem, getPortsAndReasons } from 'resources/neutron/port';
 import { DesktopOutlined } from '@ant-design/icons';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'editDnat';
 
   static title = t('Edit');
@@ -325,3 +323,5 @@ export default class Edit extends ModalAction {
     return ret;
   }
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/network/containers/FloatingIp/Detail/PortForwarding/index.jsx b/src/pages/network/containers/FloatingIp/Detail/PortForwarding/index.jsx
index 6211c5e5..43dfa3ad 100644
--- a/src/pages/network/containers/FloatingIp/Detail/PortForwarding/index.jsx
+++ b/src/pages/network/containers/FloatingIp/Detail/PortForwarding/index.jsx
@@ -17,9 +17,7 @@ import Base from 'containers/List';
 import { PortForwardingStore } from 'stores/neutron/port-forwarding';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class PortForwarding extends Base {
+export class PortForwarding extends Base {
   init() {
     this.store = new PortForwardingStore();
     this.downloadStore = new PortForwardingStore();
@@ -97,3 +95,5 @@ export default class PortForwarding extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(PortForwarding));
diff --git a/src/pages/network/containers/FloatingIp/actions/CreateDNAT.jsx b/src/pages/network/containers/FloatingIp/actions/CreateDNAT.jsx
index 03444086..a390b746 100644
--- a/src/pages/network/containers/FloatingIp/actions/CreateDNAT.jsx
+++ b/src/pages/network/containers/FloatingIp/actions/CreateDNAT.jsx
@@ -24,9 +24,7 @@ import { getInterfaceWithReason } from 'resources/neutron/floatingip';
 import globalPortForwardingStore from 'stores/neutron/port-forwarding';
 import { enablePFW } from 'resources/neutron/neutron';
 
-@inject('rootStore')
-@observer
-export default class CreateDNAT extends ModalAction {
+export class CreateDNAT extends ModalAction {
   static id = 'createDNAT';
 
   static title = t('Create DNAT Rule');
@@ -250,3 +248,5 @@ export default class CreateDNAT extends ModalAction {
     return ret;
   }
 }
+
+export default inject('rootStore')(observer(CreateDNAT));
diff --git a/src/pages/network/containers/LoadBalancers/Listener/Actions/CreateListener.jsx b/src/pages/network/containers/LoadBalancers/Listener/Actions/CreateListener.jsx
index 22ebc4f2..c06c969c 100644
--- a/src/pages/network/containers/LoadBalancers/Listener/Actions/CreateListener.jsx
+++ b/src/pages/network/containers/LoadBalancers/Listener/Actions/CreateListener.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import { ListenerStore } from 'stores/octavia/listener';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create_listener';
 
   static title = t('Create Listener');
@@ -95,3 +93,5 @@ export default class Create extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/network/containers/LoadBalancers/Listener/Actions/CreatePool.jsx b/src/pages/network/containers/LoadBalancers/Listener/Actions/CreatePool.jsx
index 90c127c6..c111e523 100644
--- a/src/pages/network/containers/LoadBalancers/Listener/Actions/CreatePool.jsx
+++ b/src/pages/network/containers/LoadBalancers/Listener/Actions/CreatePool.jsx
@@ -18,9 +18,7 @@ import globalPoolStore from 'stores/octavia/pool';
 import globalLbaasStore from 'stores/octavia/loadbalancer';
 import { Algorithm, algorithmTip } from 'resources/octavia/pool';
 
-@inject('rootStore')
-@observer
-class CreatePool extends ModalAction {
+export class CreatePool extends ModalAction {
   static id = 'pool-create';
 
   static title = t('Create Default Pool');
@@ -114,4 +112,4 @@ class CreatePool extends ModalAction {
   };
 }
 
-export default CreatePool;
+export default inject('rootStore')(observer(CreatePool));
diff --git a/src/pages/network/containers/LoadBalancers/Listener/Actions/Edit.jsx b/src/pages/network/containers/LoadBalancers/Listener/Actions/Edit.jsx
index f38ca0c5..e4f29e7e 100644
--- a/src/pages/network/containers/LoadBalancers/Listener/Actions/Edit.jsx
+++ b/src/pages/network/containers/LoadBalancers/Listener/Actions/Edit.jsx
@@ -17,9 +17,7 @@ import globalListenerStore from 'stores/octavia/listener';
 import { ModalAction } from 'containers/Action';
 import globalLbaasStore from 'stores/octavia/loadbalancer';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit-listener';
 
   static title = t('Edit Listener');
@@ -74,3 +72,5 @@ export default class Edit extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/network/containers/LoadBalancers/Listener/Actions/EditHealthMonitor.jsx b/src/pages/network/containers/LoadBalancers/Listener/Actions/EditHealthMonitor.jsx
index 0d60e677..b8002c2e 100644
--- a/src/pages/network/containers/LoadBalancers/Listener/Actions/EditHealthMonitor.jsx
+++ b/src/pages/network/containers/LoadBalancers/Listener/Actions/EditHealthMonitor.jsx
@@ -21,9 +21,7 @@ import { BackendProtocol } from 'resources/octavia/pool';
 import { PoolStore } from 'stores/octavia/pool';
 import globalLbaasStore from 'stores/octavia/loadbalancer';
 
-@inject('rootStore')
-@observer
-class EditHealthMonitor extends ModalAction {
+export class EditHealthMonitor extends ModalAction {
   init() {
     this.store = new HealthMonitorStore();
     this.poolStore = new PoolStore();
@@ -194,4 +192,4 @@ class EditHealthMonitor extends ModalAction {
   };
 }
 
-export default EditHealthMonitor;
+export default inject('rootStore')(observer(EditHealthMonitor));
diff --git a/src/pages/network/containers/LoadBalancers/Listener/Actions/EditPoolInfo.jsx b/src/pages/network/containers/LoadBalancers/Listener/Actions/EditPoolInfo.jsx
index 71543560..2c42f7f5 100644
--- a/src/pages/network/containers/LoadBalancers/Listener/Actions/EditPoolInfo.jsx
+++ b/src/pages/network/containers/LoadBalancers/Listener/Actions/EditPoolInfo.jsx
@@ -18,9 +18,7 @@ import globalPoolStore from 'stores/octavia/pool';
 import { BackendProtocol, Algorithm } from 'resources/octavia/pool';
 import globalLbaasStore from 'stores/octavia/loadbalancer';
 
-@inject('rootStore')
-@observer
-class EditPoolInfo extends ModalAction {
+export class EditPoolInfo extends ModalAction {
   init() {
     this.state = {
       pool: {},
@@ -123,4 +121,4 @@ class EditPoolInfo extends ModalAction {
   };
 }
 
-export default EditPoolInfo;
+export default inject('rootStore')(observer(EditPoolInfo));
diff --git a/src/pages/network/containers/LoadBalancers/Listener/Detail/BaseDetail.jsx b/src/pages/network/containers/LoadBalancers/Listener/Detail/BaseDetail.jsx
index 58f4bf7a..6d0c1409 100644
--- a/src/pages/network/containers/LoadBalancers/Listener/Detail/BaseDetail.jsx
+++ b/src/pages/network/containers/LoadBalancers/Listener/Detail/BaseDetail.jsx
@@ -17,9 +17,7 @@ import globalListenerStore from 'stores/octavia/listener';
 import Base from 'containers/BaseDetail';
 import { HealthMonitorStore } from 'stores/octavia/health-monitor';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   componentDidMount() {
     this.fetchData();
     const { default_pool: { healthmonitor_id } = {} } = this.detailData;
@@ -109,3 +107,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/CreateMember.jsx b/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/CreateMember.jsx
index d5574536..8c81fe29 100644
--- a/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/CreateMember.jsx
+++ b/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/CreateMember.jsx
@@ -22,9 +22,7 @@ import { uniqWith, get } from 'lodash';
 import globalLbaasStore from 'stores/octavia/loadbalancer';
 import isEqual from 'react-fast-compare';
 
-@inject('rootStore')
-@observer
-export default class CreateAction extends ModalAction {
+export class CreateAction extends ModalAction {
   static id = 'manage-member';
 
   static title = t('Add Member');
@@ -150,3 +148,5 @@ export default class CreateAction extends ModalAction {
     });
   };
 }
+
+export default inject('rootStore')(observer(CreateAction));
diff --git a/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/EditMember.jsx b/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/EditMember.jsx
index 07a31a90..dca5b69e 100644
--- a/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/EditMember.jsx
+++ b/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/Actions/EditMember.jsx
@@ -17,9 +17,7 @@ import { ModalAction } from 'containers/Action';
 import globalPoolMemberStore from 'stores/octavia/pool-member';
 import { toJS } from 'mobx';
 
-@inject('rootStore')
-@observer
-class Edit extends ModalAction {
+export class Edit extends ModalAction {
   init() {
     this.state = {};
     this.store = globalPoolMemberStore;
@@ -82,4 +80,4 @@ class Edit extends ModalAction {
   };
 }
 
-export default Edit;
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/index.jsx b/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/index.jsx
index 878f7715..e831d03e 100644
--- a/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/index.jsx
+++ b/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/index.jsx
@@ -19,9 +19,7 @@ import { provisioningStatusCodes } from 'resources/octavia/lb';
 import globalPoolMemberStore from 'stores/octavia/pool-member';
 import { actionConfigs, adminActions } from './Actions';
 
-@inject('rootStore')
-@observer
-export default class Members extends Base {
+export class Members extends Base {
   init() {
     this.store = globalPoolMemberStore;
   }
@@ -105,3 +103,5 @@ export default class Members extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Members));
diff --git a/src/pages/network/containers/LoadBalancers/Listener/Detail/index.jsx b/src/pages/network/containers/LoadBalancers/Listener/Detail/index.jsx
index 801f1e8e..30dff00f 100644
--- a/src/pages/network/containers/LoadBalancers/Listener/Detail/index.jsx
+++ b/src/pages/network/containers/LoadBalancers/Listener/Detail/index.jsx
@@ -20,9 +20,7 @@ import BaseDetail from './BaseDetail';
 import Members from './Member';
 import { actionConfigs, adminActions } from '../Actions';
 
-@inject('rootStore')
-@observer
-export default class ListenerDetail extends Base {
+export class ListenerDetail extends Base {
   get name() {
     return t('listener');
   }
@@ -93,3 +91,5 @@ export default class ListenerDetail extends Base {
     this.store = new ListenerStore();
   }
 }
+
+export default inject('rootStore')(observer(ListenerDetail));
diff --git a/src/pages/network/containers/LoadBalancers/Listener/index.jsx b/src/pages/network/containers/LoadBalancers/Listener/index.jsx
index 37e42e6f..eaf99177 100644
--- a/src/pages/network/containers/LoadBalancers/Listener/index.jsx
+++ b/src/pages/network/containers/LoadBalancers/Listener/index.jsx
@@ -18,9 +18,7 @@ import { provisioningStatusCodes } from 'resources/octavia/lb';
 import { ListenerStore } from 'stores/octavia/listener';
 import { actionConfigs, adminActions } from './Actions';
 
-@inject('rootStore')
-@observer
-export default class Listeners extends Base {
+export class Listeners extends Base {
   init() {
     this.store = new ListenerStore();
     this.downloadStore = new ListenerStore();
@@ -104,3 +102,5 @@ export default class Listeners extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Listeners));
diff --git a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/Detail/index.jsx b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/Detail/index.jsx
index 5b0d3134..41863c71 100644
--- a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/Detail/index.jsx
+++ b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/Detail/index.jsx
@@ -19,9 +19,7 @@ import { provisioningStatusCodes } from 'resources/octavia/lb';
 import Listeners from '../../Listener';
 import { actionConfigs, adminActions } from '../actions';
 
-@inject('rootStore')
-@observer
-export default class LoadBalancerDetail extends Base {
+export class LoadBalancerDetail extends Base {
   get name() {
     return t('load balancer');
   }
@@ -106,3 +104,5 @@ export default class LoadBalancerDetail extends Base {
     this.store = new LbaasStore();
   }
 }
+
+export default inject('rootStore')(observer(LoadBalancerDetail));
diff --git a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/AssociateFIP.jsx b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/AssociateFIP.jsx
index d95a62ac..1d58e5da 100644
--- a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/AssociateFIP.jsx
+++ b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/AssociateFIP.jsx
@@ -22,9 +22,7 @@ import {
 } from 'resources/neutron/floatingip';
 import { getCanReachSubnetIdsWithRouterIdInComponent } from 'resources/neutron/router';
 
-@inject('rootStore')
-@observer
-export default class AssociateFip extends ModalAction {
+export class AssociateFip extends ModalAction {
   static id = 'AssociateFip';
 
   static title = t('Associate Floating IP');
@@ -192,3 +190,5 @@ export default class AssociateFip extends ModalAction {
     });
   };
 }
+
+export default inject('rootStore')(observer(AssociateFip));
diff --git a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/Edit.jsx b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/Edit.jsx
index 1ea99735..a020ae6e 100644
--- a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/Edit.jsx
+++ b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/Edit.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalLbaasStore from 'stores/octavia/loadbalancer';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit_load_balancer';
 
   static title = t('Edit');
@@ -67,3 +65,5 @@ export default class Edit extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/StepCreate/BaseStep/index.jsx b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/StepCreate/BaseStep/index.jsx
index 3f5e4651..e2295b9e 100644
--- a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/StepCreate/BaseStep/index.jsx
+++ b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/StepCreate/BaseStep/index.jsx
@@ -18,9 +18,7 @@ import { LbaasStore } from 'stores/octavia/loadbalancer';
 import { NetworkStore } from 'stores/neutron/network';
 import { SubnetStore } from 'stores/neutron/subnet';
 
-@inject('rootStore')
-@observer
-export default class BaseStep extends Base {
+export class BaseStep extends Base {
   init() {
     this.store = new LbaasStore();
     this.networkStore = new NetworkStore();
@@ -115,3 +113,5 @@ export default class BaseStep extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(BaseStep));
diff --git a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/StepCreate/index.jsx b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/StepCreate/index.jsx
index c5f8be3e..64337e46 100644
--- a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/StepCreate/index.jsx
+++ b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/StepCreate/index.jsx
@@ -21,9 +21,7 @@ import PoolStep from '../../../StepCreateComponents/PoolStep';
 import MemberStep from '../../../StepCreateComponents/MemberStep';
 import HealthMonitorStep from '../../../StepCreateComponents/HealthMonitorStep';
 
-@inject('rootStore')
-@observer
-class StepCreate extends StepAction {
+export class StepCreate extends StepAction {
   static id = 'lb-create';
 
   static title = t('Create Loadbalancer');
@@ -167,4 +165,4 @@ class StepCreate extends StepAction {
   };
 }
 
-export default StepCreate;
+export default inject('rootStore')(observer(StepCreate));
diff --git a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/index.jsx b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/index.jsx
index e349c789..56744774 100644
--- a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/index.jsx
+++ b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/index.jsx
@@ -24,9 +24,7 @@ import {
 import { lbEndpoint } from 'client/client/constants';
 import { actionConfigs, adminActions } from './actions';
 
-@inject('rootStore')
-@observer
-export default class LoadBalancerInstance extends Base {
+export class LoadBalancerInstance extends Base {
   init() {
     this.store = new LbaasStore();
     this.downloadStore = new LbaasStore();
@@ -163,3 +161,5 @@ export default class LoadBalancerInstance extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(LoadBalancerInstance));
diff --git a/src/pages/network/containers/LoadBalancers/StepCreateComponents/HealthMonitorStep/index.jsx b/src/pages/network/containers/LoadBalancers/StepCreateComponents/HealthMonitorStep/index.jsx
index 9f2e12d1..66e1d127 100644
--- a/src/pages/network/containers/LoadBalancers/StepCreateComponents/HealthMonitorStep/index.jsx
+++ b/src/pages/network/containers/LoadBalancers/StepCreateComponents/HealthMonitorStep/index.jsx
@@ -15,9 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import Base from 'components/Form';
 
-@inject('rootStore')
-@observer
-export default class HealthMonitorStep extends Base {
+export class HealthMonitorStep extends Base {
   get title() {
     return 'Health Monitor Detail';
   }
@@ -118,3 +116,5 @@ export default class HealthMonitorStep extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(HealthMonitorStep));
diff --git a/src/pages/network/containers/LoadBalancers/StepCreateComponents/ListenerStep/index.jsx b/src/pages/network/containers/LoadBalancers/StepCreateComponents/ListenerStep/index.jsx
index e9dbed8d..eac8379c 100644
--- a/src/pages/network/containers/LoadBalancers/StepCreateComponents/ListenerStep/index.jsx
+++ b/src/pages/network/containers/LoadBalancers/StepCreateComponents/ListenerStep/index.jsx
@@ -15,9 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import Base from 'components/Form';
 
-@inject('rootStore')
-@observer
-export default class ListenerStep extends Base {
+export class ListenerStep extends Base {
   get title() {
     return 'Listener Detail';
   }
@@ -81,3 +79,5 @@ export default class ListenerStep extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(ListenerStep));
diff --git a/src/pages/network/containers/LoadBalancers/StepCreateComponents/MemberStep/index.jsx b/src/pages/network/containers/LoadBalancers/StepCreateComponents/MemberStep/index.jsx
index b5584527..4b03453c 100644
--- a/src/pages/network/containers/LoadBalancers/StepCreateComponents/MemberStep/index.jsx
+++ b/src/pages/network/containers/LoadBalancers/StepCreateComponents/MemberStep/index.jsx
@@ -18,9 +18,7 @@ import { PortStore } from 'stores/neutron/port';
 import { VirtualAdapterStore } from 'stores/neutron/virtual-adapter';
 import { get } from 'lodash';
 
-@inject('rootStore')
-@observer
-export default class MemberStep extends Base {
+export class MemberStep extends Base {
   init() {
     this.store = new VirtualAdapterStore();
     this.portStore = new PortStore();
@@ -72,3 +70,5 @@ export default class MemberStep extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(MemberStep));
diff --git a/src/pages/network/containers/LoadBalancers/StepCreateComponents/PoolStep/index.jsx b/src/pages/network/containers/LoadBalancers/StepCreateComponents/PoolStep/index.jsx
index 5bec1c1f..3e867f1c 100644
--- a/src/pages/network/containers/LoadBalancers/StepCreateComponents/PoolStep/index.jsx
+++ b/src/pages/network/containers/LoadBalancers/StepCreateComponents/PoolStep/index.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import Base from 'components/Form';
 import { Algorithm, algorithmTip } from 'resources/octavia/pool';
 
-@inject('rootStore')
-@observer
-export default class PoolStep extends Base {
+export class PoolStep extends Base {
   get title() {
     return 'Pool Detail';
   }
@@ -89,3 +87,5 @@ export default class PoolStep extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(PoolStep));
diff --git a/src/pages/network/containers/LoadBalancers/index.jsx b/src/pages/network/containers/LoadBalancers/index.jsx
index 1e4550ee..8107e116 100644
--- a/src/pages/network/containers/LoadBalancers/index.jsx
+++ b/src/pages/network/containers/LoadBalancers/index.jsx
@@ -16,9 +16,7 @@ import { observer, inject } from 'mobx-react';
 import Base from 'containers/TabList';
 import LoadBalancerInstance from './LoadBalancerInstance';
 
-@inject('rootStore')
-@observer
-export default class Network extends Base {
+export class Network extends Base {
   get tabs() {
     const tabs = [
       {
@@ -35,3 +33,5 @@ export default class Network extends Base {
     return tabs;
   }
 }
+
+export default inject('rootStore')(observer(Network));
diff --git a/src/pages/network/containers/Network/Detail/Detail.jsx b/src/pages/network/containers/Network/Detail/Detail.jsx
index 343174fc..307eb172 100644
--- a/src/pages/network/containers/Network/Detail/Detail.jsx
+++ b/src/pages/network/containers/Network/Detail/Detail.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import Base from 'containers/BaseDetail';
 import { qosEndpoint } from 'client/client/constants';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   get leftCards() {
     const cards = [this.baseInfoCard];
     return cards;
@@ -79,3 +77,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/network/containers/Network/Detail/Subnets.jsx b/src/pages/network/containers/Network/Detail/Subnets.jsx
index 28965bd9..9dfe8bf8 100644
--- a/src/pages/network/containers/Network/Detail/Subnets.jsx
+++ b/src/pages/network/containers/Network/Detail/Subnets.jsx
@@ -20,9 +20,7 @@ import globalRootStore from 'stores/root';
 import actionConfigs from './subnetActions';
 // import { networkStatus } from 'resources/network';
 
-@inject('rootStore')
-@observer
-export default class Subnets extends Base {
+export class Subnets extends Base {
   init() {
     this.store = new SubnetStore();
     const { detail: { subnet_ip_availability = [] } = {} } = this.props;
@@ -152,3 +150,5 @@ export default class Subnets extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Subnets));
diff --git a/src/pages/network/containers/Network/Detail/subnetActions/EditSubnet.jsx b/src/pages/network/containers/Network/Detail/subnetActions/EditSubnet.jsx
index bf494089..caa0285f 100644
--- a/src/pages/network/containers/Network/Detail/subnetActions/EditSubnet.jsx
+++ b/src/pages/network/containers/Network/Detail/subnetActions/EditSubnet.jsx
@@ -35,9 +35,7 @@ const {
 
 const { isIpWithMask, isIPv6Cidr } = ipValidate;
 
-@inject('rootStore')
-@observer
-export default class EditSubnet extends ModalAction {
+export class EditSubnet extends ModalAction {
   static id = 'edit-subnet';
 
   static title = t('Edit Subnet');
@@ -219,3 +217,5 @@ export default class EditSubnet extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(EditSubnet));
diff --git a/src/pages/network/containers/Network/actions/CreateSubnet.jsx b/src/pages/network/containers/Network/actions/CreateSubnet.jsx
index 91dcc861..e692525e 100644
--- a/src/pages/network/containers/Network/actions/CreateSubnet.jsx
+++ b/src/pages/network/containers/Network/actions/CreateSubnet.jsx
@@ -35,9 +35,7 @@ const {
 
 const { isIpCidr, isIPv6Cidr, isIpv6 } = ipValidate;
 
-@inject('rootStore')
-@observer
-export default class CreateSubnet extends ModalAction {
+export class CreateSubnet extends ModalAction {
   static id = 'create-subnet';
 
   static title = t('Create Subnet');
@@ -352,3 +350,5 @@ export default class CreateSubnet extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(CreateSubnet));
diff --git a/src/pages/network/containers/Network/actions/Edit.jsx b/src/pages/network/containers/Network/actions/Edit.jsx
index d307af5f..521caa9f 100644
--- a/src/pages/network/containers/Network/actions/Edit.jsx
+++ b/src/pages/network/containers/Network/actions/Edit.jsx
@@ -19,9 +19,7 @@ import { checkPolicyRule } from 'resources/skyline/policy';
 import globalRootStore from 'stores/root';
 import { getYesNoList } from 'utils/index';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit-network';
 
   static title = t('Edit');
@@ -99,3 +97,5 @@ export default class Edit extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/network/containers/Network/index.jsx b/src/pages/network/containers/Network/index.jsx
index fc756e60..c6a6b26f 100644
--- a/src/pages/network/containers/Network/index.jsx
+++ b/src/pages/network/containers/Network/index.jsx
@@ -16,9 +16,7 @@ import { observer, inject } from 'mobx-react';
 import Base from 'containers/TabList';
 import NetworkTab from './Network';
 
-@inject('rootStore')
-@observer
-export default class Network extends Base {
+export class Network extends Base {
   get tabs() {
     const tabs = [
       {
@@ -47,3 +45,5 @@ export default class Network extends Base {
     return tabs;
   }
 }
+
+export default inject('rootStore')(observer(Network));
diff --git a/src/pages/network/containers/QoSPolicy/Detail/BaseDetail.jsx b/src/pages/network/containers/QoSPolicy/Detail/BaseDetail.jsx
index b980b1e6..40c8bc02 100644
--- a/src/pages/network/containers/QoSPolicy/Detail/BaseDetail.jsx
+++ b/src/pages/network/containers/QoSPolicy/Detail/BaseDetail.jsx
@@ -15,9 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import Base from 'containers/BaseDetail';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   get leftCards() {
     return [...this.BandwidthCard, this.DSCPMarkingCard];
   }
@@ -74,3 +72,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/network/containers/QoSPolicy/Detail/index.jsx b/src/pages/network/containers/QoSPolicy/Detail/index.jsx
index d8f4e854..4b56f9b3 100644
--- a/src/pages/network/containers/QoSPolicy/Detail/index.jsx
+++ b/src/pages/network/containers/QoSPolicy/Detail/index.jsx
@@ -19,9 +19,7 @@ import FloatingIp from 'pages/network/containers/FloatingIp';
 import BaseDetail from './BaseDetail';
 import actionConfigs from '../actions';
 
-@inject('rootStore')
-@observer
-export default class QoSPolicyDetail extends Base {
+export class QoSPolicyDetail extends Base {
   get name() {
     return t('qoS policy');
   }
@@ -101,3 +99,5 @@ export default class QoSPolicyDetail extends Base {
     this.store = new QoSPolicyStore();
   }
 }
+
+export default inject('rootStore')(observer(QoSPolicyDetail));
diff --git a/src/pages/network/containers/QoSPolicy/actions/Create.jsx b/src/pages/network/containers/QoSPolicy/actions/Create.jsx
index a4e39b53..2ced45f9 100644
--- a/src/pages/network/containers/QoSPolicy/actions/Create.jsx
+++ b/src/pages/network/containers/QoSPolicy/actions/Create.jsx
@@ -17,9 +17,7 @@ import { ModalAction } from 'containers/Action';
 import globalProjectStore from 'stores/keystone/project';
 import { QoSPolicyStore } from 'stores/neutron/qos-policy';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create_qos_policy';
 
   static title = t('Create QoS Policy');
@@ -99,3 +97,4 @@ export default class Create extends ModalAction {
     ];
   }
 }
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/network/containers/QoSPolicy/actions/CreateBandwidthLimitRule.jsx b/src/pages/network/containers/QoSPolicy/actions/CreateBandwidthLimitRule.jsx
index 16887973..1d906c34 100644
--- a/src/pages/network/containers/QoSPolicy/actions/CreateBandwidthLimitRule.jsx
+++ b/src/pages/network/containers/QoSPolicy/actions/CreateBandwidthLimitRule.jsx
@@ -17,9 +17,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalQoSPolicyStore from 'stores/neutron/qos-policy';
 
-@inject('rootStore')
-@observer
-export default class CreateBandwidthLimitRule extends ModalAction {
+export class CreateBandwidthLimitRule extends ModalAction {
   static id = 'create_bandwidth_limit_rule';
 
   static title = t('Create Bandwidth Limit Rule');
@@ -104,3 +102,5 @@ export default class CreateBandwidthLimitRule extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(CreateBandwidthLimitRule));
diff --git a/src/pages/network/containers/QoSPolicy/actions/CreateDSCPMarkingRules.jsx b/src/pages/network/containers/QoSPolicy/actions/CreateDSCPMarkingRules.jsx
index 10df8f5e..decfe1b4 100644
--- a/src/pages/network/containers/QoSPolicy/actions/CreateDSCPMarkingRules.jsx
+++ b/src/pages/network/containers/QoSPolicy/actions/CreateDSCPMarkingRules.jsx
@@ -18,9 +18,7 @@ import { ModalAction } from 'containers/Action';
 import globalQoSPolicyStore from 'stores/neutron/qos-policy';
 import dscpMarkingItems from './DSCPMarkingItems';
 
-@inject('rootStore')
-@observer
-export default class CreateDSCPMarkingRules extends ModalAction {
+export class CreateDSCPMarkingRules extends ModalAction {
   static id = 'create_DSCP_marking_rule';
 
   static title = t('Create DSCP Marking Rule');
@@ -66,3 +64,5 @@ export default class CreateDSCPMarkingRules extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(CreateDSCPMarkingRules));
diff --git a/src/pages/network/containers/QoSPolicy/actions/Edit.jsx b/src/pages/network/containers/QoSPolicy/actions/Edit.jsx
index e6f06d72..2e2a689a 100644
--- a/src/pages/network/containers/QoSPolicy/actions/Edit.jsx
+++ b/src/pages/network/containers/QoSPolicy/actions/Edit.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import { QoSPolicyStore } from 'stores/neutron/qos-policy';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit_qos_policy';
 
   static title = t('Edit QoS Policy');
@@ -74,3 +72,5 @@ export default class Edit extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/network/containers/QoSPolicy/actions/EditBandwidthEgressRule.jsx b/src/pages/network/containers/QoSPolicy/actions/EditBandwidthEgressRule.jsx
index e4a1e194..b447e2ce 100644
--- a/src/pages/network/containers/QoSPolicy/actions/EditBandwidthEgressRule.jsx
+++ b/src/pages/network/containers/QoSPolicy/actions/EditBandwidthEgressRule.jsx
@@ -17,9 +17,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalQoSPolicyStore from 'stores/neutron/qos-policy';
 
-@inject('rootStore')
-@observer
-export default class EditBandwidthEgressRule extends ModalAction {
+export class EditBandwidthEgressRule extends ModalAction {
   static id = 'edit_bandwidth_egress_limit_rule';
 
   static title = t('Edit Bandwidth Egress Limit Rule');
@@ -99,3 +97,5 @@ export default class EditBandwidthEgressRule extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(EditBandwidthEgressRule));
diff --git a/src/pages/network/containers/QoSPolicy/actions/EditBandwidthIngressRule.jsx b/src/pages/network/containers/QoSPolicy/actions/EditBandwidthIngressRule.jsx
index 23462a79..85a48f5b 100644
--- a/src/pages/network/containers/QoSPolicy/actions/EditBandwidthIngressRule.jsx
+++ b/src/pages/network/containers/QoSPolicy/actions/EditBandwidthIngressRule.jsx
@@ -17,9 +17,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalQoSPolicyStore from 'stores/neutron/qos-policy';
 
-@inject('rootStore')
-@observer
-export default class EditBandwidthIngressRule extends ModalAction {
+export class EditBandwidthIngressRule extends ModalAction {
   static id = 'edit_bandwidth_ingress_limit_rule';
 
   static title = t('Edit Bandwidth Ingress Limit Rule');
@@ -97,3 +95,5 @@ export default class EditBandwidthIngressRule extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(EditBandwidthIngressRule));
diff --git a/src/pages/network/containers/QoSPolicy/actions/EditDSCPMarkingRule.jsx b/src/pages/network/containers/QoSPolicy/actions/EditDSCPMarkingRule.jsx
index 58f37dc0..0cc23edb 100644
--- a/src/pages/network/containers/QoSPolicy/actions/EditDSCPMarkingRule.jsx
+++ b/src/pages/network/containers/QoSPolicy/actions/EditDSCPMarkingRule.jsx
@@ -18,9 +18,7 @@ import { ModalAction } from 'containers/Action';
 import globalQoSPolicyStore from 'stores/neutron/qos-policy';
 import dscpMarkingItems from './DSCPMarkingItems';
 
-@inject('rootStore')
-@observer
-export default class EditDSCPMarkingRule extends ModalAction {
+export class EditDSCPMarkingRule extends ModalAction {
   static id = 'edit_DSCP_marking_rule';
 
   static title = t('Edit DSCP Marking Rule');
@@ -76,3 +74,4 @@ export default class EditDSCPMarkingRule extends ModalAction {
     ];
   }
 }
+export default inject('rootStore')(observer(EditDSCPMarkingRule));
diff --git a/src/pages/network/containers/QoSPolicy/index.jsx b/src/pages/network/containers/QoSPolicy/index.jsx
index a3018406..930cee76 100644
--- a/src/pages/network/containers/QoSPolicy/index.jsx
+++ b/src/pages/network/containers/QoSPolicy/index.jsx
@@ -17,9 +17,7 @@ import Base from 'containers/TabList';
 import { qosEndpoint } from 'client/client/constants';
 import QoSPolicyComponent from './QoSPolicy';
 
-@inject('rootStore')
-@observer
-export default class QoSPolicy extends Base {
+export class QoSPolicy extends Base {
   get checkEndpoint() {
     return true;
   }
@@ -51,3 +49,5 @@ export default class QoSPolicy extends Base {
     return tabs;
   }
 }
+
+export default inject('rootStore')(observer(QoSPolicy));
diff --git a/src/pages/network/containers/Router/Port/Detail/BaseDetail.jsx b/src/pages/network/containers/Router/Port/Detail/BaseDetail.jsx
index 19552c76..47470f66 100644
--- a/src/pages/network/containers/Router/Port/Detail/BaseDetail.jsx
+++ b/src/pages/network/containers/Router/Port/Detail/BaseDetail.jsx
@@ -18,9 +18,7 @@ import Base from 'containers/BaseDetail';
 import { bindingTypes } from 'resources/neutron/port';
 import { isEmpty } from 'lodash';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   get leftCards() {
     const cards = [this.portInfo];
     const {
@@ -198,3 +196,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/network/containers/Router/Port/index.jsx b/src/pages/network/containers/Router/Port/index.jsx
index 877a03f9..9f67056a 100644
--- a/src/pages/network/containers/Router/Port/index.jsx
+++ b/src/pages/network/containers/Router/Port/index.jsx
@@ -19,9 +19,7 @@ import { portStatus } from 'resources/neutron/port';
 import { PortStore } from 'stores/neutron/port';
 import { getOptions } from 'utils';
 
-@inject('rootStore')
-@observer
-export default class Ports extends Base {
+export class Ports extends Base {
   init() {
     this.store = new PortStore();
   }
@@ -114,3 +112,5 @@ export default class Ports extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Ports));
diff --git a/src/pages/network/containers/Router/StaticRouter/actions/Create.jsx b/src/pages/network/containers/Router/StaticRouter/actions/Create.jsx
index 756a6104..6d35a309 100644
--- a/src/pages/network/containers/Router/StaticRouter/actions/Create.jsx
+++ b/src/pages/network/containers/Router/StaticRouter/actions/Create.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import globalStaticRouteStore from 'stores/neutron/static-route';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create';
 
   static title = t('Create Static Route');
@@ -66,3 +64,5 @@ export default class Create extends ModalAction {
     return this.store.addStaticRoute({ id, routes });
   };
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/network/containers/Router/StaticRouter/index.jsx b/src/pages/network/containers/Router/StaticRouter/index.jsx
index fe65e25a..358a79bd 100644
--- a/src/pages/network/containers/Router/StaticRouter/index.jsx
+++ b/src/pages/network/containers/Router/StaticRouter/index.jsx
@@ -17,9 +17,7 @@ import Base from 'containers/List';
 import globalStaticRouteStore from 'stores/neutron/static-route';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class StaticRouters extends Base {
+export class StaticRouters extends Base {
   init() {
     this.store = globalStaticRouteStore;
   }
@@ -54,3 +52,5 @@ export default class StaticRouters extends Base {
     return [];
   }
 }
+
+export default inject('rootStore')(observer(StaticRouters));
diff --git a/src/pages/network/containers/Router/actions/AssociateFip.jsx b/src/pages/network/containers/Router/actions/AssociateFip.jsx
index a93f1d07..6b3712e1 100644
--- a/src/pages/network/containers/Router/actions/AssociateFip.jsx
+++ b/src/pages/network/containers/Router/actions/AssociateFip.jsx
@@ -18,9 +18,7 @@ import { RouterStore } from 'stores/neutron/router';
 import { FloatingIpStore } from 'stores/neutron/floatingIp';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class AssociateFip extends ModalAction {
+export class AssociateFip extends ModalAction {
   static id = 'associate-fip';
 
   static title = t('Associate Floating IP');
@@ -141,3 +139,5 @@ export default class AssociateFip extends ModalAction {
     return this.store.associateFip({ id, fip, router: this.item });
   };
 }
+
+export default inject('rootStore')(observer(AssociateFip));
diff --git a/src/pages/network/containers/Router/actions/ConnectSubnet.jsx b/src/pages/network/containers/Router/actions/ConnectSubnet.jsx
index 8d7396b2..5f824000 100644
--- a/src/pages/network/containers/Router/actions/ConnectSubnet.jsx
+++ b/src/pages/network/containers/Router/actions/ConnectSubnet.jsx
@@ -19,9 +19,7 @@ import globalSubnetStore from 'stores/neutron/subnet';
 import { PortStore } from 'stores/neutron/port';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class ConnectSubnet extends ModalAction {
+export class ConnectSubnet extends ModalAction {
   static id = 'connect-subnet';
 
   static title = t('Connect Subnet');
@@ -167,3 +165,5 @@ export default class ConnectSubnet extends ModalAction {
     return this.store.connectSubnet({ id, subnetId, networkId });
   };
 }
+
+export default inject('rootStore')(observer(ConnectSubnet));
diff --git a/src/pages/network/containers/Router/actions/DisconnectSubnet.jsx b/src/pages/network/containers/Router/actions/DisconnectSubnet.jsx
index d490390d..ab4a75d2 100644
--- a/src/pages/network/containers/Router/actions/DisconnectSubnet.jsx
+++ b/src/pages/network/containers/Router/actions/DisconnectSubnet.jsx
@@ -20,9 +20,7 @@ import globalSubnetStore from 'stores/neutron/subnet';
 import { PortStore } from 'stores/neutron/port';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class DisconnectSubnet extends ModalAction {
+export class DisconnectSubnet extends ModalAction {
   static id = 'disconnect-subnet';
 
   static title = t('Disconnect Subnet');
@@ -153,3 +151,5 @@ export default class DisconnectSubnet extends ModalAction {
     return this.store.disconnectSubnet({ id, subnetId });
   };
 }
+
+export default inject('rootStore')(observer(DisconnectSubnet));
diff --git a/src/pages/network/containers/Router/actions/Edit.jsx b/src/pages/network/containers/Router/actions/Edit.jsx
index f37ab666..056e34b4 100644
--- a/src/pages/network/containers/Router/actions/Edit.jsx
+++ b/src/pages/network/containers/Router/actions/Edit.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import globalRouterStore from 'stores/neutron/router';
 import { ModalAction } from 'containers/Action';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit-router';
 
   static title = t('Edit Router');
@@ -68,3 +66,5 @@ export default class Edit extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/network/containers/SecurityGroup/Detail/Rule/actions/Create.jsx b/src/pages/network/containers/SecurityGroup/Detail/Rule/actions/Create.jsx
index 465e193f..2122d849 100644
--- a/src/pages/network/containers/SecurityGroup/Detail/Rule/actions/Create.jsx
+++ b/src/pages/network/containers/SecurityGroup/Detail/Rule/actions/Create.jsx
@@ -20,9 +20,7 @@ import { ipProtocols } from 'resources/neutron/security-group-rule';
 import { has } from 'lodash';
 import { cidrAllValidate } from 'utils/validate';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create';
 
   static title = t('Create Rule');
@@ -337,3 +335,5 @@ export default class Create extends ModalAction {
     return this.store.create(modalValue);
   };
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/network/containers/SecurityGroup/actions/Create.jsx b/src/pages/network/containers/SecurityGroup/actions/Create.jsx
index 6593a2b6..a6a8713c 100644
--- a/src/pages/network/containers/SecurityGroup/actions/Create.jsx
+++ b/src/pages/network/containers/SecurityGroup/actions/Create.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalSecurityGroupStore from 'stores/neutron/security-group';
 
-@inject('rootStore')
-@observer
-export default class CreateAction extends ModalAction {
+export class CreateAction extends ModalAction {
   static id = 'create';
 
   static title = t('Create Security Group');
@@ -58,3 +56,5 @@ export default class CreateAction extends ModalAction {
     return globalSecurityGroupStore.create(values);
   };
 }
+
+export default inject('rootStore')(observer(CreateAction));
diff --git a/src/pages/network/containers/SecurityGroup/actions/Edit.jsx b/src/pages/network/containers/SecurityGroup/actions/Edit.jsx
index 2922c57a..81c06d70 100644
--- a/src/pages/network/containers/SecurityGroup/actions/Edit.jsx
+++ b/src/pages/network/containers/SecurityGroup/actions/Edit.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalSecurityGroupStore from 'stores/neutron/security-group';
 
-@inject('rootStore')
-@observer
-export default class EditAction extends ModalAction {
+export class EditAction extends ModalAction {
   static id = 'edit';
 
   static title = t('Edit');
@@ -59,3 +57,5 @@ export default class EditAction extends ModalAction {
     return globalSecurityGroupStore.edit({ id }, values);
   };
 }
+
+export default inject('rootStore')(observer(EditAction));
diff --git a/src/pages/network/containers/Topology/index.jsx b/src/pages/network/containers/Topology/index.jsx
index afec8af6..a81d45df 100644
--- a/src/pages/network/containers/Topology/index.jsx
+++ b/src/pages/network/containers/Topology/index.jsx
@@ -43,9 +43,7 @@ import NodeCard from './NodeCard';
 let graph = null;
 const { isIpInRangeAll } = ipValidate;
 
-@inject('rootStore')
-@observer
-export default class Topology extends React.Component {
+export class Topology extends React.Component {
   constructor(props) {
     super(props);
     this.init();
@@ -809,3 +807,5 @@ export default class Topology extends React.Component {
     );
   }
 }
+
+export default inject('rootStore')(observer(Topology));
diff --git a/src/pages/network/containers/VPN/EndpointGroup/actions/Create.js b/src/pages/network/containers/VPN/EndpointGroup/actions/Create.js
index 1f2c3ce5..c99ba30f 100644
--- a/src/pages/network/containers/VPN/EndpointGroup/actions/Create.js
+++ b/src/pages/network/containers/VPN/EndpointGroup/actions/Create.js
@@ -26,9 +26,7 @@ import {
 
 const { isCidr, isIPv6CidrOnly } = ipValidate;
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create-vpn-endpoint-group';
 
   static title = t('Create VPN Endpoint Group');
@@ -203,3 +201,5 @@ export default class Create extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/network/containers/VPN/EndpointGroup/actions/Edit.js b/src/pages/network/containers/VPN/EndpointGroup/actions/Edit.js
index f265094d..c15367a6 100644
--- a/src/pages/network/containers/VPN/EndpointGroup/actions/Edit.js
+++ b/src/pages/network/containers/VPN/EndpointGroup/actions/Edit.js
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalVPNEndPointGroupStore from 'stores/neutron/vpn-endpoint-group';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit-vpn-endpoint-groups';
 
   static title = t('Edit VPN EndPoint Groups');
@@ -65,3 +63,5 @@ export default class Edit extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/network/containers/VPN/EndpointGroup/index.jsx b/src/pages/network/containers/VPN/EndpointGroup/index.jsx
index 9b508b43..62572e32 100644
--- a/src/pages/network/containers/VPN/EndpointGroup/index.jsx
+++ b/src/pages/network/containers/VPN/EndpointGroup/index.jsx
@@ -21,9 +21,7 @@ import { FileTextOutlined } from '@ant-design/icons';
 import { SubnetStore } from 'stores/neutron/subnet';
 import { actionConfigs, adminConfigs } from './actions';
 
-@inject('rootStore')
-@observer
-export default class Index extends Base {
+export class EndpointGroup extends Base {
   init() {
     this.store = new VpnEndPointGroupStore();
     this.downloadStore = new VpnEndPointGroupStore();
@@ -170,3 +168,5 @@ function PopUpSubnet({ record }) {
     </Row>
   );
 }
+
+export default inject('rootStore')(observer(EndpointGroup));
diff --git a/src/pages/network/containers/VPN/IKEPolicy/actions/Create.js b/src/pages/network/containers/VPN/IKEPolicy/actions/Create.js
index fef353d2..edadd5c6 100644
--- a/src/pages/network/containers/VPN/IKEPolicy/actions/Create.js
+++ b/src/pages/network/containers/VPN/IKEPolicy/actions/Create.js
@@ -22,9 +22,7 @@ import {
   pfsOptions,
 } from 'resources/neutron/vpn';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create-vpn-ike-policy';
 
   static title = t('Create VPN IKE Policy');
@@ -114,3 +112,5 @@ export default class Create extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/network/containers/VPN/IKEPolicy/actions/Edit.jsx b/src/pages/network/containers/VPN/IKEPolicy/actions/Edit.jsx
index 4c6e60d2..21e3dcc8 100644
--- a/src/pages/network/containers/VPN/IKEPolicy/actions/Edit.jsx
+++ b/src/pages/network/containers/VPN/IKEPolicy/actions/Edit.jsx
@@ -18,9 +18,7 @@ import { ModalAction } from 'containers/Action';
 import globalVpnIKEPolicyStore from 'stores/neutron/vpn-ike-policy';
 import globalVpnIPsecConnectionStore from 'stores/neutron/vpn-ipsec-connection';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit-vpn-ike-policy';
 
   static title = t('Edit VPN IKE Policy');
@@ -159,3 +157,5 @@ export default class Edit extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/network/containers/VPN/IKEPolicy/index.jsx b/src/pages/network/containers/VPN/IKEPolicy/index.jsx
index 5f15c7e5..1803d6e0 100644
--- a/src/pages/network/containers/VPN/IKEPolicy/index.jsx
+++ b/src/pages/network/containers/VPN/IKEPolicy/index.jsx
@@ -24,9 +24,7 @@ import {
 } from 'resources/neutron/vpn';
 import { actionConfigs, adminConfigs } from './actions';
 
-@inject('rootStore')
-@observer
-export default class Index extends Base {
+export class IKEPolicy extends Base {
   init() {
     this.store = new VpnIKEPolicyStore();
     this.downloadStore = new VpnIKEPolicyStore();
@@ -156,3 +154,5 @@ export default class Index extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(IKEPolicy));
diff --git a/src/pages/network/containers/VPN/IPsecPolicy/actions/Create.js b/src/pages/network/containers/VPN/IPsecPolicy/actions/Create.js
index c57ce15b..bc5b0db5 100644
--- a/src/pages/network/containers/VPN/IPsecPolicy/actions/Create.js
+++ b/src/pages/network/containers/VPN/IPsecPolicy/actions/Create.js
@@ -23,9 +23,7 @@ import {
   pfsOptions,
 } from 'resources/neutron/vpn';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create-vpn-ipsec-policy';
 
   static title = t('Create VPN IPsec Policy');
@@ -123,3 +121,5 @@ export default class Create extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/network/containers/VPN/IPsecPolicy/actions/Edit.jsx b/src/pages/network/containers/VPN/IPsecPolicy/actions/Edit.jsx
index 054583cb..bcd38ca3 100644
--- a/src/pages/network/containers/VPN/IPsecPolicy/actions/Edit.jsx
+++ b/src/pages/network/containers/VPN/IPsecPolicy/actions/Edit.jsx
@@ -18,9 +18,7 @@ import { ModalAction } from 'containers/Action';
 import globalVpnIPsecPolicyStore from 'stores/neutron/vpn-ipsec-policy';
 import globalVpnIPsecConnectionStore from 'stores/neutron/vpn-ipsec-connection';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit-vpn-ipsec-policy';
 
   static title = t('Edit VPN IPsec Policy');
@@ -169,3 +167,5 @@ export default class Edit extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/network/containers/VPN/IPsecPolicy/index.jsx b/src/pages/network/containers/VPN/IPsecPolicy/index.jsx
index 5a8a7d9a..e4ce2a11 100644
--- a/src/pages/network/containers/VPN/IPsecPolicy/index.jsx
+++ b/src/pages/network/containers/VPN/IPsecPolicy/index.jsx
@@ -25,9 +25,7 @@ import {
 } from 'resources/neutron/vpn';
 import { actionConfigs, adminConfigs } from './actions';
 
-@inject('rootStore')
-@observer
-export default class Index extends Base {
+export class IPsecPolicy extends Base {
   init() {
     this.store = new VpnIPsecPolicyStore();
     this.downloadStore = new VpnIPsecPolicyStore();
@@ -167,3 +165,5 @@ export default class Index extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(IPsecPolicy));
diff --git a/src/pages/network/containers/VPN/IPsecSiteConnection/Detail/BaseDetail.jsx b/src/pages/network/containers/VPN/IPsecSiteConnection/Detail/BaseDetail.jsx
index 555fff7c..a522c22c 100644
--- a/src/pages/network/containers/VPN/IPsecSiteConnection/Detail/BaseDetail.jsx
+++ b/src/pages/network/containers/VPN/IPsecSiteConnection/Detail/BaseDetail.jsx
@@ -18,9 +18,7 @@ import { VpnIPsecConnectionStore } from 'stores/neutron/vpn-ipsec-connection';
 import React from 'react';
 import { toJS } from 'mobx';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   init() {
     this.store = new VpnIPsecConnectionStore();
   }
@@ -182,3 +180,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/network/containers/VPN/IPsecSiteConnection/Detail/index.jsx b/src/pages/network/containers/VPN/IPsecSiteConnection/Detail/index.jsx
index bcc3f016..94e2e73f 100644
--- a/src/pages/network/containers/VPN/IPsecSiteConnection/Detail/index.jsx
+++ b/src/pages/network/containers/VPN/IPsecSiteConnection/Detail/index.jsx
@@ -18,9 +18,7 @@ import { VpnIPsecConnectionStore } from 'stores/neutron/vpn-ipsec-connection';
 import BaseDetail from './BaseDetail';
 import { actionConfigs, adminConfigs } from '../actions';
 
-@inject('rootStore')
-@observer
-export default class IPsecSiteConnection extends Base {
+export class IPsecSiteConnection extends Base {
   init() {
     this.store = new VpnIPsecConnectionStore();
   }
@@ -103,3 +101,5 @@ export default class IPsecSiteConnection extends Base {
     return tabs;
   }
 }
+
+export default inject('rootStore')(observer(IPsecSiteConnection));
diff --git a/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Create.jsx b/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Create.jsx
index b92fd0d1..19801f11 100644
--- a/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Create.jsx
+++ b/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Create.jsx
@@ -27,9 +27,7 @@ import LocalSubnet from './components/LocalSubnet';
 
 const { isIPv4, isIpv6 } = ipValidate;
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create-ipsec-site-connection';
 
   static title = t('Create IPsec Site Connection');
@@ -313,3 +311,4 @@ export default class Create extends ModalAction {
     ];
   }
 }
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Edit.js b/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Edit.js
index 83a53ef7..b5eac125 100644
--- a/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Edit.js
+++ b/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Edit.js
@@ -18,9 +18,7 @@ import globalVpnIPsecConnectionStore from 'stores/neutron/vpn-ipsec-connection';
 
 const canEditStatus = ['ACTIVE', 'DOWN'];
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit-ipsec-site-connection';
 
   static title = t('Edit IPsec Site Connection');
@@ -68,3 +66,5 @@ export default class Edit extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/network/containers/VPN/IPsecSiteConnection/index.jsx b/src/pages/network/containers/VPN/IPsecSiteConnection/index.jsx
index ba6206ca..1885fb4c 100644
--- a/src/pages/network/containers/VPN/IPsecSiteConnection/index.jsx
+++ b/src/pages/network/containers/VPN/IPsecSiteConnection/index.jsx
@@ -18,9 +18,7 @@ import { VpnIPsecConnectionStore } from 'stores/neutron/vpn-ipsec-connection';
 import { vpnStatus, vpnStatusOptions } from 'resources/neutron/vpn';
 import { actionConfigs, adminConfigs } from './actions';
 
-@inject('rootStore')
-@observer
-export default class Index extends Base {
+export class IPsecSiteConnection extends Base {
   init() {
     this.store = new VpnIPsecConnectionStore();
     this.downloadStore = new VpnIPsecConnectionStore();
@@ -119,3 +117,5 @@ export default class Index extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(IPsecSiteConnection));
diff --git a/src/pages/network/containers/VPN/VPNGateway/actions/Create.js b/src/pages/network/containers/VPN/VPNGateway/actions/Create.js
index 2c7b3ba4..2b188c75 100644
--- a/src/pages/network/containers/VPN/VPNGateway/actions/Create.js
+++ b/src/pages/network/containers/VPN/VPNGateway/actions/Create.js
@@ -18,9 +18,7 @@ import { RouterStore } from 'stores/neutron/router';
 import globalVpnServicesStore from 'stores/neutron/vpn-service';
 import { getRouterSelectTablePropsBackend } from 'resources/neutron/router';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create-vpn';
 
   static title = t('Create VPN');
@@ -85,3 +83,5 @@ export default class Create extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/network/containers/VPN/VPNGateway/actions/Edit.js b/src/pages/network/containers/VPN/VPNGateway/actions/Edit.js
index 6c07f837..8a285b94 100644
--- a/src/pages/network/containers/VPN/VPNGateway/actions/Edit.js
+++ b/src/pages/network/containers/VPN/VPNGateway/actions/Edit.js
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalVpnServicesStore from 'stores/neutron/vpn-service';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit-vpn';
 
   static title = t('Edit VPN');
@@ -70,3 +68,5 @@ export default class Edit extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/network/containers/VPN/VPNGateway/index.jsx b/src/pages/network/containers/VPN/VPNGateway/index.jsx
index 692de8de..7cefbd39 100644
--- a/src/pages/network/containers/VPN/VPNGateway/index.jsx
+++ b/src/pages/network/containers/VPN/VPNGateway/index.jsx
@@ -19,9 +19,7 @@ import { vpnStatus, vpnStatusOptions } from 'resources/neutron/vpn';
 import React from 'react';
 import { actionConfigs, adminConfigs } from './actions';
 
-@inject('rootStore')
-@observer
-export default class Index extends Base {
+export class VPNGateway extends Base {
   init() {
     this.store = new VpnServicesStore();
     this.downloadStore = new VpnServicesStore();
@@ -120,3 +118,5 @@ export default class Index extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(VPNGateway));
diff --git a/src/pages/network/containers/VPN/index.jsx b/src/pages/network/containers/VPN/index.jsx
index 096a3d47..ddd1f2b0 100644
--- a/src/pages/network/containers/VPN/index.jsx
+++ b/src/pages/network/containers/VPN/index.jsx
@@ -21,9 +21,7 @@ import IKEPolicy from './IKEPolicy';
 import IPsecPolicy from './IPsecPolicy';
 import IPsecSiteConnection from './IPsecSiteConnection';
 
-@inject('rootStore')
-@observer
-export default class VPN extends Base {
+export class VPN extends Base {
   get name() {
     return t('VPN');
   }
@@ -66,3 +64,5 @@ export default class VPN extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(VPN));
diff --git a/src/pages/network/containers/VirtualAdapter/Detail/AllowedAddressPair/actions/CreateAllowedAddressPair.jsx b/src/pages/network/containers/VirtualAdapter/Detail/AllowedAddressPair/actions/CreateAllowedAddressPair.jsx
index d28fdf67..67bb210c 100644
--- a/src/pages/network/containers/VirtualAdapter/Detail/AllowedAddressPair/actions/CreateAllowedAddressPair.jsx
+++ b/src/pages/network/containers/VirtualAdapter/Detail/AllowedAddressPair/actions/CreateAllowedAddressPair.jsx
@@ -20,9 +20,7 @@ import { isEmpty } from 'lodash';
 
 const { isIpCidr, isIPv6Cidr } = ipValidate;
 
-@inject('rootStore')
-@observer
-export default class CreateAllowedAddressPair extends ModalAction {
+export class CreateAllowedAddressPair extends ModalAction {
   static id = 'create-ip';
 
   static title = t('Create Allowed Address Pair');
@@ -151,3 +149,5 @@ export default class CreateAllowedAddressPair extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(CreateAllowedAddressPair));
diff --git a/src/pages/network/containers/VirtualAdapter/Detail/AllowedAddressPair/index.jsx b/src/pages/network/containers/VirtualAdapter/Detail/AllowedAddressPair/index.jsx
index 1155f0af..fe775fa2 100644
--- a/src/pages/network/containers/VirtualAdapter/Detail/AllowedAddressPair/index.jsx
+++ b/src/pages/network/containers/VirtualAdapter/Detail/AllowedAddressPair/index.jsx
@@ -18,9 +18,7 @@ import globalVirtualAdapterStore from 'stores/neutron/virtual-adapter';
 import List from 'stores/base-list';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class AllowedAddressPair extends Base {
+export class AllowedAddressPair extends Base {
   init() {
     this.store = globalVirtualAdapterStore;
     // because of the father component use new Store
@@ -96,3 +94,5 @@ export default class AllowedAddressPair extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(AllowedAddressPair));
diff --git a/src/pages/network/containers/VirtualAdapter/Detail/BaseDetail/index.jsx b/src/pages/network/containers/VirtualAdapter/Detail/BaseDetail/index.jsx
index 37f96e43..6f46c49a 100644
--- a/src/pages/network/containers/VirtualAdapter/Detail/BaseDetail/index.jsx
+++ b/src/pages/network/containers/VirtualAdapter/Detail/BaseDetail/index.jsx
@@ -19,9 +19,7 @@ import Base from 'containers/BaseDetail';
 import { bindingTypes } from 'resources/neutron/port';
 import { qosEndpoint } from 'client/client/constants';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   get leftCards() {
     return [this.baseInfoCard];
   }
@@ -81,3 +79,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/network/containers/VirtualAdapter/Detail/FixedIPs/index.jsx b/src/pages/network/containers/VirtualAdapter/Detail/FixedIPs/index.jsx
index 46764a9e..5fda93e2 100644
--- a/src/pages/network/containers/VirtualAdapter/Detail/FixedIPs/index.jsx
+++ b/src/pages/network/containers/VirtualAdapter/Detail/FixedIPs/index.jsx
@@ -17,9 +17,7 @@ import Base from 'containers/List';
 import { FixedIpStore } from 'stores/neutron/fixed-ip';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class FixedIP extends Base {
+export class FixedIP extends Base {
   init() {
     this.store = new FixedIpStore();
     this.downloadStore = new FixedIpStore();
@@ -84,3 +82,5 @@ export default class FixedIP extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(FixedIP));
diff --git a/src/pages/network/containers/VirtualAdapter/actions/AllocateIP.jsx b/src/pages/network/containers/VirtualAdapter/actions/AllocateIP.jsx
index 4c20de6b..6a62ee44 100644
--- a/src/pages/network/containers/VirtualAdapter/actions/AllocateIP.jsx
+++ b/src/pages/network/containers/VirtualAdapter/actions/AllocateIP.jsx
@@ -18,9 +18,7 @@ import globalVirtualAdapterStore from 'stores/neutron/virtual-adapter';
 import { NetworkStore } from 'stores/neutron/network';
 import { SubnetStore } from 'stores/neutron/subnet';
 
-@inject('rootStore')
-@observer
-export default class AllocateIP extends ModalAction {
+export class AllocateIP extends ModalAction {
   static id = 'allocate-ip';
 
   static title = t('Allocate IP');
@@ -111,3 +109,5 @@ export default class AllocateIP extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(AllocateIP));
diff --git a/src/pages/network/containers/VirtualAdapter/actions/AssociateFIP.jsx b/src/pages/network/containers/VirtualAdapter/actions/AssociateFIP.jsx
index 6774cb1e..338bd81c 100644
--- a/src/pages/network/containers/VirtualAdapter/actions/AssociateFIP.jsx
+++ b/src/pages/network/containers/VirtualAdapter/actions/AssociateFIP.jsx
@@ -23,9 +23,7 @@ import {
   handleFixedIPChange,
 } from 'resources/neutron/floatingip';
 
-@inject('rootStore')
-@observer
-export default class AssociateFip extends ModalAction {
+export class AssociateFip extends ModalAction {
   static id = 'AssociateFip';
 
   static title = t('Associate Floating IP');
@@ -179,3 +177,5 @@ export default class AssociateFip extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(AssociateFip));
diff --git a/src/pages/network/containers/VirtualAdapter/actions/DisAssociateFIP.jsx b/src/pages/network/containers/VirtualAdapter/actions/DisAssociateFIP.jsx
index 615855a5..0dcedacd 100644
--- a/src/pages/network/containers/VirtualAdapter/actions/DisAssociateFIP.jsx
+++ b/src/pages/network/containers/VirtualAdapter/actions/DisAssociateFIP.jsx
@@ -17,9 +17,7 @@ import globalFloatingIpsStore from 'stores/neutron/floatingIp';
 import { ModalAction } from 'containers/Action';
 import { isNotError } from 'resources/nova/instance';
 
-@inject('rootStore')
-@observer
-export default class DisAssociateFip extends ModalAction {
+export class DisAssociateFip extends ModalAction {
   static id = 'DisAssociateFip';
 
   static title = t('Disassociate Floating IP');
@@ -100,3 +98,5 @@ export default class DisAssociateFip extends ModalAction {
     return globalFloatingIpsStore.disassociateFip({ id });
   };
 }
+
+export default inject('rootStore')(observer(DisAssociateFip));
diff --git a/src/pages/network/containers/VirtualAdapter/actions/ManageSecurityGroup.jsx b/src/pages/network/containers/VirtualAdapter/actions/ManageSecurityGroup.jsx
index bc903286..80e2cbf0 100644
--- a/src/pages/network/containers/VirtualAdapter/actions/ManageSecurityGroup.jsx
+++ b/src/pages/network/containers/VirtualAdapter/actions/ManageSecurityGroup.jsx
@@ -23,9 +23,7 @@ import {
 import { toJS } from 'mobx';
 import { get as _get } from 'lodash';
 
-@inject('rootStore')
-@observer
-export default class ManageSecurityGroup extends ModalAction {
+export class ManageSecurityGroup extends ModalAction {
   static id = 'manage-security-group';
 
   static title = t('Manage Security Group');
@@ -147,3 +145,5 @@ export default class ManageSecurityGroup extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(ManageSecurityGroup));
diff --git a/src/pages/storage/containers/Backup/Detail/BaseDetail.jsx b/src/pages/storage/containers/Backup/Detail/BaseDetail.jsx
index 90a87136..f905c885 100644
--- a/src/pages/storage/containers/Backup/Detail/BaseDetail.jsx
+++ b/src/pages/storage/containers/Backup/Detail/BaseDetail.jsx
@@ -15,9 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import Base from 'containers/BaseDetail';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   get leftCards() {
     const cards = [this.volumeCard];
     return cards;
@@ -46,3 +44,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/storage/containers/Backup/Detail/index.jsx b/src/pages/storage/containers/Backup/Detail/index.jsx
index e5229f71..9e647dfb 100644
--- a/src/pages/storage/containers/Backup/Detail/index.jsx
+++ b/src/pages/storage/containers/Backup/Detail/index.jsx
@@ -19,9 +19,7 @@ import { backupStatus } from 'resources/cinder/backup';
 import BaseDetail from './BaseDetail';
 import actionConfigs from '../actions';
 
-@inject('rootStore')
-@observer
-export default class Detail extends Base {
+export class Detail extends Base {
   get name() {
     return t('backup');
   }
@@ -99,3 +97,5 @@ export default class Detail extends Base {
     this.store = globalBackupStore;
   }
 }
+
+export default inject('rootStore')(observer(Detail));
diff --git a/src/pages/storage/containers/Backup/actions/Create.jsx b/src/pages/storage/containers/Backup/actions/Create.jsx
index a19da434..5d1e725a 100644
--- a/src/pages/storage/containers/Backup/actions/Create.jsx
+++ b/src/pages/storage/containers/Backup/actions/Create.jsx
@@ -23,9 +23,7 @@ import {
   volumeSelectTablePropsBackend,
 } from 'resources/cinder/volume';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create';
 
   static title = t('Create Backup');
@@ -102,3 +100,5 @@ export default class Create extends ModalAction {
     return this.store.create(body);
   };
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/storage/containers/Backup/actions/CreateVolume.jsx b/src/pages/storage/containers/Backup/actions/CreateVolume.jsx
index 73593d63..7e323bdc 100644
--- a/src/pages/storage/containers/Backup/actions/CreateVolume.jsx
+++ b/src/pages/storage/containers/Backup/actions/CreateVolume.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalVolumeStore from 'stores/cinder/volume';
 
-@inject('rootStore')
-@observer
-export default class CreateVolume extends ModalAction {
+export class CreateVolume extends ModalAction {
   static id = 'create';
 
   static title = t('Create Volume');
@@ -127,3 +125,5 @@ export default class CreateVolume extends ModalAction {
     return globalVolumeStore.create(body);
   };
 }
+
+export default inject('rootStore')(observer(CreateVolume));
diff --git a/src/pages/storage/containers/Backup/actions/Edit.jsx b/src/pages/storage/containers/Backup/actions/Edit.jsx
index d57c753c..170d79e7 100644
--- a/src/pages/storage/containers/Backup/actions/Edit.jsx
+++ b/src/pages/storage/containers/Backup/actions/Edit.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalBackupStore from 'stores/cinder/backup';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit-backup';
 
   static title = t('Edit Backup');
@@ -52,3 +50,5 @@ export default class Edit extends ModalAction {
     return globalBackupStore.edit({ id }, values);
   };
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/storage/containers/Backup/actions/Restore.jsx b/src/pages/storage/containers/Backup/actions/Restore.jsx
index af05d963..b029d45e 100644
--- a/src/pages/storage/containers/Backup/actions/Restore.jsx
+++ b/src/pages/storage/containers/Backup/actions/Restore.jsx
@@ -21,9 +21,7 @@ import { restoreTip } from 'resources/cinder/backup';
 import { volumeStatus } from 'resources/cinder/volume';
 import { instanceStatus, isShutOff } from 'resources/nova/instance';
 
-@inject('rootStore')
-@observer
-export default class Restore extends ModalAction {
+export class Restore extends ModalAction {
   static id = 'restore-backup';
 
   static title = t('Restore Backup');
@@ -163,3 +161,5 @@ export default class Restore extends ModalAction {
     return globalBackupStore.restore(id, body);
   };
 }
+
+export default inject('rootStore')(observer(Restore));
diff --git a/src/pages/storage/containers/Backup/index.jsx b/src/pages/storage/containers/Backup/index.jsx
index a264832c..5edc59be 100644
--- a/src/pages/storage/containers/Backup/index.jsx
+++ b/src/pages/storage/containers/Backup/index.jsx
@@ -19,9 +19,7 @@ import CreateBackup from 'pages/storage/containers/Volume/actions/CreateBackup';
 import { backupStatus } from 'resources/cinder/backup';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class Backup extends Base {
+export class Backup extends Base {
   get name() {
     return t('Backups');
   }
@@ -139,3 +137,5 @@ export default class Backup extends Base {
     return params;
   };
 }
+
+export default inject('rootStore')(observer(Backup));
diff --git a/src/pages/storage/containers/Container/Detail/actions/CreateFolder.jsx b/src/pages/storage/containers/Container/Detail/actions/CreateFolder.jsx
index ee02ecf7..9a180505 100644
--- a/src/pages/storage/containers/Container/Detail/actions/CreateFolder.jsx
+++ b/src/pages/storage/containers/Container/Detail/actions/CreateFolder.jsx
@@ -17,9 +17,7 @@ import { ModalAction } from 'containers/Action';
 import globalObjectStore from 'stores/swift/object';
 import { allCanChangePolicy } from 'resources/skyline/policy';
 
-@inject('rootStore')
-@observer
-export default class CreateFolder extends ModalAction {
+export class CreateFolder extends ModalAction {
   static id = 'create';
 
   static title = t('Create Folder');
@@ -91,3 +89,5 @@ export default class CreateFolder extends ModalAction {
     return globalObjectStore.createFolder(container, rest);
   };
 }
+
+export default inject('rootStore')(observer(CreateFolder));
diff --git a/src/pages/storage/containers/Container/Detail/actions/Edit.jsx b/src/pages/storage/containers/Container/Detail/actions/Edit.jsx
index e2989a14..65175960 100644
--- a/src/pages/storage/containers/Container/Detail/actions/Edit.jsx
+++ b/src/pages/storage/containers/Container/Detail/actions/Edit.jsx
@@ -18,9 +18,7 @@ import globalObjectStore, { ObjectStore } from 'stores/swift/object';
 import { allCanChangePolicy } from 'resources/skyline/policy';
 import { isFile } from 'resources/swift/container';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit-file';
 
   static title = t('Edit');
@@ -115,3 +113,5 @@ export default class Edit extends ModalAction {
     return this.store.updateFile(container, file, this.item.name, config);
   };
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/storage/containers/Container/Detail/actions/Rename.jsx b/src/pages/storage/containers/Container/Detail/actions/Rename.jsx
index 20b76eb0..83f57f49 100644
--- a/src/pages/storage/containers/Container/Detail/actions/Rename.jsx
+++ b/src/pages/storage/containers/Container/Detail/actions/Rename.jsx
@@ -18,9 +18,7 @@ import globalObjectStore from 'stores/swift/object';
 import { allCanChangePolicy } from 'resources/skyline/policy';
 import { isFile } from 'resources/swift/container';
 
-@inject('rootStore')
-@observer
-export default class Rename extends ModalAction {
+export class Rename extends ModalAction {
   static id = 'rename';
 
   static title = t('Rename');
@@ -93,3 +91,5 @@ export default class Rename extends ModalAction {
     return globalObjectStore.rename(container, name, newName);
   };
 }
+
+export default inject('rootStore')(observer(Rename));
diff --git a/src/pages/storage/containers/Container/Detail/actions/UploadFile.jsx b/src/pages/storage/containers/Container/Detail/actions/UploadFile.jsx
index 9c70a86c..522db5cc 100644
--- a/src/pages/storage/containers/Container/Detail/actions/UploadFile.jsx
+++ b/src/pages/storage/containers/Container/Detail/actions/UploadFile.jsx
@@ -17,9 +17,7 @@ import { ModalAction } from 'containers/Action';
 import globalObjectStore, { ObjectStore } from 'stores/swift/object';
 import { allCanChangePolicy } from 'resources/skyline/policy';
 
-@inject('rootStore')
-@observer
-export default class UploadFile extends ModalAction {
+export class UploadFile extends ModalAction {
   static id = 'upload-file';
 
   static title = t('Upload File');
@@ -102,3 +100,5 @@ export default class UploadFile extends ModalAction {
     return this.store.createFile(container, rest, config);
   };
 }
+
+export default inject('rootStore')(observer(UploadFile));
diff --git a/src/pages/storage/containers/Container/Detail/index.jsx b/src/pages/storage/containers/Container/Detail/index.jsx
index c187c2e1..744efb03 100644
--- a/src/pages/storage/containers/Container/Detail/index.jsx
+++ b/src/pages/storage/containers/Container/Detail/index.jsx
@@ -92,9 +92,7 @@ function PopUpContent({ item }) {
   );
 }
 
-@inject('rootStore')
-@observer
-export default class ContainerObject extends Base {
+export class ContainerObject extends Base {
   init() {
     this.store = globalObjectStore;
   }
@@ -305,3 +303,5 @@ export default class ContainerObject extends Base {
     );
   }
 }
+
+export default inject('rootStore')(observer(ContainerObject));
diff --git a/src/pages/storage/containers/Container/actions/Access.jsx b/src/pages/storage/containers/Container/actions/Access.jsx
index f3f6df21..7e5e9cf3 100644
--- a/src/pages/storage/containers/Container/actions/Access.jsx
+++ b/src/pages/storage/containers/Container/actions/Access.jsx
@@ -17,9 +17,7 @@ import { ModalAction } from 'containers/Action';
 import globalContainerStore, { ContainerStore } from 'stores/swift/container';
 import { allCanChangePolicy } from 'resources/skyline/policy';
 
-@inject('rootStore')
-@observer
-export default class Access extends ModalAction {
+export class Access extends ModalAction {
   static id = 'access';
 
   static title = t('Update Access');
@@ -70,3 +68,5 @@ export default class Access extends ModalAction {
     return globalContainerStore.updatePublic(this.item.name, isPublic);
   };
 }
+
+export default inject('rootStore')(observer(Access));
diff --git a/src/pages/storage/containers/Container/actions/Create.jsx b/src/pages/storage/containers/Container/actions/Create.jsx
index d24bdcf6..520fd8e6 100644
--- a/src/pages/storage/containers/Container/actions/Create.jsx
+++ b/src/pages/storage/containers/Container/actions/Create.jsx
@@ -17,9 +17,7 @@ import { ModalAction } from 'containers/Action';
 import globalContainerStore from 'stores/swift/container';
 import { allCanChangePolicy } from 'resources/skyline/policy';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create';
 
   static title = t('Create Container');
@@ -66,3 +64,5 @@ export default class Create extends ModalAction {
     return globalContainerStore.create(value);
   };
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/storage/containers/Container/index.jsx b/src/pages/storage/containers/Container/index.jsx
index e19db4e9..4ba3aba9 100644
--- a/src/pages/storage/containers/Container/index.jsx
+++ b/src/pages/storage/containers/Container/index.jsx
@@ -82,9 +82,7 @@ function PopUpContent({ name }) {
   );
 }
 
-@inject('rootStore')
-@observer
-export default class Container extends Base {
+export class Container extends Base {
   init() {
     this.store = globalContainerStore;
   }
@@ -168,3 +166,5 @@ export default class Container extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Container));
diff --git a/src/pages/storage/containers/Snapshot/actions/Edit.jsx b/src/pages/storage/containers/Snapshot/actions/Edit.jsx
index b15a51c8..0f9aaab7 100644
--- a/src/pages/storage/containers/Snapshot/actions/Edit.jsx
+++ b/src/pages/storage/containers/Snapshot/actions/Edit.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalSnapshotStore from 'stores/cinder/snapshot';
 
-@inject('rootStore')
-@observer
-export default class EditAction extends ModalAction {
+export class EditAction extends ModalAction {
   static id = 'edit';
 
   static title = t('Edit');
@@ -58,3 +56,5 @@ export default class EditAction extends ModalAction {
     return globalSnapshotStore.update(id, values);
   };
 }
+
+export default inject('rootStore')(observer(EditAction));
diff --git a/src/pages/storage/containers/Storage/index.jsx b/src/pages/storage/containers/Storage/index.jsx
index b2c0f74c..4c2ed62e 100644
--- a/src/pages/storage/containers/Storage/index.jsx
+++ b/src/pages/storage/containers/Storage/index.jsx
@@ -17,9 +17,7 @@ import Base from 'containers/List';
 import globalPoolStore from 'stores/cinder/pool';
 import { poolColumns } from 'resources/cinder/cinder-pool';
 
-@inject('rootStore')
-@observer
-export default class Storage extends Base {
+export class Storage extends Base {
   init() {
     this.store = globalPoolStore;
   }
@@ -47,3 +45,5 @@ export default class Storage extends Base {
     return rest;
   };
 }
+
+export default inject('rootStore')(observer(Storage));
diff --git a/src/pages/storage/containers/Volume/actions/AcceptVolumeTransfer.jsx b/src/pages/storage/containers/Volume/actions/AcceptVolumeTransfer.jsx
index b773e780..c82e5aec 100644
--- a/src/pages/storage/containers/Volume/actions/AcceptVolumeTransfer.jsx
+++ b/src/pages/storage/containers/Volume/actions/AcceptVolumeTransfer.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalVolumeStore from 'stores/cinder/volume';
 
-@inject('rootStore')
-@observer
-export default class AcceptVolumeTransfer extends ModalAction {
+export class AcceptVolumeTransfer extends ModalAction {
   static id = 'accept-volume-transfer';
 
   static title = t('Accept Volume Transfer');
@@ -62,3 +60,5 @@ export default class AcceptVolumeTransfer extends ModalAction {
   onSubmit = ({ transfer_id, auth_key }) =>
     globalVolumeStore.acceptVolumeTransfer(transfer_id, { auth_key });
 }
+
+export default inject('rootStore')(observer(AcceptVolumeTransfer));
diff --git a/src/pages/storage/containers/Volume/actions/Bootable.jsx b/src/pages/storage/containers/Volume/actions/Bootable.jsx
index 2a7e7670..485eec2c 100644
--- a/src/pages/storage/containers/Volume/actions/Bootable.jsx
+++ b/src/pages/storage/containers/Volume/actions/Bootable.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalVolumeStore from 'stores/cinder/volume';
 
-@inject('rootStore')
-@observer
-export default class Bootable extends ModalAction {
+export class Bootable extends ModalAction {
   static id = 'volume-bootable';
 
   static title = t('Bootable');
@@ -58,3 +56,5 @@ export default class Bootable extends ModalAction {
     ];
   }
 }
+
+export default inject('rootStore')(observer(Bootable));
diff --git a/src/pages/storage/containers/Volume/actions/CloneVolume.jsx b/src/pages/storage/containers/Volume/actions/CloneVolume.jsx
index 59c62d90..f074338a 100644
--- a/src/pages/storage/containers/Volume/actions/CloneVolume.jsx
+++ b/src/pages/storage/containers/Volume/actions/CloneVolume.jsx
@@ -17,9 +17,7 @@ import { ModalAction } from 'containers/Action';
 import globalVolumeStore from 'stores/cinder/volume';
 import { isAvailableOrInUse } from 'resources/cinder/volume';
 
-@inject('rootStore')
-@observer
-export default class CloneVolume extends ModalAction {
+export class CloneVolume extends ModalAction {
   static id = 'clone-volume';
 
   static title = t('Clone Volume');
@@ -76,3 +74,5 @@ export default class CloneVolume extends ModalAction {
     return this.store.create(body);
   };
 }
+
+export default inject('rootStore')(observer(CloneVolume));
diff --git a/src/pages/storage/containers/Volume/actions/CreateInstance.jsx b/src/pages/storage/containers/Volume/actions/CreateInstance.jsx
index 8000c2a7..55e75562 100644
--- a/src/pages/storage/containers/Volume/actions/CreateInstance.jsx
+++ b/src/pages/storage/containers/Volume/actions/CreateInstance.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import CreateInstance from 'pages/compute/containers/Instance/actions/StepCreate';
 import { canCreateInstance } from 'resources/cinder/volume';
 
-@inject('rootStore')
-@observer
-export default class StepCreate extends CreateInstance {
+export class StepCreate extends CreateInstance {
   static id = 'instance-create';
 
   static title = t('Create Instance');
@@ -33,3 +31,5 @@ export default class StepCreate extends CreateInstance {
     return Promise.resolve(canCreateInstance(item));
   }
 }
+
+export default inject('rootStore')(observer(StepCreate));
diff --git a/src/pages/storage/containers/Volume/actions/CreateSnapshot.jsx b/src/pages/storage/containers/Volume/actions/CreateSnapshot.jsx
index 1b2b1375..a51dfcfd 100644
--- a/src/pages/storage/containers/Volume/actions/CreateSnapshot.jsx
+++ b/src/pages/storage/containers/Volume/actions/CreateSnapshot.jsx
@@ -18,9 +18,7 @@ import globalSnapshotStore from 'stores/cinder/snapshot';
 import { isAvailableOrInUse } from 'resources/cinder/volume';
 import globalVolumeTypeStore from 'stores/cinder/volume-type';
 
-@inject('rootStore')
-@observer
-export default class CreateSnapshot extends ModalAction {
+export class CreateSnapshot extends ModalAction {
   static id = 'create-snapshot';
 
   static title = t('Create Snapshot');
@@ -75,3 +73,5 @@ export default class CreateSnapshot extends ModalAction {
     return this.store.create(data);
   };
 }
+
+export default inject('rootStore')(observer(CreateSnapshot));
diff --git a/src/pages/storage/containers/Volume/actions/CreateTransfer.jsx b/src/pages/storage/containers/Volume/actions/CreateTransfer.jsx
index 4e9bcfa9..932da9a1 100644
--- a/src/pages/storage/containers/Volume/actions/CreateTransfer.jsx
+++ b/src/pages/storage/containers/Volume/actions/CreateTransfer.jsx
@@ -17,9 +17,7 @@ import { ModalAction } from 'containers/Action';
 import globalVolumeStore from 'stores/cinder/volume';
 import { isAvailable } from 'resources/cinder/volume';
 
-@inject('rootStore')
-@observer
-export default class CreateTransfer extends ModalAction {
+export class CreateTransfer extends ModalAction {
   static id = 'create-transfer';
 
   static title = t('Create Transfer');
@@ -85,3 +83,5 @@ export default class CreateTransfer extends ModalAction {
     });
   };
 }
+
+export default inject('rootStore')(observer(CreateTransfer));
diff --git a/src/pages/storage/containers/Volume/actions/Edit.jsx b/src/pages/storage/containers/Volume/actions/Edit.jsx
index 388eaad6..36b01727 100644
--- a/src/pages/storage/containers/Volume/actions/Edit.jsx
+++ b/src/pages/storage/containers/Volume/actions/Edit.jsx
@@ -17,9 +17,7 @@ import { ModalAction } from 'containers/Action';
 import globalVolumeStore from 'stores/cinder/volume';
 import { isAvailableOrInUse } from 'resources/cinder/volume';
 
-@inject('rootStore')
-@observer
-export default class EditAction extends ModalAction {
+export class EditAction extends ModalAction {
   static id = 'edit';
 
   static title = t('Edit');
@@ -63,3 +61,5 @@ export default class EditAction extends ModalAction {
     return this.store.update(id, values);
   };
 }
+
+export default inject('rootStore')(observer(EditAction));
diff --git a/src/pages/storage/containers/Volume/actions/Migrate.jsx b/src/pages/storage/containers/Volume/actions/Migrate.jsx
index 4ccf75dd..17127f3c 100644
--- a/src/pages/storage/containers/Volume/actions/Migrate.jsx
+++ b/src/pages/storage/containers/Volume/actions/Migrate.jsx
@@ -19,9 +19,7 @@ import { isAvailableOrInUse } from 'resources/cinder/volume';
 import globalPoolStore from 'stores/cinder/pool';
 import { poolColumns } from 'resources/cinder/cinder-pool';
 
-@inject('rootStore')
-@observer
-export default class Migrate extends ModalAction {
+export class Migrate extends ModalAction {
   static id = 'migrate-volume';
 
   static title = t('Migrate Volume');
@@ -105,3 +103,5 @@ export default class Migrate extends ModalAction {
     return globalVolumeStore.migrate(id, { host: selectedRowKeys[0] });
   };
 }
+
+export default inject('rootStore')(observer(Migrate));
diff --git a/src/pages/storage/containers/Volume/actions/UpdateStatus.jsx b/src/pages/storage/containers/Volume/actions/UpdateStatus.jsx
index d7002a3d..e4ea398d 100644
--- a/src/pages/storage/containers/Volume/actions/UpdateStatus.jsx
+++ b/src/pages/storage/containers/Volume/actions/UpdateStatus.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalVolumeStore from 'stores/cinder/volume';
 
-@inject('rootStore')
-@observer
-export default class UpdateStatus extends ModalAction {
+export class UpdateStatus extends ModalAction {
   static id = 'update-status';
 
   static title = t('Update Status');
@@ -93,3 +91,5 @@ export default class UpdateStatus extends ModalAction {
     return this.store.resetStatus(id, values);
   };
 }
+
+export default inject('rootStore')(observer(UpdateStatus));
diff --git a/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/actions/Create.jsx b/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/actions/Create.jsx
index 5048e471..61ea3d1f 100644
--- a/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/actions/Create.jsx
+++ b/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/actions/Create.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalQosSpecKeyStore from 'stores/cinder/qos-spec-key';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create';
 
   static title = t('Create Extra Specs');
@@ -116,3 +114,5 @@ export default class Create extends ModalAction {
     return this.store.createOrUpdate(id, qos_specs);
   };
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/actions/Edit.jsx b/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/actions/Edit.jsx
index ccf53fa7..a3b4ef70 100644
--- a/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/actions/Edit.jsx
+++ b/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/actions/Edit.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalQosSpecKeyStore from 'stores/cinder/qos-spec-key';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit';
 
   static title = t('Edit Extra Specs');
@@ -71,3 +69,5 @@ export default class Edit extends ModalAction {
     return this.store.createOrUpdate(id, qos_specs);
   };
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/index.jsx b/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/index.jsx
index e55cd7bf..0f034507 100644
--- a/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/index.jsx
+++ b/src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/index.jsx
@@ -17,9 +17,7 @@ import Base from 'containers/List';
 import { QosSpecKeyStore } from 'stores/cinder/qos-spec-key';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class ExtraSpecs extends Base {
+export class ExtraSpecs extends Base {
   init() {
     this.store = new QosSpecKeyStore();
   }
@@ -56,3 +54,5 @@ export default class ExtraSpecs extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(ExtraSpecs));
diff --git a/src/pages/storage/containers/VolumeType/QosSpec/Detail/index.jsx b/src/pages/storage/containers/VolumeType/QosSpec/Detail/index.jsx
index 114120f5..964f725a 100644
--- a/src/pages/storage/containers/VolumeType/QosSpec/Detail/index.jsx
+++ b/src/pages/storage/containers/VolumeType/QosSpec/Detail/index.jsx
@@ -19,9 +19,7 @@ import { consumerTypes } from 'resources/cinder/volume-type';
 import ExtraSpec from './ExtraSpec';
 import actionConfigs from '../actions';
 
-@inject('rootStore')
-@observer
-export default class Detail extends Base {
+export class Detail extends Base {
   get name() {
     return t('volume type qos');
   }
@@ -71,3 +69,5 @@ export default class Detail extends Base {
     this.store = new QosSpecStore();
   }
 }
+
+export default inject('rootStore')(observer(Detail));
diff --git a/src/pages/storage/containers/VolumeType/QosSpec/actions/Create.jsx b/src/pages/storage/containers/VolumeType/QosSpec/actions/Create.jsx
index 9e4d2fbe..6070cd51 100644
--- a/src/pages/storage/containers/VolumeType/QosSpec/actions/Create.jsx
+++ b/src/pages/storage/containers/VolumeType/QosSpec/actions/Create.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalQosSpecStore from 'stores/cinder/qos-spec';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create';
 
   static title = t('Create QoS Spec');
@@ -62,3 +60,5 @@ export default class Create extends ModalAction {
     return this.store.create({ values });
   };
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/storage/containers/VolumeType/QosSpec/actions/EditConsumer.jsx b/src/pages/storage/containers/VolumeType/QosSpec/actions/EditConsumer.jsx
index 178b5c21..25b36fcf 100644
--- a/src/pages/storage/containers/VolumeType/QosSpec/actions/EditConsumer.jsx
+++ b/src/pages/storage/containers/VolumeType/QosSpec/actions/EditConsumer.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalQosSpecStore from 'stores/cinder/qos-spec';
 
-@inject('rootStore')
-@observer
-export default class EditConsumer extends ModalAction {
+export class EditConsumer extends ModalAction {
   static id = 'editConsumer';
 
   static title = t('Edit Consumer');
@@ -65,3 +63,5 @@ export default class EditConsumer extends ModalAction {
     return this.store.editConsumer({ ...this.item, ...values });
   };
 }
+
+export default inject('rootStore')(observer(EditConsumer));
diff --git a/src/pages/storage/containers/VolumeType/QosSpec/index.jsx b/src/pages/storage/containers/VolumeType/QosSpec/index.jsx
index c84b0718..a5cdb241 100644
--- a/src/pages/storage/containers/VolumeType/QosSpec/index.jsx
+++ b/src/pages/storage/containers/VolumeType/QosSpec/index.jsx
@@ -19,9 +19,7 @@ import { consumerTypes } from 'resources/cinder/volume-type';
 import globalQosSpecStore from 'stores/cinder/qos-spec';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class QosSpecs extends Base {
+export class QosSpecs extends Base {
   init() {
     this.store = globalQosSpecStore;
   }
@@ -96,3 +94,5 @@ export default class QosSpecs extends Base {
     return false;
   }
 }
+
+export default inject('rootStore')(observer(QosSpecs));
diff --git a/src/pages/storage/containers/VolumeType/VolumeType/Detail/BaseDetail.jsx b/src/pages/storage/containers/VolumeType/VolumeType/Detail/BaseDetail.jsx
index 01f59e6c..2780449d 100644
--- a/src/pages/storage/containers/VolumeType/VolumeType/Detail/BaseDetail.jsx
+++ b/src/pages/storage/containers/VolumeType/VolumeType/Detail/BaseDetail.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import Base from 'containers/BaseDetail';
 import { controls } from 'resources/cinder/volume-type';
 
-@inject('rootStore')
-@observer
-export default class BaseDetail extends Base {
+export class BaseDetail extends Base {
   get leftCards() {
     return [this.encryptionInfo];
   }
@@ -54,3 +52,5 @@ export default class BaseDetail extends Base {
     };
   }
 }
+
+export default inject('rootStore')(observer(BaseDetail));
diff --git a/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/actions/Create.jsx b/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/actions/Create.jsx
index 350f18e2..35bfe47d 100644
--- a/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/actions/Create.jsx
+++ b/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/actions/Create.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalExtraSpecStore from 'stores/cinder/extra-spec';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create';
 
   static title = t('Create Extra Specs');
@@ -69,3 +67,5 @@ export default class Create extends ModalAction {
     return this.store.createOrUpdate(id, extra_specs);
   };
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/actions/Edit.jsx b/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/actions/Edit.jsx
index adcff0da..479659f6 100644
--- a/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/actions/Edit.jsx
+++ b/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/actions/Edit.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalExtraSpecStore from 'stores/cinder/extra-spec';
 
-@inject('rootStore')
-@observer
-export default class Edit extends ModalAction {
+export class Edit extends ModalAction {
   static id = 'edit';
 
   static title = t('Edit Extra Specs');
@@ -75,3 +73,5 @@ export default class Edit extends ModalAction {
     return this.store.createOrUpdate(id, extra_specs);
   };
 }
+
+export default inject('rootStore')(observer(Edit));
diff --git a/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/index.jsx b/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/index.jsx
index e399978d..265b6cc0 100644
--- a/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/index.jsx
+++ b/src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/index.jsx
@@ -17,9 +17,7 @@ import Base from 'containers/List';
 import { ExtraSpecStore } from 'stores/cinder/extra-spec';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class ExtraSpecs extends Base {
+export class ExtraSpecs extends Base {
   init() {
     this.store = new ExtraSpecStore();
   }
@@ -56,3 +54,5 @@ export default class ExtraSpecs extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(ExtraSpecs));
diff --git a/src/pages/storage/containers/VolumeType/VolumeType/Detail/index.jsx b/src/pages/storage/containers/VolumeType/VolumeType/Detail/index.jsx
index 92c2b630..4ba5d442 100644
--- a/src/pages/storage/containers/VolumeType/VolumeType/Detail/index.jsx
+++ b/src/pages/storage/containers/VolumeType/VolumeType/Detail/index.jsx
@@ -20,9 +20,7 @@ import ExtraSpec from './ExtraSpec';
 import BaseDetail from './BaseDetail';
 import actionConfigs from '../actions';
 
-@inject('rootStore')
-@observer
-export default class Detail extends Base {
+export class Detail extends Base {
   get name() {
     return t('volume type');
   }
@@ -86,3 +84,5 @@ export default class Detail extends Base {
     this.store = new VolumeTypeStore();
   }
 }
+
+export default inject('rootStore')(observer(Detail));
diff --git a/src/pages/storage/containers/VolumeType/VolumeType/actions/Create.jsx b/src/pages/storage/containers/VolumeType/VolumeType/actions/Create.jsx
index 75066771..ebe8b54b 100644
--- a/src/pages/storage/containers/VolumeType/VolumeType/actions/Create.jsx
+++ b/src/pages/storage/containers/VolumeType/VolumeType/actions/Create.jsx
@@ -20,9 +20,7 @@ import { ProjectStore } from 'stores/keystone/project';
 import { toJS } from 'mobx';
 import { multiTip } from 'resources/cinder/volume';
 
-@inject('rootStore')
-@observer
-export default class Create extends ModalAction {
+export class Create extends ModalAction {
   static id = 'create';
 
   static title = t('Create Volume Type');
@@ -178,3 +176,5 @@ export default class Create extends ModalAction {
     return this.store.create(body, projectIds);
   };
 }
+
+export default inject('rootStore')(observer(Create));
diff --git a/src/pages/storage/containers/VolumeType/VolumeType/actions/CreateEncryption.jsx b/src/pages/storage/containers/VolumeType/VolumeType/actions/CreateEncryption.jsx
index 72202632..f6979be2 100644
--- a/src/pages/storage/containers/VolumeType/VolumeType/actions/CreateEncryption.jsx
+++ b/src/pages/storage/containers/VolumeType/VolumeType/actions/CreateEncryption.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalVolumeTypeStore from 'stores/cinder/volume-type';
 
-@inject('rootStore')
-@observer
-export default class CreateEncryption extends ModalAction {
+export class CreateEncryption extends ModalAction {
   static id = 'create';
 
   static title = t('Create Encryption');
@@ -98,3 +96,5 @@ export default class CreateEncryption extends ModalAction {
     return this.store.createEncryption(id, values);
   };
 }
+
+export default inject('rootStore')(observer(CreateEncryption));
diff --git a/src/pages/storage/containers/VolumeType/VolumeType/actions/Edit.jsx b/src/pages/storage/containers/VolumeType/VolumeType/actions/Edit.jsx
index f4306bff..25da3502 100644
--- a/src/pages/storage/containers/VolumeType/VolumeType/actions/Edit.jsx
+++ b/src/pages/storage/containers/VolumeType/VolumeType/actions/Edit.jsx
@@ -16,9 +16,7 @@ import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalVolumeTypeStore from 'stores/cinder/volume-type';
 
-@inject('rootStore')
-@observer
-export default class EditAction extends ModalAction {
+export class EditAction extends ModalAction {
   static id = 'edit';
 
   static title = t('Edit');
@@ -64,3 +62,5 @@ export default class EditAction extends ModalAction {
     return this.store.update(id, values);
   };
 }
+
+export default inject('rootStore')(observer(EditAction));
diff --git a/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageAccess.jsx b/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageAccess.jsx
index d2d1764d..88b8dd4a 100644
--- a/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageAccess.jsx
+++ b/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageAccess.jsx
@@ -20,9 +20,7 @@ import { ModalAction } from 'containers/Action';
 import { ProjectStore } from 'stores/keystone/project';
 import { projectTableOptions } from 'resources/keystone/project';
 
-@inject('rootStore')
-@observer
-export default class ManageAccess extends ModalAction {
+export class ManageAccess extends ModalAction {
   static id = 'manage-access';
 
   static title = t('Manage Access');
@@ -138,3 +136,5 @@ export default class ManageAccess extends ModalAction {
     return globalVolumeTypeStore.updateProjectAccess(body);
   };
 }
+
+export default inject('rootStore')(observer(ManageAccess));
diff --git a/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageQos.jsx b/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageQos.jsx
index c4b7b552..33ff9c96 100644
--- a/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageQos.jsx
+++ b/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageQos.jsx
@@ -18,9 +18,7 @@ import { ModalAction } from 'containers/Action';
 import { consumerTypes } from 'resources/cinder/volume-type';
 import globalQosSpecStore from 'stores/cinder/qos-spec';
 
-@inject('rootStore')
-@observer
-export default class ManageQos extends ModalAction {
+export class ManageQos extends ModalAction {
   static id = 'manage-qos';
 
   static title = t('Manage QoS');
@@ -127,3 +125,5 @@ export default class ManageQos extends ModalAction {
     });
   };
 }
+
+export default inject('rootStore')(observer(ManageQos));
diff --git a/src/pages/storage/containers/VolumeType/VolumeType/index.jsx b/src/pages/storage/containers/VolumeType/VolumeType/index.jsx
index 631f8ca7..de16b6d3 100644
--- a/src/pages/storage/containers/VolumeType/VolumeType/index.jsx
+++ b/src/pages/storage/containers/VolumeType/VolumeType/index.jsx
@@ -21,9 +21,7 @@ import { has } from 'lodash';
 import { multiTip } from 'resources/cinder/volume';
 import actionConfigs from './actions';
 
-@inject('rootStore')
-@observer
-export default class VolumeType extends Base {
+export class VolumeType extends Base {
   init() {
     this.store = globalVolumeTypeStore;
     this.downloadStore = new VolumeTypeStore();
@@ -120,3 +118,5 @@ export default class VolumeType extends Base {
     ];
   }
 }
+
+export default inject('rootStore')(observer(VolumeType));
diff --git a/src/pages/storage/containers/VolumeType/index.jsx b/src/pages/storage/containers/VolumeType/index.jsx
index ff587538..30cc3bea 100644
--- a/src/pages/storage/containers/VolumeType/index.jsx
+++ b/src/pages/storage/containers/VolumeType/index.jsx
@@ -17,9 +17,7 @@ import Base from 'containers/TabList';
 import QosSpec from './QosSpec';
 import VolumeType from './VolumeType';
 
-@inject('rootStore')
-@observer
-export default class Index extends Base {
+export class VolumeTypaAll extends Base {
   get tabs() {
     const tabs = [
       {
@@ -36,3 +34,5 @@ export default class Index extends Base {
     return tabs;
   }
 }
+
+export default inject('rootStore')(observer(VolumeTypaAll));