Skip to content

Feature/translate monitoring apm and chart#25063

Merged
maryia-lapata merged 28 commits intoelastic:masterfrom
Nox911:feature/translate-monitoring-apm
Nov 23, 2018
Merged

Feature/translate monitoring apm and chart#25063
maryia-lapata merged 28 commits intoelastic:masterfrom
Nox911:feature/translate-monitoring-apm

Conversation

@Nox911
Copy link
Copy Markdown
Contributor

@Nox911 Nox911 commented Nov 2, 2018

Translate monitoring -> public -> components:

  • apm,
  • chart;
    monitoring -> public -> directives -> chart;
    monitoring -> public -> views -> apm;

Fixes: #24713

@Nox911 Nox911 requested a review from maryia-lapata November 2, 2018 15:50
@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@maryia-lapata
Copy link
Copy Markdown
Contributor

retest

Copy link
Copy Markdown
Contributor

@maryia-lapata maryia-lapata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Copy link
Copy Markdown
Contributor

@maryia-lapata maryia-lapata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

Copy link
Copy Markdown
Contributor

@chrisronline chrisronline left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly great, but a couple issues I found

value: intl.formatMessage({
id: 'xpack.monitoring.apm.instance.status.lastEventDescription',
defaultMessage: '{timeOfLastEvent} ago' }, {
timeOfLastEvent: formatTimestampToDuration(+moment(timeOfLastEvent), CALCULATE_DURATION_SINCE)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing 'since' argument

Copy link
Copy Markdown
Contributor Author

@Nox911 Nox911 Nov 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'since' it's not a label, it's a kind of key, which is passed as a parameter to function formatTimestampToDuration() . And according to this key timeDuration is calculated differently. So we didn't miss 'since' argument, we just replaced it with a constant like in the other code:

Please correct me if I am wrong.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yes you're right!

value: intl.formatMessage({
id: 'xpack.monitoring.apm.instances.status.lastEventDescription',
defaultMessage: '{timeOfLastEvent} ago' }, {
timeOfLastEvent: formatTimestampToDuration(+moment(timeOfLastEvent), CALCULATE_DURATION_SINCE)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again here, missing 'since' argument

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/kibana-monitoring

Copy link
Copy Markdown
Contributor

@chrisronline chrisronline left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@maryia-lapata
Copy link
Copy Markdown
Contributor

Should be merge after #24717.

@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@maryia-lapata maryia-lapata merged commit d58addc into elastic:master Nov 23, 2018
maryia-lapata pushed a commit to maryia-lapata/kibana that referenced this pull request Nov 23, 2018
* Translate monitoring - apm

* Translate monitoring - chart

* Fix issues with apm

* Fix issues with chart

* Update snapshots
maryia-lapata added a commit that referenced this pull request Nov 23, 2018
* Translate monitoring - apm

* Translate monitoring - chart

* Fix issues with apm

* Fix issues with chart

* Update snapshots
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants