[incubator-skywalking-ui] branch 5.0.0/beta updated: Amend page styles

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hanahmily pushed a commit to branch 5.0.0/beta
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git


The following commit(s) were added to refs/heads/5.0.0/beta by this push:
     new 4b0a651  Amend page styles
4b0a651 is described below

commit 4b0a6510fd4bcb8bc325294ddc528149bcdb2bac
Author: hanahmily <ha...@gmail.com>
AuthorDate: Wed May 2 10:26:00 2018 +0800

    Amend page styles
---
 src/components/GlobalHeader/index.js  | 4 ++--
 src/models/alarm.js                   | 2 +-
 src/routes/Application/Application.js | 6 +++---
 src/routes/Topology/Topology.js       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/GlobalHeader/index.js b/src/components/GlobalHeader/index.js
index c2f24b8..f665a4c 100644
--- a/src/components/GlobalHeader/index.js
+++ b/src/components/GlobalHeader/index.js
@@ -102,10 +102,10 @@ export default class GlobalHeader extends PureComponent {
               className={styles.action}
               count={applicationAlarmList.total + serverAlarmList.total}
               onItemClick={(item, tabProps) => {
-                redirect({ pathname: '/alarm', state: { type: tabProps.title } });
+                redirect({ pathname: '/monitor/alarm', state: { type: tabProps.title } });
               }}
               onClear={(tabTitle) => {
-                redirect({ pathname: '/alarm', state: { type: tabTitle } });
+                redirect({ pathname: '/monitor/alarm', state: { type: tabTitle } });
               }}
               loading={fetching}
               popupAlign={{ offset: [20, -16] }}
diff --git a/src/models/alarm.js b/src/models/alarm.js
index 2b1e43e..576dda9 100644
--- a/src/models/alarm.js
+++ b/src/models/alarm.js
@@ -97,7 +97,7 @@ export default generateModal({
   subscriptions: {
     setup({ history, dispatch }) {
       return history.listen(({ pathname, state }) => {
-        if (pathname === '/alarm' && state) {
+        if (pathname === '/monitor/alarm' && state) {
           dispatch({
             type: 'saveVariables',
             payload: { values: {
diff --git a/src/routes/Application/Application.js b/src/routes/Application/Application.js
index 3a39562..7ca2bfe 100644
--- a/src/routes/Application/Application.js
+++ b/src/routes/Application/Application.js
@@ -119,14 +119,14 @@ export default class Application extends PureComponent {
             {getFieldDecorator('applicationId')(
               <Select
                 showSearch
+                optionFilterProp="children"
                 style={{ width: 200 }}
                 placeholder="Select a application"
                 labelInValue
                 onSelect={this.handleSelect.bind(this)}
               >
-                {options.applicationId && options.applicationId.map((app) => {
-                    return (<Option key={app.key} value={app.key}>{app.label}</Option>);
-                  })}
+                {options.applicationId && options.applicationId.map(app =>
+                  <Option key={app.key} value={app.key}>{app.label}</Option>)}
               </Select>
             )}
           </FormItem>
diff --git a/src/routes/Topology/Topology.js b/src/routes/Topology/Topology.js
index ed59ae2..77baa56 100644
--- a/src/routes/Topology/Topology.js
+++ b/src/routes/Topology/Topology.js
@@ -132,14 +132,14 @@ export default class Topology extends PureComponent {
             {data.appInfo ? (
               <Card
                 title={data.appInfo.name}
-                bodyStyle={{ height: 558 }}
+                bodyStyle={{ height: 568 }}
                 actions={this.renderActions()}
               >
                 <ApplicationLitePanel appInfo={data.appInfo} />
               </Card>
             )
             : (
-              <Card title="Overview" style={{ height: 662 }}>
+              <Card title="Overview" style={{ height: 672 }}>
                 <DescriptionList col={1} layout="vertical" >
                   <Description term="Total Application">{data.getClusterTopology.nodes.filter(_ => _.sla).length}</Description>
                   <Description term="Application Alarm">{data.getClusterTopology.nodes.filter(_ => _.isAlarm).length}</Description>

-- 
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.