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

SavedObjects management: change index patterns labels to data views #125356

Merged
merged 2 commits into from
Feb 15, 2022
Merged

SavedObjects management: change index patterns labels to data views #125356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8dc0c5
SavedObjects management: change index patterns labels to data views
pgayvallet Feb 11, 2022
b9aa53e
Merge branch 'main' into kbn-125273-SOM-index-pattern-labels
kibanamachine Feb 14, 2022
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
8 changes: 4 additions & 4 deletions ...ic/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions ...cts_management/public/management_section/object_view/components/not_found_errors.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('NotFoundErrors component', () => {
const callOut = mounted.find('EuiCallOut');
expect(callOut).toMatchSnapshot();
expect(mounted.text()).toMatchInlineSnapshot(
`"There is a problem with this saved objectThe index pattern associated with this object no longer exists.If you know what this error means, you can use the Saved objects APIs(opens in a new tab or window) to fix it — otherwise click the delete button above."`
`"There is a problem with this saved objectThe data view associated with this object no longer exists.If you know what this error means, you can use the Saved objects APIs(opens in a new tab or window) to fix it — otherwise click the delete button above."`
);
});

Expand All @@ -43,7 +43,7 @@ describe('NotFoundErrors component', () => {
const callOut = mounted.find('EuiCallOut');
expect(callOut).toMatchSnapshot();
expect(mounted.text()).toMatchInlineSnapshot(
`"There is a problem with this saved objectA field associated with this object no longer exists in the index pattern.If you know what this error means, you can use the Saved objects APIs(opens in a new tab or window) to fix it — otherwise click the delete button above."`
`"There is a problem with this saved objectA field associated with this object no longer exists in the data view.If you know what this error means, you can use the Saved objects APIs(opens in a new tab or window) to fix it — otherwise click the delete button above."`
);
});

Expand Down
4 changes: 2 additions & 2 deletions ..._objects_management/public/management_section/object_view/components/not_found_errors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ export const NotFoundErrors = ({ type, docLinks }: NotFoundErrors) => {
return (
<FormattedMessage
id="savedObjectsManagement.view.indexPatternDoesNotExistErrorMessage"
defaultMessage="The index pattern associated with this object no longer exists."
defaultMessage="The data view associated with this object no longer exists."
/>
);
case 'index-pattern-field':
return (
<FormattedMessage
id="savedObjectsManagement.view.fieldDoesNotExistErrorMessage"
defaultMessage="A field associated with this object no longer exists in the index pattern."
defaultMessage="A field associated with this object no longer exists in the data view."
/>
);
default:
Expand Down
10 changes: 5 additions & 5 deletions ...ent/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions ...ns/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
),
description: i18n.translate(
'savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdDescription',
{ defaultMessage: 'ID of the index pattern' }
{ defaultMessage: 'ID of the data view' }
),
sortable: true,
},
Expand Down Expand Up @@ -329,7 +329,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
field: 'existingIndexPatternId',
name: i18n.translate(
'savedObjectsManagement.objectsTable.flyout.renderConflicts.columnNewIndexPatternName',
{ defaultMessage: 'New index pattern' }
{ defaultMessage: 'New data view' }
),
render: (id: string) => {
const options = [
Expand Down Expand Up @@ -573,7 +573,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
title={
<FormattedMessage
id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle"
defaultMessage="Index Pattern Conflicts"
defaultMessage="Data Views Conflicts"
/>
}
color="warning"
Expand All @@ -582,15 +582,15 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
<p>
<FormattedMessage
id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription"
defaultMessage="The following saved objects use index patterns that do not exist.
Please select the index patterns you'd like re-associated with
defaultMessage="The following saved objects use data views that do not exist.
Please select the data views you'd like re-associated with
them. You can {indexPatternLink} if necessary."
values={{
indexPatternLink: (
<EuiLink href={this.props.newIndexPatternUrl}>
<FormattedMessage
id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
defaultMessage="create a new index pattern"
defaultMessage="create a new data view"
/>
</EuiLink>
),
Expand Down
5 changes: 0 additions & 5 deletions x-pack/plugins/translations/translations/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4667,14 +4667,9 @@
"savedObjectsManagement.objectsTable.flyout.importSavedObjectTitle": "保存されたオブジェクトのインポート",
"savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel": "すべての変更を確定",
"savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmButtonLabel": "完了",
"savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "新規インデックスパターンを作成",
"savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription": "次の保存されたオブジェクトは、存在しないインデックスパターンを使用しています。関連付け直す別のインデックスパターンを選択してください。必要に応じて、{indexPatternLink}できます。",
"savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle": "インデックスパターンの矛盾",
"savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountDescription": "影響されるオブジェクトの数です",
"savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountName": "カウント",
"savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdDescription": "インデックスパターンのIDです",
"savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdName": "ID",
"savedObjectsManagement.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "新規インデックスパターン",
"savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription": "影響されるオブジェクトのサンプル",
"savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName": "影響されるオブジェクトのサンプル",
"savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel": "インポートするファイルを選択してください",
Expand Down
5 changes: 0 additions & 5 deletions x-pack/plugins/translations/translations/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4464,14 +4464,9 @@
"savedObjectsManagement.objectsTable.flyout.importSavedObjectTitle": "导入已保存对象",
"savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel": "确认所有更改",
"savedObjectsManagement.objectsTable.flyout.importSuccessful.confirmButtonLabel": "完成",
"savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "创建新的索引模式",
"savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription": "以下已保存对象使用不存在的索引模式。请选择要重新关联的索引模式。必要时可以{indexPatternLink}。",
"savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle": "索引模式冲突",
"savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountDescription": "受影响对象数目",
"savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountName": "计数",
"savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdDescription": "索引模式的 ID",
"savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdName": "ID",
"savedObjectsManagement.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "新建索引模式",
"savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription": "受影响对象样例",
"savedObjectsManagement.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName": "受影响对象样例",
"savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel": "选择要导入的文件",
Expand Down