Reorder Rules page

elastic · Mar 8, 2023 · e47ab7c · e47ab7c
1 parent 8a11060
commit e47ab7c
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 159 deletions.
diff --git a/x-pack/plugins/observability/public/pages/rule_details/index.tsx b/x-pack/plugins/observability/public/pages/rule_details/index.tsx
@@ -58,16 +58,15 @@ import { RuleDetailsPathParams, TabId } from './types';
 import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
 import { usePluginContext } from '../../hooks/use_plugin_context';
 import { useFetchRule } from '../../hooks/use_fetch_rule';
-import { RULES_BREADCRUMB_TEXT } from '../rules/translations';
 import { PageTitle } from './components';
 import { getHealthColor } from './config';
 import { hasExecuteActionsCapability, hasAllPrivilege } from './config';
 import { paths } from '../../config/paths';
 import { ALERT_STATUS_ALL } from '../../../common/constants';
-import { AlertStatus } from '../../../common/typings';
 import { observabilityFeatureId, ruleDetailsLocatorID } from '../../../common';
 import { ALERT_STATUS_LICENSE_ERROR, rulesStatusesTranslationsMapping } from './translations';
-import { ObservabilityAppServices } from '../../application/types';
+import type { AlertStatus } from '../../../common/typings';
+import type { ObservabilityAppServices } from '../../application/types';
 
 export function RuleDetailsPage() {
   const {
@@ -219,7 +218,9 @@ export function RuleDetailsPage() {
     },
     {
       href: http.basePath.prepend(paths.observability.rules),
-      text: RULES_BREADCRUMB_TEXT,
+      text: i18n.translate('xpack.observability.breadcrumbs.rulesLinkText', {
+        defaultMessage: 'Rules',
+      }),
     },
     {
       text: rule && rule.name,

diff --git a/x-pack/plugins/observability/public/pages/rules/config.ts b/x-pack/plugins/observability/public/pages/rules/config.ts
diff --git a/...ability/public/pages/rules/index.test.tsx → ...ability/public/pages/rules/rules.test.tsx b/...ability/public/pages/rules/index.test.tsx → ...ability/public/pages/rules/rules.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import { CoreStart } from '@kbn/core/public';
 import { ObservabilityPublicPluginsStart } from '../../plugin';
-import { RulesPage } from '.';
+import { RulesPage } from './rules';
 import { kibanaStartMock } from '../../utils/kibana_react.mock';
 import * as pluginContext from '../../hooks/use_plugin_context';
 import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template';

diff --git a/...bservability/public/pages/rules/index.tsx → ...bservability/public/pages/rules/rules.tsx b/...bservability/public/pages/rules/index.tsx → ...bservability/public/pages/rules/rules.tsx
@@ -13,12 +13,12 @@ import { useLoadRuleTypes } from '@kbn/triggers-actions-ui-plugin/public';
 import { ALERTS_FEATURE_ID } from '@kbn/alerting-plugin/common';
 import type { RulesListVisibleColumns } from '@kbn/triggers-actions-ui-plugin/public';
 
-import { Provider, rulesPageStateContainer, useRulesPageStateContainer } from './state_container';
 import { useKibana } from '../../utils/kibana_react';
 import { usePluginContext } from '../../hooks/use_plugin_context';
 import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
 import { useGetFilteredRuleTypes } from '../../hooks/use_get_filtered_rule_types';
-import { RULES_PAGE_TITLE, RULES_BREADCRUMB_TEXT } from './translations';
+import { useRulesPageStateContainer } from './state_container/use_rules_page_state_container';
+import { rulesPageStateContainer, Provider } from './state_container/state_container';
 
 const RULES_LIST_COLUMNS_KEY = 'observability_rulesListColumns';
 const RULES_LIST_COLUMNS: RulesListVisibleColumns[] = [
@@ -35,7 +35,7 @@ function RulesPage() {
     http,
     docLinks,
     triggersActionsUi: {
-      getAddAlertFlyout: AddAlertFlyout,
+      getAddAlertFlyout: AddRuleFlyout,
       getRulesList: RuleList,
       getRulesSettingsLink: RulesSettingsLink,
     },
@@ -65,14 +65,18 @@ function RulesPage() {
       href: http.basePath.prepend('/app/observability/alerts'),
     },
     {
-      text: RULES_BREADCRUMB_TEXT,
+      text: i18n.translate('xpack.observability.breadcrumbs.rulesLinkText', {
+        defaultMessage: 'Rules',
+      }),
     },
   ]);
 
   return (
     <ObservabilityPageTemplate
       pageHeader={{
-        pageTitle: <>{RULES_PAGE_TITLE}</>,
+        pageTitle: i18n.translate('xpack.observability.rulesTitle', {
+          defaultMessage: 'Rules',
+        }),
         rightSideItems: [
           <EuiButton
             fill
@@ -121,7 +125,7 @@ function RulesPage() {
       </EuiFlexGroup>
 
       {addRuleFlyoutVisibility && (
-        <AddAlertFlyout
+        <AddRuleFlyout
           consumer={ALERTS_FEATURE_ID}
           filteredRuleTypes={filteredRuleTypes}
           onClose={() => {

diff --git a/x-pack/plugins/observability/public/pages/rules/state_container/index.tsx b/x-pack/plugins/observability/public/pages/rules/state_container/index.tsx
diff --git a/x-pack/plugins/observability/public/pages/rules/translations.ts b/x-pack/plugins/observability/public/pages/rules/translations.ts
diff --git a/x-pack/plugins/observability/public/routes/index.tsx b/x-pack/plugins/observability/public/routes/index.tsx
@@ -15,7 +15,7 @@ import { AlertsPage } from '../pages/alerts/containers/alerts_page';
 import { OverviewPage } from '../pages/overview';
 import { jsonRt } from './json_rt';
 import { ObservabilityExploratoryView } from '../components/shared/exploratory_view/obsv_exploratory_view';
-import { RulesPage } from '../pages/rules';
+import { RulesPage } from '../pages/rules/rules';
 import { RuleDetailsPage } from '../pages/rule_details';
 import { AlertingPages } from '../config';
 import { AlertDetails } from '../pages/alert_details';

diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
@@ -24705,18 +24705,7 @@
     "xpack.observability.rules.addRuleButtonLabel": "Créer une règle",
     "xpack.observability.rules.deleteSelectedIdsConfirmModal.cancelButtonLabel": "Annuler",
     "xpack.observability.rules.docsLinkText": "Documentation",
-    "xpack.observability.rules.loadError": "Impossible de charger les règles",
-    "xpack.observability.rules.rulesTable.changeStatusAriaLabel": "Modifier le statut",
-    "xpack.observability.rules.rulesTable.columns.lastResponseTitle": "Dernière réponse",
-    "xpack.observability.rules.rulesTable.ruleStatusActive": "Actif",
-    "xpack.observability.rules.rulesTable.ruleStatusError": "Erreur",
-    "xpack.observability.rules.rulesTable.ruleStatusLicenseError": "Erreur de licence",
-    "xpack.observability.rules.rulesTable.ruleStatusOk": "Ok",
-    "xpack.observability.rules.rulesTable.ruleStatusPending": "En attente",
-    "xpack.observability.rules.rulesTable.ruleStatusUnknown": "Inconnu",
-    "xpack.observability.rules.rulesTable.ruleStatusWarning": "avertissement",
     "xpack.observability.rulesLinkTitle": "Règles",
-    "xpack.observability.rulesList.unableToLoadRuleTags": "Impossible de charger les balises de règle",
     "xpack.observability.rulesTitle": "Règles",
     "xpack.observability.search.url.close": "Fermer",
     "xpack.observability.section.errorPanel": "Une erreur est survenue lors de la tentative de récupération des données. Réessayez plus tard",

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -24683,18 +24683,7 @@
     "xpack.observability.rules.addRuleButtonLabel": "ルールを作成",
     "xpack.observability.rules.deleteSelectedIdsConfirmModal.cancelButtonLabel": "キャンセル",
     "xpack.observability.rules.docsLinkText": "ドキュメント",
-    "xpack.observability.rules.loadError": "ルールを読み込めません",
-    "xpack.observability.rules.rulesTable.changeStatusAriaLabel": "ステータスの変更",
-    "xpack.observability.rules.rulesTable.columns.lastResponseTitle": "前回の応答",
-    "xpack.observability.rules.rulesTable.ruleStatusActive": "アクティブ",
-    "xpack.observability.rules.rulesTable.ruleStatusError": "エラー",
-    "xpack.observability.rules.rulesTable.ruleStatusLicenseError": "ライセンスエラー",
-    "xpack.observability.rules.rulesTable.ruleStatusOk": "OK",
-    "xpack.observability.rules.rulesTable.ruleStatusPending": "保留中",
-    "xpack.observability.rules.rulesTable.ruleStatusUnknown": "不明",
-    "xpack.observability.rules.rulesTable.ruleStatusWarning": "警告",
     "xpack.observability.rulesLinkTitle": "ルール",
-    "xpack.observability.rulesList.unableToLoadRuleTags": "ルールタグを読み込めません",
     "xpack.observability.rulesTitle": "ルール",
     "xpack.observability.search.url.close": "閉じる",
     "xpack.observability.section.errorPanel": "データの取得時にエラーが発生しました。再試行してください",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -24714,18 +24714,7 @@
     "xpack.observability.rules.addRuleButtonLabel": "创建规则",
     "xpack.observability.rules.deleteSelectedIdsConfirmModal.cancelButtonLabel": "取消",
     "xpack.observability.rules.docsLinkText": "文档",
-    "xpack.observability.rules.loadError": "无法加载规则",
-    "xpack.observability.rules.rulesTable.changeStatusAriaLabel": "更改状态",
-    "xpack.observability.rules.rulesTable.columns.lastResponseTitle": "上次响应",
-    "xpack.observability.rules.rulesTable.ruleStatusActive": "活动",
-    "xpack.observability.rules.rulesTable.ruleStatusError": "错误",
-    "xpack.observability.rules.rulesTable.ruleStatusLicenseError": "许可证错误",
-    "xpack.observability.rules.rulesTable.ruleStatusOk": "确定",
-    "xpack.observability.rules.rulesTable.ruleStatusPending": "待处理",
-    "xpack.observability.rules.rulesTable.ruleStatusUnknown": "未知",
-    "xpack.observability.rules.rulesTable.ruleStatusWarning": "警告",
     "xpack.observability.rulesLinkTitle": "规则",
-    "xpack.observability.rulesList.unableToLoadRuleTags": "无法加载规则标签",
     "xpack.observability.rulesTitle": "规则",
     "xpack.observability.search.url.close": "关闭",
     "xpack.observability.section.errorPanel": "尝试提取数据时发生错误。请重试",