Alerting: Rename draft new rule option (#108597)

* Rename draft new rule option

* Update tests

* Update translation key
This commit is contained in:
Konrad Lalik
2025-07-25 14:42:37 +02:00
committed by GitHub
parent 9ad8881411
commit fb08352300
3 changed files with 14 additions and 14 deletions
@@ -155,11 +155,11 @@ describe('RuleList v2', () => {
describe('RuleListActions', () => { describe('RuleListActions', () => {
const ui = { const ui = {
newRuleButton: byRole('link', { name: /new alert rule/i }), newRuleButton: byRole('link', { name: /^new alert rule$/i }),
moreButton: byRole('button', { name: /more/i }), moreButton: byRole('button', { name: /more/i }),
moreMenu: byRole('menu'), moreMenu: byRole('menu'),
menuOptions: { menuOptions: {
draftNewRule: byRole('link', { name: /draft a new rule/i }), newAlertRuleForExport: byRole('link', { name: /new alert rule for export/i }),
newGrafanaRecordingRule: byRole('link', { name: /new grafana recording rule/i }), newGrafanaRecordingRule: byRole('link', { name: /new grafana recording rule/i }),
newDataSourceRecordingRule: byRole('link', { name: /new data source recording rule/i }), newDataSourceRecordingRule: byRole('link', { name: /new data source recording rule/i }),
}, },
@@ -191,7 +191,7 @@ describe('RuleListActions', () => {
expect(ui.moreButton.get()).toBeInTheDocument(); expect(ui.moreButton.get()).toBeInTheDocument();
}); });
it('should only show Draft a new rule when the user has view Grafana rules permission', async () => { it('should only show New alert rule for export when the user has view Grafana rules permission', async () => {
grantUserPermissions([AccessControlAction.AlertingRuleRead]); grantUserPermissions([AccessControlAction.AlertingRuleRead]);
const { user } = render(<RuleListActions />); const { user } = render(<RuleListActions />);
@@ -200,7 +200,7 @@ describe('RuleListActions', () => {
const menu = await ui.moreMenu.find(); const menu = await ui.moreMenu.find();
expect(ui.newRuleButton.query()).not.toBeInTheDocument(); expect(ui.newRuleButton.query()).not.toBeInTheDocument();
expect(ui.menuOptions.draftNewRule.query(menu)).toBeInTheDocument(); expect(ui.menuOptions.newAlertRuleForExport.query(menu)).toBeInTheDocument();
expect(ui.menuOptions.newGrafanaRecordingRule.query(menu)).not.toBeInTheDocument(); expect(ui.menuOptions.newGrafanaRecordingRule.query(menu)).not.toBeInTheDocument();
expect(ui.menuOptions.newDataSourceRecordingRule.query(menu)).not.toBeInTheDocument(); expect(ui.menuOptions.newDataSourceRecordingRule.query(menu)).not.toBeInTheDocument();
}); });
@@ -213,7 +213,7 @@ describe('RuleListActions', () => {
await user.click(ui.moreButton.get()); await user.click(ui.moreButton.get());
const menu = await ui.moreMenu.find(); const menu = await ui.moreMenu.find();
expect(ui.menuOptions.draftNewRule.query(menu)).toBeInTheDocument(); expect(ui.menuOptions.newAlertRuleForExport.query(menu)).toBeInTheDocument();
expect(ui.menuOptions.newGrafanaRecordingRule.query(menu)).toBeInTheDocument(); expect(ui.menuOptions.newGrafanaRecordingRule.query(menu)).toBeInTheDocument();
expect(ui.menuOptions.newDataSourceRecordingRule.query(menu)).not.toBeInTheDocument(); expect(ui.menuOptions.newDataSourceRecordingRule.query(menu)).not.toBeInTheDocument();
}); });
@@ -226,7 +226,7 @@ describe('RuleListActions', () => {
await user.click(ui.moreButton.get()); await user.click(ui.moreButton.get());
const menu = await ui.moreMenu.find(); const menu = await ui.moreMenu.find();
expect(ui.menuOptions.draftNewRule.query(menu)).toBeInTheDocument(); expect(ui.menuOptions.newAlertRuleForExport.query(menu)).toBeInTheDocument();
expect(ui.menuOptions.newGrafanaRecordingRule.query(menu)).not.toBeInTheDocument(); expect(ui.menuOptions.newGrafanaRecordingRule.query(menu)).not.toBeInTheDocument();
expect(ui.menuOptions.newDataSourceRecordingRule.query(menu)).toBeInTheDocument(); expect(ui.menuOptions.newDataSourceRecordingRule.query(menu)).toBeInTheDocument();
}); });
@@ -239,7 +239,7 @@ describe('RuleListActions', () => {
await user.click(ui.moreButton.get()); await user.click(ui.moreButton.get());
const menu = await ui.moreMenu.find(); const menu = await ui.moreMenu.find();
expect(ui.menuOptions.draftNewRule.query(menu)).toBeInTheDocument(); expect(ui.menuOptions.newAlertRuleForExport.query(menu)).toBeInTheDocument();
expect(ui.menuOptions.newGrafanaRecordingRule.query(menu)).toBeInTheDocument(); expect(ui.menuOptions.newGrafanaRecordingRule.query(menu)).toBeInTheDocument();
expect(ui.menuOptions.newDataSourceRecordingRule.query(menu)).toBeInTheDocument(); expect(ui.menuOptions.newDataSourceRecordingRule.query(menu)).toBeInTheDocument();
}); });
@@ -47,7 +47,7 @@ export function RuleListActions() {
<Menu> <Menu>
<Menu.Group> <Menu.Group>
<Menu.Item <Menu.Item
label={t('alerting.rule-list.draft-new-rule', 'Draft a new rule')} label={t('alerting.rule-list.new-rule-for-export', 'New alert rule for export')}
icon="file-export" icon="file-export"
url="/alerting/export-new-rule" url="/alerting/export-new-rule"
/> />
+6 -6
View File
@@ -2468,7 +2468,6 @@
}, },
"rule-list": { "rule-list": {
"configure-datasource": "Configure", "configure-datasource": "Configure",
"draft-new-rule": "Draft a new rule",
"ds-error": { "ds-error": {
"title": "Cannot load rules for this datasource" "title": "Cannot load rules for this datasource"
}, },
@@ -2494,6 +2493,7 @@
"new-alert-rule": "New alert rule", "new-alert-rule": "New alert rule",
"new-datasource-recording-rule": "New Data source recording rule", "new-datasource-recording-rule": "New Data source recording rule",
"new-grafana-recording-rule": "New Grafana recording rule", "new-grafana-recording-rule": "New Grafana recording rule",
"new-rule-for-export": "New alert rule for export",
"pagination": { "pagination": {
"next-page": "Show more…" "next-page": "Show more…"
}, },
@@ -3515,7 +3515,7 @@
"this-folder-is-empty": "This folder is empty" "this-folder-is-empty": "This folder is empty"
}, },
"bulk-action-resources-form": { "bulk-action-resources-form": {
"failed-alert_one": "{{count}} item failed", "failed-alert_one": "{{count}} items failed",
"failed-alert_other": "{{count}} items failed" "failed-alert_other": "{{count}} items failed"
}, },
"bulk-delete-resources-form": { "bulk-delete-resources-form": {
@@ -9256,9 +9256,9 @@
"type": { "type": {
"loki": { "loki": {
"indexed-label_one": "Indexed label", "indexed-label_one": "Indexed label",
"indexed-label_other": "Indexed labels", "indexed-label_other": "Indexed label",
"parsedl-label_one": "Parsed field", "parsedl-label_one": "Parsed field",
"parsedl-label_other": "Parsed fields", "parsedl-label_other": "Parsed field",
"structured-metadata_one": "Structured metadata", "structured-metadata_one": "Structured metadata",
"structured-metadata_other": "Structured metadata" "structured-metadata_other": "Structured metadata"
} }
@@ -10987,7 +10987,7 @@
}, },
"bootstrap-step": { "bootstrap-step": {
"dashboards-count_one": "{{count}} dashboard", "dashboards-count_one": "{{count}} dashboard",
"dashboards-count_other": "{{count}} dashboards", "dashboards-count_other": "{{count}} dashboard",
"description-clear-repository-connection": "Add a clear name for this repository connection", "description-clear-repository-connection": "Add a clear name for this repository connection",
"empty": "Empty", "empty": "Empty",
"error-field-required": "This field is required.", "error-field-required": "This field is required.",
@@ -10995,7 +10995,7 @@
"files-count_one": "{{count}} files", "files-count_one": "{{count}} files",
"files-count_other": "{{count}} files", "files-count_other": "{{count}} files",
"folders-count_one": "{{count}} folder", "folders-count_one": "{{count}} folder",
"folders-count_other": "{{count}} folders", "folders-count_other": "{{count}} folder",
"grafana": "Grafana instance", "grafana": "Grafana instance",
"label-display-name": "Display name", "label-display-name": "Display name",
"placeholder-my-repository-connection": "My repository connection", "placeholder-my-repository-connection": "My repository connection",