[8.12][RAM] Bug with custom threshold in the create rule flyout (#174982) (#175272)

# Backport This will backport the following commits from `main` to `8.12`: - [[RAM] Bug with custom threshold in the create rule flyout (#174982)](https://github.com/elastic/kibana/pull/174982)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)
2025-04-24 17:59:23 -04:00 · 2024-01-22 17:50:32 -05:00 · 2024-01-22 17:50:32 -05:00 · 44ad90549a
commit 44ad90549a
parent 28fd9cc8cf
12 changed files with 67 additions and 9 deletions
--- a/x-pack/plugins/stack_connectors/public/connector_types/bedrock/connector.test.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/bedrock/connector.test.tsx
@ -13,8 +13,15 @@ import userEvent from '@testing-library/user-event';
 import { useKibana } from '@kbn/triggers-actions-ui-plugin/public';
 import { DEFAULT_BEDROCK_MODEL } from '../../../common/bedrock/constants';
 import { useGetDashboard } from '../lib/gen_ai/use_get_dashboard';
+import { createStartServicesMock } from '@kbn/triggers-actions-ui-plugin/public/common/lib/kibana/kibana_react.mock';

-jest.mock('@kbn/triggers-actions-ui-plugin/public/common/lib/kibana');
+const mockUseKibanaReturnValue = createStartServicesMock();
+jest.mock('@kbn/triggers-actions-ui-plugin/public/common/lib/kibana', () => ({
+  __esModule: true,
+  useKibana: jest.fn(() => ({
+    services: mockUseKibanaReturnValue,
+  })),
+}));
 jest.mock('../lib/gen_ai/use_get_dashboard');

 const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
--- a/x-pack/plugins/stack_connectors/public/connector_types/openai/connector.test.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/openai/connector.test.tsx
@ -13,8 +13,15 @@ import userEvent from '@testing-library/user-event';
 import { DEFAULT_OPENAI_MODEL, OpenAiProviderType } from '../../../common/openai/constants';
 import { useKibana } from '@kbn/triggers-actions-ui-plugin/public';
 import { useGetDashboard } from '../lib/gen_ai/use_get_dashboard';
+import { createStartServicesMock } from '@kbn/triggers-actions-ui-plugin/public/common/lib/kibana/kibana_react.mock';

-jest.mock('@kbn/triggers-actions-ui-plugin/public/common/lib/kibana');
+const mockUseKibanaReturnValue = createStartServicesMock();
+jest.mock('@kbn/triggers-actions-ui-plugin/public/common/lib/kibana', () => ({
+  __esModule: true,
+  useKibana: jest.fn(() => ({
+    services: mockUseKibanaReturnValue,
+  })),
+}));
 jest.mock('../lib/gen_ai/use_get_dashboard');

 const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
--- a/x-pack/plugins/stack_connectors/public/connector_types/slack_api/slack_connectors.test.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/slack_api/slack_connectors.test.tsx
@ -8,12 +8,19 @@
 import React from 'react';
 import { act, render, screen, waitFor } from '@testing-library/react';
 import { useKibana } from '@kbn/triggers-actions-ui-plugin/public';
+import { createStartServicesMock } from '@kbn/triggers-actions-ui-plugin/public/common/lib/kibana/kibana_react.mock';

 import { ConnectorFormTestProvider, waitForComponentToUpdate } from '../lib/test_utils';
 import { SlackActionFieldsComponents as SlackActionFields } from './slack_connectors';
 import { useValidChannels } from './use_valid_channels';

-jest.mock('@kbn/triggers-actions-ui-plugin/public/common/lib/kibana');
+const mockUseKibanaReturnValue = createStartServicesMock();
+jest.mock('@kbn/triggers-actions-ui-plugin/public/common/lib/kibana', () => ({
+  __esModule: true,
+  useKibana: jest.fn(() => ({
+    services: mockUseKibanaReturnValue,
+  })),
+}));
 jest.mock('./use_valid_channels');

 (useKibana as jest.Mock).mockImplementation(() => ({
--- a/x-pack/plugins/triggers_actions_ui/kibana.jsonc
+++ b/x-pack/plugins/triggers_actions_ui/kibana.jsonc
@ -24,7 +24,8 @@
      "actions",
      "dashboard",
      "licensing",
-      "expressions"
+      "expressions",
+      "lens"
    ],
    "optionalPlugins": [
      "cloud",
--- a/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
@ -23,6 +23,7 @@ import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/publi
 import { PluginStartContract as AlertingStart } from '@kbn/alerting-plugin/public';
 import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import type { LicensingPluginStart } from '@kbn/licensing-plugin/public';
+import type { LensPublicStart } from '@kbn/lens-plugin/public';

 import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
@ -73,6 +74,7 @@ export interface TriggersAndActionsUiServices extends CoreStart {
  licensing: LicensingPluginStart;
  expressions: ExpressionsStart;
  isServerless: boolean;
+  lens: LensPublicStart;
 }

 export const renderApp = (deps: TriggersAndActionsUiServices) => {
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/cases/cell.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/cases/cell.test.tsx
@ -15,8 +15,15 @@ import { getMaintenanceWindowMockMap } from '../maintenance_windows/index.mock';
 import userEvent from '@testing-library/user-event';
 import { AppMockRenderer, createAppMockRenderer } from '../../test_utils';
 import { useCaseViewNavigation } from './use_case_view_navigation';
+import { createStartServicesMock } from '../../../../common/lib/kibana/kibana_react.mock';

-jest.mock('../../../../common/lib/kibana');
+const mockUseKibanaReturnValue = createStartServicesMock();
+jest.mock('../../../../common/lib/kibana', () => ({
+  __esModule: true,
+  useKibana: jest.fn(() => ({
+    services: mockUseKibanaReturnValue,
+  })),
+}));
 jest.mock('./use_case_view_navigation');

 const useCaseViewNavigationMock = useCaseViewNavigation as jest.Mock;
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_get_maintenance_windows.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_get_maintenance_windows.test.ts
@ -15,8 +15,15 @@ import { useKibana } from '../../../../common/lib/kibana';
 import { useBulkGetMaintenanceWindows } from './use_bulk_get_maintenance_windows';
 import { AppMockRenderer, createAppMockRenderer } from '../../test_utils';
 import { useLicense } from '../../../hooks/use_license';
+import { createStartServicesMock } from '../../../../common/lib/kibana/kibana_react.mock';

-jest.mock('../../../../common/lib/kibana');
+const mockUseKibanaReturnValue = createStartServicesMock();
+jest.mock('../../../../common/lib/kibana', () => ({
+  __esModule: true,
+  useKibana: jest.fn(() => ({
+    services: mockUseKibanaReturnValue,
+  })),
+}));
 jest.mock('../../../hooks/use_license');
 jest.mock('./apis/bulk_get_maintenance_windows');

--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_columns/use_columns.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_columns/use_columns.test.ts
@ -14,8 +14,15 @@ import { useColumns, UseColumnsArgs, UseColumnsResp } from './use_columns';
 import { useFetchBrowserFieldCapabilities } from '../use_fetch_browser_fields_capabilities';
 import { BrowserFields } from '@kbn/rule-registry-plugin/common';
 import { AlertsTableStorage } from '../../alerts_table_state';
+import { createStartServicesMock } from '../../../../../common/lib/kibana/kibana_react.mock';

-jest.mock('../../../../../common/lib/kibana');
+const mockUseKibanaReturnValue = createStartServicesMock();
+jest.mock('../../../../../common/lib/kibana', () => ({
+  __esModule: true,
+  useKibana: jest.fn(() => ({
+    services: mockUseKibanaReturnValue,
+  })),
+}));
 jest.mock('../use_fetch_browser_fields_capabilities');

 const setItemStorageMock = jest.fn();
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule.test.tsx
@ -22,7 +22,13 @@ import { useKibana } from '../../../../common/lib/kibana';
 import { useBulkGetMaintenanceWindows } from '../../alerts_table/hooks/use_bulk_get_maintenance_windows';
 import { getMaintenanceWindowMockMap } from '../../alerts_table/maintenance_windows/index.mock';

-jest.mock('../../../../common/lib/kibana');
+const mockUseKibanaReturnValue = createStartServicesMock();
+jest.mock('../../../../common/lib/kibana', () => ({
+  __esModule: true,
+  useKibana: jest.fn(() => ({
+    services: mockUseKibanaReturnValue,
+  })),
+}));
 jest.mock('../../../../common/get_experimental_features', () => ({
  getIsExperimentalFeatureEnabled: jest.fn(),
 }));
@ -55,6 +61,7 @@ const ruleTypeRegistry = ruleTypeRegistryMock.create();

 import { getIsExperimentalFeatureEnabled } from '../../../../common/get_experimental_features';
 import { waitFor } from '@testing-library/react';
+import { createStartServicesMock } from '../../../../common/lib/kibana/kibana_react.mock';

 const fakeNow = new Date('2020-02-09T23:15:41.941Z');
 const fake2MinutesAgo = new Date('2020-02-09T23:13:41.941Z');
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts
@ -14,6 +14,7 @@ import { dashboardPluginMock } from '@kbn/dashboard-plugin/public/mocks';
 import { coreMock, scopedHistoryMock, themeServiceMock } from '@kbn/core/public/mocks';
 import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { lensPluginMock } from '@kbn/lens-plugin/public/mocks';
 import { TriggersAndActionsUiServices } from '../../../application/app';
 import {
  RuleTypeRegistryContract,
@ -75,6 +76,7 @@ export const createStartServicesMock = (): TriggersAndActionsUiServices => {
    licensing: licensingPluginMock,
    expressions: expressionsPluginMock.createStartContract(),
    isServerless: false,
+    lens: lensPluginMock.createStartContract(),
  } as TriggersAndActionsUiServices;
 };

--- a/x-pack/plugins/triggers_actions_ui/public/plugin.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/plugin.ts
@ -28,6 +28,7 @@ import { DashboardStart } from '@kbn/dashboard-plugin/public';
 import type { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { ExpressionsStart } from '@kbn/expressions-plugin/public';
 import { ServerlessPluginStart } from '@kbn/serverless/public';
+import { LensPublicStart } from '@kbn/lens-plugin/public';
 import { getAlertsTableDefaultAlertActionsLazy } from './common/get_alerts_table_default_row_actions';
 import type { AlertActionsProps } from './types';
 import type { AlertsSearchBarProps } from './application/sections/alerts_search_bar';
@ -172,6 +173,7 @@ interface PluginsStart {
  unifiedSearch: UnifiedSearchPublicPluginStart;
  licensing: LicensingPluginStart;
  serverless?: ServerlessPluginStart;
+  lens: LensPublicStart;
 }

 export class Plugin
@ -298,6 +300,7 @@ export class Plugin
          licensing: pluginsStart.licensing,
          expressions: pluginsStart.expressions,
          isServerless: !!pluginsStart.serverless,
+          lens: pluginsStart.lens,
        });
      },
    });
--- a/x-pack/plugins/triggers_actions_ui/tsconfig.json
+++ b/x-pack/plugins/triggers_actions_ui/tsconfig.json
@ -57,7 +57,8 @@
    "@kbn/expressions-plugin",
    "@kbn/core-saved-objects-api-server",
    "@kbn/serverless",
-    "@kbn/triggers-actions-ui-types"
+    "@kbn/triggers-actions-ui-types",
+    "@kbn/lens-plugin"
  ],
  "exclude": ["target/**/*"]
 }