@backstage/plugin-catalog-react 0.6.5 → 0.6.9

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # @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
+
+- 3491a36ab9: added useOwnedEntities hook to get the list of entities of the logged-in user
+- Updated dependencies
+  - @backstage/core-plugin-api@0.4.0
+  - @backstage/core-components@0.8.2
+  - @backstage/catalog-client@0.5.3
+
+## 0.6.7
+
+### Patch Changes
+
+- 6156fb8730: `useEntityTypeFilter`: Skip updating selected types if a kind filter change did not change them.
+- Updated dependencies
+  - @backstage/core-plugin-api@0.3.1
+  - @backstage/core-components@0.8.1
+  - @backstage/catalog-model@0.9.8
+
+## 0.6.6
+
+### Patch Changes
+
+- 4c0f0b2003: Removed dependency on `@backstage/core-app-api`.
+
 ## 0.6.5
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -13,6 +13,7 @@ var versionBridge = require('@backstage/version-bridge');
 var reactRouter = require('react-router');
 var reactUse = require('react-use');
 var qs = require('qs');
+var isEqual = require('lodash/isEqual');
 var coreComponents = require('@backstage/core-components');
 var core = require('@material-ui/core');
 var jwtDecoder = require('jwt-decode');
@@ -33,6 +34,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var ObservableImpl__default = /*#__PURE__*/_interopDefaultLegacy(ObservableImpl);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var qs__default = /*#__PURE__*/_interopDefaultLegacy(qs);
+var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 var jwtDecoder__default = /*#__PURE__*/_interopDefaultLegacy(jwtDecoder);
 var CheckBoxIcon__default = /*#__PURE__*/_interopDefaultLegacy(CheckBoxIcon);
 var CheckBoxOutlineBlankIcon__default = /*#__PURE__*/_interopDefaultLegacy(CheckBoxOutlineBlankIcon);
@@ -577,7 +579,9 @@ function useEntityTypeFilter() {
     const newTypes = Object.entries(countByType).sort(([, count1], [, count2]) => count2 - count1).map(([type]) => type);
     setAvailableTypes(newTypes);
     const stillValidTypes = selectedTypes.filter((value) => newTypes.includes(value));
-    setSelectedTypes(stillValidTypes);
+    if (!isEqual__default["default"](selectedTypes, stillValidTypes)) {
+      setSelectedTypes(stillValidTypes);
+    }
   }, [loading, kind, selectedTypes, setSelectedTypes, entities]);
   React.useEffect(() => {
     updateFilters({
@@ -765,6 +769,30 @@ function useEntityOwnership() {
   return React.useMemo(() => ({ loading, isOwnedEntity }), [loading, isOwnedEntity]);
 }
 
+function useOwnedEntities(allowedKinds) {
+  const identityApi = corePluginApi.useApi(corePluginApi.identityApiRef);
+  const catalogApi = corePluginApi.useApi(catalogApiRef);
+  const { loading, value: refs } = reactUse.useAsync(async () => {
+    const identityRefs = await loadIdentityOwnerRefs(identityApi);
+    const catalogRefs = await loadCatalogOwnerRefs(catalogApi, identityRefs);
+    const catalogs = await catalogApi.getEntities(allowedKinds ? {
+      filter: {
+        kind: allowedKinds,
+        [`relations.${catalogModel.RELATION_OWNED_BY}`]: [...identityRefs, ...catalogRefs]
+      }
+    } : {
+      filter: {
+        [`relations.${catalogModel.RELATION_OWNED_BY}`]: [...identityRefs, ...catalogRefs]
+      }
+    });
+    return catalogs;
+  }, []);
+  const ownedEntities = React.useMemo(() => {
+    return refs;
+  }, [refs]);
+  return React.useMemo(() => ({ loading, ownedEntities }), [loading, ownedEntities]);
+}
+
 const EntityKindPicker = ({
   initialFilter,
   hidden
@@ -1489,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));
@@ -1512,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:
@@ -1634,6 +1664,7 @@ exports.useEntityListProvider = useEntityListProvider;
 exports.useEntityOwnership = useEntityOwnership;
 exports.useEntityTypeFilter = useEntityTypeFilter;
 exports.useOwnUser = useOwnUser;
+exports.useOwnedEntities = useOwnedEntities;
 exports.useRelatedEntities = useRelatedEntities;
 exports.useStarredEntities = useStarredEntities;
 exports.useStarredEntity = useStarredEntity;