fix duplicate missing resources requests

elastic · Dec 16, 2024 · 5d63c09 · 5d63c09
1 parent 876ddda
commit 5d63c09
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/...ns/rules/components/data_input_flyout/steps/macros/sub_steps/macros_file_upload/index.tsx b/...ns/rules/components/data_input_flyout/steps/macros/sub_steps/macros_file_upload/index.tsx
@@ -81,7 +81,7 @@ export const useMacrosFileUploadStep = ({
   }, [isLoading, error, status]);
 
   return {
-    title: i18n.RULES_DATA_INPUT_FILE_UPLOAD_TITLE,
+    title: i18n.MACROS_DATA_INPUT_FILE_UPLOAD_TITLE,
     status: uploadStepStatus,
     children: (
       <MacrosFileUpload

diff --git a/...public/siem_migrations/rules/components/migration_status_panels/migration_ready_panel.tsx b/...public/siem_migrations/rules/components/migration_status_panels/migration_ready_panel.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { useCallback, useEffect } from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiButton, EuiButtonEmpty, EuiPanel } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiButton, EuiPanel } from '@elastic/eui';
 import { CenteredLoadingSpinner } from '../../../../common/components/centered_loading_spinner';
 import type { RuleMigrationResourceData } from '../../../../../common/siem_migrations/model/rule_migration.gen';
 import { PanelText } from '../../../../common/components/panel_text';
@@ -26,7 +26,7 @@ export const MigrationReadyPanel = React.memo<MigrationReadyPanelProps>(({ migra
 
   useEffect(() => {
     getMissingResources(migrationStats.id);
-  }, [getMissingResources, migrationStats]);
+  }, [getMissingResources, migrationStats.id]);
 
   const onOpenFlyout = useCallback<React.MouseEventHandler>(() => {
     openFlyout(migrationStats);
@@ -48,6 +48,7 @@ export const MigrationReadyPanel = React.memo<MigrationReadyPanelProps>(({ migra
               <EuiFlexItem>
                 <PanelText size="s" subdued>
                   {i18n.RULE_MIGRATION_READY_DESCRIPTION(
+                    migrationStats.rules.total,
                     missingResources.length > 0 ? i18n.RULE_MIGRATION_READY_MISSING_RESOURCES : ''
                   )}
                 </PanelText>

diff --git a/..._solution/public/siem_migrations/rules/components/migration_status_panels/translations.ts b/..._solution/public/siem_migrations/rules/components/migration_status_panels/translations.ts
@@ -7,11 +7,14 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const RULE_MIGRATION_READY_DESCRIPTION = (missingResourcesText: string) =>
+export const RULE_MIGRATION_READY_DESCRIPTION = (
+  totalRules: number,
+  missingResourcesText: string
+) =>
   i18n.translate('xpack.securitySolution.siemMigrations.rules.panel.ready.description', {
     defaultMessage:
-      'Migration is created but the translation has not started yet. {missingResourcesText}',
-    values: { missingResourcesText },
+      'Migration of {totalRules} rules is created but the translation has not started yet. {missingResourcesText}',
+    values: { totalRules, missingResourcesText },
   });
 export const RULE_MIGRATION_READY_MISSING_RESOURCES = i18n.translate(
   'xpack.securitySolution.siemMigrations.rules.panel.ready.description',

diff --git a/.../public/siem_migrations/rules/components/migration_status_panels/upload_missing_panel.tsx b/.../public/siem_migrations/rules/components/migration_status_panels/upload_missing_panel.tsx
@@ -36,7 +36,7 @@ export const RuleMigrationsUploadMissingPanel = React.memo<RuleMigrationsUploadM
 
     useEffect(() => {
       getMissingResources(migrationStats.id);
-    }, [getMissingResources, migrationStats]);
+    }, [getMissingResources, migrationStats.id]);
 
     const onOpenFlyout = useCallback(() => {
       openFlyout(migrationStats);

diff --git a/...plugins/security_solution/public/siem_migrations/rules/service/rule_migrations_service.ts b/...plugins/security_solution/public/siem_migrations/rules/service/rule_migrations_service.ts
@@ -45,7 +45,7 @@ import * as i18n from './translations';
 const NAMESPACE_TRACE_OPTIONS_SESSION_STORAGE_KEY =
   `${DEFAULT_ASSISTANT_NAMESPACE}.${TRACE_OPTIONS_SESSION_STORAGE_KEY}` as const;
 
-const REQUEST_POLLING_INTERVAL_MS = 5000 as const;
+const REQUEST_POLLING_INTERVAL_SECONDS = 10 as const;
 const CREATE_MIGRATION_BODY_BATCH_SIZE = 50 as const;
 
 export class SiemRulesMigrationsService {
@@ -213,7 +213,7 @@ export class SiemRulesMigrationsService {
         }
       }
 
-      await new Promise((resolve) => setTimeout(resolve, REQUEST_POLLING_INTERVAL_MS));
+      await new Promise((resolve) => setTimeout(resolve, REQUEST_POLLING_INTERVAL_SECONDS * 1000));
     } while (pendingMigrationIds.length > 0);
   }
 }