From 5fcc3b053ea8bbc42eb73abfff3c4c106f07feb6 Mon Sep 17 00:00:00 2001
From: zhangjingwei <zhang.jingwei@99cloud.net>
Date: Wed, 31 Jan 2024 14:21:55 +0800
Subject: [PATCH] feat: support refresh button for SelectTable component

1. Support refresh button to refresh data for the SelectTable component.
2. When creating an instance/ironic/container, you can click to create a network/security group, then create a new resource in a new window, refresh the data in the previous window and select the newly created resource.

Closes-Bug: 2042928
Change-Id: I66bdbf848d375e45f0ab8941b0989165ad86a137
---
 ...ton-For-Select-Table-5312ff8105325055.yaml | 13 +++++
 src/components/FormItem/SelectTable/index.jsx | 54 ++++++++++++++++++-
 .../FormItem/SelectTable/index.less           | 18 +++++++
 .../actions/StepCreate/NetworkStep/index.jsx  |  2 +
 .../actions/StepCreate/StepNetworks/index.jsx |  1 +
 .../actions/StepCreate/StepNetworks/index.jsx |  1 +
 src/styles/variables-custom.less              |  1 +
 src/styles/variables.less                     |  1 +
 src/utils/route-map.jsx                       | 14 ++++-
 9 files changed, 101 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/Support-Refresh-Button-For-Select-Table-5312ff8105325055.yaml

diff --git a/releasenotes/notes/Support-Refresh-Button-For-Select-Table-5312ff8105325055.yaml b/releasenotes/notes/Support-Refresh-Button-For-Select-Table-5312ff8105325055.yaml
new file mode 100644
index 00000000..c7352af2
--- /dev/null
+++ b/releasenotes/notes/Support-Refresh-Button-For-Select-Table-5312ff8105325055.yaml
@@ -0,0 +1,13 @@
+---
+features:
+  - |
+    `Feature #2042928 <https://bugs.launchpad.net/skyline-console/+bug/2042928>`_:
+
+    Support refresh button for SelectTable component:
+
+    * Support refresh button to refresh data for the SelectTable component
+
+    * When creating an instance/ironic/container, you can click to create
+      a network/security group, then create a new resource in a new window,
+      refresh the data in the previous window and select the newly created
+      resource.
diff --git a/src/components/FormItem/SelectTable/index.jsx b/src/components/FormItem/SelectTable/index.jsx
index 0e7cba12..a1b092c7 100644
--- a/src/components/FormItem/SelectTable/index.jsx
+++ b/src/components/FormItem/SelectTable/index.jsx
@@ -14,7 +14,7 @@
 
 import React from 'react';
 import { Radio, Tag, Button, Tooltip } from 'antd';
-import { ClearOutlined } from '@ant-design/icons';
+import { ClearOutlined, SyncOutlined } from '@ant-design/icons';
 import { observer } from 'mobx-react';
 import PropTypes from 'prop-types';
 import MagicInput from 'components/MagicInput';
@@ -102,6 +102,8 @@ export default class SelectTable extends React.Component {
     onRow: PropTypes.func,
     childrenColumnName: PropTypes.string,
     imageTabAuto: PropTypes.bool,
+    refreshFunc: PropTypes.func,
+    hideRefresh: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -127,6 +129,8 @@ export default class SelectTable extends React.Component {
     defaultSortOrder: '',
     childrenColumnName: 'children',
     imageTabAuto: false,
+    refreshFunc: null,
+    hideRefresh: false,
   };
 
   constructor(props) {
@@ -388,6 +392,7 @@ export default class SelectTable extends React.Component {
   };
 
   handleFilterInput = (tags) => {
+    this.setState({ tags });
     const { backendPageStore } = this.props;
     const filters = {};
     tags.forEach((n) => {
@@ -606,6 +611,19 @@ export default class SelectTable extends React.Component {
     });
   };
 
+  handleRefresh = () => {
+    console.log('handleRefresh');
+    const { backendPageStore, refreshFunc } = this.props;
+    const { tags = [] } = this.state;
+    if (refreshFunc) {
+      refreshFunc();
+      return;
+    }
+    if (backendPageStore) {
+      this.handleFilterInput(tags);
+    }
+  };
+
   initTabChange() {
     const { defaultTabValue, onTabChange, value } = this.props;
     if (defaultTabValue !== undefined && onTabChange !== undefined) {
@@ -615,6 +633,28 @@ export default class SelectTable extends React.Component {
     }
   }
 
+  renderRefresh() {
+    const { hideRefresh, backendPageStore, refreshFunc } = this.props;
+    let showButton = false;
+    if (!hideRefresh) {
+      if (backendPageStore) {
+        showButton = true;
+      } else if (refreshFunc) {
+        showButton = true;
+      }
+    }
+    if (!showButton) {
+      return null;
+    }
+    return (
+      <Button
+        type="default"
+        icon={<SyncOutlined />}
+        onClick={this.handleRefresh}
+      />
+    );
+  }
+
   renderSearch() {
     const { canSearch } = this.props;
     if (!canSearch) {
@@ -639,6 +679,15 @@ export default class SelectTable extends React.Component {
     );
   }
 
+  renderSearchLine() {
+    return (
+      <div className={styles['search-line']}>
+        {this.renderSearch()}
+        {this.renderRefresh()}
+      </div>
+    );
+  }
+
   renderHeader() {
     const { header } = this.props;
     return header || null;
@@ -849,7 +898,8 @@ export default class SelectTable extends React.Component {
       <div className={styles['select-table']}>
         {this.renderHeader()}
         {this.renderTabs()}
-        {this.renderSearch()}
+
+        {this.renderSearchLine()}
         {this.renderTableHeader()}
         {this.renderTable()}
         {this.renderSelected()}
diff --git a/src/components/FormItem/SelectTable/index.less b/src/components/FormItem/SelectTable/index.less
index 06312a8e..b668a658 100644
--- a/src/components/FormItem/SelectTable/index.less
+++ b/src/components/FormItem/SelectTable/index.less
@@ -76,3 +76,21 @@
     }
   }
 }
+
+.search-line {
+  display: flex;
+  gap: 8px;
+
+  :global {
+    .ant-btn-default {
+      color: @table-header-default-button-color;
+      background-color: @table-header-default-button-background-gray;
+      border-color: @table-header-default-button-border;
+    }
+
+    .ant-btn-default:hover {
+      color: @primary-color;
+      border-color: @primary-color;
+    }
+  }
+}
diff --git a/src/pages/compute/containers/Instance/actions/StepCreate/NetworkStep/index.jsx b/src/pages/compute/containers/Instance/actions/StepCreate/NetworkStep/index.jsx
index 0c12a5c8..02c08557 100644
--- a/src/pages/compute/containers/Instance/actions/StepCreate/NetworkStep/index.jsx
+++ b/src/pages/compute/containers/Instance/actions/StepCreate/NetworkStep/index.jsx
@@ -212,6 +212,7 @@ export class NetworkStep extends Base {
             {getLinkRender({
               key: 'network',
               value: `${t('create a new network/subnet')} > `,
+              extra: { target: '_blank' },
             })}
           </div>
         ),
@@ -285,6 +286,7 @@ export class NetworkStep extends Base {
             {getLinkRender({
               key: 'securityGroup',
               value: `${t('create a new security group')}> `,
+              extra: { target: '_blank' },
             })}
             {t(
               'Note: The security group you use will act on all virtual adapters of the instance.'
diff --git a/src/pages/container-infra/containers/Clusters/actions/StepCreate/StepNetworks/index.jsx b/src/pages/container-infra/containers/Clusters/actions/StepCreate/StepNetworks/index.jsx
index 4f75d8e3..49b5777b 100644
--- a/src/pages/container-infra/containers/Clusters/actions/StepCreate/StepNetworks/index.jsx
+++ b/src/pages/container-infra/containers/Clusters/actions/StepCreate/StepNetworks/index.jsx
@@ -155,6 +155,7 @@ export class StepNetworks extends Base {
             {getLinkRender({
               key: 'network',
               value: `${t('create a new network/subnet')} > `,
+              extra: { target: '_blank' },
             })}
           </div>
         ),
diff --git a/src/pages/container-service/containers/Containers/actions/StepCreate/StepNetworks/index.jsx b/src/pages/container-service/containers/Containers/actions/StepCreate/StepNetworks/index.jsx
index 2792434c..c5935e39 100644
--- a/src/pages/container-service/containers/Containers/actions/StepCreate/StepNetworks/index.jsx
+++ b/src/pages/container-service/containers/Containers/actions/StepCreate/StepNetworks/index.jsx
@@ -97,6 +97,7 @@ export class StepNetworks extends Base {
             {getLinkRender({
               key: 'securityGroup',
               value: `${t('create a new security group')}> `,
+              extra: { target: '_blank' },
             })}
           </div>
         ),
diff --git a/src/styles/variables-custom.less b/src/styles/variables-custom.less
index 301029a2..e71ceea2 100644
--- a/src/styles/variables-custom.less
+++ b/src/styles/variables-custom.less
@@ -332,6 +332,7 @@
 // @table-header-search-input-background: @background-color;
 // @table-header-search-input-border-color: @primary-color;
 @table-header-default-button-background: #fff;
+@table-header-default-button-background-gray: #f6f7fb;
 @table-header-default-button-border: #fff;
 @table-header-default-button-color: #1d2129;
 @table-header-search-input-background: #fff;
diff --git a/src/styles/variables.less b/src/styles/variables.less
index 79fd2f9e..4520e49c 100644
--- a/src/styles/variables.less
+++ b/src/styles/variables.less
@@ -225,6 +225,7 @@
 
 // table
 @table-header-default-button-background: #fff;
+@table-header-default-button-background-gray: #f6f7fb;
 @table-header-default-button-border: @primary-color;
 @table-header-default-button-color: @primary-color;
 @table-header-search-input-background: #fff;
diff --git a/src/utils/route-map.jsx b/src/utils/route-map.jsx
index 5f8c74d3..657e2bc0 100644
--- a/src/utils/route-map.jsx
+++ b/src/utils/route-map.jsx
@@ -54,10 +54,20 @@ export const getPath = ({ key, params, query = {} }) => {
   return str ? `${path}?${str}` : path;
 };
 
-export const getLinkRender = ({ key, params, query = {}, value }) => {
+export const getLinkRender = ({
+  key,
+  params,
+  query = {},
+  value,
+  extra = {},
+}) => {
   if (!value) {
     return null;
   }
   const path = getPath({ key, params, query });
-  return <Link to={path}>{value}</Link>;
+  return (
+    <Link to={path} {...extra}>
+      {value}
+    </Link>
+  );
 };