From 043a4238f5ee39d37eaafd29f0e67d63fc8e1075 Mon Sep 17 00:00:00 2001
From: Phil Kuang <pkuang@factset.com>
Date: Fri, 23 Jul 2021 14:44:53 -0400
Subject: [PATCH] fix(EntityListProvider): don't update url if unmounted

Signed-off-by: Phil Kuang <pkuang@factset.com>
---
 .changeset/small-emus-sin.md                    |  5 +++++
 .../src/hooks/useEntityListProvider.tsx         | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/small-emus-sin.md

diff --git a/.changeset/small-emus-sin.md b/.changeset/small-emus-sin.md
new file mode 100644
index 0000000000..e5683d18f9
--- /dev/null
+++ b/.changeset/small-emus-sin.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Fix `EntityListProvider` to not update url if unmounted
diff --git a/plugins/catalog-react/src/hooks/useEntityListProvider.tsx b/plugins/catalog-react/src/hooks/useEntityListProvider.tsx
index 8ca3efd243..2506b55d6d 100644
--- a/plugins/catalog-react/src/hooks/useEntityListProvider.tsx
+++ b/plugins/catalog-react/src/hooks/useEntityListProvider.tsx
@@ -25,7 +25,7 @@ import React, {
   useState,
 } from 'react';
 import { useSearchParams } from 'react-router-dom';
-import { useAsyncFn, useDebounce } from 'react-use';
+import { useAsyncFn, useDebounce, useMountedState } from 'react-use';
 import { catalogApiRef } from '../api';
 import {
   EntityKindFilter,
@@ -102,6 +102,7 @@ type OutputState<EntityFilters extends DefaultEntityFilters> = {
 export const EntityListProvider = <EntityFilters extends DefaultEntityFilters>({
   children,
 }: PropsWithChildren<{}>) => {
+  const isMounted = useMountedState();
   const catalogApi = useApi(catalogApiRef);
   const [searchParams, setSearchParams] = useSearchParams();
   const allQueryParams = qs.parse(searchParams.toString());
@@ -164,12 +165,14 @@ export const EntityListProvider = <EntityFilters extends DefaultEntityFilters>({
         });
       }
 
-      setSearchParams(
-        qs.stringify({ ...allQueryParams, filters: queryParams }),
-        {
-          replace: true,
-        },
-      );
+      if (isMounted()) {
+        setSearchParams(
+          qs.stringify({ ...allQueryParams, filters: queryParams }),
+          {
+            replace: true,
+          },
+        );
+      }
     },
     [catalogApi, requestedFilters, outputState],
     { loading: true },