Fix FTR Add/Save Filter failures

cee-chen · cee-chen · commit d279fd64ce1a · 2022-08-08T18:15:10.000-07:00
diff --git a/src/plugins/unified_search/public/query_string_input/add_filter_popover.tsx b/src/plugins/unified_search/public/query_string_input/add_filter_popover.tsx
@@ -47,7 +47,7 @@ export const AddFilterPopover = React.memo(function AddFilterPopover({
         iconType="plusInCircleFilled"
         aria-label={buttonIconLabel}
         data-test-subj="addFilter"
-        onClick={() => setIsAddFilterPopoverOpen(!isAddFilterPopoverOpen)}
+        onClick={() => setIsAddFilterPopoverOpen((isOpen) => !isOpen)}
         size="m"
         {...buttonProps}
       />
@@ -63,6 +63,7 @@ export const AddFilterPopover = React.memo(function AddFilterPopover({
         closePopover={() => setIsAddFilterPopoverOpen(false)}
         anchorPosition="downLeft"
         panelPaddingSize="none"
+        panelProps={{ 'data-test-subj': 'addFilterPopover' }}
         initialFocus=".filterEditor__hiddenItem"
         ownFocus
         repositionOnScroll
diff --git a/test/functional/services/filter_bar.ts b/test/functional/services/filter_bar.ts
@@ -128,6 +128,7 @@ export class FilterBarService extends FtrService {
    */
   public async addFilter(field: string, operator: string, ...values: any): Promise<void> {
     await this.testSubjects.click('addFilter');
+    await this.testSubjects.existOrFail('addFilterPopover');
     await this.comboBox.set('filterFieldSuggestionList', field);
     await this.comboBox.set('filterOperatorList', operator);
     const params = await this.testSubjects.find('filterParams');
@@ -152,7 +153,9 @@ export class FilterBarService extends FtrService {
         }
       }
     }
-    await this.testSubjects.click('saveFilter');
+    await this.testSubjects.existOrFail('addFilterPopover');
+    await this.common.sleep(500); // Stale element errors occur without this wait
+    await this.testSubjects.clickWhenNotDisabled('saveFilter');
     await this.header.awaitGlobalLoadingIndicatorHidden();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ export class FilterBarService extends FtrService {`
`128`	`128`	`*/`
`129`	`129`	`public async addFilter(field: string, operator: string, ...values: any): Promise<void> {`
`130`	`130`	`await this.testSubjects.click('addFilter');`
	`131`	`+ await this.testSubjects.existOrFail('addFilterPopover');`
`131`	`132`	`await this.comboBox.set('filterFieldSuggestionList', field);`
`132`	`133`	`await this.comboBox.set('filterOperatorList', operator);`
`133`	`134`	`const params = await this.testSubjects.find('filterParams');`
`@@ -152,7 +153,9 @@ export class FilterBarService extends FtrService {`
`152`	`153`	`}`
`153`	`154`	`}`
`154`	`155`	`}`
`155`		`- await this.testSubjects.click('saveFilter');`
	`156`	`+ await this.testSubjects.existOrFail('addFilterPopover');`
	`157`	`+ await this.common.sleep(500); // Stale element errors occur without this wait`
	`158`	`+ await this.testSubjects.clickWhenNotDisabled('saveFilter');`
`156`	`159`	`await this.header.awaitGlobalLoadingIndicatorHidden();`
`157`	`160`	`}`
`158`	`161`