solve conflicts

x-pack/solutions/security/plugins/security_solution/public/common/lib/telemetry/events/siem_migrations/types.ts

@@ -28,9 +28,6 @@ export interface BaseResultActionParams {
   result: 'success' | 'failed';
   errorMessage?: string;
 }
-export interface BaseTranslatedRuleActionParams extends BaseResultActionParams {
-  migrationId: string;
-}
 
 // Setup actions
 

x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/components/migration_status_panels/migration_ready_panel.tsx

@@ -32,7 +32,7 @@ export const MigrationReadyPanel = React.memo<MigrationReadyPanelProps>(({ migra
 
   const onOpenFlyout = useCallback<React.MouseEventHandler>(() => {
     openFlyout(migrationStats);
-    telemetry.reportSetupMigrationOpenUpload({
+    telemetry.reportSetupMigrationOpenResources({
       migrationId: migrationStats.id,
       missingResourcesCount: missingResources.length,
     });

x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/components/migration_status_panels/upload_missing_panel.tsx

@@ -42,7 +42,7 @@ export const RuleMigrationsUploadMissingPanel = React.memo<RuleMigrationsUploadM
 
     const onOpenFlyout = useCallback(() => {
       openFlyout(migrationStats);
-      telemetry.reportSetupMigrationOpenUpload({
+      telemetry.reportSetupMigrationOpenResources({
         migrationId: migrationStats.id,
         missingResourcesCount: missingResources.length,
       });

x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/service/rule_migrations_service.ts

@@ -50,6 +50,8 @@ import { getSuccessToast } from './notifications/success_notification';
 import { RuleMigrationsStorage } from './storage';
 import * as i18n from './translations';
 import { SiemRulesMigrationsTelemetry } from './telemetry';
+import { getNoConnectorToast } from './notifications/no_connector_notification';
+import { getMissingCapabilitiesToast } from './notifications/missing_capabilities_notification';
 
 // use the default assistant namespace since it's the only one we use
 const NAMESPACE_TRACE_OPTIONS_SESSION_STORAGE_KEY =

x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/service/telemetry.ts

@@ -36,7 +36,7 @@ export class SiemRulesMigrationsTelemetry {
     this.telemetryService.reportEvent(SiemMigrationsEventTypes.SetupMigrationOpenNew, params);
   };
 
-  reportSetupMigrationOpenUpload = (params: {
+  reportSetupMigrationOpenResources = (params: {
     migrationId: string;
     missingResourcesCount: number;
   }) => {