[8.x] [ResponseOps][NewRuleForm] Update functional tests to use new r…

…ule form for stack management (#198915) (#202212) # Backport This will backport the following commits from `main` to `8.x`: - [[ResponseOps][NewRuleForm] Update functional tests to use new rule form for stack management (#198915)](#198915)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Janki Salvi <[email protected]>
elastic · Nov 28, 2024 · 4581688 · 4581688
1 parent c171c0e
commit 4581688
Show file tree

Hide file tree

Showing 15 changed files with 290 additions and 352 deletions.
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/create_rule_form.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/create_rule_form.tsx
@@ -195,6 +195,7 @@ export const CreateRuleForm = (props: CreateRuleFormProps) => {
             multiConsumerSelection,
             validConsumers,
             ruleType,
+            ruleTypes,
           }),
         }}
       >

diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page.test.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page.test.tsx
@@ -152,7 +152,7 @@ describe('rulePage', () => {
     render(<RulePage onCancel={onCancel} onSave={onSave} />);
 
     fireEvent.click(screen.getByTestId('rulePageFooterCancelButton'));
-    expect(screen.getByTestId('ruleFormCancelModal')).toBeInTheDocument();
+    expect(screen.getByTestId('confirmRuleCloseModal')).toBeInTheDocument();
   });
 
   test('should not display discard changes modal id no changes are made in the form', () => {
@@ -181,6 +181,6 @@ describe('rulePage', () => {
     render(<RulePage onCancel={onCancel} onSave={onSave} />);
 
     fireEvent.click(screen.getByTestId('rulePageFooterCancelButton'));
-    expect(screen.queryByTestId('ruleFormCancelModal')).not.toBeInTheDocument();
+    expect(screen.queryByTestId('confirmRuleCloseModal')).not.toBeInTheDocument();
   });
 });
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page.tsx b/packages/kbn-alerts-ui-shared/src/rule_form/rule_page/rule_page.tsx
@@ -217,7 +217,7 @@ export const RulePage = (props: RulePageProps) => {
         <EuiConfirmModal
           onCancel={() => setIsCancelModalOpen(false)}
           onConfirm={onCancel}
-          data-test-subj="ruleFormCancelModal"
+          data-test-subj="confirmRuleCloseModal"
           buttonColor="danger"
           defaultFocusedButton="confirm"
           title={RULE_FORM_CANCEL_MODAL_TITLE}

diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/utils/get_initial_multi_consumer.ts b/packages/kbn-alerts-ui-shared/src/rule_form/utils/get_initial_multi_consumer.ts
@@ -11,6 +11,7 @@ import { AlertConsumers, RuleCreationValidConsumer } from '@kbn/rule-data-utils'
 import { RuleTypeWithDescription } from '../../common/types';
 import { MULTI_CONSUMER_RULE_TYPE_IDS } from '../constants';
 import { FEATURE_NAME_MAP } from '../translations';
+import { getAuthorizedConsumers } from './get_authorized_consumers';
 
 export const getValidatedMultiConsumer = ({
   multiConsumerSelection,
@@ -33,10 +34,12 @@ export const getInitialMultiConsumer = ({
   multiConsumerSelection,
   validConsumers,
   ruleType,
+  ruleTypes,
 }: {
   multiConsumerSelection?: RuleCreationValidConsumer | null;
   validConsumers: RuleCreationValidConsumer[];
   ruleType: RuleTypeWithDescription;
+  ruleTypes: RuleTypeWithDescription[];
 }): RuleCreationValidConsumer | null => {
   // If rule type doesn't support multi-consumer or no valid consumers exists,
   // return nothing
@@ -54,6 +57,23 @@ export const getInitialMultiConsumer = ({
     return AlertConsumers.OBSERVABILITY;
   }
 
+  const selectedAvailableRuleType = ruleTypes.find((availableRuleType) => {
+    return availableRuleType.id === ruleType.id;
+  });
+
+  if (!selectedAvailableRuleType?.authorizedConsumers) {
+    return null;
+  }
+
+  const authorizedConsumers = getAuthorizedConsumers({
+    ruleType: selectedAvailableRuleType,
+    validConsumers,
+  });
+
+  if (authorizedConsumers.length === 1) {
+    return authorizedConsumers[0];
+  }
+
   // User passed in null explicitly, won't set initial consumer
   if (multiConsumerSelection === null) {
     return null;

diff --git a/x-pack/test/functional/services/ml/alerting.ts b/x-pack/test/functional/services/ml/alerting.ts
@@ -28,7 +28,7 @@ export function MachineLearningAlertingProvider(
     async selectAnomalyDetectionAlertType() {
       await retry.tryForTime(5000, async () => {
         await testSubjects.click('xpack.ml.anomaly_detection_alert-SelectOption');
-        await testSubjects.existOrFail(`mlAnomalyAlertForm`, { timeout: 1000 });
+        await testSubjects.existOrFail(`mlAnomalyAlertForm`);
       });
     },
 

diff --git a/x-pack/test/functional/services/rules/common.ts b/x-pack/test/functional/services/rules/common.ts
@@ -27,7 +27,7 @@ export function RulesCommonServiceProvider({ getService, getPageObject }: FtrPro
     },
 
     async cancelRuleCreation() {
-      await testSubjects.click('cancelSaveRuleButton');
+      await testSubjects.click('rulePageFooterCancelButton');
       await testSubjects.existOrFail('confirmRuleCloseModal');
       await testSubjects.click('confirmRuleCloseModal > confirmModalConfirmButton');
       await testSubjects.missingOrFail('confirmRuleCloseModal');
@@ -43,8 +43,6 @@ export function RulesCommonServiceProvider({ getService, getPageObject }: FtrPro
       await browser.refresh();
       await this.clickCreateAlertButton();
       await testSubjects.click(`.index-threshold-SelectOption`);
-      await testSubjects.scrollIntoView('ruleNameInput');
-      await testSubjects.setValue('ruleNameInput', alertName);
       await testSubjects.scrollIntoView('selectIndexExpression');
       await testSubjects.click('selectIndexExpression');
       await comboBox.set('thresholdIndexesComboBox', 'k');
@@ -55,9 +53,6 @@ export function RulesCommonServiceProvider({ getService, getPageObject }: FtrPro
         await fieldOptions[1].click();
       });
       await testSubjects.click('closePopover');
-      // need this two out of popup clicks to close them
-      const nameInput = await testSubjects.find('ruleNameInput');
-      await nameInput.click();
 
       await testSubjects.click('whenExpression');
       await testSubjects.click('whenExpressionSelect');
@@ -74,6 +69,9 @@ export function RulesCommonServiceProvider({ getService, getPageObject }: FtrPro
       const ofOptions = ofOptionsString.trim().split('\n');
       expect(ofOptions.length > 0).to.be(true);
       await comboBox.set('availableFieldsOptionsComboBox', ofOptions[0]);
+
+      await testSubjects.scrollIntoView('ruleDetailsNameInput');
+      await testSubjects.setValue('ruleDetailsNameInput', alertName);
     },
   };
 }
diff --git a/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/discover/search_source_alert.ts b/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/discover/search_source_alert.ts
@@ -470,7 +470,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       await testSubjects.click('thresholdPopover');
       await testSubjects.setValue('alertThresholdInput0', '1');
-      await testSubjects.click('saveEditedRuleButton');
+      await testSubjects.click('rulePageFooterSaveButton');
       await PageObjects.header.waitUntilLoadingHasFinished();
 
       await openAlertResults(RULE_NAME);
@@ -622,8 +622,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.header.waitUntilLoadingHasFinished();
 
       await retry.waitFor('rule name value is correct', async () => {
-        await testSubjects.setValue('ruleNameInput', newAlert);
-        const ruleName = await testSubjects.getAttribute('ruleNameInput', 'value');
+        await testSubjects.setValue('ruleDetailsNameInput', newAlert);
+        const ruleName = await testSubjects.getAttribute('ruleDetailsNameInput', 'value');
         return ruleName === newAlert;
       });
 
@@ -641,10 +641,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       );
       await sourceDataViewOption.click();
 
-      await testSubjects.click('saveRuleButton');
+      await testSubjects.click('rulePageFooterSaveButton');
 
       await retry.waitFor('confirmation modal', async () => {
-        return await testSubjects.exists('confirmModalConfirmButton');
+        return await testSubjects.exists('rulePageConfirmCreateRule');
       });
 
       await testSubjects.click('confirmModalConfirmButton');

diff --git a/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/ml/alert_flyout.ts b/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/ml/alert_flyout.ts
@@ -134,6 +134,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         await pageObjects.triggersActionsUI.setAlertName('ml-test-alert');
         await pageObjects.triggersActionsUI.setAlertInterval(10, 's');
         await pageObjects.triggersActionsUI.saveAlert();
+        await ml.navigation.navigateToAlertsAndAction();
         await pageObjects.triggersActionsUI.clickOnAlertInAlertsList('ml-test-alert');
       });
     });