Skip to content

[Transforms] Avoid using "Are you sure" #75932

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

Merged
merged 8 commits into from
Aug 28, 2020
Merged

[Transforms] Avoid using "Are you sure" #75932

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4c9e297
[Transforms] Avoid using Are you sure
lcawl Aug 25, 2020
8478b3d
Remove unnecessary modal body
lcawl Aug 26, 2020
abf4441
Remove unnecessary deleteModalContent
lcawl Aug 27, 2020
de3c864
Merge branch 'master' into transform-text
elasticmachine Aug 27, 2020
6b06804
Updates translations
lcawl Aug 27, 2020
5e61bd6
Removes unnecessary imports
lcawl Aug 27, 2020
c989db2
Adds missing question marks
lcawl Aug 27, 2020
f01d4ec
Addresses translation strings
lcawl Aug 27, 2020
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
30 changes: 0 additions & 30 deletions ...public/app/sections/transform_management/components/action_delete/delete_action_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ import {
EuiSpacer,
EuiSwitch,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { TRANSFORM_STATE } from '../../../../../../common';

import { DeleteAction } from './use_delete_action';

Expand Down Expand Up @@ -47,21 +45,6 @@ export const DeleteActionModal: FC<DeleteAction> = ({
});
const bulkDeleteModalContent = (
<>
<p>
{shouldForceDelete ? (
<FormattedMessage
id="xpack.transform.transformList.bulkForceDeleteModalBody"
defaultMessage="Are you sure you want to force delete {count, plural, one {this} other {these}} {count} {count, plural, one {transform} other {transforms}}? The {count, plural, one {transform} other {transforms}} will be deleted regardless of {count, plural, one {its} other {their}} current state."
values={{ count: items.length }}
/>
) : (
<FormattedMessage
id="xpack.transform.transformList.bulkDeleteModalBody"
defaultMessage="Are you sure you want to delete {count, plural, one {this} other {these}} {count} {count, plural, one {transform} other {transforms}}?"
values={{ count: items.length }}
/>
)}
</p>
<EuiFlexGroup direction="column" gutterSize="none">
<EuiFlexItem>
{
Expand Down Expand Up @@ -100,19 +83,6 @@ export const DeleteActionModal: FC<DeleteAction> = ({

const deleteModalContent = (
<>
<p>
{items[0] && items[0] && items[0].stats.state === TRANSFORM_STATE.FAILED ? (
<FormattedMessage
id="xpack.transform.transformList.forceDeleteModalBody"
defaultMessage="Are you sure you want to force delete this transform? The transform will be deleted regardless of its current state."
/>
) : (
<FormattedMessage
id="xpack.transform.transformList.deleteModalBody"
defaultMessage="Are you sure you want to delete this transform?"
/>
)}
</p>
<EuiFlexGroup direction="column" gutterSize="none">
<EuiFlexItem>
{userCanDeleteIndex && (
Expand Down
2 changes: 1 addition & 1 deletion ...m/public/app/sections/transform_management/components/action_start/start_action_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const StartActionModal: FC<StartAction> = ({ closeModal, items, startAndC
<p>
{i18n.translate('xpack.transform.transformList.startModalBody', {
defaultMessage:
'A transform will increase search and indexing load in your cluster. Please stop the transform if excessive load is experienced. Are you sure you want to start {count, plural, one {this} other {these}} {count} {count, plural, one {transform} other {transforms}}?',
'A transform increases search and indexing load in your cluster. Start {count, plural, one {this} other {these}} {count} {count, plural, one {transform} other {transforms}}?',
values: { count: items.length },
})}
</p>
Expand Down
4 changes: 0 additions & 4 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 @@ -18154,17 +18154,14 @@
"xpack.transform.transformForm.sizeNotationPlaceholder": "例: {example1}、{example2}、{example3}、{example4}",
"xpack.transform.transformList.bulkDeleteDestIndexPatternSuccessMessage": "{count}個のディスティネーションインデックス{count, plural, one {パターン} other {パターン}}を正常に削除しました。",
"xpack.transform.transformList.bulkDeleteDestIndexSuccessMessage": "{count}個のディスティネーション{count, plural, one {インデックス} other {インデックス}}を正常に削除しました。",
"xpack.transform.transformList.bulkDeleteModalBody": "{count, plural, one {この} other {これらの}} {count} {count, plural, one {変換} other {変換}}を削除しますか?",
"xpack.transform.transformList.bulkDeleteModalTitle": "{count} 件の{count, plural, one {変換} other {変換}}を削除",
"xpack.transform.transformList.bulkDeleteTransformSuccessMessage": "{count} {count, plural, one {個の変換} other {個の変換}}を正常に削除しました。",
"xpack.transform.transformList.bulkForceDeleteModalBody": "{count, plural, one {この} other {これらの}} {count} {count, plural, one {変換} other {変換}}を強制的に削除しますか?{count, plural, one {} other {}}現在の状態に関係なく、{count, plural, one {個の変換} other {個の変換}}は削除されます。",
"xpack.transform.transformList.bulkStartModalTitle": "{count} 件の{count, plural, one {変換} other {変換}}を開始",
"xpack.transform.transformList.completeBatchTransformBulkActionToolTip": "1 つまたは複数の変換が完了済みの一斉変換で、再度開始できません。",
"xpack.transform.transformList.completeBatchTransformToolTip": "{transformId} は完了済みの一斉変換で、再度開始できません。",
"xpack.transform.transformList.createTransformButton": "変換の作成",
"xpack.transform.transformList.deleteActionDisabledToolTipContent": "削除するにはデータフレームジョブを停止してください。",
"xpack.transform.transformList.deleteBulkActionDisabledToolTipContent": "削除するには、選択された変換のうちの 1 つまたは複数を停止する必要があります。",
"xpack.transform.transformList.deleteModalBody": "この変換を削除してよろしいですか？",
"xpack.transform.transformList.deleteModalCancelButton": "キャンセル",
"xpack.transform.transformList.deleteModalDeleteButton": "削除",
"xpack.transform.transformList.deleteModalTitle": "{transformId} 削除",
Expand All @@ -18187,7 +18184,6 @@
"xpack.transform.transformList.editTransformGenericErrorMessage": "変換を削除するためのAPIエンドポイントの呼び出し中にエラーが発生しました。",
"xpack.transform.transformList.editTransformSuccessMessage": "変換{transformId}が更新されました。",
"xpack.transform.transformList.errorWithCheckingIfUserCanDeleteIndexNotificationErrorMessage": "ユーザーがディスティネーションインデックスを削除できるかどうかを確認するときにエラーが発生しました。",
"xpack.transform.transformList.forceDeleteModalBody": "この変換を強制的に削除しますか?現在の状態に関係なく、変換が削除されます。",
"xpack.transform.transformList.refreshButtonLabel": "更新",
"xpack.transform.transformList.rowCollapse": "{transformId} の詳細を非表示",
"xpack.transform.transformList.rowExpand": "{transformId} の詳細を表示",
Expand Down
4 changes: 0 additions & 4 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 @@ -18161,17 +18161,14 @@
"xpack.transform.transformForm.sizeNotationPlaceholder": "示例：{example1}、{example2}、{example3}、{example4}",
"xpack.transform.transformList.bulkDeleteDestIndexPatternSuccessMessage": "已成功删除 {count} 个目标索引{count, plural, one {模式} other {模式}}。",
"xpack.transform.transformList.bulkDeleteDestIndexSuccessMessage": "已成功删除 {count} 个目标{count, plural, one {索引} other {索引}}。",
"xpack.transform.transformList.bulkDeleteModalBody": "确定要删除{count, plural, one {这} other {这}} {count} 个{count, plural, one {转换} other {转换}}？",
"xpack.transform.transformList.bulkDeleteModalTitle": "删除 {count} 个 {count, plural, one {转换} other {转换}}？",
"xpack.transform.transformList.bulkDeleteTransformSuccessMessage": "已成功删除 {count} 个{count, plural, one {转换} other {转换}}。",
"xpack.transform.transformList.bulkForceDeleteModalBody": "确定要强制删除{count, plural, one {这} other {这}} {count} 个{count, plural, one {转换} other {转换}}？无论{count, plural, one {转换} other {转换}}的当前状态如何，都将删除{count, plural, one {} other {}}。",
"xpack.transform.transformList.bulkStartModalTitle": "启动 {count} 个 {count, plural, one {转换} other {转换}}？",
"xpack.transform.transformList.completeBatchTransformBulkActionToolTip": "一个或多个转换为已完成批量转换，无法重新启动。",
"xpack.transform.transformList.completeBatchTransformToolTip": "{transformId} 为已完成批量转换，无法重新启动。",
"xpack.transform.transformList.createTransformButton": "创建转换",
"xpack.transform.transformList.deleteActionDisabledToolTipContent": "停止数据帧作业，以便将其删除。",
"xpack.transform.transformList.deleteBulkActionDisabledToolTipContent": "一个或多个选定数据帧转换必须停止，才能删除。",
"xpack.transform.transformList.deleteModalBody": "是否确定要删除此转换？",
"xpack.transform.transformList.deleteModalCancelButton": "取消",
"xpack.transform.transformList.deleteModalDeleteButton": "删除",
"xpack.transform.transformList.deleteModalTitle": "删除 {transformId}",
Expand All @@ -18194,7 +18191,6 @@
"xpack.transform.transformList.editTransformGenericErrorMessage": "调用用于更新转换的 API 终端时发生错误。",
"xpack.transform.transformList.editTransformSuccessMessage": "转换 {transformId} 已更新。",
"xpack.transform.transformList.errorWithCheckingIfUserCanDeleteIndexNotificationErrorMessage": "检查用户是否可以删除目标索引时发生错误",
"xpack.transform.transformList.forceDeleteModalBody": "确定要强制删除此索引？无论转换的当前状态如何，都将删除。",
"xpack.transform.transformList.refreshButtonLabel": "刷新",
"xpack.transform.transformList.rowCollapse": "隐藏 {transformId} 的详情",
"xpack.transform.transformList.rowExpand": "显示 {transformId} 的详情",
Expand Down