Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[lens] Fix build by updating saved objects and i18n #39391

Merged
merged 4 commits into from
Jun 21, 2019
Merged

[lens] Fix build by updating saved objects and i18n #39391

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a07aa93
[lens] Update location of saved objects code
wylieconlon Jun 20, 2019
662947e
Update internatationalization
wylieconlon Jun 20, 2019
b50b880
Merge remote-tracking branch 'origin/feature/lens' into lens/fix-type
wylieconlon Jun 21, 2019
2846b2a
Remove added file
wylieconlon Jun 21, 2019
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
1 change: 1 addition & 0 deletions .i18nrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"xpack.indexLifecycleMgmt": "x-pack/plugins/index_lifecycle_management",
"xpack.infra": "x-pack/plugins/infra",
"xpack.kueryAutocomplete": "x-pack/plugins/kuery_autocomplete",
"xpack.lens": "x-pack/plugins/lens",
"xpack.licenseMgmt": "x-pack/plugins/license_management",
"xpack.maps": "x-pack/plugins/maps",
"xpack.ml": "x-pack/plugins/ml",
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/lens/public/indexpattern_plugin/loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { Chrome } from 'ui/chrome';
import { ToastNotifications } from 'ui/notify/toasts/toast_notifications';
import { SavedObjectAttributes } from 'src/legacy/server/saved_objects/service/saved_objects_client';
import { SavedObjectAttributes } from 'src/core/server/saved_objects';
import { IndexPatternField } from './indexpattern';

interface SavedIndexPatternAttributes extends SavedObjectAttributes {
Expand Down
12 changes: 6 additions & 6 deletions x-pack/plugins/lens/public/indexpattern_plugin/operation_definitions/metrics.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,35 +75,35 @@ export const minOperation = buildMetricOperation<MinIndexPatternColumn>(

export const maxOperation = buildMetricOperation<MaxIndexPatternColumn>(
'max',
i18n.translate('xpack.lens.indexPattern.min', {
i18n.translate('xpack.lens.indexPattern.max', {
defaultMessage: 'Maximum',
}),
name =>
i18n.translate('xpack.lens.indexPattern.minOf', {
i18n.translate('xpack.lens.indexPattern.maxOf', {
defaultMessage: 'Maximum of {name}',
values: { name },
})
);

export const averageOperation = buildMetricOperation<AvgIndexPatternColumn>(
'avg',
i18n.translate('xpack.lens.indexPattern.min', {
i18n.translate('xpack.lens.indexPattern.avg', {
defaultMessage: 'Average',
}),
name =>
i18n.translate('xpack.lens.indexPattern.minOf', {
i18n.translate('xpack.lens.indexPattern.avgOf', {
defaultMessage: 'Average of {name}',
values: { name },
})
);

export const sumOperation = buildMetricOperation<SumIndexPatternColumn>(
'sum',
i18n.translate('xpack.lens.indexPattern.min', {
i18n.translate('xpack.lens.indexPattern.sum', {
defaultMessage: 'Sum',
}),
name =>
i18n.translate('xpack.lens.indexPattern.minOf', {
i18n.translate('xpack.lens.indexPattern.sumOf', {
defaultMessage: 'Sum of {name}',
values: { name },
})
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/lens/public/indexpattern_plugin/rename_columns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ export const renameColumns: ExpressionFunction<
> = {
name: 'lens_rename_columns',
type: 'kibana_datatable',
help: i18n.translate('lens.functions.renameColumns.help', {
help: i18n.translate('xpack.lens.functions.renameColumns.help', {
defaultMessage: 'A helper to rename the columns of a datatable',
}),
args: {
idMap: {
types: ['string'],
help: i18n.translate('lens.functions.renameColumns.idMap.help', {
help: i18n.translate('xpack.lens.functions.renameColumns.idMap.help', {
defaultMessage:
'A JSON encoded object in which keys are the old column ids and values are the corresponding new ones. All other columns ids are kept.',
}),
Expand Down