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 {
{authEnabled === 'false' ? ( -
+ +
+ ) : null} {this.props.children}
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 {
{ if (!metadata) return null; return Object.keys(metadata).map(k => ( -

+

{k}={metadata[k]}

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