Revert "[Security solution] [Endpoint] Unify subtitle text in flyout …

…and modal for event filters (#106401)" This reverts commit 7f75873.
elastic · Jul 22, 2021 · ba2915e · ba2915e
1 parent 745db30
commit ba2915e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/...ns/security_solution/public/management/pages/event_filters/view/components/form/index.tsx b/...ns/security_solution/public/management/pages/event_filters/view/components/form/index.tsx
@@ -31,10 +31,16 @@ import { ExceptionBuilder } from '../../../../../../shared_imports';
 
 import { useEventFiltersSelector } from '../../hooks';
 import { getFormEntryStateMutable, getHasNameError, getNewComment } from '../../../store/selector';
-import { NAME_LABEL, NAME_ERROR, NAME_PLACEHOLDER, OS_LABEL, RULE_NAME } from './translations';
+import {
+  FORM_DESCRIPTION,
+  NAME_LABEL,
+  NAME_ERROR,
+  NAME_PLACEHOLDER,
+  OS_LABEL,
+  RULE_NAME,
+} from './translations';
 import { OS_TITLES } from '../../../../../common/translations';
 import { ENDPOINT_EVENT_FILTERS_LIST_ID, EVENT_FILTER_LIST_TYPE } from '../../../constants';
-import { ABOUT_EVENT_FILTERS } from '../../translations';
 
 const OPERATING_SYSTEMS: readonly OperatingSystem[] = [
   OperatingSystem.MAC,
@@ -199,12 +205,8 @@ export const EventFiltersForm: React.FC<EventFiltersFormProps> = memo(
 
     return !isIndexPatternLoading && exception ? (
       <EuiForm component="div">
-        {!exception || !exception.item_id ? (
-          <EuiText color="subdued" size="xs">
-            {ABOUT_EVENT_FILTERS}
-            <EuiSpacer size="m" />
-          </EuiText>
-        ) : null}
+        <EuiText size="s">{FORM_DESCRIPTION}</EuiText>
+        <EuiSpacer size="m" />
         {nameInputMemo}
         <EuiSpacer size="m" />
         {allowSelectOs ? (

diff --git a/...urity_solution/public/management/pages/event_filters/view/components/form/translations.ts b/...urity_solution/public/management/pages/event_filters/view/components/form/translations.ts
@@ -7,6 +7,13 @@
 
 import { i18n } from '@kbn/i18n';
 
+export const FORM_DESCRIPTION = i18n.translate(
+  'xpack.securitySolution.eventFilter.modal.description',
+  {
+    defaultMessage: "Events are filtered when the rule's conditions are met:",
+  }
+);
+
 export const NAME_PLACEHOLDER = i18n.translate(
   'xpack.securitySolution.eventFilter.form.name.placeholder',
   {

diff --git a/.../security_solution/public/management/pages/event_filters/view/event_filters_list_page.tsx b/.../security_solution/public/management/pages/event_filters/view/event_filters_list_page.tsx
@@ -44,7 +44,6 @@ import { EventFilterDeleteModal } from './components/event_filter_delete_modal';
 
 import { SearchBar } from '../../../components/search_bar';
 import { BackToExternalAppButton } from '../../../components/back_to_external_app_button';
-import { ABOUT_EVENT_FILTERS } from './translations';
 
 type EventListPaginatedContent = PaginatedContentProps<
   Immutable<ExceptionListItemSchema>,
@@ -196,7 +195,11 @@ export const EventFiltersListPage = memo(() => {
           defaultMessage="Event Filters"
         />
       }
-      subtitle={ABOUT_EVENT_FILTERS}
+      subtitle={i18n.translate('xpack.securitySolution.eventFilters.aboutInfo', {
+        defaultMessage:
+          'Add an event filter to exclude high volume or unwanted events from being written to Elasticsearch. Event ' +
+          'filters are processed by the Endpoint Security integration, and are applied to hosts running this integration on their agents.',
+      })}
       actions={
         doesDataExist && (
           <EuiButton

diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/translations.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/translations.ts
@@ -51,9 +51,3 @@ export const getGetErrorMessage = (getError: ServerApiError) => {
     values: { error: getError.message },
   });
 };
-
-export const ABOUT_EVENT_FILTERS = i18n.translate('xpack.securitySolution.eventFilters.aboutInfo', {
-  defaultMessage:
-    'Add an event filter to exclude high volume or unwanted events from being written to Elasticsearch. Event ' +
-    'filters are processed by the Endpoint Security integration, and are applied to hosts running this integration on their agents.',
-});