Merge branch 'master' into rugvip/ports

plugins/org/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @backstage/plugin-org
 
+## 0.3.5
+
+### Patch Changes
+
+- 7fc89bae2: Display owner and system as entity page links in the tables of the `api-docs`
+  plugin.
+
+  Move `isOwnerOf` and `getEntityRelations` from `@backstage/plugin-catalog` to
+  `@backstage/plugin-catalog-react` and export it from there to use it by other
+  plugins.
+
+- 0269f4fd9: Migrate to new composability API, exporting the plugin instance as `orgPlugin`, and the entity cards as `EntityGroupProfileCard`, `EntityMembersListCard`, `EntityOwnershipCard`, and `EntityUserProfileCard`.
+- 019fe39a0: Switch dependency from `@backstage/plugin-catalog` to `@backstage/plugin-catalog-react`.
+- Updated dependencies [12ece98cd]
+- Updated dependencies [d82246867]
+- Updated dependencies [7fc89bae2]
+- Updated dependencies [c810082ae]
+- Updated dependencies [5fa3bdb55]
+- Updated dependencies [6e612ce25]
+- Updated dependencies [025e122c3]
+- Updated dependencies [21e624ba9]
+- Updated dependencies [da9f53c60]
+- Updated dependencies [32c95605f]
+- Updated dependencies [7881f2117]
+- Updated dependencies [54c7d02f7]
+- Updated dependencies [11cb5ef94]
+  - @backstage/core@0.6.0
+  - @backstage/plugin-catalog-react@0.0.2
+  - @backstage/theme@0.2.3
+  - @backstage/catalog-model@0.7.1
+
 ## 0.3.4
 
 ### Patch Changes

plugins/org/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-org",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,10 +20,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.7.0",
-    "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog-react": "^0.0.1",
-    "@backstage/theme": "^0.2.2",
+    "@backstage/catalog-model": "^0.7.1",
+    "@backstage/core": "^0.6.0",
+    "@backstage/plugin-catalog-react": "^0.0.2",
+    "@backstage/theme": "^0.2.3",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -33,8 +33,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.5.0",
-    "@backstage/dev-utils": "^0.1.8",
+    "@backstage/cli": "^0.6.0",
+    "@backstage/dev-utils": "^0.1.9",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",

plugins/org/src/components/Cards/Group/GroupProfile/GroupProfileCard.tsx

@@ -77,12 +77,12 @@ export const GroupProfileCard = ({
   } = group;
   const parent = group?.relations
     ?.filter(r => r.type === RELATION_CHILD_OF)
-    ?.map(group => group.target.name)
+    ?.map(groupItem => groupItem.target.name)
     .toString();
 
   const childrens = group?.relations
     ?.filter(r => r.type === RELATION_PARENT_OF)
-    ?.map(group => group.target.name);
+    ?.map(groupItem => groupItem.target.name);
 
   const displayName = profile?.displayName ?? name;