revert filter terms

elastic · Sep 13, 2023 · 6384492 · 6384492
1 parent 1a1b212
commit 6384492
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 38 deletions.
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/group_by_over.test.tsx b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/group_by_over.test.tsx
@@ -63,33 +63,6 @@ describe('group by expression', () => {
     expect(onChangeSelectedTermField).toHaveBeenCalledWith('');
   });
 
-  it('filters out the terms that are not in the available fields', async () => {
-    const onChangeSelectedTermField = jest.fn();
-    render(
-      <IntlProvider locale="en">
-        <GroupByExpression
-          errors={{ termSize: [], termField: [] }}
-          fields={[
-            {
-              normalizedType: 'number',
-              name: 'test',
-              type: 'long',
-              searchable: true,
-              aggregatable: true,
-            },
-          ]}
-          termField={['test', 'notavailable']}
-          groupBy={'top'}
-          onChangeSelectedGroupBy={() => {}}
-          onChangeSelectedTermSize={() => {}}
-          onChangeSelectedTermField={onChangeSelectedTermField}
-        />
-      </IntlProvider>
-    );
-
-    expect(onChangeSelectedTermField).toHaveBeenCalledWith(['test']);
-  });
-
   it('calls onChangeSelectedTermField when a termField is selected', async () => {
     const onChangeSelectedTermField = jest.fn();
     render(

diff --git a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/group_by_over.tsx b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/group_by_over.tsx
@@ -114,17 +114,14 @@ export const GroupByExpression = ({
 
   useEffect(() => {
     // if current field set doesn't contain selected field, clear selection
-    if (termField && termField.length > 0 && fields.length > 0) {
-      if (Array.isArray(termField)) {
-        const filteredTerms = termField.filter((term) =>
-          fields.some((field) => field.name === term)
-        );
-        onChangeSelectedTermField(filteredTerms);
-      } else {
-        if (!fields.find((field: FieldOption) => field.name === termField)) {
-          onChangeSelectedTermField('');
-        }
-      }
+    if (
+      termField &&
+      !Array.isArray(termField) &&
+      termField.length > 0 &&
+      fields.length > 0 &&
+      !fields.find((field: FieldOption) => field.name === termField)
+    ) {
+      onChangeSelectedTermField('');
     }
   }, [termField, fields, onChangeSelectedTermField]);