From 64774de6e1dc56b874d69a01fef2e3e99b501f11 Mon Sep 17 00:00:00 2001
From: maoling <11016631+maoling@users.noreply.github.com>
Date: Wed, 19 Jul 2023 16:27:34 +0800
Subject: [PATCH] fix a couple of invaild props (#10810)

---
 console-ui/src/layouts/MainLayout.js                        | 6 ++++--
 .../PermissionsManagement/PermissionsManagement.js          | 2 +-
 .../pages/AuthorityControl/UserManagement/UserManagement.js | 2 +-
 .../ServiceManagement/ServiceDetail/EditInstanceDialog.js   | 4 ++--
 .../pages/ServiceManagement/ServiceDetail/InstanceTable.js  | 2 +-
 .../ServiceManagement/SubscriberList/SubscriberList.js      | 4 +++-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/console-ui/src/layouts/MainLayout.js b/console-ui/src/layouts/MainLayout.js
index 33bd2c7d7..b92ea4b61 100644
--- a/console-ui/src/layouts/MainLayout.js
+++ b/console-ui/src/layouts/MainLayout.js
@@ -39,7 +39,7 @@ class MainLayout extends React.Component {
     getState: PropTypes.func,
     functionMode: PropTypes.string,
     authEnabled: PropTypes.string,
-    children: PropTypes.object,
+    children: PropTypes.array,
     getNotice: PropTypes.func,
     notice: PropTypes.string,
   };
@@ -152,7 +152,9 @@ class MainLayout extends React.Component {
             </div>
             <div className="right-panel next-shell-sub-main">
               {authEnabled === 'false' ? (
-                <Message type="notice"><div dangerouslySetInnerHTML={{ __html: this.props.notice }} /></Message>
+                <Message type="notice">
+                  <div dangerouslySetInnerHTML={{ __html: this.props.notice }} />
+                </Message>
               ) : null}
               {this.props.children}
             </div>
diff --git a/console-ui/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.js b/console-ui/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.js
index b879155c0..7631c5476 100644
--- a/console-ui/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.js
+++ b/console-ui/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.js
@@ -48,7 +48,7 @@ class PermissionsManagement extends React.Component {
   static propTypes = {
     locale: PropTypes.object,
     permissions: PropTypes.object,
-    namespaces: PropTypes.object,
+    namespaces: PropTypes.array,
     getPermissions: PropTypes.func,
     getNamespaces: PropTypes.func,
   };
diff --git a/console-ui/src/pages/AuthorityControl/UserManagement/UserManagement.js b/console-ui/src/pages/AuthorityControl/UserManagement/UserManagement.js
index 5b900548e..f6d721a99 100644
--- a/console-ui/src/pages/AuthorityControl/UserManagement/UserManagement.js
+++ b/console-ui/src/pages/AuthorityControl/UserManagement/UserManagement.js
@@ -123,7 +123,7 @@ class UserManagement extends React.Component {
         <Form inline>
           <Form.Item label={locale.username}>
             <Input
-              value={this.username}
+              value={this.state.username || ''}
               htmlType="text"
               placeholder={this.state.defaultFuzzySearch ? locale.defaultFuzzyd : locale.fuzzyd}
               style={{ width: 200 }}
diff --git a/console-ui/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js b/console-ui/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js
index 350697592..0ae62f517 100644
--- a/console-ui/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js
+++ b/console-ui/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js
@@ -29,8 +29,8 @@ class EditInstanceDialog extends React.Component {
     serviceName: PropTypes.string,
     clusterName: PropTypes.string,
     groupName: PropTypes.string,
-    openLoading: PropTypes.string,
-    closeLoading: PropTypes.string,
+    openLoading: PropTypes.func,
+    closeLoading: PropTypes.func,
     getInstanceList: PropTypes.func,
     locale: PropTypes.object,
   };
diff --git a/console-ui/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js b/console-ui/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js
index 44ba8e102..3bcbea26d 100644
--- a/console-ui/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js
+++ b/console-ui/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js
@@ -162,7 +162,7 @@ class InstanceTable extends React.Component {
             cell={(metadata = {}) => {
               if (!metadata) return null;
               return Object.keys(metadata).map(k => (
-                <p>
+                <p key={k}>
                   {k}={metadata[k]}
                 </p>
               ));
diff --git a/console-ui/src/pages/ServiceManagement/SubscriberList/SubscriberList.js b/console-ui/src/pages/ServiceManagement/SubscriberList/SubscriberList.js
index 9a6bbb4b0..60989d57f 100644
--- a/console-ui/src/pages/ServiceManagement/SubscriberList/SubscriberList.js
+++ b/console-ui/src/pages/ServiceManagement/SubscriberList/SubscriberList.js
@@ -111,6 +111,8 @@ class SubscriberList extends React.Component {
   render() {
     const { locale = {}, subscriberData = {} } = this.props;
     const { count = 0, subscribers = [] } = subscriberData;
+    const subscribersArray = Array.isArray(subscribers) ? subscribers : [];
+
     const {
       pubNoData,
       subscriberList,
@@ -186,7 +188,7 @@ class SubscriberList extends React.Component {
           </Row>
           <Row style={{ padding: 0 }}>
             <Col span="24" style={{ padding: 0 }}>
-              <Table dataSource={subscribers} locale={{ empty: pubNoData }}>
+              <Table dataSource={subscribersArray} locale={{ empty: pubNoData }}>
                 <Column title={locale.serviceName} dataIndex="serviceName" />
                 <Column title={locale.address} dataIndex="addrStr" />
                 <Column title={locale.clientVersion} dataIndex="agent" />