Alerting: Rename list view section titles (#93182)

This commit is contained in:
Gilles De Mey 2024-09-10 18:31:11 +02:00 committed by GitHub
parent 697afc71b4
commit c8dc4d93d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 36 additions and 19 deletions

View File

@ -2252,8 +2252,7 @@ exports[`better eslint`] = {
"public/app/features/alerting/unified/components/rules/CloudRules.tsx:5381": [ "public/app/features/alerting/unified/components/rules/CloudRules.tsx:5381": [
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"], [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "1"], [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "1"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "2"], [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "2"]
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "3"]
], ],
"public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx:5381": [ "public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx:5381": [
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"], [0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"],

View File

@ -5,6 +5,7 @@ import { useLocation } from 'react-router-dom-v5-compat';
import { GrafanaTheme2, urlUtil } from '@grafana/data'; import { GrafanaTheme2, urlUtil } from '@grafana/data';
import { LinkButton, LoadingPlaceholder, Pagination, Spinner, Text, useStyles2 } from '@grafana/ui'; import { LinkButton, LoadingPlaceholder, Pagination, Spinner, Text, useStyles2 } from '@grafana/ui';
import { Trans } from 'app/core/internationalization';
import { CombinedRuleNamespace } from 'app/types/unified-alerting'; import { CombinedRuleNamespace } from 'app/types/unified-alerting';
import { DEFAULT_PER_PAGE_PAGINATION } from '../../../../../core/constants'; import { DEFAULT_PER_PAGE_PAGINATION } from '../../../../../core/constants';
@ -56,7 +57,7 @@ export const CloudRules = ({ namespaces, expandAll }: Props) => {
<div className={styles.sectionHeader}> <div className={styles.sectionHeader}>
<div className={styles.headerRow}> <div className={styles.headerRow}>
<Text element="h2" variant="h5"> <Text element="h2" variant="h5">
Mimir / Cortex / Loki <Trans i18nKey="alerting.list-view.section.dataSourceManaged.title">Data source-managed</Trans>
</Text> </Text>
{dataSourcesLoading.length ? ( {dataSourcesLoading.length ? (
<LoadingPlaceholder <LoadingPlaceholder

View File

@ -64,10 +64,13 @@ export const GrafanaRules = ({ namespaces, expandAll }: Props) => {
<div className={styles.sectionHeader}> <div className={styles.sectionHeader}>
<div className={styles.headerRow}> <div className={styles.headerRow}>
<Text element="h2" variant="h5"> <Text element="h2" variant="h5">
<Trans i18nKey="alerting.grafana-rules.title">Grafana</Trans> <Trans i18nKey="alerting.list-view.section.grafanaManaged.title">Grafana-managed</Trans>
</Text> </Text>
{loading ? ( {loading ? (
<LoadingPlaceholder className={styles.loader} text={t('alerting.grafana-rules.loading', 'Loading...')} /> <LoadingPlaceholder
className={styles.loader}
text={t('alerting.list-view.section.grafanaManaged.loading', 'Loading...')}
/>
) : ( ) : (
<div /> <div />
)} )}
@ -81,7 +84,7 @@ export const GrafanaRules = ({ namespaces, expandAll }: Props) => {
onClick={toggleShowExportDrawer} onClick={toggleShowExportDrawer}
variant="secondary" variant="secondary"
> >
<Trans i18nKey="alerting.grafana-rules.export-rules">Export rules</Trans> <Trans i18nKey="alerting.list-view.section.grafanaManaged.export-rules">Export rules</Trans>
</Button> </Button>
)} )}
{grafanaRecordingRulesEnabled && ( {grafanaRecordingRulesEnabled && (
@ -94,7 +97,7 @@ export const GrafanaRules = ({ namespaces, expandAll }: Props) => {
tooltip="Create new Grafana-managed recording rule" tooltip="Create new Grafana-managed recording rule"
onClick={() => logInfo(LogMessages.grafanaRecording)} onClick={() => logInfo(LogMessages.grafanaRecording)}
> >
<Trans i18nKey="alerting.grafana-rules.new-recording-rule">New recording rule</Trans> <Trans i18nKey="alerting.list-view.section.grafanaManaged.new-recording-rule">New recording rule</Trans>
</LinkButton> </LinkButton>
)} )}
</Stack> </Stack>

View File

@ -16,8 +16,8 @@ import { RuleListGroupView } from './RuleListGroupView';
jest.spyOn(analytics, 'logInfo'); jest.spyOn(analytics, 'logInfo');
const ui = { const ui = {
grafanaRulesHeading: byRole('heading', { name: 'Grafana' }), grafanaRulesHeading: byRole('heading', { name: 'Grafana-managed' }),
cloudRulesHeading: byRole('heading', { name: 'Mimir / Cortex / Loki' }), cloudRulesHeading: byRole('heading', { name: 'Data source-managed' }),
}; };
setPluginExtensionsHook(() => ({ setPluginExtensionsHook(() => ({

View File

@ -123,11 +123,18 @@
"contactPointFilter": { "contactPointFilter": {
"label": "Contact point" "label": "Contact point"
}, },
"grafana-rules": { "list-view": {
"section": {
"dataSourceManaged": {
"title": "Data source-managed"
},
"grafanaManaged": {
"export-rules": "Export rules", "export-rules": "Export rules",
"loading": "Loading...", "loading": "Loading...",
"new-recording-rule": "New recording rule", "new-recording-rule": "New recording rule",
"title": "Grafana" "title": "Grafana-managed"
}
}
}, },
"mute_timings": { "mute_timings": {
"error-loading": { "error-loading": {

View File

@ -123,11 +123,18 @@
"contactPointFilter": { "contactPointFilter": {
"label": "Cőʼnŧäčŧ pőįʼnŧ" "label": "Cőʼnŧäčŧ pőįʼnŧ"
}, },
"grafana-rules": { "list-view": {
"section": {
"dataSourceManaged": {
"title": "Đäŧä şőūřčę-mäʼnäģęđ"
},
"grafanaManaged": {
"export-rules": "Ēχpőřŧ řūľęş", "export-rules": "Ēχpőřŧ řūľęş",
"loading": "Ŀőäđįʼnģ...", "loading": "Ŀőäđįʼnģ...",
"new-recording-rule": "Ńęŵ řęčőřđįʼnģ řūľę", "new-recording-rule": "Ńęŵ řęčőřđįʼnģ řūľę",
"title": "Ğřäƒäʼnä" "title": "Ğřäƒäʼnä-mäʼnäģęđ"
}
}
}, },
"mute_timings": { "mute_timings": {
"error-loading": { "error-loading": {