Skip to content

Commit

Permalink
[Reporting] implement content changes per feedback (#108068)
Browse files Browse the repository at this point in the history
  • Loading branch information
tsullivan authored Aug 11, 2021
1 parent c39c129 commit 6563fad
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class DataDownloadOptions extends Component<DataDownloadOptionsProps, DataDownlo
position="top"
content={i18n.translate('data.inspector.table.exportButtonFormulasWarning', {
defaultMessage:
'Your CSV contains characters which spreadsheet applications can interpret as formulas',
'Your CSV contains characters that spreadsheet applications might interpret as formulas.',
})}
>
{button}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export const TableVisControls = memo(
position="top"
content={i18n.translate('visTypeTable.vis.controls.exportButtonFormulasWarning', {
defaultMessage:
'Your CSV contains characters which spreadsheet applications can interpret as formulas',
'Your CSV contains characters that spreadsheet applications might interpret as formulas.',
})}
>
{button}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ export const LensTopNavMenu = ({
if (formulaDetected) {
return i18n.translate('xpack.lens.app.downloadButtonFormulasWarning', {
defaultMessage:
'Your CSV contains characters which spreadsheet applications can interpret as formulas',
'Your CSV contains characters that spreadsheet applications might interpret as formulas.',
});
}
}
Expand Down
9 changes: 4 additions & 5 deletions x-pack/plugins/reporting/public/lib/job.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export class Job {
let smallMessage;
if (status === PENDING) {
smallMessage = i18n.translate('xpack.reporting.jobStatusDetail.pendingStatusReachedText', {
defaultMessage: 'Waiting for job to be processed.',
defaultMessage: 'Waiting for job to process.',
});
} else if (status === PROCESSING) {
smallMessage = i18n.translate('xpack.reporting.jobStatusDetail.attemptXofY', {
Expand Down Expand Up @@ -139,8 +139,7 @@ export class Job {
getStatusLabel() {
return (
<>
{this.getStatus()}
{this.getStatusMessage()}
{this.getStatus()} {this.getStatusMessage()}
</>
);
}
Expand Down Expand Up @@ -184,14 +183,14 @@ export class Job {
warnings.push(
i18n.translate('xpack.reporting.jobWarning.csvContainsFormulas', {
defaultMessage:
'Your CSV contains characters which spreadsheet applications can interpret as formulas.',
'Your CSV contains characters that spreadsheet applications might interpret as formulas.',
})
);
}
if (this.max_size_reached) {
warnings.push(
i18n.translate('xpack.reporting.jobWarning.maxSizeReachedTooltip', {
defaultMessage: 'Max size reached, contains partial data.',
defaultMessage: 'Your search reached the max size and contains partial data.',
})
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export class ReportingAPIClient implements IReportingAPI {
}

return i18n.translate('xpack.reporting.apiClient.unknownError', {
defaultMessage: `Report job {job} failed: Unknown error.`,
defaultMessage: `Report job {job} failed. Error unknown.`,
values: { job: jobId },
});
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions x-pack/plugins/reporting/public/management/report_info_button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class ReportInfoButtonUi extends Component<Props, State> {
{
title: this.props.intl.formatMessage({
id: 'xpack.reporting.listing.infoPanel.createdAtInfo',
defaultMessage: 'Created At',
defaultMessage: 'Created at',
}),
description: info.getCreatedAtLabel(),
},
Expand All @@ -106,7 +106,7 @@ class ReportInfoButtonUi extends Component<Props, State> {
{
title: this.props.intl.formatMessage({
id: 'xpack.reporting.listing.infoPanel.tzInfo',
defaultMessage: 'Timezone',
defaultMessage: 'Time zone',
}),
description: info.browserTimezone || NA,
},
Expand All @@ -116,36 +116,36 @@ class ReportInfoButtonUi extends Component<Props, State> {
{
title: this.props.intl.formatMessage({
id: 'xpack.reporting.listing.infoPanel.startedAtInfo',
defaultMessage: 'Started At',
defaultMessage: 'Started at',
}),
description: info.started_at || NA,
},
{
title: this.props.intl.formatMessage({
id: 'xpack.reporting.listing.infoPanel.completedAtInfo',
defaultMessage: 'Completed At',
defaultMessage: 'Completed at',
}),
description: info.completed_at || NA,
},
{
title: this.props.intl.formatMessage({
id: 'xpack.reporting.listing.infoPanel.processedByInfo',
defaultMessage: 'Processed By',
defaultMessage: 'Processed by',
}),
description:
info.kibana_name && info.kibana_id ? `${info.kibana_name} (${info.kibana_id})` : NA,
},
{
title: this.props.intl.formatMessage({
id: 'xpack.reporting.listing.infoPanel.contentTypeInfo',
defaultMessage: 'Content Type',
defaultMessage: 'Content type',
}),
description: info.content_type || NA,
},
{
title: this.props.intl.formatMessage({
id: 'xpack.reporting.listing.infoPanel.sizeInfo',
defaultMessage: 'Size in Bytes',
defaultMessage: 'Size in bytes',
}),
description: info.size?.toString() || NA,
},
Expand All @@ -159,7 +159,7 @@ class ReportInfoButtonUi extends Component<Props, State> {
{
title: this.props.intl.formatMessage({
id: 'xpack.reporting.listing.infoPanel.maxAttemptsInfo',
defaultMessage: 'Max Attempts',
defaultMessage: 'Max attempts',
}),
description: info.max_attempts?.toString() || NA,
},
Expand All @@ -173,7 +173,7 @@ class ReportInfoButtonUi extends Component<Props, State> {
{
title: this.props.intl.formatMessage({
id: 'xpack.reporting.listing.infoPanel.exportTypeInfo',
defaultMessage: 'Export Type',
defaultMessage: 'Export type',
}),
description: info.isDeprecated
? this.props.intl.formatMessage(
Expand Down Expand Up @@ -207,7 +207,7 @@ class ReportInfoButtonUi extends Component<Props, State> {
{
title: this.props.intl.formatMessage({
id: 'xpack.reporting.listing.infoPanel.browserTypeInfo',
defaultMessage: 'Browser Type',
defaultMessage: 'Browser type',
}),
description: info.browser_type || NA,
},
Expand Down Expand Up @@ -293,17 +293,17 @@ class ReportInfoButtonUi extends Component<Props, State> {

let message = this.props.intl.formatMessage({
id: 'xpack.reporting.listing.table.reportInfoButtonTooltip',
defaultMessage: 'See report info',
defaultMessage: 'See report info.',
});
if (job.getError()) {
message = this.props.intl.formatMessage({
id: 'xpack.reporting.listing.table.reportInfoAndErrorButtonTooltip',
defaultMessage: 'See report info and error message',
defaultMessage: 'See report info and error message.',
});
} else if (job.getWarnings()) {
message = this.props.intl.formatMessage({
id: 'xpack.reporting.listing.table.reportInfoAndWarningsButtonTooltip',
defaultMessage: 'See report info and warnings',
defaultMessage: 'See report info and warnings.',
});
}

Expand Down Expand Up @@ -349,7 +349,7 @@ class ReportInfoButtonUi extends Component<Props, State> {
isLoading: false,
calloutTitle: this.props.intl.formatMessage({
id: 'xpack.reporting.listing.table.reportInfoUnableToFetch',
defaultMessage: 'Unable to fetch report info',
defaultMessage: 'Unable to fetch report info.',
}),
info: null,
error: err,
Expand Down
Loading

0 comments on commit 6563fad

Please sign in to comment.