diff --git a/x-pack/solutions/security/plugins/security_solution/public/onboarding/components/onboarding_body/cards/siem_migrations/start_migration/index.ts b/x-pack/solutions/security/plugins/security_solution/public/onboarding/components/onboarding_body/cards/siem_migrations/start_migration/index.ts index e90bfb929c764..86af2b148ac43 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/onboarding/components/onboarding_body/cards/siem_migrations/start_migration/index.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/onboarding/components/onboarding_body/cards/siem_migrations/start_migration/index.ts @@ -17,7 +17,6 @@ import startMigrationDarkIcon from './images/start_migration_icon_dark.png'; export const startMigrationCardConfig: OnboardingCardConfig = { id: OnboardingCardId.siemMigrationsRules, title: START_MIGRATION_CARD_TITLE, - badge: 'tech_preview', icon: startMigrationIcon, iconDark: startMigrationDarkIcon, Component: React.lazy( diff --git a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/links.ts b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/links.ts index e1e2ac86ec023..f4460ccfb5fab 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/links.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/links.ts @@ -30,10 +30,4 @@ export const siemMigrationsLinks: LinkItem = { skipUrlState: true, hideTimeline: true, hideWhenExperimentalKey: 'siemMigrationsDisabled', - isBeta: true, - betaOptions: { - text: i18n.translate('xpack.securitySolution.appLinks.siemMigrationsRules.badge', { - defaultMessage: 'Technical Preview', - }), - }, }; diff --git a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/components/rules_table/filters/author.tsx b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/components/rules_table/filters/author.tsx index fd12fc3185bde..66898d14b77a4 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/components/rules_table/filters/author.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/components/rules_table/filters/author.tsx @@ -65,6 +65,7 @@ export const AuthorFilterButton: React.FC = React.memo( }} isSelected={isPopoverOpen} hasActiveFilters={author !== undefined} + numActiveFilters={author ? 1 : 0} data-test-subj="authorFilterButton" > {i18n.AUTHOR_BUTTON_TITLE} diff --git a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/components/rules_table/filters/status.tsx b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/components/rules_table/filters/status.tsx index c8f35426ab928..aeb9113e4bee8 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/components/rules_table/filters/status.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/components/rules_table/filters/status.tsx @@ -79,6 +79,7 @@ export const StatusFilterButton: React.FC = React.memo( }} isSelected={isPopoverOpen} hasActiveFilters={status !== undefined} + numActiveFilters={status ? 1 : 0} data-test-subj="statusFilterButton" > {i18n.STATUS_BUTTON_TITLE} diff --git a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/components/rules_table/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/components/rules_table/index.tsx index c2dd9708802ed..71fe947428900 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/components/rules_table/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/components/rules_table/index.tsx @@ -18,6 +18,7 @@ import { } from '@elastic/eui'; import React, { useCallback, useMemo, useState } from 'react'; +import type { RuleMigrationFilters } from '../../../../../common/siem_migrations/types'; import { useVisibility } from '../../../../common/hooks/use_visibility'; import type { RelatedIntegration, RuleResponse } from '../../../../../common/api/detection_engine'; import { isMigrationPrebuiltRule } from '../../../../../common/siem_migrations/rules/utils'; @@ -95,6 +96,11 @@ export const MigrationRulesTable: React.FC = React.mem const { data: prebuiltRules = {}, isLoading: isPrebuiltRulesLoading } = useGetMigrationPrebuiltRules(migrationId); + const filters = useMemo( + () => ({ searchTerm, ...convertFilterOptions(filterOptions) }), + [searchTerm, filterOptions] + ); + const { data: { migrationRules, total } = { migrationRules: [], total: 0 }, isLoading: isDataLoading, @@ -104,10 +110,7 @@ export const MigrationRulesTable: React.FC = React.mem perPage: pageSize, sortField, sortDirection, - filters: { - searchTerm, - ...convertFilterOptions(filterOptions), - }, + filters, }); const [selectedMigrationRules, setSelectedMigrationRules] = useState([]); diff --git a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/pages/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/pages/index.tsx index 9d8740e9a6126..4a02190a64be1 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/pages/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/rules/pages/index.tsx @@ -7,7 +7,13 @@ import React, { useCallback, useEffect, useMemo } from 'react'; -import { EuiSkeletonLoading, EuiSkeletonText, EuiSkeletonTitle, EuiSpacer } from '@elastic/eui'; +import { + EuiSkeletonLoading, + EuiSkeletonText, + EuiSkeletonTitle, + EuiSpacer, + EuiTitle, +} from '@elastic/eui'; import type { RouteComponentProps } from 'react-router-dom'; import type { RelatedIntegration } from '../../../../common/api/detection_engine'; import { SiemMigrationTaskStatus } from '../../../../common/siem_migrations/constants'; @@ -28,9 +34,9 @@ import { MigrationProgressPanel } from '../components/migration_status_panels/mi import { useInvalidateGetMigrationRules } from '../logic/use_get_migration_rules'; import { useInvalidateGetMigrationTranslationStats } from '../logic/use_get_migration_translation_stats'; import { useGetIntegrations } from '../service/hooks/use_get_integrations'; -import { PageTitle } from './page_title'; import { RuleMigrationsUploadMissingPanel } from '../components/migration_status_panels/upload_missing_panel'; import { EmptyMigrationRulesPage } from './empty'; +import * as i18n from './translations'; export type MigrationRulesPageProps = RouteComponentProps<{ migrationId?: string }>; @@ -88,8 +94,6 @@ export const MigrationRulesPage: React.FC = React.memo( refreshStats, ]); - const pageTitle = useMemo(() => , []); - const content = useMemo(() => { if (ruleMigrationsStats.length === 0 && !migrationId) { return ; @@ -133,7 +137,14 @@ export const MigrationRulesPage: React.FC = React.memo( return ( - + +

{i18n.PAGE_TITLE}

+ + } + border + > { - const { euiTheme } = useEuiTheme(); - - return ( - - - -

{i18n.PAGE_TITLE}

-
-
- - - - -
- ); -}); -PageTitle.displayName = 'PageTitle';