Merge branch 'master' into hosted-policy-detail-changes

elastic · Apr 9, 2021 · 1c7bfcb · 1c7bfcb
2 parents b142cb9 + 17b460d
commit 1c7bfcb
Show file tree

Hide file tree

Showing 12 changed files with 229 additions and 157 deletions.
diff --git a/x-pack/plugins/security_solution/public/cases/components/all_cases/columns.tsx b/x-pack/plugins/security_solution/public/cases/components/all_cases/columns.tsx
@@ -14,6 +14,8 @@ import {
   EuiTableActionsColumnType,
   EuiTableComputedColumnType,
   EuiTableFieldDataColumnType,
+  EuiFlexGroup,
+  EuiFlexItem,
 } from '@elastic/eui';
 import { RIGHT_ALIGNMENT } from '@elastic/eui/lib/services';
 import styled from 'styled-components';
@@ -73,12 +75,12 @@ export const getCasesColumns = (
           return theCase.status !== CaseStatuses.closed ? (
             caseDetailsLinkComponent
           ) : (
-            <>
-              {caseDetailsLinkComponent}
-              <Spacer>
+            <EuiFlexGroup direction="column" gutterSize="none">
+              <EuiFlexItem>{caseDetailsLinkComponent}</EuiFlexItem>
+              <EuiFlexItem>
                 <MediumShadeText>{i18n.CLOSED}</MediumShadeText>
-              </Spacer>
-            </>
+              </EuiFlexItem>
+            </EuiFlexGroup>
           );
         }
         return getEmptyTagValue();
@@ -132,7 +134,6 @@ export const getCasesColumns = (
       align: RIGHT_ALIGNMENT,
       field: 'totalAlerts',
       name: ALERTS,
-      sortable: true,
       render: (totalAlerts: Case['totalAlerts']) =>
         totalAlerts != null
           ? renderStringField(`${totalAlerts}`, `case-table-column-alertsCount`)
@@ -142,37 +143,36 @@ export const getCasesColumns = (
       align: RIGHT_ALIGNMENT,
       field: 'totalComment',
       name: i18n.COMMENTS,
-      sortable: true,
       render: (totalComment: Case['totalComment']) =>
         totalComment != null
           ? renderStringField(`${totalComment}`, `case-table-column-commentCount`)
           : getEmptyTagValue(),
     },
-    filterStatus === CaseStatuses.open
+    filterStatus === CaseStatuses.closed
       ? {
-          field: 'createdAt',
-          name: i18n.OPENED_ON,
+          field: 'closedAt',
+          name: i18n.CLOSED_ON,
           sortable: true,
-          render: (createdAt: Case['createdAt']) => {
-            if (createdAt != null) {
+          render: (closedAt: Case['closedAt']) => {
+            if (closedAt != null) {
               return (
-                <span data-test-subj={`case-table-column-createdAt`}>
-                  <FormattedRelativePreferenceDate value={createdAt} />
+                <span data-test-subj={`case-table-column-closedAt`}>
+                  <FormattedRelativePreferenceDate value={closedAt} />
                 </span>
               );
             }
             return getEmptyTagValue();
           },
         }
       : {
-          field: 'closedAt',
-          name: i18n.CLOSED_ON,
+          field: 'createdAt',
+          name: i18n.OPENED_ON,
           sortable: true,
-          render: (closedAt: Case['closedAt']) => {
-            if (closedAt != null) {
+          render: (createdAt: Case['createdAt']) => {
+            if (createdAt != null) {
               return (
-                <span data-test-subj={`case-table-column-closedAt`}>
-                  <FormattedRelativePreferenceDate value={closedAt} />
+                <span data-test-subj={`case-table-column-createdAt`}>
+                  <FormattedRelativePreferenceDate value={createdAt} />
                 </span>
               );
             }

diff --git a/x-pack/plugins/security_solution/public/cases/components/all_cases/index.test.tsx b/x-pack/plugins/security_solution/public/cases/components/all_cases/index.test.tsx
@@ -827,7 +827,7 @@ describe('AllCases', () => {
     wrapper.find('button[data-test-subj="case-status-filter-in-progress"]').simulate('click');
     await waitFor(() => {
       expect(setQueryParams).toBeCalledWith({
-        sortField: 'updatedAt',
+        sortField: 'createdAt',
       });
     });
   });

diff --git a/x-pack/plugins/security_solution/public/cases/components/all_cases/index.tsx b/x-pack/plugins/security_solution/public/cases/components/all_cases/index.tsx
@@ -342,7 +342,7 @@ export const AllCases = React.memo<AllCasesProps>(
           newFilterOptions.status &&
           newFilterOptions.status === CaseStatuses['in-progress']
         ) {
-          setQueryParams({ sortField: SortFieldCase.updatedAt });
+          setQueryParams({ sortField: SortFieldCase.createdAt });
         }
         setFilters(newFilterOptions);
         refreshCases(false);

diff --git a/...ns/security_solution/public/cases/components/configure_cases/connectors_dropdown.test.tsx b/...ns/security_solution/public/cases/components/configure_cases/connectors_dropdown.test.tsx
@@ -41,6 +41,7 @@ describe('ConnectorsDropdown', () => {
           "inputDisplay": <EuiFlexGroup
             alignItems="center"
             gutterSize="none"
+            responsive={false}
           >
             <EuiFlexItem
               grow={false}
@@ -65,6 +66,7 @@ describe('ConnectorsDropdown', () => {
           "inputDisplay": <EuiFlexGroup
             alignItems="center"
             gutterSize="none"
+            responsive={false}
           >
             <EuiFlexItem
               grow={false}
@@ -87,6 +89,7 @@ describe('ConnectorsDropdown', () => {
           "inputDisplay": <EuiFlexGroup
             alignItems="center"
             gutterSize="none"
+            responsive={false}
           >
             <EuiFlexItem
               grow={false}
@@ -109,6 +112,7 @@ describe('ConnectorsDropdown', () => {
           "inputDisplay": <EuiFlexGroup
             alignItems="center"
             gutterSize="none"
+            responsive={false}
           >
             <EuiFlexItem
               grow={false}
@@ -131,6 +135,7 @@ describe('ConnectorsDropdown', () => {
           "inputDisplay": <EuiFlexGroup
             alignItems="center"
             gutterSize="none"
+            responsive={false}
           >
             <EuiFlexItem
               grow={false}

diff --git a/...plugins/security_solution/public/cases/components/configure_cases/connectors_dropdown.tsx b/...plugins/security_solution/public/cases/components/configure_cases/connectors_dropdown.tsx
@@ -34,7 +34,7 @@ const EuiIconExtended = styled(EuiIcon)`
 const noConnectorOption = {
   value: 'none',
   inputDisplay: (
-    <EuiFlexGroup gutterSize="none" alignItems="center">
+    <EuiFlexGroup gutterSize="none" alignItems="center" responsive={false}>
       <EuiFlexItem grow={false}>
         <EuiIconExtended type="minusInCircle" size={ICON_SIZE} />
       </EuiFlexItem>
@@ -77,7 +77,7 @@ const ConnectorsDropdownComponent: React.FC<Props> = ({
           {
             value: connector.id,
             inputDisplay: (
-              <EuiFlexGroup gutterSize="none" alignItems="center">
+              <EuiFlexGroup gutterSize="none" alignItems="center" responsive={false}>
                 <EuiFlexItem grow={false}>
                   <EuiIconExtended
                     type={connectorsConfiguration[connector.actionTypeId]?.logo ?? ''}

diff --git a/x-pack/plugins/security_solution/public/cases/components/configure_cases/field_mapping.tsx b/x-pack/plugins/security_solution/public/cases/components/configure_cases/field_mapping.tsx
@@ -39,7 +39,7 @@ const FieldMappingComponent: React.FC<FieldMappingProps> = ({
     <EuiFlexGroup direction="column" gutterSize="none">
       <EuiFlexItem>
         {' '}
-        <EuiFlexGroup>
+        <EuiFlexGroup responsive={false}>
           <EuiFlexItem>
             <span className="euiFormLabel">{i18n.FIELD_MAPPING_FIRST_COL}</span>
           </EuiFlexItem>

diff --git a/...ns/security_solution/public/cases/components/configure_cases/field_mapping_row_static.tsx b/...ns/security_solution/public/cases/components/configure_cases/field_mapping_row_static.tsx
@@ -28,9 +28,9 @@ const FieldMappingRowComponent: React.FC<RowProps> = ({
     selectedActionType,
   ]);
   return (
-    <EuiFlexGroup data-test-subj="static-mappings" alignItems="center">
+    <EuiFlexGroup data-test-subj="static-mappings" alignItems="center" responsive={false}>
       <EuiFlexItem>
-        <EuiFlexGroup component="span" justifyContent="spaceBetween">
+        <EuiFlexGroup component="span" justifyContent="spaceBetween" responsive={false}>
           <EuiFlexItem component="span" grow={false}>
             <EuiCode data-test-subj="field-mapping-source">{securitySolutionField}</EuiCode>
           </EuiFlexItem>
@@ -40,7 +40,7 @@ const FieldMappingRowComponent: React.FC<RowProps> = ({
         </EuiFlexGroup>
       </EuiFlexItem>
       <EuiFlexItem>
-        <EuiFlexGroup component="span" justifyContent="spaceBetween">
+        <EuiFlexGroup component="span" justifyContent="spaceBetween" responsive={false}>
           <EuiFlexItem component="span" grow={false}>
             {isLoading ? (
               <EuiLoadingSpinner size="m" />

diff --git a/x-pack/plugins/security_solution/public/cases/containers/types.ts b/x-pack/plugins/security_solution/public/cases/containers/types.ts
@@ -117,7 +117,6 @@ export interface AllCases extends CasesStatus {
 export enum SortFieldCase {
   createdAt = 'createdAt',
   closedAt = 'closedAt',
-  updatedAt = 'updatedAt',
 }
 
 export interface ElasticUser {

diff --git a/...ers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx b/...ers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx
@@ -18,6 +18,7 @@ import {
   PagerDutyConfig,
   PagerDutySecrets,
   PagerDutyActionParams,
+  EventActionOptions,
 } from '.././types';
 import pagerDutySvg from './pagerduty.svg';
 import { hasMustacheTokens } from '../../../lib/has_mustache_tokens';
@@ -88,7 +89,10 @@ export function getActionType(): ActionTypeModel<
           )
         );
       }
-      if (!actionParams.summary?.length) {
+      if (
+        actionParams.eventAction === EventActionOptions.TRIGGER &&
+        !actionParams.summary?.length
+      ) {
         errors.summary.push(
           i18n.translate(
             'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.error.requiredSummaryText',

diff --git a/...ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.test.tsx b/...ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.test.tsx
@@ -57,9 +57,29 @@ describe('PagerDutyParamsFields renders', () => {
     expect(wrapper.find('[data-test-subj="dedupKeyAddVariableButton"]').length > 0).toBeTruthy();
   });
 
-  test('params select fields dont auto set values ', () => {
+  test('params select fields do not auto set values eventActionSelect', () => {
     const actionParams = {};
 
+    const wrapper = mountWithIntl(
+      <PagerDutyParamsFields
+        actionParams={actionParams}
+        errors={{ summary: [], timestamp: [], dedupKey: [] }}
+        editAction={() => {}}
+        index={0}
+      />
+    );
+    expect(wrapper.find('[data-test-subj="eventActionSelect"]').length > 0).toBeTruthy();
+    expect(
+      wrapper.find('[data-test-subj="eventActionSelect"]').first().prop('value')
+    ).toStrictEqual(undefined);
+  });
+
+  test('params select fields do not auto set values severitySelect', () => {
+    const actionParams = {
+      eventAction: EventActionOptions.TRIGGER,
+      dedupKey: 'test',
+    };
+
     const wrapper = mountWithIntl(
       <PagerDutyParamsFields
         actionParams={actionParams}
@@ -72,9 +92,35 @@ describe('PagerDutyParamsFields renders', () => {
     expect(wrapper.find('[data-test-subj="severitySelect"]').first().prop('value')).toStrictEqual(
       undefined
     );
+  });
+
+  test('only eventActionSelect is available as a payload params for PagerDuty Resolve event', () => {
+    const actionParams = {
+      eventAction: EventActionOptions.RESOLVE,
+      dedupKey: 'test',
+    };
+
+    const wrapper = mountWithIntl(
+      <PagerDutyParamsFields
+        actionParams={actionParams}
+        errors={{ summary: [], timestamp: [], dedupKey: [] }}
+        editAction={() => {}}
+        index={0}
+      />
+    );
+    expect(wrapper.find('[data-test-subj="dedupKeyInput"]').length > 0).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="dedupKeyInput"]').first().prop('value')).toStrictEqual(
+      'test'
+    );
     expect(wrapper.find('[data-test-subj="eventActionSelect"]').length > 0).toBeTruthy();
     expect(
       wrapper.find('[data-test-subj="eventActionSelect"]').first().prop('value')
-    ).toStrictEqual(undefined);
+    ).toStrictEqual('resolve');
+    expect(wrapper.find('[data-test-subj="dedupKeyInput"]').length > 0).toBeTruthy();
+    expect(wrapper.find('[data-test-subj="timestampInput"]').length > 0).toBeFalsy();
+    expect(wrapper.find('[data-test-subj="componentInput"]').length > 0).toBeFalsy();
+    expect(wrapper.find('[data-test-subj="groupInput"]').length > 0).toBeFalsy();
+    expect(wrapper.find('[data-test-subj="sourceInput"]').length > 0).toBeFalsy();
+    expect(wrapper.find('[data-test-subj="summaryInput"]').length > 0).toBeFalsy();
   });
 });