Merge pull request #484 from keen/fix/event-collection-select

fix: 🐛 prevent reset query after selecting same event stream
keen · Oct 30, 2020 · 0cb1f6d · 0cb1f6d
2 parents 1c99dbc + 9e6c5a2
commit 0cb1f6d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/lib/js/app/queryCreator/components/EventCollection/EventCollection.test.tsx b/lib/js/app/queryCreator/components/EventCollection/EventCollection.test.tsx
@@ -120,3 +120,25 @@ test('renders empty search results', () => {
     getByText('query_creator_event_collection.empty_search_results')
   ).toBeInTheDocument();
 });
+
+test('do not calls "onChange" handler for selecting same event collection', () => {
+  const storeState = {
+    events: {
+      collections: ['clicks', 'logins', 'purchases'],
+    },
+  };
+  const {
+    wrapper: { getByTestId, getByText },
+    props,
+  } = render(storeState, {
+    collection: 'clicks',
+  });
+
+  const propertyField = getByTestId('dropable-container');
+  fireEvent.click(propertyField);
+
+  const property = getByText('clicks');
+  fireEvent.click(property);
+
+  expect(props.onChange).not.toHaveBeenCalled();
+});
diff --git a/lib/js/app/queryCreator/components/EventCollection/EventCollection.tsx b/lib/js/app/queryCreator/components/EventCollection/EventCollection.tsx
@@ -174,7 +174,9 @@ const EventCollection: FC<Props> = ({
                 items={collectionsList}
                 setActiveItem={(_item, idx) => selectionIndex === idx}
                 onClick={(_e, { value }) => {
-                  onChange(value);
+                  if (collection !== value) {
+                    onChange(value);
+                  }
                   setCollectionsList(options);
                 }}
               />