Renamed button and dropdown items in headers (apm, logs, metrics and uptime) from alerts to rules

x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx

@@ -18,7 +18,7 @@ import { AlertType } from '../../../../common/alert_types';
 import { AlertingFlyout } from '../../alerting/alerting_flyout';
 
 const alertLabel = i18n.translate('xpack.apm.home.alertsMenu.alerts', {
-  defaultMessage: 'Alerts',
+  defaultMessage: 'Alerts and rules',
 });
 const transactionDurationLabel = i18n.translate(
   'xpack.apm.home.alertsMenu.transactionDuration',
@@ -33,11 +33,11 @@ const errorCountLabel = i18n.translate('xpack.apm.home.alertsMenu.errorCount', {
 });
 const createThresholdAlertLabel = i18n.translate(
   'xpack.apm.home.alertsMenu.createThresholdAlert',
-  { defaultMessage: 'Create threshold alert' }
+  { defaultMessage: 'Create threshold rule' }
 );
 const createAnomalyAlertAlertLabel = i18n.translate(
   'xpack.apm.home.alertsMenu.createAnomalyAlert',
-  { defaultMessage: 'Create anomaly alert' }
+  { defaultMessage: 'Create anomaly rule' }
 );
 
 const CREATE_TRANSACTION_DURATION_ALERT_PANEL_ID =
@@ -102,7 +102,7 @@ export function AlertingPopoverAndFlyout({
               {
                 name: i18n.translate(
                   'xpack.apm.home.alertsMenu.viewActiveAlerts',
-                  { defaultMessage: 'View active alerts' }
+                  { defaultMessage: 'Manage rules' }
                 ),
                 href: basePath.prepend(
                   '/app/management/insightsAndAlerting/triggersActions/alerts'

x-pack/plugins/cases/public/components/case_action_bar/actions.tsx

@@ -58,7 +58,11 @@ const ActionsComponent: React.FC<CaseViewActions> = ({
   );
 
   if (isDeleted) {
+<<<<<<< HEAD
+    allCasesNavigation.onClick(({ preventDefault: () => null } as unknown) as MouseEvent);
+=======
     allCasesNavigation.onClick(null);
+>>>>>>> master
     return null;
   }
   return (

x-pack/plugins/cases/public/components/case_view/index.tsx

@@ -383,8 +383,17 @@ export const CaseComponent = React.memo<CaseComponentProps>(
                   <>
                     <UserActionTree
                       getCaseDetailHrefWithCommentId={getCaseDetailHrefWithCommentId}
+<<<<<<< HEAD
+                      getRuleDetailsHref={
+                        ruleDetailsNavigation ? ruleDetailsNavigation.href : undefined
+                      }
+                      onRuleDetailsClick={
+                        ruleDetailsNavigation ? ruleDetailsNavigation.onClick : undefined
+                      }
+=======
                       getRuleDetailsHref={ruleDetailsNavigation?.href}
                       onRuleDetailsClick={ruleDetailsNavigation?.onClick}
+>>>>>>> master
                       caseServices={caseServices}
                       caseUserActions={caseUserActions}
                       connectors={connectors}

x-pack/plugins/infra/public/alerting/common/components/metrics_alert_dropdown.tsx

@@ -36,12 +36,12 @@ export const MetricsAlertDropdown = () => {
     () => ({
       id: 1,
       title: i18n.translate('xpack.infra.alerting.infrastructureDropdownTitle', {
-        defaultMessage: 'Infrastructure alerts',
+        defaultMessage: 'Infrastructure rules',
       }),
       items: [
         {
           name: i18n.translate('xpack.infra.alerting.createInventoryAlertButton', {
-            defaultMessage: 'Create inventory alert',
+            defaultMessage: 'Create inventory rule',
           }),
           onClick: () => setVisibleFlyoutType('inventory'),
         },
@@ -54,12 +54,12 @@ export const MetricsAlertDropdown = () => {
     () => ({
       id: 2,
       title: i18n.translate('xpack.infra.alerting.metricsDropdownTitle', {
-        defaultMessage: 'Metrics alerts',
+        defaultMessage: 'Metrics rules',
       }),
       items: [
         {
           name: i18n.translate('xpack.infra.alerting.createThresholdAlertButton', {
-            defaultMessage: 'Create threshold alert',
+            defaultMessage: 'Create threshold rule',
           }),
           onClick: () => setVisibleFlyoutType('threshold'),
         },
@@ -76,7 +76,7 @@ export const MetricsAlertDropdown = () => {
   const manageAlertsMenuItem = useMemo(
     () => ({
       name: i18n.translate('xpack.infra.alerting.manageAlerts', {
-        defaultMessage: 'Manage alerts',
+        defaultMessage: 'Manage rules',
       }),
       icon: 'tableOfContents',
       onClick: manageAlertsLinkProps.onClick,
@@ -112,7 +112,7 @@ export const MetricsAlertDropdown = () => {
         {
           id: 0,
           title: i18n.translate('xpack.infra.alerting.alertDropdownTitle', {
-            defaultMessage: 'Alerts',
+            defaultMessage: 'Alerts and rules',
           }),
           items: firstPanelMenuItems,
         },
@@ -134,6 +134,13 @@ export const MetricsAlertDropdown = () => {
         panelPaddingSize="none"
         anchorPosition="downLeft"
         button={
+<<<<<<< HEAD
+          <EuiButtonEmpty iconSide={'right'} iconType={'arrowDown'} onClick={openPopover}>
+            <FormattedMessage
+              id="xpack.infra.alerting.alertsButton"
+              defaultMessage="Alerts and rules"
+            />
+=======
           <EuiButtonEmpty
             size="xs"
             color="text"
@@ -142,6 +149,7 @@ export const MetricsAlertDropdown = () => {
             onClick={openPopover}
           >
             <FormattedMessage id="xpack.infra.alerting.alertsButton" defaultMessage="Alerts" />
+>>>>>>> master
           </EuiButtonEmpty>
         }
         isOpen={popoverOpen}

x-pack/plugins/infra/public/alerting/inventory/components/manage_alerts_context_menu_item.tsx

@@ -17,7 +17,7 @@ export const ManageAlertsContextMenuItem = () => {
   });
   return (
     <EuiContextMenuItem icon="tableOfContents" key="manageLink" {...manageAlertsLinkProps}>
-      <FormattedMessage id="xpack.infra.alerting.manageAlerts" defaultMessage="Manage alerts" />
+      <FormattedMessage id="xpack.infra.alerting.manageAlerts" defaultMessage="Manage rules" />
     </EuiContextMenuItem>
   );
 };

x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx

@@ -66,13 +66,13 @@ export const AlertDropdown = () => {
       >
         <FormattedMessage
           id="xpack.infra.alerting.logs.createAlertButton"
-          defaultMessage="Create alert"
+          defaultMessage="Create rule"
         />
       </EuiContextMenuItem>,
       <EuiContextMenuItem icon="tableOfContents" key="manageLink" {...manageAlertsLinkProps}>
         <FormattedMessage
           id="xpack.infra.alerting.logs.manageAlerts"
-          defaultMessage="Manage alerts"
+          defaultMessage="Manage rules"
         />
       </EuiContextMenuItem>,
     ];
@@ -83,6 +83,13 @@ export const AlertDropdown = () => {
       <EuiPopover
         panelPaddingSize="none"
         button={
+<<<<<<< HEAD
+          <EuiButtonEmpty iconSide={'right'} iconType={'arrowDown'} onClick={openPopover}>
+            <FormattedMessage
+              id="xpack.infra.alerting.logs.alertsButton"
+              defaultMessage="Alerts and rules"
+            />
+=======
           <EuiButtonEmpty
             size="xs"
             color="text"
@@ -91,6 +98,7 @@ export const AlertDropdown = () => {
             onClick={openPopover}
           >
             <FormattedMessage id="xpack.infra.alerting.logs.alertsButton" defaultMessage="Alerts" />
+>>>>>>> master
           </EuiButtonEmpty>
         }
         isOpen={popoverOpen}

x-pack/plugins/monitoring/public/alerts/configuration.tsx

@@ -32,7 +32,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
     } catch (err) {
       Legacy.shims.toastNotifications.addDanger({
         title: i18n.translate('xpack.monitoring.alerts.panel.disableAlert.errorTitle', {
-          defaultMessage: `Unable to disable alert`,
+          defaultMessage: `Unable to disable rule`,
         }),
         text: err.message,
       });
@@ -46,7 +46,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
     } catch (err) {
       Legacy.shims.toastNotifications.addDanger({
         title: i18n.translate('xpack.monitoring.alerts.panel.enableAlert.errorTitle', {
-          defaultMessage: `Unable to enable alert`,
+          defaultMessage: `Unable to enable rule`,
         }),
         text: err.message,
       });
@@ -60,7 +60,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
     } catch (err) {
       Legacy.shims.toastNotifications.addDanger({
         title: i18n.translate('xpack.monitoring.alerts.panel.muteAlert.errorTitle', {
-          defaultMessage: `Unable to mute alert`,
+          defaultMessage: `Unable to mute rule`,
         }),
         text: err.message,
       });
@@ -74,7 +74,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
     } catch (err) {
       Legacy.shims.toastNotifications.addDanger({
         title: i18n.translate('xpack.monitoring.alerts.panel.ummuteAlert.errorTitle', {
-          defaultMessage: `Unable to unmute alert`,
+          defaultMessage: `Unable to unmute rule`,
         }),
         text: err.message,
       });
@@ -112,7 +112,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
             }}
           >
             {i18n.translate('xpack.monitoring.alerts.panel.editAlert', {
-              defaultMessage: `Edit alert`,
+              defaultMessage: `Edit rule`,
             })}
           </EuiButton>
         </EuiFlexItem>

x-pack/plugins/observability/public/components/app/cases/all_cases/index.tsx

@@ -45,9 +45,13 @@ export const AllCases = React.memo<AllCasesProps>(({ userCanCrud }) => {
     configureCasesNavigation: {
       href: formatUrl(getConfigureCasesUrl()),
       onClick: async (ev) => {
+<<<<<<< HEAD
+        ev.preventDefault();
+=======
         if (ev != null) {
           ev.preventDefault();
         }
+>>>>>>> master
         return navigateToApp(`${CASES_APP_ID}`, {
           path: getConfigureCasesUrl(),
         });
@@ -56,9 +60,13 @@ export const AllCases = React.memo<AllCasesProps>(({ userCanCrud }) => {
     createCaseNavigation: {
       href: formatUrl(getCreateCaseUrl()),
       onClick: async (ev) => {
+<<<<<<< HEAD
+        ev.preventDefault();
+=======
         if (ev != null) {
           ev.preventDefault();
         }
+>>>>>>> master
         return navigateToApp(`${CASES_APP_ID}`, {
           path: getCreateCaseUrl(),
         });

x-pack/plugins/observability/public/components/app/cases/callout/callout.test.tsx

@@ -80,7 +80,11 @@ describe('Callout', () => {
   });
 
   it('dismiss the callout correctly', () => {
+<<<<<<< HEAD
+    const wrapper = mount(<CallOut {...defaultProps} messages={[]} />);
+=======
     const wrapper = mount(<CallOut {...defaultProps} />);
+>>>>>>> master
     expect(wrapper.find(`[data-test-subj="callout-dismiss-md5-hex"]`).exists()).toBeTruthy();
     wrapper.find(`button[data-test-subj="callout-dismiss-md5-hex"]`).simulate('click');
     wrapper.update();

x-pack/plugins/observability/public/components/app/cases/callout/callout.tsx

@@ -35,9 +35,17 @@ function CallOutComponent({
     type,
   ]);
 
+<<<<<<< HEAD
+  return showCallOut ? (
+    <EuiCallOut title={title} color={type} iconType="gear" data-test-subj={`case-callout-${id}`}>
+      {!isEmpty(messages) && (
+        <EuiDescriptionList data-test-subj={`callout-messages-${id}`} listItems={messages} />
+      )}
+=======
   return showCallOut && !isEmpty(messages) ? (
     <EuiCallOut title={title} color={type} iconType="gear" data-test-subj={`case-callout-${id}`}>
       <EuiDescriptionList data-test-subj={`callout-messages-${id}`} listItems={messages} />
+>>>>>>> master
       <EuiButton
         data-test-subj={`callout-dismiss-${id}`}
         color={type === 'success' ? 'secondary' : type}

x-pack/plugins/observability/public/components/app/cases/case_view/index.tsx

@@ -7,7 +7,10 @@
 
 import React, { useCallback, useState } from 'react';
 import {
+<<<<<<< HEAD
+=======
   casesBreadcrumbs,
+>>>>>>> master
   getCaseDetailsUrl,
   getCaseDetailsUrlWithCommentId,
   getCaseUrl,
@@ -18,7 +21,11 @@ import { Case } from '../../../../../../cases/common';
 import { useFetchAlertData } from './helpers';
 import { useKibana } from '../../../../utils/kibana_react';
 import { CASES_APP_ID } from '../constants';
+<<<<<<< HEAD
+import { casesBreadcrumbs, useBreadcrumbs } from '../../../../hooks/use_breadcrumbs';
+=======
 import { useBreadcrumbs } from '../../../../hooks/use_breadcrumbs';
+>>>>>>> master
 
 interface Props {
   caseId: string;
@@ -82,21 +89,31 @@ export const CaseView = React.memo(({ caseId, subCaseId, userCanCrud }: Props) =
   return casesUi.getCaseView({
     allCasesNavigation: {
       href: allCasesHref,
+<<<<<<< HEAD
+      onClick: async (e) => {
+        e.preventDefault();
+=======
       onClick: async (ev) => {
         if (ev != null) {
           ev.preventDefault();
         }
+>>>>>>> master
         return navigateToApp(`${CASES_APP_ID}`, {
           path: allCasesLink,
         });
       },
     },
     caseDetailsNavigation: {
       href: caseDetailsHref,
+<<<<<<< HEAD
+      onClick: async (e) => {
+        e.preventDefault();
+=======
       onClick: async (ev) => {
         if (ev != null) {
           ev.preventDefault();
         }
+>>>>>>> master
         return navigateToApp(`${CASES_APP_ID}`, {
           path: getCaseDetailsUrl({ id: caseId }),
         });
@@ -105,10 +122,15 @@ export const CaseView = React.memo(({ caseId, subCaseId, userCanCrud }: Props) =
     caseId,
     configureCasesNavigation: {
       href: configureCasesHref,
+<<<<<<< HEAD
+      onClick: async (e) => {
+        e.preventDefault();
+=======
       onClick: async (ev) => {
         if (ev != null) {
           ev.preventDefault();
         }
+>>>>>>> master
         return navigateToApp(`${CASES_APP_ID}`, {
           path: configureCasesLink,
         });