Skip to content
This repository has been archived by the owner on Oct 29, 2019. It is now read-only.

Feature/5.0.0 #116

Merged
merged 67 commits into from
Feb 14, 2018
Merged
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
b22b60d
Init frontend
hanahmily Dec 14, 2017
381f40b
Finished dashboard demo
hanahmily Dec 18, 2017
e59b586
App application demo page
hanahmily Dec 21, 2017
48199b3
Add service demo page
hanahmily Dec 21, 2017
1080608
First version of demo is finished
hanahmily Dec 22, 2017
546e414
Time-Select component finish
hanahmily Jan 7, 2018
5a20076
Fetching dashboard data
hanahmily Jan 8, 2018
a62a368
Fetching application data
hanahmily Jan 8, 2018
7682d98
Fetching server data
hanahmily Jan 8, 2018
de65603
Fetching service data
hanahmily Jan 8, 2018
354beb9
Fetching alarm data
hanahmily Jan 8, 2018
13406fd
Reactor mock
hanahmily Jan 10, 2018
28bde99
Add cytoscape.js
hanahmily Jan 10, 2018
35a2bae
Add application topology
hanahmily Jan 11, 2018
ef8fa2c
Finish AppTopology
hanahmily Jan 12, 2018
a1bd2ff
Service Topology
hanahmily Jan 12, 2018
1c5a7f0
Generate input duration
hanahmily Jan 15, 2018
746f3b2
Trace list
hanahmily Jan 16, 2018
f9c0da9
Add an ignore.
wu-sheng Jan 16, 2018
92c162e
Merge branch 'feature/5.0.0' of https://github.com/apache/incubator-s…
wu-sheng Jan 16, 2018
59b08f7
Add trace stack component
hanahmily Jan 17, 2018
e395a52
Merge branch 'feature/5.0.0' of https://github.com/apache/incubator-s…
hanahmily Jan 17, 2018
2e25284
Attach trace stack component to trace list
hanahmily Jan 17, 2018
da5a159
Resize trace stack
hanahmily Jan 17, 2018
7faf92e
Add span info modal in trace stack
hanahmily Jan 18, 2018
6aed77a
Add area chart to support heap chart
hanahmily Jan 18, 2018
9767df3
Add stack bar chart
hanahmily Jan 19, 2018
9b53a6c
Add displaying right time scale basing on selected duration
hanahmily Jan 19, 2018
1c23ad9
Add topology menu
hanahmily Jan 19, 2018
f25410e
Add application topology
hanahmily Jan 19, 2018
fcc2d6c
Add menu icon and logo
hanahmily Jan 21, 2018
2ebb11a
Add Topology graph zooming
hanahmily Jan 22, 2018
2f51c17
Refactor alarm page to the list style
hanahmily Jan 22, 2018
f5a8f72
Refactor topology graph layout
hanahmily Jan 22, 2018
222c6d0
Refactor time select style
hanahmily Jan 22, 2018
132098b
Refactor dashboard top list
hanahmily Jan 22, 2018
2e7d442
Add default selected item for application and server pages
hanahmily Jan 22, 2018
8244eec
Mend list style
hanahmily Jan 22, 2018
9d33ad3
Add panel page
hanahmily Jan 26, 2018
104c4e8
Add loading application list from backend
hanahmily Jan 26, 2018
4e4407d
Add topology graphql query
hanahmily Jan 26, 2018
e78dc70
Refactor page
hanahmily Jan 29, 2018
9df9c10
Refactor dashboard
hanahmily Jan 29, 2018
1a3e9e2
Refactor topology
hanahmily Jan 29, 2018
9c2d42b
Add searching server
hanahmily Jan 29, 2018
995f934
Amend server data
hanahmily Jan 30, 2018
983dfe9
Add service search
hanahmily Jan 30, 2018
9f3040a
Add selecting multiple application in tracing page
hanahmily Jan 30, 2018
e2557ac
Add searching alarm info
hanahmily Jan 31, 2018
8c6c8ae
Add alarm notice on top bar
hanahmily Jan 31, 2018
3a3fa53
Add zuul to proxy graphql query
hanahmily Feb 1, 2018
f53f97e
Add proxy to backend
hanahmily Feb 2, 2018
a3acdc6
Add error handler
hanahmily Feb 2, 2018
629684d
Overhaul ui for e2e test
hanahmily Feb 3, 2018
43b67ee
Add graphql proxy
hanahmily Feb 7, 2018
43338d7
Add package script
hanahmily Feb 8, 2018
2cfda28
Fix env variable conflict.
wu-sheng Feb 8, 2018
5e6cb04
Overhaul query for integration test
hanahmily Feb 9, 2018
42b2f3e
Merge branch 'feature/5.0.0' of https://github.com/apache/incubator-s…
hanahmily Feb 9, 2018
c204543
Overhaul query for integration test
hanahmily Feb 11, 2018
0fd5bf8
Amend code for online check
hanahmily Feb 11, 2018
6ca52a2
Amend Time-select and Search components issues
hanahmily Feb 13, 2018
cf57fe6
Overhaul dashboard and service pages for integration test
hanahmily Feb 13, 2018
d5ebd41
Add Ranking component
hanahmily Feb 13, 2018
6a589cf
Add MQ trace feature
hanahmily Feb 14, 2018
c3fd855
Update README.md
hanahmily Feb 14, 2018
fb3b3fa
Merge branch 'master' into feature/5.0.0
hanahmily Feb 14, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add displaying right time scale basing on selected duration
  • Loading branch information
hanahmily committed Jan 19, 2018
commit 9b53a6cc7e8eab3fae285c69614b51566acc3dae
11 changes: 6 additions & 5 deletions src/main/frontend/src/utils/utils.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import moment from 'moment';

function createTimeMeasure(measureType, step, format) {
function createTimeMeasure(measureType, step, format, displayFormat = format) {
return {
measureType, step, format,
measureType, step, format, displayFormat,
};
}

function getMeasureList() {
return [createTimeMeasure('months', 'MONTH', 'YYYY-MM'), createTimeMeasure('days', 'DAY', 'YYYY-MM-DD'),
createTimeMeasure('hours', 'HOUR', ' YYYY-MM-DD HH'), createTimeMeasure('minutes', 'MINUTE', ' YYYY-MM-DD HHmm'), createTimeMeasure('seconds', 'SECOND', ' YYYY-MM-DD HHmmss')];
createTimeMeasure('hours', 'HOUR', ' YYYY-MM-DD HH', 'YYYY-MM-DD HH:00:00'), createTimeMeasure('minutes', 'MINUTE', ' YYYY-MM-DD HHmm', 'HH:mm:00'),
createTimeMeasure('seconds', 'SECOND', ' YYYY-MM-DD HHmmss', 'HH:mm:ss')];
}

export function fixedZero(val) {
Expand Down Expand Up @@ -111,7 +112,7 @@ export function timeRange({ display }) {
export function generateDuration({ from, to }) {
const start = from();
const end = to();
const { measureType, step, format } = getMeasureList()
const { measureType, step, format, displayFormat } = getMeasureList()
.find(measure => (end.diff(start, measure.measureType) > 1));
return {
input: {
Expand All @@ -121,7 +122,7 @@ export function generateDuration({ from, to }) {
},
display: {
range: Array.from({ length: end.diff(start, measureType) + 1 },
(v, i) => start.clone().add(i, measureType).format(format)),
(v, i) => start.clone().add(i, measureType).format(displayFormat)),
},
};
}