maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Reporting] implement content changes per feedback (#108068)

Browse source
This commit is contained in:
Tim Sullivan 2021-08-11 13:13:40 -07:00 committed by GitHub
parent c39c1292eb
commit 6563fad7be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 50 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx
View file

@ -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}

2
src/plugins/vis_type_table/public/components/table_vis_controls.tsx
View file

@ -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}

2
x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
View file

@ -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.',
});
}
}

9
x-pack/plugins/reporting/public/lib/job.tsx
View file

@ -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', {
@ -139,8 +139,7 @@ export class Job {
getStatusLabel() {
return (
<>
{this.getStatus()}
{this.getStatusMessage()}
{this.getStatus()} {this.getStatusMessage()}
</>
);
}
@ -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.',
})
);
}

2
x-pack/plugins/reporting/public/lib/reporting_api_client/reporting_api_client.ts
View file

@ -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 },
});
}

4
x-pack/plugins/reporting/public/management/__snapshots__/report_info_button.test.tsx.snap generated
View file

@ -61,7 +61,7 @@ Array [
className="euiTitle euiTitle--medium"
id="flyoutTitle"
>
Unable to fetch report info
Unable to fetch report info.
</h2>
</EuiTitle>
</div>
@ -113,7 +113,7 @@ Array [
className="euiTitle euiTitle--medium"
id="flyoutTitle"
>
Unable to fetch report info
Unable to fetch report info.
</h2>
</EuiTitle>
</div>

29
x-pack/plugins/reporting/public/management/__snapshots__/report_listing.test.tsx.snap generated
View file

@ -549,6 +549,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
2020-04-14 @ 05:01 PM
</span>
</FormattedMessage>
<EuiText
size="s"
>
@ -562,7 +563,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
className="euiTextColor euiTextColor--subdued"
style={Object {}}
>
Waiting for job to be processed.
Waiting for job to process.
</span>
</EuiTextColor>
</div>
@ -1293,7 +1294,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
}
>
<EuiToolTip
content="See report info"
content="See report info."
delay="regular"
position="top"
>
@ -1562,6 +1563,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
2020-04-14 @ 05:01 PM
</span>
</FormattedMessage>
<EuiText
size="s"
>
@ -2306,7 +2308,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
}
>
<EuiToolTip
content="See report info"
content="See report info."
delay="regular"
position="top"
>
@ -2575,6 +2577,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
2020-04-14 @ 04:19 PM
</span>
</FormattedMessage>
</div>
</div>
</td>
@ -3348,7 +3351,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
}
>
<EuiToolTip
content="See report info"
content="See report info."
delay="regular"
position="top"
>
@ -3617,6 +3620,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
2020-04-14 @ 01:21 PM
</span>
</FormattedMessage>
<EuiText
size="s"
>
@ -4418,7 +4422,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
}
>
<EuiToolTip
content="See report info and warnings"
content="See report info and warnings."
delay="regular"
position="top"
>
@ -4687,6 +4691,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
2020-04-14 @ 01:19 PM
</span>
</FormattedMessage>
</div>
</div>
</td>
@ -5460,7 +5465,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
}
>
<EuiToolTip
content="See report info"
content="See report info."
delay="regular"
position="top"
>
@ -5729,6 +5734,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
2020-04-14 @ 01:19 PM
</span>
</FormattedMessage>
</div>
</div>
</td>
@ -6502,7 +6508,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
}
>
<EuiToolTip
content="See report info"
content="See report info."
delay="regular"
position="top"
>
@ -6771,6 +6777,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
2020-04-14 @ 01:18 PM
</span>
</FormattedMessage>
</div>
</div>
</td>
@ -7544,7 +7551,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
}
>
<EuiToolTip
content="See report info"
content="See report info."
delay="regular"
position="top"
>
@ -7813,6 +7820,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
2020-04-14 @ 01:13 PM
</span>
</FormattedMessage>
</div>
</div>
</td>
@ -8586,7 +8594,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
}
>
<EuiToolTip
content="See report info"
content="See report info."
delay="regular"
position="top"
>
@ -8855,6 +8863,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
2020-04-09 @ 03:10 PM
</span>
</FormattedMessage>
</div>
</div>
</td>
@ -9628,7 +9637,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
}
>
<EuiToolTip
content="See report info"
content="See report info."
delay="regular"
position="top"
>

28
x-pack/plugins/reporting/public/management/report_info_button.tsx
View file

@ -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(),
},
@ -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,
},
@ -116,21 +116,21 @@ 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,
@ -138,14 +138,14 @@ class ReportInfoButtonUi extends Component<Props, State> {
{
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,
},
@ -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,
},
@ -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(
@ -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,
},
@ -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.',
});
}
@ -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,

14
x-pack/test/functional/apps/reporting_management/report_listing.ts
View file

@ -92,7 +92,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
"actions": "",
"createdAt": "2021-07-19 @ 10:29 PMtest_user",
"report": "Automated reportsearch",
"status": "Completed at 2021-07-19 @ 10:29 PMSee report info for warnings.",
"status": "Completed at 2021-07-19 @ 10:29 PM See report info for warnings.",
},
Object {
"actions": "",
@ -104,37 +104,37 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
"actions": "",
"createdAt": "2021-07-19 @ 06:46 PMtest_user",
"report": "Discover search [2021-07-19T11:46:00.132-07:00]search",
"status": "Completed at 2021-07-19 @ 06:46 PMSee report info for warnings.",
"status": "Completed at 2021-07-19 @ 06:46 PM See report info for warnings.",
},
Object {
"actions": "",
"createdAt": "2021-07-19 @ 06:44 PMtest_user",
"report": "Discover search [2021-07-19T11:44:48.670-07:00]search",
"status": "Completed at 2021-07-19 @ 06:44 PMSee report info for warnings.",
"status": "Completed at 2021-07-19 @ 06:44 PM See report info for warnings.",
},
Object {
"actions": "",
"createdAt": "2021-07-19 @ 06:41 PMtest_user",
"report": "[Flights] Global Flight Dashboarddashboard",
"status": "Pending at 2021-07-19 @ 06:41 PMWaiting for job to be processed.",
"status": "Pending at 2021-07-19 @ 06:41 PM Waiting for job to process.",
},
Object {
"actions": "",
"createdAt": "2021-07-19 @ 06:41 PMtest_user",
"report": "[Flights] Global Flight Dashboarddashboard",
"status": "Failed at 2021-07-19 @ 06:43 PMSee report info for error details.",
"status": "Failed at 2021-07-19 @ 06:43 PM See report info for error details.",
},
Object {
"actions": "",
"createdAt": "2021-07-19 @ 06:41 PMtest_user",
"report": "[Flights] Global Flight Dashboarddashboard",
"status": "Completed at 2021-07-19 @ 06:41 PMSee report info for warnings.",
"status": "Completed at 2021-07-19 @ 06:41 PM See report info for warnings.",
},
Object {
"actions": "",
"createdAt": "2021-07-19 @ 06:38 PMtest_user",
"report": "[Flights] Global Flight Dashboarddashboard",
"status": "Completed at 2021-07-19 @ 06:39 PMSee report info for warnings.",
"status": "Completed at 2021-07-19 @ 06:39 PM See report info for warnings.",
},
Object {
"actions": "",