remove condition field

Author: benakansara

x-pack/platform/packages/shared/response-ops/alerting-v2-rule-form/form/field_groups/alert_conditions_field_group.test.tsx

@@ -21,12 +21,6 @@ jest.mock('../fields/recovery_base_query_only_field', () => ({
   ),
 }));
 
-jest.mock('../fields/recovery_base_and_condition_field', () => ({
-  RecoveryBaseAndConditionField: () => (
-    <div data-test-subj="mockRecoveryBaseAndConditionField">Recovery Condition Field</div>
-  ),
-}));
-
 jest.mock('../fields/alert_delay_field', () => ({
   AlertDelayField: () => <div data-test-subj="mockAlertDelayField">Alert Delay Field</div>,
 }));
@@ -109,10 +103,9 @@ describe('AlertConditionsFieldGroup', () => {
     );
 
     expect(screen.queryByTestId('mockRecoveryBaseQueryOnlyField')).not.toBeInTheDocument();
-    expect(screen.queryByTestId('mockRecoveryBaseAndConditionField')).not.toBeInTheDocument();
   });
 
-  it('renders RecoveryBaseQueryOnlyField when type is query and no evaluation condition exists', () => {
+  it('renders RecoveryBaseQueryOnlyField when type is query', () => {
     const Wrapper = createFormWrapper({
       kind: 'alert',
       recoveryPolicy: { type: 'query' },
@@ -126,29 +119,6 @@ describe('AlertConditionsFieldGroup', () => {
     );
 
     expect(screen.getByTestId('mockRecoveryBaseQueryOnlyField')).toBeInTheDocument();
-    expect(screen.queryByTestId('mockRecoveryBaseAndConditionField')).not.toBeInTheDocument();
-  });
-
-  it('renders RecoveryBaseAndConditionField when type is query and evaluation condition exists', () => {
-    const Wrapper = createFormWrapper({
-      kind: 'alert',
-      recoveryPolicy: { type: 'query' },
-      evaluation: {
-        query: {
-          base: 'FROM logs | STATS count() BY host',
-          condition: 'WHERE count > 100',
-        },
-      },
-    });
-
-    render(
-      <Wrapper>
-        <AlertConditionsFieldGroup />
-      </Wrapper>
-    );
-
-    expect(screen.getByTestId('mockRecoveryBaseAndConditionField')).toBeInTheDocument();
-    expect(screen.queryByTestId('mockRecoveryBaseQueryOnlyField')).not.toBeInTheDocument();
   });
 
   it('always renders recovery type field regardless of type', () => {
@@ -165,26 +135,4 @@ describe('AlertConditionsFieldGroup', () => {
 
     expect(screen.getByTestId('mockRecoveryTypeField')).toBeInTheDocument();
   });
-
-  it('falls back to RecoveryBaseQueryOnlyField when evaluation condition is only whitespace', () => {
-    const Wrapper = createFormWrapper({
-      kind: 'alert',
-      recoveryPolicy: { type: 'query' },
-      evaluation: {
-        query: {
-          base: 'FROM logs | STATS count() BY host',
-          condition: '   ',
-        },
-      },
-    });
-
-    render(
-      <Wrapper>
-        <AlertConditionsFieldGroup />
-      </Wrapper>
-    );
-
-    expect(screen.getByTestId('mockRecoveryBaseQueryOnlyField')).toBeInTheDocument();
-    expect(screen.queryByTestId('mockRecoveryBaseAndConditionField')).not.toBeInTheDocument();
-  });
 });

x-pack/platform/packages/shared/response-ops/alerting-v2-rule-form/form/field_groups/alert_conditions_field_group.tsx

@@ -13,7 +13,6 @@ import type { FormValues } from '../types';
 import { FieldGroup } from './field_group';
 import { RecoveryTypeField } from '../fields/recovery_type_field';
 import { RecoveryBaseQueryOnlyField } from '../fields/recovery_base_query_only_field';
-import { RecoveryBaseAndConditionField } from '../fields/recovery_base_and_condition_field';
 import { useRuleFormServices } from '../contexts';
 import { useRecoveryValidation } from '../hooks/use_recovery_validation';
 import { AlertDelayField } from '../fields/alert_delay_field';
@@ -26,9 +25,6 @@ import { RecoveryDelayField } from '../fields/recovery_delay_field';
  * - Alert delay (pending state transition: immediate / breaches / duration)
  * - A dropdown to select recovery type (no_breach vs. custom query)
  * - When `query` type is selected:
- *   - If an evaluation condition (WHERE clause) exists:
- *     uses RecoveryBaseAndConditionField (split mode with WHERE clause editor)
- *   - If no evaluation condition exists:
  *     uses RecoveryBaseQueryOnlyField (full ES|QL editor with "not same as eval" validation)
  * - Recovery delay (recovering state transition: immediate / breaches / duration)
  */
@@ -58,11 +54,7 @@ export const AlertConditionsFieldGroup = () => {
       {recoveryType === 'query' && (
         <>
           <EuiSpacer size="m" />
-          {recoveryValidation.hasEvaluationCondition ? (
-            <RecoveryBaseAndConditionField validation={recoveryValidation} />
-          ) : (
-            <RecoveryBaseQueryOnlyField validation={recoveryValidation} />
-          )}
+          <RecoveryBaseQueryOnlyField validation={recoveryValidation} />
         </>
       )}
       <EuiSpacer size="m" />

x-pack/platform/packages/shared/response-ops/alerting-v2-rule-form/form/field_groups/condition_field_group.tsx

@@ -11,7 +11,6 @@ import { EuiSpacer, EuiFormRow, EuiCodeBlock } from '@elastic/eui';
 import { useFormContext, useWatch } from 'react-hook-form';
 import type { FormValues } from '../types';
 import { FieldGroup } from './field_group';
-import { WhereClauseEditor } from '../fields/where_clause_editor';
 import { EvaluationQueryField } from '../fields/evaluation_query_field';
 import { GroupFieldSelect } from '../fields/group_field_select';
 import { TimeFieldSelect } from '../fields/time_field_select';
@@ -30,10 +29,9 @@ interface ConditionFieldGroupProps {
  *
  * This component displays:
  * - An editable ES|QL query editor (when includeQuery is true) OR a read-only view of the base query
- * - An editable WHERE clause condition field
  *
- * The base query defines what data is being evaluated, while the
- * condition field defines the threshold or filter that triggers alerts.
+ * The base query defines what data is being evaluated and the trigger
+ * condition must be embedded within it (e.g. as a trailing WHERE clause).
  */
 export const ConditionFieldGroup = ({ includeBase = false }: ConditionFieldGroupProps) => {
   const { control } = useFormContext<FormValues>();
@@ -72,26 +70,6 @@ export const ConditionFieldGroup = ({ includeBase = false }: ConditionFieldGroup
         )
       )}
 
-      <WhereClauseEditor
-        name="evaluation.query.condition"
-        label={i18n.translate('xpack.alertingV2.ruleForm.conditionLabel', {
-          defaultMessage: 'Trigger condition',
-        })}
-        labelTooltip={i18n.translate('xpack.alertingV2.ruleForm.conditionTooltip', {
-          defaultMessage:
-            'A trigger condition filters when alerts are created. If no condition is specified, an alert will be created for every result returned by the base query.',
-        })}
-        helpText={
-          !baseQuery
-            ? i18n.translate('xpack.alertingV2.ruleForm.conditionDisabledHelp', {
-                defaultMessage: 'Define a base query first to enable the condition editor.',
-              })
-            : undefined
-        }
-        baseQuery={baseQuery || ''}
-        disabled={!baseQuery}
-        fullWidth={true}
-      />
       <GroupFieldSelect />
       <TimeFieldSelect />
     </FieldGroup>