@backstage/plugin-catalog-react 1.9.0 → 1.9.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @backstage/plugin-catalog-react
 
+## 1.9.1
+
+### Patch Changes
+
+- ceebf2ca4ba7: Fixed a issue where `CatalogPage` wasn't using the chosen `initiallySelectedFilter` as intended.
+- Updated dependencies
+  - @backstage/integration-react@1.1.21
+
 ## 1.9.0
 
 ### Minor Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-react",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "main": "../dist/alpha.esm.js",
   "module": "../dist/alpha.esm.js",
   "types": "../dist/alpha.d.ts"

package/dist/index.esm.js

@@ -52,6 +52,7 @@ import YAML from 'yaml';
 import Alert$1 from '@material-ui/lab/Alert';
 import { assertError } from '@backstage/errors';
 import SettingsIcon from '@material-ui/icons/Settings';
+import useDeepCompareEffect from 'react-use/lib/useDeepCompareEffect';
 import Box$1 from '@material-ui/core/Box';
 import Button$1 from '@material-ui/core/Button';
 import { makeStyles as makeStyles$1 } from '@material-ui/core/styles';
@@ -2671,58 +2672,48 @@ function useOwnedEntitiesCount() {
     // load only on mount
     []
   );
-  const prevRequest = useRef();
-  const request = useMemo(() => {
-    const { user, owners, ...allFilters } = filters;
-    const compacted = compact(Object.values(allFilters));
-    const allFilter = reduceCatalogFilters(compacted);
-    const { ["metadata.name"]: metadata, ...filter2 } = allFilter;
-    const countFilter = getOwnedCountClaims(owners, ownershipEntityRefs);
-    if ((ownershipEntityRefs == null ? void 0 : ownershipEntityRefs.length) === 0 || countFilter === void 0 || Object.keys(filter2).length === 0) {
-      prevRequest.current = void 0;
-      return void 0;
-    }
-    const newRequest = {
-      filter: {
-        ...filter2,
-        "relations.ownedBy": countFilter
-      },
-      limit: 0
-    };
-    if (isEqual(newRequest, prevRequest.current)) {
-      return prevRequest.current;
-    }
-    prevRequest.current = newRequest;
-    return newRequest;
-  }, [filters, ownershipEntityRefs]);
+  const { user, owners, ...allFilters } = filters;
+  const { ["metadata.name"]: metadata, ...filter } = reduceCatalogFilters(
+    compact(Object.values(allFilters))
+  );
   const [{ value: count, loading: loadingEntityOwnership }, fetchEntities] = useAsyncFn(
-    async (req, ownershipEntityRefsParam) => {
-      if (ownershipEntityRefsParam && !req) {
+    async (req) => {
+      const ownedClaims = getOwnedCountClaims(
+        req.owners,
+        req.ownershipEntityRefs
+      );
+      if (ownedClaims === void 0) {
         return 0;
       }
-      const { totalItems } = await catalogApi.queryEntities(req);
+      const { totalItems } = await catalogApi.queryEntities({
+        filter: {
+          ...req.filter,
+          "relations.ownedBy": ownedClaims
+        },
+        limit: 0
+      });
       return totalItems;
     },
     [],
     { loading: true }
   );
-  useEffect(() => {
-    if (ownershipEntityRefs) {
-      if (request && Object.keys(request).length === 0) {
-        return;
-      }
-      fetchEntities(request, ownershipEntityRefs);
+  useDeepCompareEffect(() => {
+    if (Object.keys(filter).length === 0) {
+      return;
     }
-  }, [fetchEntities, request, ownershipEntityRefs]);
+    if (ownershipEntityRefs === void 0) {
+      return;
+    }
+    fetchEntities({ ownershipEntityRefs, owners, filter });
+  }, [ownershipEntityRefs, owners, filter]);
   const loading = loadingEntityRefs || loadingEntityOwnership;
-  const filter = useMemo(
-    () => EntityUserFilter.owned(ownershipEntityRefs != null ? ownershipEntityRefs : []),
-    [ownershipEntityRefs]
-  );
   return {
     count,
     loading,
-    filter,
+    filter: useMemo(
+      () => EntityUserFilter.owned(ownershipEntityRefs != null ? ownershipEntityRefs : []),
+      [ownershipEntityRefs]
+    ),
     ownershipEntityRefs
   };
 }