@backstage/plugin-catalog-react 0.6.8 → 0.6.9

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @backstage/plugin-catalog-react
 
+## 0.6.9
+
+### Patch Changes
+
+- c6fdddec77: When a user has zero owned entities when viewing an entity kind in the catalog
+  page, it will be automatically redirected to see all the entities. Furthermore,
+  for the kind User and Group there are no longer the owned selector.
+- Updated dependencies
+  - @backstage/integration@0.7.0
+
 ## 0.6.8
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -1517,22 +1517,24 @@ 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 userAndGroupFilterIds = ["starred", "all"];
   const filterGroups = getFilterGroups(orgName).map((filterGroup) => ({
     ...filterGroup,
-    items: filterGroup.items.filter(({ id }) => !availableFilters || availableFilters.includes(id))
+    items: filterGroup.items.filter(({ id }) => ["group", "user"].some((kind) => kind === queryParameters.kind) ? userAndGroupFilterIds.includes(id) : !availableFilters || availableFilters.includes(id))
   })).filter(({ items }) => !!items.length);
-  const { filters, updateFilters, backendEntities, queryParameters } = useEntityListProvider();
   const { isStarredEntity } = useStarredEntities();
   const { isOwnedEntity } = useEntityOwnership();
-  const [selectedUserFilter, setSelectedUserFilter] = React.useState((_b = [queryParameters.user].flat()[0]) != null ? _b : initialFilter);
   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");
   React.useEffect(() => {
     updateFilters({
       user: selectedUserFilter ? new UserListFilter(selectedUserFilter, isOwnedEntity, isStarredEntity) : void 0
     });
   }, [selectedUserFilter, isOwnedEntity, isStarredEntity, updateFilters]);
-  const [entitiesWithoutUserFilter, setEntitiesWithoutUserFilter] = React.useState(backendEntities);
   React.useEffect(() => {
     const filterFn = reduceEntityFilters(lodash.compact(Object.values({ ...filters, user: void 0 })));
     setEntitiesWithoutUserFilter(backendEntities.filter(filterFn));
@@ -1540,7 +1542,7 @@ const UserListPicker = ({
   function getFilterCount(id) {
     switch (id) {
       case "owned":
-        return entitiesWithoutUserFilter.filter((entity) => ownedFilter.filterEntity(entity)).length;
+        return totalOwnedUserEntities;
       case "starred":
         return entitiesWithoutUserFilter.filter((entity) => starredFilter.filterEntity(entity)).length;
       default: