@backstage/plugin-catalog-react 0.6.13-next.0 → 0.6.13-next.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @backstage/plugin-catalog-react
 
+## 0.6.13-next.1
+
+### Patch Changes
+
+- f7257dff6f: The `<Link />` component now accepts a `noTrack` prop, which prevents the `click` event from being captured by the Analytics API. This can be used if tracking is explicitly not warranted, or in order to use custom link tracking in specific situations.
+- 300f8cdaee: Fix bug: previously the filter would be set to "all" on page load, even if the
+  `initiallySelectedFilter` on the `DefaultCatalogPage` was set to something else,
+  or a different query parameter was supplied. Now, the prop and query parameters
+  control the filter as expected. Additionally, after this change any filters
+  which match 0 items will be disabled, and the filter will be reverted to 'all'
+  if they're set on page load.
+- 6acc8f7db7: Add caching to the useEntityPermission hook
+
+  The hook now caches the authorization decision based on the permission + the entity, and returns the cache match value as the default `allowed` value while loading. This helps avoid flicker in UI elements that would be conditionally rendered based on the `allowed` result of this hook.
+
+- Updated dependencies
+  - @backstage/core-components@0.8.7-next.1
+
 ## 0.6.13-next.0
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -1520,7 +1520,7 @@ const UserListPicker = ({
   const classes = useStyles();
   const configApi = corePluginApi.useApi(corePluginApi.configApiRef);
   const orgName = (_a = configApi.getOptionalString("organization.name")) != null ? _a : "Company";
-  const { filters, updateFilters, backendEntities, queryParameters } = useEntityListProvider();
+  const { filters, updateFilters, backendEntities, queryParameters, loading } = useEntityListProvider();
   const userAndGroupFilterIds = ["starred", "all"];
   const filterGroups = getFilterGroups(orgName).map((filterGroup) => ({
     ...filterGroup,
@@ -1530,28 +1530,23 @@ const UserListPicker = ({
   const { isOwnedEntity } = useEntityOwnership();
   const ownedFilter = React.useMemo(() => new UserListFilter("owned", isOwnedEntity, isStarredEntity), [isOwnedEntity, isStarredEntity]);
   const starredFilter = React.useMemo(() => new UserListFilter("starred", isOwnedEntity, isStarredEntity), [isOwnedEntity, isStarredEntity]);
-  const [entitiesWithoutUserFilter, setEntitiesWithoutUserFilter] = React.useState(backendEntities);
-  const totalOwnedUserEntities = entitiesWithoutUserFilter.filter((entity) => ownedFilter.filterEntity(entity)).length;
-  const [selectedUserFilter, setSelectedUserFilter] = React.useState(totalOwnedUserEntities > 0 ? (_b = [queryParameters.user].flat()[0]) != null ? _b : initialFilter : "all");
+  const [selectedUserFilter, setSelectedUserFilter] = React.useState((_b = [queryParameters.user].flat()[0]) != null ? _b : initialFilter);
+  const entitiesWithoutUserFilter = React.useMemo(() => backendEntities.filter(reduceEntityFilters(lodash.compact(Object.values({ ...filters, user: void 0 })))), [filters, backendEntities]);
+  const filterCounts = React.useMemo(() => ({
+    all: entitiesWithoutUserFilter.length,
+    starred: entitiesWithoutUserFilter.filter((entity) => starredFilter.filterEntity(entity)).length,
+    owned: entitiesWithoutUserFilter.filter((entity) => ownedFilter.filterEntity(entity)).length
+  }), [entitiesWithoutUserFilter, starredFilter, ownedFilter]);
+  React.useEffect(() => {
+    if (!loading && !!selectedUserFilter && selectedUserFilter !== "all" && filterCounts[selectedUserFilter] === 0) {
+      setSelectedUserFilter("all");
+    }
+  }, [loading, filterCounts, selectedUserFilter, setSelectedUserFilter]);
   React.useEffect(() => {
     updateFilters({
       user: selectedUserFilter ? new UserListFilter(selectedUserFilter, isOwnedEntity, isStarredEntity) : void 0
     });
   }, [selectedUserFilter, isOwnedEntity, isStarredEntity, updateFilters]);
-  React.useEffect(() => {
-    const filterFn = reduceEntityFilters(lodash.compact(Object.values({ ...filters, user: void 0 })));
-    setEntitiesWithoutUserFilter(backendEntities.filter(filterFn));
-  }, [filters, backendEntities]);
-  function getFilterCount(id) {
-    switch (id) {
-      case "owned":
-        return totalOwnedUserEntities;
-      case "starred":
-        return entitiesWithoutUserFilter.filter((entity) => starredFilter.filterEntity(entity)).length;
-      default:
-        return entitiesWithoutUserFilter.length;
-    }
-  }
   return /* @__PURE__ */ React__default["default"].createElement(core.Card, {
     className: classes.root
   }, filterGroups.map((group) => /* @__PURE__ */ React__default["default"].createElement(React.Fragment, {
@@ -1572,15 +1567,16 @@ const UserListPicker = ({
       divider: true,
       onClick: () => setSelectedUserFilter(item.id),
       selected: item.id === ((_a2 = filters.user) == null ? void 0 : _a2.value),
-      className: classes.menuItem
+      className: classes.menuItem,
+      disabled: filterCounts[item.id] === 0,
+      "data-testid": `user-picker-${item.id}`
     }, item.icon && /* @__PURE__ */ React__default["default"].createElement(core.ListItemIcon, {
       className: classes.listIcon
     }, /* @__PURE__ */ React__default["default"].createElement(item.icon, {
       fontSize: "small"
     })), /* @__PURE__ */ React__default["default"].createElement(core.ListItemText, null, /* @__PURE__ */ React__default["default"].createElement(core.Typography, {
-      variant: "body1",
-      "data-testid": `user-picker-${item.id}`
-    }, item.label)), /* @__PURE__ */ React__default["default"].createElement(core.ListItemSecondaryAction, null, (_b2 = getFilterCount(item.id)) != null ? _b2 : "-"));
+      variant: "body1"
+    }, item.label)), /* @__PURE__ */ React__default["default"].createElement(core.ListItemSecondaryAction, null, (_b2 = filterCounts[item.id]) != null ? _b2 : "-"));
   }))))));
 };