This repository has been archived by the owner on Sep 18, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Update WebUI for metrics data changing to json string #2067
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,7 +43,7 @@ const getFinalResult = (final?: MetricDataRecord[]): number => { | |
let acc; | ||
let showDefault = 0; | ||
if (final) { | ||
acc = JSON.parse(final[final.length - 1].data); | ||
acc = JSON5.parse(final[final.length - 1].data); | ||
if (typeof (acc) === 'object') { | ||
if (acc.default) { | ||
showDefault = acc.default; | ||
|
@@ -61,7 +61,7 @@ const getFinalResult = (final?: MetricDataRecord[]): number => { | |
const getFinal = (final?: MetricDataRecord[]): FinalType | undefined => { | ||
let showDefault: FinalType; | ||
if (final) { | ||
showDefault = JSON.parse(final[final.length - 1].data); | ||
showDefault = JSON5.parse(final[final.length - 1].data); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can this be replaced by parseMetrics? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. OK. |
||
if (typeof showDefault === 'number') { | ||
showDefault = { default: showDefault }; | ||
} | ||
|
@@ -182,8 +182,6 @@ function formatTimestamp(timestamp?: number, placeholder?: string): string { | |
function parseMetrics(metricData: string): any { | ||
if (metricData.includes('NaN')) { | ||
return JSON5.parse(metricData) | ||
} else { | ||
return JSON.parse(metricData) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why remove this? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I thought UI only use JSON5 from the teams message. |
||
} | ||
} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to call parseMetrics here? there maybe more updates in parseMetrics later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's OK.