@backstage/plugin-org 0.6.25-next.1 → 0.6.25-next.2

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @backstage/plugin-org
 
+## 0.6.25-next.2
+
+### Patch Changes
+
+- 99e6105: Fix ownership card sometimes locking up for complex org structures
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.12.0-next.2
+  - @backstage/core-components@0.14.7-next.2
+  - @backstage/core-compat-api@0.2.5-next.1
+  - @backstage/frontend-plugin-api@0.6.5-next.1
+
 ## 0.6.25-next.1
 
 ### Patch Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-org",
-  "version": "0.6.25-next.1",
+  "version": "0.6.25-next.2",
   "main": "../dist/alpha.esm.js",
   "module": "../dist/alpha.esm.js",
   "types": "../dist/alpha.d.ts"

package/dist/components/Cards/OwnershipCard/useGetEntities.esm.js

@@ -6,7 +6,7 @@ import useAsync from 'react-use/esm/useAsync';
 import qs from 'qs';
 import { uniq } from 'lodash';
 
-const limiter = limiterFactory(10);
+const limiter = limiterFactory(5);
 const getQueryParams = (ownersEntityRef, selectedEntity) => {
   const { kind, type } = selectedEntity;
   const owners = ownersEntityRef.map(
@@ -42,10 +42,12 @@ const getChildOwnershipEntityRefs = async (entity, catalogApi, alreadyRetrievedP
   const entityRef = stringifyEntityRef(entity);
   if (hasChildGroups) {
     const entityRefs = childGroups.map((r) => stringifyEntityRef(r));
-    const childGroupResponse = await catalogApi.getEntitiesByRefs({
-      fields: ["kind", "metadata.namespace", "metadata.name", "relations"],
-      entityRefs
-    });
+    const childGroupResponse = await limiter(
+      () => catalogApi.getEntitiesByRefs({
+        fields: ["kind", "metadata.namespace", "metadata.name", "relations"],
+        entityRefs
+      })
+    );
     const childGroupEntities = childGroupResponse.items.filter(isEntity);
     const unknownChildren = childGroupEntities.filter(
       (childGroupEntity) => !alreadyRetrievedParentRefs.includes(
@@ -54,12 +56,10 @@ const getChildOwnershipEntityRefs = async (entity, catalogApi, alreadyRetrievedP
     );
     const childrenRefs = (await Promise.all(
       unknownChildren.map(
-        (childGroupEntity) => limiter(
-          () => getChildOwnershipEntityRefs(childGroupEntity, catalogApi, [
-            ...alreadyRetrievedParentRefs,
-            entityRef
-          ])
-        )
+        (childGroupEntity) => getChildOwnershipEntityRefs(childGroupEntity, catalogApi, [
+          ...alreadyRetrievedParentRefs,
+          entityRef
+        ])
       )
     )).flatMap((aggregated) => aggregated);
     return uniq([...childrenRefs, entityRef]);

package/dist/components/Cards/OwnershipCard/useGetEntities.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGetEntities.esm.js","sources":["../../../../src/components/Cards/OwnershipCard/useGetEntities.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  Entity,\n  parseEntityRef,\n  RELATION_MEMBER_OF,\n  RELATION_PARENT_OF,\n  stringifyEntityRef,\n} from '@backstage/catalog-model';\nimport {\n  CatalogApi,\n  catalogApiRef,\n  getEntityRelations,\n  humanizeEntityRef,\n} from '@backstage/plugin-catalog-react';\nimport limiterFactory from 'p-limit';\nimport { useApi } from '@backstage/core-plugin-api';\nimport useAsync from 'react-use/esm/useAsync';\nimport qs from 'qs';\nimport { EntityRelationAggregation } from '../types';\nimport { uniq } from 'lodash';\n\nconst limiter = limiterFactory(10);\n\ntype EntityTypeProps = {\n  kind: string;\n  type?: string;\n  count: number;\n};\n\nconst getQueryParams = (\n  ownersEntityRef: string[],\n  selectedEntity: EntityTypeProps,\n): string => {\n  const { kind, type } = selectedEntity;\n  const owners = ownersEntityRef.map(owner =>\n    humanizeEntityRef(parseEntityRef(owner), { defaultKind: 'group' }),\n  );\n  const filters = {\n    kind: kind.toLocaleLowerCase('en-US'),\n    type,\n    owners,\n    user: 'all',\n  };\n  return qs.stringify({ filters }, { arrayFormat: 'repeat' });\n};\n\nconst getMemberOfEntityRefs = (owner: Entity): string[] => {\n  const parentGroups = getEntityRelations(owner, RELATION_MEMBER_OF, {\n    kind: 'Group',\n  });\n\n  const ownerGroupsNames = parentGroups.map(({ kind, namespace, name }) =>\n    stringifyEntityRef({\n      kind,\n      namespace,\n      name,\n    }),\n  );\n\n  return [...ownerGroupsNames, stringifyEntityRef(owner)];\n};\n\nconst isEntity = (entity: Entity | undefined): entity is Entity =>\n  entity !== undefined;\n\nconst getChildOwnershipEntityRefs = async (\n  entity: Entity,\n  catalogApi: CatalogApi,\n  alreadyRetrievedParentRefs: string[] = [],\n): Promise<string[]> => {\n  const childGroups = getEntityRelations(entity, RELATION_PARENT_OF, {\n    kind: 'Group',\n  });\n\n  const hasChildGroups = childGroups.length > 0;\n\n  const entityRef = stringifyEntityRef(entity);\n  if (hasChildGroups) {\n    const entityRefs = childGroups.map(r => stringifyEntityRef(r));\n    const childGroupResponse = await catalogApi.getEntitiesByRefs({\n      fields: ['kind', 'metadata.namespace', 'metadata.name', 'relations'],\n      entityRefs,\n    });\n    const childGroupEntities = childGroupResponse.items.filter(isEntity);\n\n    const unknownChildren = childGroupEntities.filter(\n      childGroupEntity =>\n        !alreadyRetrievedParentRefs.includes(\n          stringifyEntityRef(childGroupEntity),\n        ),\n    );\n    const childrenRefs = (\n      await Promise.all(\n        unknownChildren.map(childGroupEntity =>\n          limiter(() =>\n            getChildOwnershipEntityRefs(childGroupEntity, catalogApi, [\n              ...alreadyRetrievedParentRefs,\n              entityRef,\n            ]),\n          ),\n        ),\n      )\n    ).flatMap(aggregated => aggregated);\n\n    return uniq([...childrenRefs, entityRef]);\n  }\n\n  return [entityRef];\n};\n\nconst getOwners = async (\n  entity: Entity,\n  relations: EntityRelationAggregation,\n  catalogApi: CatalogApi,\n): Promise<string[]> => {\n  const isGroup = entity.kind === 'Group';\n  const isAggregated = relations === 'aggregated';\n  const isUserEntity = entity.kind === 'User';\n\n  if (isAggregated && isGroup) {\n    return getChildOwnershipEntityRefs(entity, catalogApi);\n  }\n\n  if (isAggregated && isUserEntity) {\n    return getMemberOfEntityRefs(entity);\n  }\n\n  return [stringifyEntityRef(entity)];\n};\n\nconst getOwnedEntitiesByOwners = (\n  owners: string[],\n  kinds: string[],\n  catalogApi: CatalogApi,\n) =>\n  catalogApi.getEntities({\n    filter: [\n      {\n        kind: kinds,\n        'relations.ownedBy': owners,\n      },\n    ],\n    fields: [\n      'kind',\n      'metadata.name',\n      'metadata.namespace',\n      'spec.type',\n      'relations',\n    ],\n  });\n\nexport function useGetEntities(\n  entity: Entity,\n  relations: EntityRelationAggregation,\n  entityFilterKind?: string[],\n  entityLimit = 6,\n): {\n  componentsWithCounters:\n    | {\n        counter: number;\n        type: string;\n        kind: string;\n        queryParams: string;\n      }[]\n    | undefined;\n  loading: boolean;\n  error?: Error;\n} {\n  const catalogApi = useApi(catalogApiRef);\n  const kinds = entityFilterKind ?? ['Component', 'API', 'System'];\n\n  const {\n    loading,\n    error,\n    value: componentsWithCounters,\n  } = useAsync(async () => {\n    const owners = await getOwners(entity, relations, catalogApi);\n\n    const ownedEntitiesList = await getOwnedEntitiesByOwners(\n      owners,\n      kinds,\n      catalogApi,\n    );\n\n    const counts = ownedEntitiesList.items.reduce(\n      (acc: EntityTypeProps[], ownedEntity) => {\n        const match = acc.find(\n          x => x.kind === ownedEntity.kind && x.type === ownedEntity.spec?.type,\n        );\n        if (match) {\n          match.count += 1;\n        } else {\n          acc.push({\n            kind: ownedEntity.kind,\n            type: ownedEntity.spec?.type?.toString(),\n            count: 1,\n          });\n        }\n        return acc;\n      },\n      [],\n    );\n\n    // Return top N (entityLimit) entities to be displayed in ownership boxes\n    const topN = counts.sort((a, b) => b.count - a.count).slice(0, entityLimit);\n\n    return topN.map(topOwnedEntity => ({\n      counter: topOwnedEntity.count,\n      type: topOwnedEntity.type,\n      kind: topOwnedEntity.kind,\n      queryParams: getQueryParams(owners, topOwnedEntity),\n    })) as Array<{\n      counter: number;\n      type: string;\n      kind: string;\n      queryParams: string;\n    }>;\n  }, [catalogApi, entity, relations]);\n\n  return {\n    componentsWithCounters,\n    loading,\n    error,\n  };\n}\n"],"names":["_a"],"mappings":"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"}
+{"version":3,"file":"useGetEntities.esm.js","sources":["../../../../src/components/Cards/OwnershipCard/useGetEntities.ts"],"sourcesContent":["/*\n * Copyright 2020 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  Entity,\n  parseEntityRef,\n  RELATION_MEMBER_OF,\n  RELATION_PARENT_OF,\n  stringifyEntityRef,\n} from '@backstage/catalog-model';\nimport {\n  CatalogApi,\n  catalogApiRef,\n  getEntityRelations,\n  humanizeEntityRef,\n} from '@backstage/plugin-catalog-react';\nimport limiterFactory from 'p-limit';\nimport { useApi } from '@backstage/core-plugin-api';\nimport useAsync from 'react-use/esm/useAsync';\nimport qs from 'qs';\nimport { EntityRelationAggregation } from '../types';\nimport { uniq } from 'lodash';\n\nconst limiter = limiterFactory(5);\n\ntype EntityTypeProps = {\n  kind: string;\n  type?: string;\n  count: number;\n};\n\nconst getQueryParams = (\n  ownersEntityRef: string[],\n  selectedEntity: EntityTypeProps,\n): string => {\n  const { kind, type } = selectedEntity;\n  const owners = ownersEntityRef.map(owner =>\n    humanizeEntityRef(parseEntityRef(owner), { defaultKind: 'group' }),\n  );\n  const filters = {\n    kind: kind.toLocaleLowerCase('en-US'),\n    type,\n    owners,\n    user: 'all',\n  };\n  return qs.stringify({ filters }, { arrayFormat: 'repeat' });\n};\n\nconst getMemberOfEntityRefs = (owner: Entity): string[] => {\n  const parentGroups = getEntityRelations(owner, RELATION_MEMBER_OF, {\n    kind: 'Group',\n  });\n\n  const ownerGroupsNames = parentGroups.map(({ kind, namespace, name }) =>\n    stringifyEntityRef({\n      kind,\n      namespace,\n      name,\n    }),\n  );\n\n  return [...ownerGroupsNames, stringifyEntityRef(owner)];\n};\n\nconst isEntity = (entity: Entity | undefined): entity is Entity =>\n  entity !== undefined;\n\nconst getChildOwnershipEntityRefs = async (\n  entity: Entity,\n  catalogApi: CatalogApi,\n  alreadyRetrievedParentRefs: string[] = [],\n): Promise<string[]> => {\n  const childGroups = getEntityRelations(entity, RELATION_PARENT_OF, {\n    kind: 'Group',\n  });\n\n  const hasChildGroups = childGroups.length > 0;\n\n  const entityRef = stringifyEntityRef(entity);\n  if (hasChildGroups) {\n    const entityRefs = childGroups.map(r => stringifyEntityRef(r));\n    const childGroupResponse = await limiter(() =>\n      catalogApi.getEntitiesByRefs({\n        fields: ['kind', 'metadata.namespace', 'metadata.name', 'relations'],\n        entityRefs,\n      }),\n    );\n    const childGroupEntities = childGroupResponse.items.filter(isEntity);\n\n    const unknownChildren = childGroupEntities.filter(\n      childGroupEntity =>\n        !alreadyRetrievedParentRefs.includes(\n          stringifyEntityRef(childGroupEntity),\n        ),\n    );\n    const childrenRefs = (\n      await Promise.all(\n        unknownChildren.map(childGroupEntity =>\n          getChildOwnershipEntityRefs(childGroupEntity, catalogApi, [\n            ...alreadyRetrievedParentRefs,\n            entityRef,\n          ]),\n        ),\n      )\n    ).flatMap(aggregated => aggregated);\n\n    return uniq([...childrenRefs, entityRef]);\n  }\n\n  return [entityRef];\n};\n\nconst getOwners = async (\n  entity: Entity,\n  relations: EntityRelationAggregation,\n  catalogApi: CatalogApi,\n): Promise<string[]> => {\n  const isGroup = entity.kind === 'Group';\n  const isAggregated = relations === 'aggregated';\n  const isUserEntity = entity.kind === 'User';\n\n  if (isAggregated && isGroup) {\n    return getChildOwnershipEntityRefs(entity, catalogApi);\n  }\n\n  if (isAggregated && isUserEntity) {\n    return getMemberOfEntityRefs(entity);\n  }\n\n  return [stringifyEntityRef(entity)];\n};\n\nconst getOwnedEntitiesByOwners = (\n  owners: string[],\n  kinds: string[],\n  catalogApi: CatalogApi,\n) =>\n  catalogApi.getEntities({\n    filter: [\n      {\n        kind: kinds,\n        'relations.ownedBy': owners,\n      },\n    ],\n    fields: [\n      'kind',\n      'metadata.name',\n      'metadata.namespace',\n      'spec.type',\n      'relations',\n    ],\n  });\n\nexport function useGetEntities(\n  entity: Entity,\n  relations: EntityRelationAggregation,\n  entityFilterKind?: string[],\n  entityLimit = 6,\n): {\n  componentsWithCounters:\n    | {\n        counter: number;\n        type: string;\n        kind: string;\n        queryParams: string;\n      }[]\n    | undefined;\n  loading: boolean;\n  error?: Error;\n} {\n  const catalogApi = useApi(catalogApiRef);\n  const kinds = entityFilterKind ?? ['Component', 'API', 'System'];\n\n  const {\n    loading,\n    error,\n    value: componentsWithCounters,\n  } = useAsync(async () => {\n    const owners = await getOwners(entity, relations, catalogApi);\n\n    const ownedEntitiesList = await getOwnedEntitiesByOwners(\n      owners,\n      kinds,\n      catalogApi,\n    );\n\n    const counts = ownedEntitiesList.items.reduce(\n      (acc: EntityTypeProps[], ownedEntity) => {\n        const match = acc.find(\n          x => x.kind === ownedEntity.kind && x.type === ownedEntity.spec?.type,\n        );\n        if (match) {\n          match.count += 1;\n        } else {\n          acc.push({\n            kind: ownedEntity.kind,\n            type: ownedEntity.spec?.type?.toString(),\n            count: 1,\n          });\n        }\n        return acc;\n      },\n      [],\n    );\n\n    // Return top N (entityLimit) entities to be displayed in ownership boxes\n    const topN = counts.sort((a, b) => b.count - a.count).slice(0, entityLimit);\n\n    return topN.map(topOwnedEntity => ({\n      counter: topOwnedEntity.count,\n      type: topOwnedEntity.type,\n      kind: topOwnedEntity.kind,\n      queryParams: getQueryParams(owners, topOwnedEntity),\n    })) as Array<{\n      counter: number;\n      type: string;\n      kind: string;\n      queryParams: string;\n    }>;\n  }, [catalogApi, entity, relations]);\n\n  return {\n    componentsWithCounters,\n    loading,\n    error,\n  };\n}\n"],"names":["_a"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-org",
-  "version": "0.6.25-next.1",
+  "version": "0.6.25-next.2",
   "description": "A Backstage plugin that helps you create entity pages for your organization",
   "backstage": {
     "role": "frontend-plugin"
@@ -47,11 +47,11 @@
   "dependencies": {
     "@backstage/catalog-model": "^1.5.0-next.0",
     "@backstage/core-compat-api": "^0.2.5-next.1",
-    "@backstage/core-components": "^0.14.6-next.1",
+    "@backstage/core-components": "^0.14.7-next.2",
     "@backstage/core-plugin-api": "^1.9.2",
     "@backstage/frontend-plugin-api": "^0.6.5-next.1",
     "@backstage/plugin-catalog-common": "^1.0.23-next.0",
-    "@backstage/plugin-catalog-react": "^1.11.4-next.1",
+    "@backstage/plugin-catalog-react": "^1.12.0-next.2",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
@@ -64,10 +64,10 @@
   },
   "devDependencies": {
     "@backstage/catalog-client": "^1.6.5-next.0",
-    "@backstage/cli": "^0.26.5-next.0",
+    "@backstage/cli": "^0.26.5-next.1",
     "@backstage/core-app-api": "^1.12.4",
-    "@backstage/dev-utils": "^1.0.32-next.1",
-    "@backstage/plugin-catalog": "^1.19.1-next.1",
+    "@backstage/dev-utils": "^1.0.32-next.2",
+    "@backstage/plugin-catalog": "^1.20.0-next.2",
     "@backstage/plugin-permission-common": "^0.7.13",
     "@backstage/plugin-permission-react": "^0.4.22",
     "@backstage/test-utils": "^1.5.5-next.0",