Skip to content

[follow up] small ui refactoring #225234

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
denar50 merged 2 commits into from
Jun 25, 2025
Merged

[follow up] small ui refactoring #225234

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
05bbc9f
follow up commit with small ui refactoring
denar50 Jun 25, 2025
e716374
update language files
denar50 Jun 25, 2025
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
2 changes: 0 additions & 2 deletions x-pack/platform/plugins/private/translations/translations/fr-FR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37103,8 +37103,6 @@
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditWarningToastTitle": "Les mises à jour des règles sont en cours",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkExportConfirmationDeniedTitle": "Impossible d'exporter {rulesCount, plural, =1 {# rule} other {# règles}}",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunConfirmationDeniedTitle": "Impossible de programmer {rulesCount, plural, =1 {# rule} other {# règles}}",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunLimitErrorCloseButton": "Fermer",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunLimitErrorMessage": "Cette action peut uniquement être appliquée",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunLimitErrorTitle": "L'exécution de règle manuelle ne peut être planifiée pour plus de {rulesCount, plural, =1 {# rule} other {# règles}}",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.contextMenuTitle": "Options",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.defaultRulesExportFailureDescription": "Impossible d'exporter {rulesCount, plural, =1 {# rule} other {# règles}} ({message})",
Expand Down
2 changes: 0 additions & 2 deletions x-pack/platform/plugins/private/translations/translations/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37140,8 +37140,6 @@
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditWarningToastTitle": "ルールを更新しています",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkExportConfirmationDeniedTitle": "{rulesCount, plural, =1 {# rule} other {# 個のルール}}をエクスポートできません",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunConfirmationDeniedTitle": "{rulesCount, plural, =1 {# rule} other {# 個のルール}}をスケジュールできません",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunLimitErrorCloseButton": "閉じる",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunLimitErrorMessage": "このアクションのみ適用できます",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunLimitErrorTitle": "{rulesCount, plural, =1 {# rule} other {#個のルール}}を超える手動ルール実行はスケジュールできません",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.contextMenuTitle": "オプション",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.defaultRulesEditFailureDescription": "{rulesCount, plural, =1 {# rule} other {# 個のルール}}を編集できません（{message}）",
Expand Down
2 changes: 0 additions & 2 deletions x-pack/platform/plugins/private/translations/translations/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37128,8 +37128,6 @@
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkEditWarningToastTitle": "正在进行规则更新",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkExportConfirmationDeniedTitle": "无法导出{rulesCount, plural, =1 {# 个规则} other {# 个规则}}",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunConfirmationDeniedTitle": "{rulesCount, plural, =1 {# 个规则} other {# 个规则}}无法计划",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunLimitErrorCloseButton": "关闭",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunLimitErrorMessage": "只能应用此操作",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunLimitErrorTitle": "无法为超过 {rulesCount, plural, =1 {# 个规则} other {# 个规则}}计划手动规则运行",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.contextMenuTitle": "选项",
"xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.defaultRulesEditFailureDescription": "无法编辑 {rulesCount, plural, =1 {# 个规则} other {# 个规则}} ({message})",
Expand Down
34 changes: 10 additions & 24 deletions ...lutions/security/plugins/security_solution/public/detection_engine/common/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,37 +391,30 @@ export const BULK_FILL_RULE_GAPS_CONFIRMATION_CONFIRM = i18n.translate(
}
);

export const BULK_MANUAL_RULE_RUN_LIMIT_ERROR_TITLE = i18n.translate(
'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunLimitErrorMessage',
export const BULK_ACTION_LIMIT_ERROR_MODAL_TITLE = i18n.translate(
'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkActionErrorModalMessage',
{
defaultMessage: 'Cannot execute the bulk action',
}
);

export const BULK_ACTION_ERROR_MODAL_CLOSE_BUTTON = i18n.translate(
'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkActionErrorModalCloseButton',
{
defaultMessage: 'Close',
}
);

export const BULK_MANUAL_RULE_RUN_LIMIT_ERROR_MESSAGE = (rulesCount: number) =>
i18n.translate(
'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunLimitErrorTitle',
{
values: { rulesCount },
defaultMessage:
'Manual rule run cannot be scheduled for more than {rulesCount, plural, =1 {# rule} other {# rules}}',
'Manual rule run cannot be scheduled for more than {rulesCount, plural, =1 {# rule} other {# rules}}.',
}
);

export const BULK_MANUAL_RULE_RUN_LIMIT_ERROR_CLOSE_BUTTON = i18n.translate(
'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkManualRuleRunLimitErrorCloseButton',
{
defaultMessage: 'Close',
}
);

export const BULK_FILL_RULE_GAPS_LIMIT_ERROR_TITLE = i18n.translate(
'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkFillRuleGapsRuleLimitErrorMessage',
{
defaultMessage: 'Cannot execute the bulk action',
}
);

export const BULK_FILL_RULE_GAPS_LIMIT_ERROR_MESSAGE = (rulesCount: number) =>
i18n.translate(
'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkFillRuleGapsRuleLimitErrorTitle',
Expand All @@ -432,13 +425,6 @@ export const BULK_FILL_RULE_GAPS_LIMIT_ERROR_MESSAGE = (rulesCount: number) =>
}
);

export const BULK_FILL_RULE_GAPS_LIMIT_ERROR_CLOSE_BUTTON = i18n.translate(
'xpack.securitySolution.detectionEngine.rules.allRules.bulkActions.bulkFillRuleGapsRuleLimitErrorCloseButton',
{
defaultMessage: 'Close',
}
);

export const BULK_EDIT_FLYOUT_FORM_SAVE = i18n.translate(
'xpack.securitySolution.detectionEngine.components.allRules.bulkActions.bulkEditFlyoutForm.saveButtonLabel',
{
Expand Down
15 changes: 6 additions & 9 deletions ..._management_ui/components/rules_table/bulk_actions/bulk_action_rule_limit_error_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,26 @@ import {
EuiModalHeader,
EuiModalHeaderTitle,
} from '@elastic/eui';
import * as i18n from '../../../../common/translations';

interface BulkManualRuleRunRulesLimitErrorModalProps {
onClose: () => void;
text: {
title: string;
message: string;
closeButton: string;
};
message: string;
}

const BulkActionRuleLimitErrorModalComponent = ({
onClose,
text,
message,
}: BulkManualRuleRunRulesLimitErrorModalProps) => {
return (
<EuiModal onClose={onClose}>
<EuiModalHeader>
<EuiModalHeaderTitle>{text.title}</EuiModalHeaderTitle>
<EuiModalHeaderTitle>{i18n.BULK_ACTION_LIMIT_ERROR_MODAL_TITLE}</EuiModalHeaderTitle>
</EuiModalHeader>
<EuiModalBody>{text.message}</EuiModalBody>
<EuiModalBody>{message}</EuiModalBody>
<EuiModalFooter>
<EuiButton onClick={onClose} fill>
{text.closeButton}
{i18n.BULK_ACTION_ERROR_MODAL_CLOSE_BUTTON}
</EuiButton>
</EuiModalFooter>
</EuiModal>
Expand Down
8 changes: 2 additions & 6 deletions ...agement_ui/components/rules_table/bulk_actions/bulk_manual_rule_run_limit_error_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,12 @@ interface BulkManualRuleRunRulesLimitErrorModalProps {
onClose: () => void;
}

const text = {
title: i18n.BULK_MANUAL_RULE_RUN_LIMIT_ERROR_TITLE,
message: i18n.BULK_MANUAL_RULE_RUN_LIMIT_ERROR_MESSAGE(MAX_MANUAL_RULE_RUN_BULK_SIZE),
closeButton: i18n.BULK_MANUAL_RULE_RUN_LIMIT_ERROR_CLOSE_BUTTON,
};
const message = i18n.BULK_MANUAL_RULE_RUN_LIMIT_ERROR_MESSAGE(MAX_MANUAL_RULE_RUN_BULK_SIZE);

const BulkManualRuleRunLimitErrorModalComponent = ({
onClose,
}: BulkManualRuleRunRulesLimitErrorModalProps) => {
return <BulkActionRuleLimitErrorModal onClose={onClose} text={text} />;
return <BulkActionRuleLimitErrorModal onClose={onClose} message={message} />;
};

export const BulkManualRuleRunLimitErrorModal = React.memo(
Expand Down
8 changes: 2 additions & 6 deletions ...ui/components/rules_table/bulk_actions/bulk_schedule_gap_fills_rule_limit_error_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,12 @@ interface BulkManualRuleRunRulesLimitErrorModalProps {
onClose: () => void;
}

const text = {
title: i18n.BULK_FILL_RULE_GAPS_LIMIT_ERROR_TITLE,
message: i18n.BULK_FILL_RULE_GAPS_LIMIT_ERROR_MESSAGE(MAX_BULK_FILL_RULE_GAPS_BULK_SIZE),
closeButton: i18n.BULK_FILL_RULE_GAPS_LIMIT_ERROR_CLOSE_BUTTON,
};
const message = i18n.BULK_FILL_RULE_GAPS_LIMIT_ERROR_MESSAGE(MAX_BULK_FILL_RULE_GAPS_BULK_SIZE);

const BulkFillRuleGapsRuleLimitErrorModalComponent = ({
onClose,
}: BulkManualRuleRunRulesLimitErrorModalProps) => {
return <BulkActionRuleLimitErrorModal onClose={onClose} text={text} />;
return <BulkActionRuleLimitErrorModal onClose={onClose} message={message} />;
};

export const BulkFillRuleGapsRuleLimitErrorModal = React.memo(
Expand Down