From 61e07535a5edeb457f4c47a4e9fb669c93255a80 Mon Sep 17 00:00:00 2001 From: "Jingwei.Zhang" Date: Tue, 12 Sep 2023 11:16:20 +0800 Subject: [PATCH] feat: add detail info to action in detail tab 1. add instance detail info to the attach volume action in the instance detail page 2. add instance detail info to the manage security group action and detach action in the instance detail page 3. add port detail info to the manage security group action and detach action in the port detail page Change-Id: Ie63f8d330ad5442fdb5c6263e83e974e53fb1a3e --- .../compute/containers/Instance/Detail/BaseDetail/index.jsx | 4 +--- .../containers/Instance/Detail/SecurityGroup/index.jsx | 2 ++ .../network/containers/Port/Detail/SecurityGroups/index.jsx | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/compute/containers/Instance/Detail/BaseDetail/index.jsx b/src/pages/compute/containers/Instance/Detail/BaseDetail/index.jsx index 6695e746..60f600bb 100644 --- a/src/pages/compute/containers/Instance/Detail/BaseDetail/index.jsx +++ b/src/pages/compute/containers/Instance/Detail/BaseDetail/index.jsx @@ -399,8 +399,6 @@ export class BaseDetail extends Base { ); }); - const { isAdminPage } = this.props; - const containerProps = { isAdminPage }; return (
@@ -413,7 +411,7 @@ export class BaseDetail extends Base { actions={this.volumeActions} onFinishAction={this.handleRefreshVolume} item={this.detailData} - containerProps={containerProps} + containerProps={this.props} firstActionClassName={styles['attach-btn']} />
diff --git a/src/pages/compute/containers/Instance/Detail/SecurityGroup/index.jsx b/src/pages/compute/containers/Instance/Detail/SecurityGroup/index.jsx index aade0c54..98e65381 100644 --- a/src/pages/compute/containers/Instance/Detail/SecurityGroup/index.jsx +++ b/src/pages/compute/containers/Instance/Detail/SecurityGroup/index.jsx @@ -123,6 +123,7 @@ export class SecurityGroup extends React.Component { actions={{ firstAction: Detach }} onFinishAction={this.actionCallback} item={newItem} + containerProps={this.props} > {t('Detach')} @@ -229,6 +230,7 @@ export class SecurityGroup extends React.Component { port: activeInterfaceId, portItem: activeInterface, filterData, + ...this.props, }} > {t('Attach Security Group')} diff --git a/src/pages/network/containers/Port/Detail/SecurityGroups/index.jsx b/src/pages/network/containers/Port/Detail/SecurityGroups/index.jsx index a5320d96..c8862331 100644 --- a/src/pages/network/containers/Port/Detail/SecurityGroups/index.jsx +++ b/src/pages/network/containers/Port/Detail/SecurityGroups/index.jsx @@ -90,6 +90,7 @@ export class SecurityGroup extends React.Component { actions={{ firstAction: Detach }} onFinishAction={this.refreshSecurityGroup} item={item} + containerProps={this.props} > {t('Detach')}