[SECURITY_SOLUTION][ENDPOINT] Fix trusted apps create form displaying…

… empty conditions area if OS is changed (#77808) * Fix incorrect filtering of conditions when os changes * improve condition builder empty message Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elastic · Sep 21, 2020 · d0c1c93 · d0c1c93
1 parent 32a7b9f
commit d0c1c93
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/type_guards.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/state/type_guards.ts
@@ -12,6 +12,7 @@ import {
 } from './trusted_apps_list_page_state';
 import {
   Immutable,
+  MacosLinuxConditionEntry,
   NewTrustedApp,
   WindowsConditionEntry,
 } from '../../../../../common/endpoint/types';
@@ -51,5 +52,11 @@ export const isWindowsTrustedAppCondition = (condition: {
   return condition.field === 'process.code_signature' || true;
 };
 
+export const isMacosLinuxTrustedAppCondition = (condition: {
+  field: string;
+}): condition is MacosLinuxConditionEntry => {
+  return condition.field !== 'process.code_signature' || true;
+};
+
 export const isTrustedAppSupportedOs = (os: string): os is NewTrustedApp['os'] =>
   TRUSTED_APPS_SUPPORTED_OS_TYPES.includes(os);
diff --git a/...solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.tsx b/...solution/public/management/pages/trusted_apps/view/components/create_trusted_app_form.tsx
@@ -25,6 +25,7 @@ import {
 import { LogicalConditionBuilderProps } from './logical_condition/logical_condition_builder';
 import { OS_TITLES } from '../constants';
 import {
+  isMacosLinuxTrustedAppCondition,
   isTrustedAppSupportedOs,
   isWindowsTrustedApp,
   isWindowsTrustedAppCondition,
@@ -123,7 +124,7 @@ export const CreateTrustedAppForm = memo<CreateTrustedAppFormProps>(
             return {
               ...prevState,
               entries: [
-                ...prevState.entries.filter((entry) => !isWindowsTrustedAppCondition(entry)),
+                ...prevState.entries.filter((entry) => isMacosLinuxTrustedAppCondition(entry)),
                 generateNewEntry(),
               ] as MacosLinuxConditionEntry[],
             };
@@ -154,10 +155,15 @@ export const CreateTrustedAppForm = memo<CreateTrustedAppFormProps>(
             };
             if (!isWindowsTrustedApp(updatedState)) {
               updatedState.entries.push(
-                ...(prevState.entries.filter(
-                  (entry) => !isWindowsTrustedAppCondition(entry)
+                ...(prevState.entries.filter((entry) =>
+                  isMacosLinuxTrustedAppCondition(entry)
                 ) as MacosLinuxConditionEntry[])
               );
+              if (updatedState.entries.length === 0) {
+                updatedState.entries.push(generateNewEntry() as MacosLinuxConditionEntry);
+              }
+            } else {
+              updatedState.entries.push(...prevState.entries);
             }
             return updatedState;
           }

diff --git a/...gement/pages/trusted_apps/view/components/logical_condition/logical_condition_builder.tsx b/...gement/pages/trusted_apps/view/components/logical_condition/logical_condition_builder.tsx
@@ -5,7 +5,7 @@
  */
 
 import React, { memo, useCallback } from 'react';
-import { EuiButton, CommonProps, EuiText, EuiSpacer } from '@elastic/eui';
+import { EuiButton, CommonProps, EuiText, EuiSpacer, EuiPanel } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { ConditionGroup, ConditionGroupProps } from './components/condition_group';
 
@@ -75,14 +75,14 @@ LogicalConditionBuilder.displayName = 'LogicalConditionBuilder';
 // FIXME:PT need to style this better.
 const NoEntries = memo(() => {
   return (
-    <div>
-      <EuiText>
+    <EuiPanel paddingSize="l">
+      <EuiText textAlign="center" size="s" color="subdued">
         <FormattedMessage
           id="xpack.securitySolution.trustedapps.logicalConditionBuilder.noEntries"
-          defaultMessage="No entries"
+          defaultMessage="No conditions defined"
         />
       </EuiText>
-    </div>
+    </EuiPanel>
   );
 });