fix bug where rule form was blowing up because of a missing index fie…

…ld on the form
elastic · Jun 14, 2022 · 6637e05 · 6637e05
1 parent 6ef4f2a
commit 6637e05
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/...k/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx b/...k/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx
@@ -530,9 +530,13 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
           </EuiFlexItem>
 
           <EuiFlexItem>
-            {dataSourceRadioIdSelected === DATA_VIEW_SELECT_ID ? (
-              DataViewSelectorMemo
-            ) : (
+            <RuleTypeEuiFormRow $isVisible={dataSourceRadioIdSelected === DATA_VIEW_SELECT_ID}>
+              {DataViewSelectorMemo}
+            </RuleTypeEuiFormRow>
+            <RuleTypeEuiFormRow
+              $isVisible={dataSourceRadioIdSelected === INDEX_PATTERN_SELECT_ID}
+              fullWidth
+            >
               <CommonUseField
                 path="index"
                 config={{
@@ -552,7 +556,7 @@ const StepDefineRuleComponent: FC<StepDefineRuleProps> = ({
                   },
                 }}
               />
-            )}
+            </RuleTypeEuiFormRow>
           </EuiFlexItem>
         </EuiFlexGroup>
       </RuleTypeEuiFormRow>

diff --git a/.../plugins/security_solution/public/detections/components/rules/step_define_rule/schema.tsx b/.../plugins/security_solution/public/detections/components/rules/step_define_rule/schema.tsx
@@ -96,11 +96,13 @@ export const schema: FormSchema<DefineStepRule> = {
           const [{ path, formData }] = args;
           // the dropdown defaults the dataViewId to an empty string somehow on render..
           // need to figure this out.
-          const notEmptyDataViewId = formData.dataViewId != null && formData.dataViewId !== '';
+          const dataViewIdExists = formData.dataViewId != null && formData.dataViewId !== '';
+
           const skipValidation =
             isMlRule(formData.ruleType) ||
-            ((formData.index != null || notEmptyDataViewId) &&
-              !(formData.index != null && notEmptyDataViewId));
+            dataViewIdExists ||
+            formData.index != null ||
+            formData.index.length > 0;
 
           if (skipValidation) {
             return;