[8.19] [Security Solution] Fixes rule customizations diff bug on import (#228475) (#229842)

# Backport

This will backport the following commits from `main` to `8.19`:
- [[Security Solution] Fixes rule customizations diff bug on import
(#228475)](#228475)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Davis
Plumlee","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-07-29T15:39:31Z","message":"[Security
Solution] Fixes rule customizations diff bug on import
(#228475)\n\n**Fixes:
https://github.com/elastic/kibana/issues/228399**\n**Fixes:
https://github.com/elastic/kibana/issues/228401**\n**Fixes:
https://github.com/elastic/kibana/issues/228413**\n\n##
Summary\n\nAddresses issue with base version API route caching and not
being\nproperly invalidated on rule import and adds unit tests to cover
similar\ncache invalidation cases.\n\n\n### Checklist\n\nCheck the PR
satisfies following conditions. \n\nReviewers should verify this PR
satisfies this list as well.\n\n- [x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common
scenarios","sha":"1a1d13341b13662af30c3bcfa54641e2a8b5dae7","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:fix","Team:Detections
and Resp","Team: SecuritySolution","Team:Detection Rule
Management","Feature:Prebuilt Detection
Rules","backport:version","v9.2.0","v9.1.1","v8.19.1"],"title":"[Security
Solution] Fixes rule customizations diff bug on
import","number":228475,"url":"https://github.com/elastic/kibana/pull/228475","mergeCommit":{"message":"[Security
Solution] Fixes rule customizations diff bug on import
(#228475)\n\n**Fixes:
https://github.com/elastic/kibana/issues/228399**\n**Fixes:
https://github.com/elastic/kibana/issues/228401**\n**Fixes:
https://github.com/elastic/kibana/issues/228413**\n\n##
Summary\n\nAddresses issue with base version API route caching and not
being\nproperly invalidated on rule import and adds unit tests to cover
similar\ncache invalidation cases.\n\n\n### Checklist\n\nCheck the PR
satisfies following conditions. \n\nReviewers should verify this PR
satisfies this list as well.\n\n- [x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common
scenarios","sha":"1a1d13341b13662af30c3bcfa54641e2a8b5dae7"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/228475","number":228475,"mergeCommit":{"message":"[Security
Solution] Fixes rule customizations diff bug on import
(#228475)\n\n**Fixes:
https://github.com/elastic/kibana/issues/228399**\n**Fixes:
https://github.com/elastic/kibana/issues/228401**\n**Fixes:
https://github.com/elastic/kibana/issues/228413**\n\n##
Summary\n\nAddresses issue with base version API route caching and not
being\nproperly invalidated on rule import and adds unit tests to cover
similar\ncache invalidation cases.\n\n\n### Checklist\n\nCheck the PR
satisfies following conditions. \n\nReviewers should verify this PR
satisfies this list as well.\n\n- [x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common
scenarios","sha":"1a1d13341b13662af30c3bcfa54641e2a8b5dae7"}},{"branch":"9.1","label":"v9.1.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Davis Plumlee <[email protected]>

Author: kibanamachine

x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/components/rule_import_modal/rule_import_modal.test.tsx

@@ -12,9 +12,18 @@ import { RuleImportModal } from './rule_import_modal';
 import { ReactQueryClientProvider } from '../../../../common/containers/query_client/query_client_provider';
 import { importRules } from '../../../rule_management/logic';
 import { mockImportResponse } from './test_utils';
+import { useInvalidateFindRulesQuery } from '../../../rule_management/api/hooks/use_find_rules_query';
+import { useInvalidateFetchCoverageOverviewQuery } from '../../../rule_management/api/hooks/use_fetch_coverage_overview_query';
+import { useInvalidateFetchRuleManagementFiltersQuery } from '../../../rule_management/api/hooks/use_fetch_rule_management_filters_query';
+import { useInvalidateFetchPrebuiltRuleBaseVersionQuery } from '../../../rule_management/api/hooks/prebuilt_rules/use_fetch_prebuilt_rule_base_version_query';
 
 jest.mock('../../../../common/lib/kibana');
-
+jest.mock('../../../rule_management/api/hooks/use_find_rules_query');
+jest.mock('../../../rule_management/api/hooks/use_fetch_coverage_overview_query');
+jest.mock('../../../rule_management/api/hooks/use_fetch_rule_management_filters_query');
+jest.mock(
+  '../../../rule_management/api/hooks/prebuilt_rules/use_fetch_prebuilt_rule_base_version_query'
+);
 jest.mock('../../../../common/lib/kibana/kibana_react', () => ({
   useKibana: jest.fn().mockReturnValue({
     services: { http: { basePath: { prepend: jest.fn() } } },
@@ -26,6 +35,22 @@ jest.mock('../../../rule_management/logic', () => ({
 }));
 
 const hideImportModal = jest.fn();
+
+const mockInvalidateFindRulesQuery = jest.fn();
+const mockInvalidateFetchCoverageOverviewQuery = jest.fn();
+const mockInvalidateFetchRuleManagementFilters = jest.fn();
+const mockInvalidateFetchPrebuiltRuleBaseVerison = jest.fn();
+jest.mocked(useInvalidateFindRulesQuery).mockReturnValue(mockInvalidateFindRulesQuery);
+jest
+  .mocked(useInvalidateFetchCoverageOverviewQuery)
+  .mockReturnValue(mockInvalidateFetchCoverageOverviewQuery);
+jest
+  .mocked(useInvalidateFetchRuleManagementFiltersQuery)
+  .mockReturnValue(mockInvalidateFetchRuleManagementFilters);
+jest
+  .mocked(useInvalidateFetchPrebuiltRuleBaseVersionQuery)
+  .mockReturnValue(mockInvalidateFetchPrebuiltRuleBaseVerison);
+
 const file = new File(['file'], 'rules.json', { type: 'application/x-ndjson' });
 
 const mockedImportRules = importRules as jest.Mock;
@@ -35,6 +60,26 @@ describe('RuleImportModal', () => {
     jest.clearAllMocks();
   });
 
+  test('should invalidate all rule related queries after importing new file', async () => {
+    mockedImportRules.mockReturnValue(mockImportResponse());
+
+    const { getByTestId } = render(
+      <ReactQueryClientProvider>
+        <RuleImportModal isImportModalVisible={true} hideImportModal={hideImportModal} />
+      </ReactQueryClientProvider>
+    );
+
+    fireEvent.change(getByTestId('rule-file-picker'), { target: { files: [file] } });
+    fireEvent.click(getByTestId('import-data-modal-button'));
+
+    await waitFor(() => {
+      expect(mockInvalidateFindRulesQuery).toHaveBeenCalled();
+      expect(mockInvalidateFetchCoverageOverviewQuery).toHaveBeenCalled();
+      expect(mockInvalidateFetchRuleManagementFilters).toHaveBeenCalled();
+      expect(mockInvalidateFetchPrebuiltRuleBaseVerison).toHaveBeenCalled();
+    });
+  });
+
   test('should uncheck the selected checkboxes after importing new file', async () => {
     const { getByTestId } = render(
       <ReactQueryClientProvider>

x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/components/rule_import_modal/rule_import_modal.tsx

@@ -21,6 +21,7 @@ import { useInvalidateFetchRuleManagementFiltersQuery } from '../../../rule_mana
 import { useToasts } from '../../../../common/lib/kibana';
 import * as i18nCommon from '../../../common/translations';
 import * as i18n from './translations';
+import { useInvalidateFetchPrebuiltRuleBaseVersionQuery } from '../../../rule_management/api/hooks/prebuilt_rules/use_fetch_prebuilt_rule_base_version_query';
 
 interface RuleImportModalProps {
   isImportModalVisible: boolean;
@@ -44,14 +45,17 @@ export function RuleImportModal({ isImportModalVisible, hideImportModal }: RuleI
   const invalidateFindRulesQuery = useInvalidateFindRulesQuery();
   const invalidateFetchCoverageOverviewQuery = useInvalidateFetchCoverageOverviewQuery();
   const invalidateFetchRuleManagementFilters = useInvalidateFetchRuleManagementFiltersQuery();
+  const invalidateFetchPrebuiltRuleBaseVerison = useInvalidateFetchPrebuiltRuleBaseVersionQuery();
   const invalidateRules = useCallback(() => {
     invalidateFindRulesQuery();
     invalidateFetchRuleManagementFilters();
     invalidateFetchCoverageOverviewQuery();
+    invalidateFetchPrebuiltRuleBaseVerison();
   }, [
     invalidateFindRulesQuery,
     invalidateFetchRuleManagementFilters,
     invalidateFetchCoverageOverviewQuery,
+    invalidateFetchPrebuiltRuleBaseVerison,
   ]);
 
   const handleModalClose = useCallback(() => {