From 24f0c1cc7d4164c2f393affaa153482e68e38f94 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 1 Jul 2021 21:14:37 -0600
Subject: [PATCH] Fix incorrect merge

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .../EntityTypePicker/EntityTypePicker.tsx     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
index 0a7e94d142..9713df263d 100644
--- a/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import React from 'react';
+import React, { useEffect } from 'react';
 import capitalize from 'lodash/capitalize';
 import { Box } from '@material-ui/core';
 import { useEntityTypeFilter } from '../../hooks/useEntityTypeFilter';
@@ -31,15 +31,16 @@ export const EntityTypePicker = () => {
     setSelectedTypes,
   } = useEntityTypeFilter();
 
-  if (!availableTypes) return null;
+  useEffect(() => {
+    if (error) {
+      alertApi.post({
+        message: `Failed to load entity types`,
+        severity: 'error',
+      });
+    }
+  }, [error, alertApi]);
 
-  if (error) {
-    alertApi.post({
-      message: `Failed to load entity types`,
-      severity: 'error',
-    });
-    return null;
-  }
+  if (!availableTypes || error) return null;
 
   const items = [
     { value: 'all', label: 'All' },