Merge branch 'master' into fix-catalog-graph-kinds-filter-in-dev-app

Signed-off-by: Michael Wizner <mwz@users.noreply.github.com>
2022-05-11 15:10:34 +01:00
parent d601cb0283 6e80913e53
commit 676b5bc9f3
458 changed files with 8480 additions and 1655 deletions
@@ -1,5 +1,18 @@
 # @backstage/plugin-adr-backend

+## 0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/config@1.0.1-next.0
+  - @backstage/plugin-search-common@0.3.4-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/integration@1.2.0-next.1
+  - @backstage/plugin-adr-common@0.1.0-next.1
+  - @backstage/catalog-client@1.0.2-next.0
+
 ## 0.1.0-next.0

 ### Minor Changes
@@ -1,6 +1,6 @@
 {
  "name": "@backstage/plugin-adr-backend",
-  "version": "0.1.0-next.0",
+  "version": "0.1.0-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -29,14 +29,14 @@
    "postpack": "backstage-cli package postpack"
  },
  "dependencies": {
-    "@backstage/backend-common": "^0.13.3-next.1",
-    "@backstage/catalog-client": "^1.0.1",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/config": "^1.0.0",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/catalog-client": "^1.0.2-next.0",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
    "@backstage/errors": "^1.0.0",
-    "@backstage/integration": "^1.2.0-next.0",
-    "@backstage/plugin-adr-common": "^0.1.0-next.0",
-    "@backstage/plugin-search-common": "^0.3.3",
+    "@backstage/integration": "^1.2.0-next.1",
+    "@backstage/plugin-adr-common": "^0.1.0-next.1",
+    "@backstage/plugin-search-common": "^0.3.4-next.0",
    "luxon": "^2.0.2",
    "marked": "^4.0.14",
    "winston": "^3.2.1",
@@ -44,7 +44,7 @@
    "yn": "^4.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
    "@types/marked": "^4.0.0",
    "@types/supertest": "^2.0.8",
    "supertest": "^6.1.3",
@@ -1,5 +1,14 @@
 # @backstage/plugin-adr-common

+## 0.1.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-common@0.3.4-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/integration@1.2.0-next.1
+
 ## 0.1.0-next.0

 ### Minor Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-adr-common",
  "description": "Common functionalities for the adr plugin",
-  "version": "0.1.0-next.0",
+  "version": "0.1.0-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -30,12 +30,12 @@
    "postpack": "backstage-cli package postpack"
  },
  "dependencies": {
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/integration": "^1.2.0-next.0",
-    "@backstage/plugin-search-common": "^0.3.3"
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/integration": "^1.2.0-next.1",
+    "@backstage/plugin-search-common": "^0.3.4-next.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1"
+    "@backstage/cli": "^0.17.1-next.2"
  },
  "files": [
    "dist"
@@ -1,5 +1,13 @@
 # @backstage/plugin-airbrake-backend

+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/config@1.0.1-next.0
+
 ## 0.2.5-next.0

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@backstage/plugin-airbrake-backend",
-  "version": "0.2.5-next.0",
+  "version": "0.2.5-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -22,8 +22,8 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/backend-common": "^0.13.3-next.0",
-    "@backstage/config": "^1.0.0",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/config": "^1.0.1-next.0",
    "@types/express": "*",
    "express": "^4.17.1",
    "express-promise-router": "^4.1.0",
@@ -33,7 +33,7 @@
    "yn": "^4.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.0",
+    "@backstage/cli": "^0.17.1-next.2",
    "@types/http-proxy-middleware": "^0.19.3",
    "@types/supertest": "^2.0.8",
    "supertest": "^6.1.6",
@@ -1,5 +1,17 @@
 # @backstage/plugin-airbrake

+## 0.3.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.9.4-next.1
+  - @backstage/dev-utils@1.0.2-next.2
+  - @backstage/plugin-catalog-react@1.1.0-next.2
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/core-plugin-api@1.0.2-next.1
+  - @backstage/test-utils@1.1.0-next.2
+
 ## 0.3.5-next.1

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@backstage/plugin-airbrake",
-  "version": "0.3.5-next.1",
+  "version": "0.3.5-next.2",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -23,12 +23,12 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/core-components": "^0.9.4-next.0",
-    "@backstage/core-plugin-api": "^1.0.2-next.0",
-    "@backstage/dev-utils": "^1.0.2-next.1",
-    "@backstage/plugin-catalog-react": "^1.1.0-next.1",
-    "@backstage/test-utils": "^1.1.0-next.1",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/core-components": "^0.9.4-next.2",
+    "@backstage/core-plugin-api": "^1.0.2-next.1",
+    "@backstage/dev-utils": "^1.0.2-next.2",
+    "@backstage/plugin-catalog-react": "^1.1.0-next.2",
+    "@backstage/test-utils": "^1.1.0-next.2",
    "@backstage/theme": "^0.2.15",
    "@material-ui/core": "^4.12.2",
    "@material-ui/icons": "^4.9.1",
@@ -41,9 +41,9 @@
  },
  "devDependencies": {
    "@backstage/app-defaults": "^1.0.2-next.0",
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/dev-utils": "^1.0.2-next.1",
-    "@backstage/test-utils": "^1.1.0-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/dev-utils": "^1.0.2-next.2",
+    "@backstage/test-utils": "^1.1.0-next.2",
    "@testing-library/jest-dom": "^5.10.1",
    "@testing-library/react": "^12.1.3",
    "@testing-library/user-event": "^14.0.0",
@@ -1,5 +1,15 @@
 # @backstage/plugin-allure

+## 0.1.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.9.4-next.1
+  - @backstage/plugin-catalog-react@1.1.0-next.2
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/core-plugin-api@1.0.2-next.1
+
 ## 0.1.21-next.1

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-allure",
  "description": "A Backstage plugin that integrates with Allure",
-  "version": "0.1.21-next.1",
+  "version": "0.1.21-next.2",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -25,10 +25,10 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/core-components": "^0.9.4-next.0",
-    "@backstage/core-plugin-api": "^1.0.2-next.0",
-    "@backstage/plugin-catalog-react": "^1.1.0-next.1",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/core-components": "^0.9.4-next.2",
+    "@backstage/core-plugin-api": "^1.0.2-next.1",
+    "@backstage/plugin-catalog-react": "^1.1.0-next.2",
    "@backstage/theme": "^0.2.15",
    "@material-ui/core": "^4.12.2",
    "@material-ui/icons": "^4.9.1",
@@ -40,10 +40,10 @@
    "react": "^16.13.1 || ^17.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/core-app-api": "^1.0.2-next.0",
-    "@backstage/dev-utils": "^1.0.2-next.1",
-    "@backstage/test-utils": "^1.1.0-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/core-app-api": "^1.0.2-next.1",
+    "@backstage/dev-utils": "^1.0.2-next.2",
+    "@backstage/test-utils": "^1.1.0-next.2",
    "@testing-library/jest-dom": "^5.10.1",
    "@testing-library/react": "^12.1.3",
    "@testing-library/user-event": "^14.0.0",
@@ -1,5 +1,14 @@
 # @backstage/plugin-analytics-module-ga

+## 0.1.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.9.4-next.1
+  - @backstage/config@1.0.1-next.0
+  - @backstage/core-plugin-api@1.0.2-next.1
+
 ## 0.1.16-next.0

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@backstage/plugin-analytics-module-ga",
-  "version": "0.1.16-next.0",
+  "version": "0.1.16-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -24,9 +24,9 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/config": "^1.0.0",
-    "@backstage/core-components": "^0.9.4-next.0",
-    "@backstage/core-plugin-api": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
+    "@backstage/core-components": "^0.9.4-next.2",
+    "@backstage/core-plugin-api": "^1.0.2-next.1",
    "@backstage/theme": "^0.2.15",
    "@material-ui/core": "^4.12.2",
    "@material-ui/icons": "^4.9.1",
@@ -38,10 +38,10 @@
    "react": "^16.13.1 || ^17.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/core-app-api": "^1.0.2-next.0",
-    "@backstage/dev-utils": "^1.0.2-next.1",
-    "@backstage/test-utils": "^1.1.0-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/core-app-api": "^1.0.2-next.1",
+    "@backstage/dev-utils": "^1.0.2-next.2",
+    "@backstage/test-utils": "^1.1.0-next.2",
    "@testing-library/jest-dom": "^5.10.1",
    "@testing-library/react": "^12.1.3",
    "@testing-library/user-event": "^14.0.0",
@@ -23,8 +23,8 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/core-components": "^0.9.4-next.0",
-    "@backstage/core-plugin-api": "^1.0.2-next.0",
+    "@backstage/core-components": "^0.9.4-next.2",
+    "@backstage/core-plugin-api": "^1.0.2-next.1",
    "@material-ui/core": "^4.12.2",
    "@material-ui/icons": "^4.9.1",
    "@material-ui/lab": "4.0.0-alpha.57",
@@ -36,10 +36,10 @@
    "react": "^16.13.1 || ^17.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/core-app-api": "^1.0.2-next.0",
-    "@backstage/dev-utils": "^1.0.2-next.1",
-    "@backstage/test-utils": "^1.1.0-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/core-app-api": "^1.0.2-next.1",
+    "@backstage/dev-utils": "^1.0.2-next.2",
+    "@backstage/test-utils": "^1.1.0-next.2",
    "@testing-library/jest-dom": "^5.10.1",
    "@testing-library/react": "^12.1.3",
    "@testing-library/user-event": "^14.0.0",
@@ -1,5 +1,16 @@
 # @backstage/plugin-api-docs

+## 0.8.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.9.4-next.1
+  - @backstage/plugin-catalog@1.2.0-next.2
+  - @backstage/plugin-catalog-react@1.1.0-next.2
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/core-plugin-api@1.0.2-next.1
+
 ## 0.8.5-next.1

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-api-docs",
  "description": "A Backstage plugin that helps represent API entities in the frontend",
-  "version": "0.8.5-next.1",
+  "version": "0.8.5-next.2",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -34,11 +34,11 @@
  },
  "dependencies": {
    "@asyncapi/react-component": "1.0.0-next.38",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/core-components": "^0.9.4-next.0",
-    "@backstage/core-plugin-api": "^1.0.2-next.0",
-    "@backstage/plugin-catalog": "^1.2.0-next.1",
-    "@backstage/plugin-catalog-react": "^1.1.0-next.1",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/core-components": "^0.9.4-next.2",
+    "@backstage/core-plugin-api": "^1.0.2-next.1",
+    "@backstage/plugin-catalog": "^1.2.0-next.2",
+    "@backstage/plugin-catalog-react": "^1.1.0-next.2",
    "@backstage/theme": "^0.2.15",
    "@material-ui/core": "^4.12.2",
    "@material-ui/icons": "^4.9.1",
@@ -56,10 +56,10 @@
    "react": "^16.13.1 || ^17.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/core-app-api": "^1.0.2-next.0",
-    "@backstage/dev-utils": "^1.0.2-next.1",
-    "@backstage/test-utils": "^1.1.0-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/core-app-api": "^1.0.2-next.1",
+    "@backstage/dev-utils": "^1.0.2-next.2",
+    "@backstage/test-utils": "^1.1.0-next.2",
    "@testing-library/jest-dom": "^5.10.1",
    "@testing-library/react": "^12.1.3",
    "@testing-library/user-event": "^14.0.0",
@@ -1,5 +1,14 @@
 # @backstage/plugin-app-backend

+## 0.3.32-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/config@1.0.1-next.0
+  - @backstage/config-loader@1.1.1-next.1
+
 ## 0.3.32-next.0

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-app-backend",
  "description": "A Backstage backend plugin that serves the Backstage frontend app",
-  "version": "0.3.32-next.0",
+  "version": "0.3.32-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -33,9 +33,9 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/backend-common": "^0.13.3-next.0",
-    "@backstage/config-loader": "^1.1.1-next.0",
-    "@backstage/config": "^1.0.0",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/config-loader": "^1.1.1-next.1",
+    "@backstage/config": "^1.0.1-next.0",
    "@backstage/types": "^1.0.0",
    "@types/express": "^4.17.6",
    "globby": "^11.0.0",
@@ -50,8 +50,8 @@
    "yn": "^4.0.0"
  },
  "devDependencies": {
-    "@backstage/backend-test-utils": "^0.1.24-next.0",
-    "@backstage/cli": "^0.17.1-next.0",
+    "@backstage/backend-test-utils": "^0.1.24-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
    "@backstage/types": "^1.0.0",
    "@types/supertest": "^2.0.8",
    "mock-fs": "^5.1.0",
@@ -1,5 +1,16 @@
 # @backstage/plugin-auth-backend

+## 0.13.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/config@1.0.1-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/plugin-auth-node@0.2.1-next.1
+  - @backstage/catalog-client@1.0.2-next.0
+
 ## 0.13.1-next.1

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-auth-backend",
  "description": "A Backstage backend plugin that handles authentication",
-  "version": "0.13.1-next.1",
+  "version": "0.13.1-next.2",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -33,11 +33,11 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/plugin-auth-node": "^0.2.1-next.0",
-    "@backstage/backend-common": "^0.13.3-next.1",
-    "@backstage/catalog-client": "^1.0.1",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/config": "^1.0.0",
+    "@backstage/plugin-auth-node": "^0.2.1-next.1",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/catalog-client": "^1.0.2-next.0",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
    "@backstage/errors": "^1.0.0",
    "@backstage/types": "^1.0.0",
    "@google-cloud/firestore": "^5.0.2",
@@ -76,8 +76,8 @@
    "yn": "^4.0.0"
  },
  "devDependencies": {
-    "@backstage/backend-test-utils": "^0.1.24-next.0",
-    "@backstage/cli": "^0.17.1-next.1",
+    "@backstage/backend-test-utils": "^0.1.24-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
    "@types/body-parser": "^1.19.0",
    "@types/cookie-parser": "^1.4.2",
    "@types/express-session": "^1.17.2",
@@ -1,5 +1,13 @@
 # @backstage/plugin-auth-node

+## 0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/config@1.0.1-next.0
+
 ## 0.2.1-next.0

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@backstage/plugin-auth-node",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -23,15 +23,15 @@
    "start": "backstage-cli package start"
  },
  "dependencies": {
-    "@backstage/backend-common": "^0.13.3-next.0",
-    "@backstage/config": "^1.0.0",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/config": "^1.0.1-next.0",
    "@backstage/errors": "^1.0.0",
    "jose": "^4.6.0",
    "node-fetch": "^2.6.7",
    "winston": "^3.2.1"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.0",
+    "@backstage/cli": "^0.17.1-next.2",
    "lodash": "^4.17.21",
    "msw": "^0.35.0",
    "uuid": "^8.0.0"
@@ -1,5 +1,15 @@
 # @backstage/plugin-azure-devops-backend

+## 0.3.11-next.1
+
+### Patch Changes
+
+- ac14fcaf38: Added entity view for Azure Git Tags, based on existing Pull Requests view
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/config@1.0.1-next.0
+  - @backstage/plugin-azure-devops-common@0.2.3-next.0
+
 ## 0.3.11-next.0

 ### Patch Changes
@@ -10,6 +10,7 @@ import { Config } from '@backstage/config';
 import { DashboardPullRequest } from '@backstage/plugin-azure-devops-common';
 import express from 'express';
 import { GitRepository } from 'azure-devops-node-api/interfaces/GitInterfaces';
+import { GitTag } from '@backstage/plugin-azure-devops-common';
 import { Logger } from 'winston';
 import { PullRequest } from '@backstage/plugin-azure-devops-common';
 import { PullRequestOptions } from '@backstage/plugin-azure-devops-common';
@@ -61,6 +62,8 @@ export class AzureDevOpsApi {
    repoName: string,
  ): Promise<GitRepository>;
  // (undocumented)
+  getGitTags(projectName: string, repoName: string): Promise<GitTag[]>;
+  // (undocumented)
  getPullRequests(
    projectName: string,
    repoName: string,
@@ -1,6 +1,6 @@
 {
  "name": "@backstage/plugin-azure-devops-backend",
-  "version": "0.3.11-next.0",
+  "version": "0.3.11-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -23,9 +23,9 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/backend-common": "^0.13.3-next.0",
-    "@backstage/config": "^1.0.0",
-    "@backstage/plugin-azure-devops-common": "^0.2.2",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/config": "^1.0.1-next.0",
+    "@backstage/plugin-azure-devops-common": "^0.2.3-next.0",
    "@types/express": "^4.17.6",
    "azure-devops-node-api": "^11.0.1",
    "express": "^4.17.1",
@@ -35,7 +35,7 @@
    "yn": "^4.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.0",
+    "@backstage/cli": "^0.17.1-next.2",
    "@types/supertest": "^2.0.8",
    "supertest": "^6.1.6",
    "msw": "^0.35.0"
@@ -21,16 +21,19 @@ import {
 import {
  BuildResult,
  BuildStatus,
+  GitTag,
  PullRequest,
  PullRequestStatus,
  RepoBuild,
 } from '@backstage/plugin-azure-devops-common';
 import {
  GitPullRequest,
+  GitRef,
  GitRepository,
 } from 'azure-devops-node-api/interfaces/GitInterfaces';
 import {
  mappedBuildRun,
+  mappedGitTag,
  mappedPullRequest,
  mappedRepoBuild,
 } from './AzureDevOpsApi';
@@ -263,6 +266,38 @@ describe('AzureDevOpsApi', () => {
    });
  });

+  describe('mappedGitTag', () => {
+    describe('mappedGitTag happy path', () => {
+      it('should return GitTag from GitRef', () => {
+        const inputIdentityRef: IdentityRef = {
+          displayName: 'Jane Doe',
+        };
+        const inputGitRef: GitRef = {
+          name: 'refs/tags/v1.1.2',
+          creator: inputIdentityRef,
+          objectId: '1111aaaa2222bbbb3333cccc4444dddd5555eeee',
+          peeledObjectId: '1234567890abcdef1234567890abcdef12345678',
+        };
+        const inputLinkBaseUrl =
+          'https://host.com/myOrg/_git/super-feature-repo?version=GT';
+        const inputCommitBaseUrl =
+          'https://host.com/myOrg/_git/super-feature-repo/commit';
+        const outputGitTag: GitTag = {
+          name: 'v1.1.2',
+          createdBy: 'Jane Doe',
+          commitLink:
+            'https://host.com/myOrg/_git/super-feature-repo/commit/1234567890abcdef1234567890abcdef12345678',
+          objectId: '1111aaaa2222bbbb3333cccc4444dddd5555eeee',
+          peeledObjectId: '1234567890abcdef1234567890abcdef12345678',
+          link: 'https://host.com/myOrg/_git/super-feature-repo?version=GTv1.1.2',
+        };
+        expect(
+          mappedGitTag(inputGitRef, inputLinkBaseUrl, inputCommitBaseUrl),
+        ).toEqual(outputGitTag);
+      });
+    });
+  });
+
  describe('mappedPullRequest', () => {
    describe('mappedPullRequest happy path', () => {
      it('should return PullRequest from GitPullRequest', () => {
@@ -23,6 +23,7 @@ import {
  BuildRun,
  BuildStatus,
  DashboardPullRequest,
+  GitTag,
  Policy,
  PullRequest,
  PullRequestOptions,
@@ -33,6 +34,7 @@ import {
 import {
  GitPullRequest,
  GitPullRequestSearchCriteria,
+  GitRef,
  GitRepository,
 } from 'azure-devops-node-api/interfaces/GitInterfaces';
 import {
@@ -123,6 +125,39 @@ export class AzureDevOpsApi {
    return repoBuilds;
  }

+  public async getGitTags(
+    projectName: string,
+    repoName: string,
+  ): Promise<GitTag[]> {
+    this.logger?.debug(
+      `Calling Azure DevOps REST API, getting Git Tags for Repository ${repoName} for Project ${projectName}`,
+    );
+
+    const gitRepository = await this.getGitRepository(projectName, repoName);
+    const client = await this.webApi.getGitApi();
+    const tagRefs: GitRef[] = await client.getRefs(
+      gitRepository.id as string,
+      projectName,
+      'tags',
+      false,
+      false,
+      false,
+      false,
+      true,
+    );
+    const linkBaseUrl = `${this.webApi.serverUrl}/${encodeURIComponent(
+      projectName,
+    )}/_git/${encodeURIComponent(repoName)}?version=GT`;
+    const commitBaseUrl = `${this.webApi.serverUrl}/${encodeURIComponent(
+      projectName,
+    )}/_git/${encodeURIComponent(repoName)}/commit`;
+    const gitTags: GitTag[] = tagRefs.map(tagRef => {
+      return mappedGitTag(tagRef, linkBaseUrl, commitBaseUrl);
+    });
+
+    return gitTags;
+  }
+
  public async getPullRequests(
    projectName: string,
    repoName: string,
@@ -359,6 +394,25 @@ export function mappedRepoBuild(build: Build): RepoBuild {
  };
 }

+export function mappedGitTag(
+  gitRef: GitRef,
+  linkBaseUrl: string,
+  commitBaseUrl: string,
+): GitTag {
+  return {
+    objectId: gitRef.objectId,
+    peeledObjectId: gitRef.peeledObjectId,
+    name: gitRef.name?.replace('refs/tags/', ''),
+    createdBy: gitRef.creator?.displayName ?? 'N/A',
+    link: `${linkBaseUrl}${encodeURIComponent(
+      gitRef.name?.replace('refs/tags/', '') ?? '',
+    )}`,
+    commitLink: `${commitBaseUrl}/${encodeURIComponent(
+      gitRef.peeledObjectId ?? '',
+    )}`,
+  };
+}
+
 export function mappedPullRequest(
  pullRequest: GitPullRequest,
  linkBaseUrl: string,
@@ -22,6 +22,7 @@ import {
  BuildResult,
  BuildRun,
  BuildStatus,
+  GitTag,
  PullRequest,
  PullRequestStatus,
  RepoBuild,
@@ -46,6 +47,7 @@ describe('createRouter', () => {
      getBuildDefinitions: jest.fn(),
      getRepoBuilds: jest.fn(),
      getDefinitionBuilds: jest.fn(),
+      getGitTags: jest.fn(),
      getPullRequests: jest.fn(),
      getBuilds: jest.fn(),
      getBuildRuns: jest.fn(),
@@ -208,6 +210,43 @@ describe('createRouter', () => {
    });
  });

+  describe('GET /git-tags/:projectName/:repoName', () => {
+    it('fetches a list of git tags', async () => {
+      const firstGitTag: GitTag = {
+        name: 'v1.1.2',
+        createdBy: 'Jane Doe',
+        commitLink:
+          'https://host.com/myOrg/_git/super-feature-repo/commit/1234567890abcdef1234567890abcdef12345678',
+        objectId: '1111aaaa2222bbbb3333cccc4444dddd5555eeee',
+        peeledObjectId: '1234567890abcdef1234567890abcdef12345678',
+        link: 'https://host.com/myOrg/_git/super-feature-repo?version=GTv1.1.2',
+      };
+
+      const secondGitTag: GitTag = {
+        name: 'v1.2.0',
+        createdBy: 'Jane Doe',
+        commitLink:
+          'https://host.com/myOrg/_git/super-feature-repo/commit/2222222222222222222222222222222222222222',
+        objectId: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+        peeledObjectId: '2222222222222222222222222222222222222222',
+        link: 'https://host.com/myOrg/_git/super-feature-repo?version=GTv1.2.0',
+      };
+
+      const gitTags: GitTag[] = [firstGitTag, secondGitTag];
+
+      azureDevOpsApi.getGitTags.mockResolvedValueOnce(gitTags);
+
+      const response = await request(app).get('/git-tags/myProject/myRepo');
+
+      expect(azureDevOpsApi.getGitTags).toHaveBeenCalledWith(
+        'myProject',
+        'myRepo',
+      );
+      expect(response.status).toEqual(200);
+      expect(response.body).toEqual(gitTags);
+    });
+  });
+
  describe('GET /pull-requests/:projectName/:repoName', () => {
    it('fetches a list of pull requests', async () => {
      const firstPullRequest: PullRequest = {
@@ -97,6 +97,12 @@ export async function createRouter(
    res.status(200).json(gitRepository);
  });

+  router.get('/git-tags/:projectName/:repoName', async (req, res) => {
+    const { projectName, repoName } = req.params;
+    const gitTags = await azureDevOpsApi.getGitTags(projectName, repoName);
+    res.status(200).json(gitTags);
+  });
+
  router.get('/pull-requests/:projectName/:repoName', async (req, res) => {
    const { projectName, repoName } = req.params;

@@ -1,5 +1,11 @@
 # @backstage/plugin-azure-devops-common

+## 0.2.3-next.0
+
+### Patch Changes
+
+- ac14fcaf38: Added entity view for Azure Git Tags, based on existing Pull Requests view
+
 ## 0.2.2

 ### Patch Changes
@@ -98,6 +98,18 @@ export interface DashboardPullRequest {
  title?: string;
 }

+// Warning: (ae-missing-release-tag) "GitTag" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type GitTag = {
+  objectId?: string;
+  peeledObjectId?: string;
+  name?: string;
+  createdBy?: string;
+  link: string;
+  commitLink: string;
+};
+
 // Warning: (ae-missing-release-tag) "Policy" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -1,6 +1,6 @@
 {
  "name": "@backstage/plugin-azure-devops-common",
-  "version": "0.2.2",
+  "version": "0.2.3-next.0",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -32,7 +32,7 @@
    "clean": "backstage-cli package clean"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.0"
+    "@backstage/cli": "^0.17.1-next.2"
  },
  "files": [
    "dist"
@@ -108,6 +108,15 @@ export enum PullRequestStatus {
  All = 4,
 }

+export type GitTag = {
+  objectId?: string;
+  peeledObjectId?: string;
+  name?: string;
+  createdBy?: string;
+  link: string;
+  commitLink: string;
+};
+
 export type PullRequest = {
  pullRequestId?: number;
  repoName?: string;
@@ -1,5 +1,17 @@
 # @backstage/plugin-azure-devops

+## 0.1.21-next.2
+
+### Patch Changes
+
+- ac14fcaf38: Added entity view for Azure Git Tags, based on existing Pull Requests view
+- Updated dependencies
+  - @backstage/core-components@0.9.4-next.1
+  - @backstage/plugin-azure-devops-common@0.2.3-next.0
+  - @backstage/plugin-catalog-react@1.1.0-next.2
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/core-plugin-api@1.0.2-next.1
+
 ## 0.1.21-next.1

 ### Patch Changes
@@ -16,6 +16,12 @@ Lists the top _n_ Active, Completed, or Abandoned Pull Requests for a given repo

 ![Azure Repos Pull Requests Example](./docs/azure-devops-pull-requests.png)

+### Azure Repos Git Tags
+
+Lists all Git Tags for a given repository
+
+![Azure Repos Git Tags Example](./docs/azure-devops-git-tags.png)
+
 ## Setup

 The following sections will help you get the Azure DevOps plugin setup and running
@@ -155,6 +161,42 @@ To get the Azure Repos component working you'll need to do the following two ste
 - The `if` prop is optional on the `EntityLayout.Route`, you can remove it if you always want to see the tab even if the entity being viewed does not have the needed annotation
 - The `defaultLimit` property on the `EntityAzurePullRequestsContent` will set the max number of Pull Requests you would like to see, if not set this will default to 10

+### Git Tags Component
+
+To get the Git Tags component working you'll need to do the following two steps:
+
+1. First we need to add the @backstage/plugin-azure-devops package to your frontend app:
+
+   ```bash
+   # From your Backstage root directory
+   yarn add --cwd packages/app @backstage/plugin-azure-devops
+   ```
+
+2. Second we need to add the `EntityAzureGitTagsContent` extension to the entity page in your app:
+
+   ```tsx
+   // In packages/app/src/components/catalog/EntityPage.tsx
+   import {
+     EntityAzureGitTagsContent,
+     isAzureDevOpsAvailable,
+   } from '@backstage/plugin-azure-devops';
+
+   // For example in the Service section
+   const serviceEntityPage = (
+     <EntityLayout>
+       // ...
+       <EntityLayout.Route if={isAzureDevOpsAvailable} path="/git-tags" title="Git Tags">
+         <EntityAzureGitTagsContent />
+       </EntityLayout.Route>
+       // ...
+     </EntityLayout>
+   ```
+
+**Notes:**
+
+- You'll need to add the `EntityLayout.Route` above from step 2 to all the entity sections you want to see Git Tags in. For example if you wanted to see Git Tags when looking at Website entities then you would need to add this to the `websiteEntityPage` section.
+- The `if` prop is optional on the `EntityLayout.Route`, you can remove it if you always want to see the tab even if the entity being viewed does not have the needed annotation
+
 ## Limitations

 - Currently multiple organizations are not supported
@@ -136,6 +136,11 @@ export type CreatedByUserFilter = BaseFilter &
      }
  );

+// Warning: (ae-missing-release-tag) "EntityAzureGitTagsContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const EntityAzureGitTagsContent: () => JSX.Element;
+
 // Warning: (ae-missing-release-tag) "EntityAzurePipelinesContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -1,6 +1,6 @@
 {
  "name": "@backstage/plugin-azure-devops",
-  "version": "0.1.21-next.1",
+  "version": "0.1.21-next.2",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -30,12 +30,12 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/core-components": "^0.9.4-next.0",
-    "@backstage/core-plugin-api": "^1.0.2-next.0",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/core-components": "^0.9.4-next.2",
+    "@backstage/core-plugin-api": "^1.0.2-next.1",
    "@backstage/errors": "^1.0.0",
-    "@backstage/plugin-azure-devops-common": "^0.2.2",
-    "@backstage/plugin-catalog-react": "^1.1.0-next.1",
+    "@backstage/plugin-azure-devops-common": "^0.2.3-next.0",
+    "@backstage/plugin-catalog-react": "^1.1.0-next.2",
    "@backstage/theme": "^0.2.15",
    "@material-ui/core": "^4.12.2",
    "@material-ui/icons": "^4.9.1",
@@ -49,10 +49,10 @@
    "react": "^16.13.1 || ^17.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/core-app-api": "^1.0.2-next.0",
-    "@backstage/dev-utils": "^1.0.2-next.1",
-    "@backstage/test-utils": "^1.1.0-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/core-app-api": "^1.0.2-next.1",
+    "@backstage/dev-utils": "^1.0.2-next.2",
+    "@backstage/test-utils": "^1.1.0-next.2",
    "@testing-library/jest-dom": "^5.10.1",
    "@testing-library/react": "^12.1.3",
    "@testing-library/user-event": "^14.0.0",
@@ -18,6 +18,7 @@ import {
  BuildRun,
  BuildRunOptions,
  DashboardPullRequest,
+  GitTag,
  PullRequest,
  PullRequestOptions,
  RepoBuild,
@@ -38,6 +39,11 @@ export interface AzureDevOpsApi {
    options?: RepoBuildOptions,
  ): Promise<{ items: RepoBuild[] }>;

+  getGitTags(
+    projectName: string,
+    repoName: string,
+  ): Promise<{ items: GitTag[] }>;
+
  getPullRequests(
    projectName: string,
    repoName: string,
@@ -18,6 +18,7 @@ import {
  BuildRun,
  BuildRunOptions,
  DashboardPullRequest,
+  GitTag,
  PullRequest,
  PullRequestOptions,
  RepoBuild,
@@ -58,6 +59,18 @@ export class AzureDevOpsClient implements AzureDevOpsApi {
    return { items };
  }

+  public async getGitTags(
+    projectName: string,
+    repoName: string,
+  ): Promise<{ items: GitTag[] }> {
+    const urlSegment = `git-tags/${encodeURIComponent(
+      projectName,
+    )}/${encodeURIComponent(repoName)}`;
+
+    const items = await this.get<GitTag[]>(urlSegment);
+    return { items };
+  }
+
  public async getPullRequests(
    projectName: string,
    repoName: string,
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { SvgIcon, SvgIconProps } from '@material-ui/core';
+
+import React from 'react';
+
+// From https://github.com/microsoft/fluentui-system-icons/blob/30a3e3c458883a1d63a43a951407f30e6b32b60c/assets/Tag/SVG/ic_fluent_tag_32_regular.svg
+export const AzureGitTagsIcon = (props: SvgIconProps) => (
+  <SvgIcon {...props} viewBox="0 0 32 32">
+    <path d="M22.5 12C23.8807 12 25 10.8807 25 9.5C25 8.11929 23.8807 7 22.5 7C21.1193 7 20 8.11929 20 9.5C20 10.8807 21.1193 12 22.5 12ZM18.6842 3C17.6695 3 16.6927 3.38568 15.9516 4.07892L3.77041 15.4742C2.01578 17.1157 1.96966 19.8841 3.66863 21.5831L9.99455 27.909C11.6543 29.5687 14.3452 29.5687 16.005 27.909L27.8282 16.0858C28.5783 15.3356 28.9998 14.3182 28.9998 13.2574V6.5C28.9998 4.567 27.4328 3 25.4998 3H18.6842ZM17.3179 5.53946C17.6884 5.19284 18.1769 5 18.6842 5H25.4998C26.3282 5 26.9998 5.67157 26.9998 6.5V13.2574C26.9998 13.7878 26.789 14.2965 26.414 14.6716L14.5907 26.4948C13.7121 27.3735 12.2874 27.3735 11.4088 26.4948L5.08284 20.1689C4.18339 19.2694 4.20781 17.8038 5.13673 16.9348L17.3179 5.53946Z" />
+  </SvgIcon>
+);
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { AzureGitTagsIcon } from './AzureGitTagsIcon';
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { GitTagTable } from '../GitTagTable/GitTagTable';
+import React from 'react';
+
+export const EntityPageAzureGitTags = () => <GitTagTable />;
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { EntityPageAzureGitTags } from './EntityPageAzureGitTags';
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Box } from '@material-ui/core';
+import {
+  Link,
+  ResponseErrorPanel,
+  Table,
+  TableColumn,
+} from '@backstage/core-components';
+import { GitTag } from '@backstage/plugin-azure-devops-common';
+import React from 'react';
+
+import { AzureGitTagsIcon } from '../AzureGitTagsIcon';
+import { useEntity } from '@backstage/plugin-catalog-react';
+import { useGitTags } from '../../hooks/useGitTags';
+
+const columns: TableColumn[] = [
+  {
+    title: 'Tag',
+    field: 'name',
+    highlight: false,
+    defaultSort: 'desc',
+    width: 'auto',
+    render: (row: Partial<GitTag>) => (
+      <Box display="flex" alignItems="center">
+        <Link to={row.link ?? ''}>{row.name}</Link>
+      </Box>
+    ),
+  },
+  {
+    title: 'Commit',
+    field: 'peeledObjectId',
+    width: 'auto',
+    render: (row: Partial<GitTag>) => (
+      <Box display="flex" alignItems="center">
+        <Link to={row.commitLink ?? ''}>{row.peeledObjectId}</Link>
+      </Box>
+    ),
+  },
+  {
+    title: 'Created By',
+    field: 'createdBy',
+    width: 'auto',
+  },
+];
+
+export const GitTagTable = () => {
+  const { entity } = useEntity();
+
+  const { items, loading, error } = useGitTags(entity);
+
+  if (error) {
+    return <ResponseErrorPanel error={error} />;
+  }
+
+  return (
+    <Table
+      isLoading={loading}
+      columns={columns}
+      options={{
+        search: true,
+        paging: true,
+        pageSize: 5,
+        showEmptyDataSourceMessage: !loading,
+      }}
+      title={
+        <Box display="flex" alignItems="center">
+          <AzureGitTagsIcon style={{ fontSize: 30 }} />
+          <Box mr={1} />
+          Azure Repos - Git Tags ({items ? items.length : 0})
+        </Box>
+      }
+      data={items ?? []}
+    />
+  );
+};
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { GitTagTable } from './GitTagTable';
@@ -103,11 +103,7 @@ export const PullRequestTable = ({ defaultLimit }: PullRequestTableProps) => {
  );

  if (error) {
-    return (
-      <div>
-        <ResponseErrorPanel error={error} />
-      </div>
-    );
+    return <ResponseErrorPanel error={error} />;
  }

  return (
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { GitTag } from '@backstage/plugin-azure-devops-common';
+
+import { Entity } from '@backstage/catalog-model';
+import { azureDevOpsApiRef } from '../api';
+import { useApi } from '@backstage/core-plugin-api';
+import useAsync from 'react-use/lib/useAsync';
+import { useProjectRepoFromEntity } from './useProjectRepoFromEntity';
+
+export function useGitTags(entity: Entity): {
+  items?: GitTag[];
+  loading: boolean;
+  error?: Error;
+} {
+  const api = useApi(azureDevOpsApiRef);
+  const { project, repo } = useProjectRepoFromEntity(entity);
+
+  const { value, loading, error } = useAsync(() => {
+    return api.getGitTags(project, repo);
+  }, [api, project, repo]);
+
+  return {
+    items: value?.items,
+    loading,
+    error,
+  };
+}
@@ -17,6 +17,7 @@
 export {
  azureDevOpsPlugin,
  EntityAzurePipelinesContent,
+  EntityAzureGitTagsContent,
  EntityAzurePullRequestsContent,
  isAzureDevOpsAvailable,
  isAzurePipelinesAvailable,
@@ -22,6 +22,7 @@ import {
 import {
  azurePipelinesEntityContentRouteRef,
  azurePullRequestDashboardRouteRef,
+  azureGitTagsEntityContentRouteRef,
  azurePullRequestsEntityContentRouteRef,
 } from './routes';
 import {
@@ -78,6 +79,17 @@ export const EntityAzurePipelinesContent = azureDevOpsPlugin.provide(
  }),
 );

+export const EntityAzureGitTagsContent = azureDevOpsPlugin.provide(
+  createRoutableExtension({
+    name: 'EntityAzureGitTagsContent',
+    component: () =>
+      import('./components/EntityPageAzureGitTags').then(
+        m => m.EntityPageAzureGitTags,
+      ),
+    mountPoint: azureGitTagsEntityContentRouteRef,
+  }),
+);
+
 export const EntityAzurePullRequestsContent = azureDevOpsPlugin.provide(
  createRoutableExtension({
    name: 'EntityAzurePullRequestsContent',
@@ -24,6 +24,10 @@ export const azurePipelinesEntityContentRouteRef = createRouteRef({
  id: 'azure-pipelines-entity-content',
 });

+export const azureGitTagsEntityContentRouteRef = createRouteRef({
+  id: 'azure-git-tags-entity-content',
+});
+
 export const azurePullRequestsEntityContentRouteRef = createRouteRef({
  id: 'azure-pull-requests-entity-content',
 });
@@ -1,5 +1,15 @@
 # @backstage/plugin-badges-backend

+## 0.1.26-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/config@1.0.1-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/catalog-client@1.0.2-next.0
+
 ## 0.1.26-next.0

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-badges-backend",
  "description": "A Backstage backend plugin that generates README badges for your entities",
-  "version": "0.1.26-next.0",
+  "version": "0.1.26-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -34,10 +34,10 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/backend-common": "^0.13.3-next.0",
-    "@backstage/catalog-client": "^1.0.1",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/config": "^1.0.0",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/catalog-client": "^1.0.2-next.0",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
    "@backstage/errors": "^1.0.0",
    "@types/express": "^4.17.6",
    "badge-maker": "^3.3.0",
@@ -48,7 +48,7 @@
    "yn": "^4.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.0",
+    "@backstage/cli": "^0.17.1-next.2",
    "@types/supertest": "^2.0.8",
    "supertest": "^6.1.3"
  },
@@ -1,5 +1,15 @@
 # @backstage/plugin-badges

+## 0.2.29-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.9.4-next.1
+  - @backstage/plugin-catalog-react@1.1.0-next.2
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/core-plugin-api@1.0.2-next.1
+
 ## 0.2.29-next.1

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-badges",
  "description": "A Backstage plugin that generates README badges for your entities",
-  "version": "0.2.29-next.1",
+  "version": "0.2.29-next.2",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -30,11 +30,11 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/core-components": "^0.9.4-next.0",
-    "@backstage/core-plugin-api": "^1.0.2-next.0",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/core-components": "^0.9.4-next.2",
+    "@backstage/core-plugin-api": "^1.0.2-next.1",
    "@backstage/errors": "^1.0.0",
-    "@backstage/plugin-catalog-react": "^1.1.0-next.1",
+    "@backstage/plugin-catalog-react": "^1.1.0-next.2",
    "@backstage/theme": "^0.2.15",
    "@material-ui/core": "^4.12.2",
    "@material-ui/icons": "^4.9.1",
@@ -46,10 +46,10 @@
    "react": "^16.13.1 || ^17.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/core-app-api": "^1.0.2-next.0",
-    "@backstage/dev-utils": "^1.0.2-next.1",
-    "@backstage/test-utils": "^1.1.0-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/core-app-api": "^1.0.2-next.1",
+    "@backstage/dev-utils": "^1.0.2-next.2",
+    "@backstage/test-utils": "^1.1.0-next.2",
    "@testing-library/jest-dom": "^5.10.1",
    "@testing-library/react": "^12.1.3",
    "@testing-library/user-event": "^14.0.0",
@@ -1,5 +1,14 @@
 # @backstage/plugin-bazaar-backend

+## 0.1.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/config@1.0.1-next.0
+  - @backstage/backend-test-utils@0.1.24-next.1
+
 ## 0.1.16-next.0

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@backstage/plugin-bazaar-backend",
-  "version": "0.1.16-next.0",
+  "version": "0.1.16-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -23,9 +23,9 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/backend-common": "^0.13.3-next.0",
-    "@backstage/backend-test-utils": "^0.1.24-next.0",
-    "@backstage/config": "^1.0.0",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/backend-test-utils": "^0.1.24-next.1",
+    "@backstage/config": "^1.0.1-next.0",
    "@types/express": "^4.17.6",
    "express": "^4.17.1",
    "express-promise-router": "^4.1.0",
@@ -34,7 +34,7 @@
    "yn": "^4.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.0"
+    "@backstage/cli": "^0.17.1-next.2"
  },
  "files": [
    "dist",
@@ -1,5 +1,19 @@
 # @backstage/plugin-bazaar

+## 0.1.20-next.2
+
+### Patch Changes
+
+- 84c9e35a2f: Exported the SortView component from the Bazaar plugin for use directly
+- Updated dependencies
+  - @backstage/core-components@0.9.4-next.1
+  - @backstage/plugin-catalog@1.2.0-next.2
+  - @backstage/cli@0.17.1-next.2
+  - @backstage/plugin-catalog-react@1.1.0-next.2
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/core-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.0.2-next.0
+
 ## 0.1.20-next.1

 ### Patch Changes
@@ -28,5 +28,10 @@ export const bazaarPlugin: BackstagePlugin<
 // @public (undocumented)
 export const EntityBazaarInfoCard: () => JSX.Element | null;

+// Warning: (ae-missing-release-tag) "SortView" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const SortView: () => JSX.Element;
+
 // (No @packageDocumentation comment for this package)
 ```
@@ -1,6 +1,6 @@
 {
  "name": "@backstage/plugin-bazaar",
-  "version": "0.1.20-next.1",
+  "version": "0.1.20-next.2",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -24,13 +24,13 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/catalog-client": "^1.0.1",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/core-components": "^0.9.4-next.0",
-    "@backstage/core-plugin-api": "^1.0.2-next.0",
-    "@backstage/plugin-catalog": "^1.2.0-next.1",
-    "@backstage/plugin-catalog-react": "^1.1.0-next.1",
+    "@backstage/catalog-client": "^1.0.2-next.0",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/core-components": "^0.9.4-next.2",
+    "@backstage/core-plugin-api": "^1.0.2-next.1",
+    "@backstage/plugin-catalog": "^1.2.0-next.2",
+    "@backstage/plugin-catalog-react": "^1.1.0-next.2",
    "@date-io/luxon": "1.x",
    "@material-ui/core": "^4.12.2",
    "@material-ui/icons": "^4.9.1",
@@ -47,8 +47,8 @@
    "react": "^16.13.1 || ^17.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/dev-utils": "^1.0.2-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/dev-utils": "^1.0.2-next.2",
    "@testing-library/jest-dom": "^5.10.1",
    "cross-fetch": "^3.1.5"
  },
@@ -16,3 +16,4 @@

 export { bazaarPlugin, BazaarPage } from './plugin';
 export { EntityBazaarInfoCard } from './components/EntityBazaarInfoCard';
+export { SortView } from './components/SortView';
@@ -1,5 +1,15 @@
 # @backstage/plugin-bitrise

+## 0.1.32-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.9.4-next.1
+  - @backstage/plugin-catalog-react@1.1.0-next.2
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/core-plugin-api@1.0.2-next.1
+
 ## 0.1.32-next.1

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-bitrise",
  "description": "A Backstage plugin that integrates towards Bitrise",
-  "version": "0.1.32-next.1",
+  "version": "0.1.32-next.2",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -24,10 +24,10 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/core-components": "^0.9.4-next.0",
-    "@backstage/core-plugin-api": "^1.0.2-next.0",
-    "@backstage/plugin-catalog-react": "^1.1.0-next.1",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/core-components": "^0.9.4-next.2",
+    "@backstage/core-plugin-api": "^1.0.2-next.1",
+    "@backstage/plugin-catalog-react": "^1.1.0-next.2",
    "@backstage/theme": "^0.2.15",
    "@material-ui/core": "^4.12.2",
    "@material-ui/icons": "^4.9.1",
@@ -43,10 +43,10 @@
    "react": "^16.13.1 || ^17.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/core-app-api": "^1.0.2-next.0",
-    "@backstage/dev-utils": "^1.0.2-next.1",
-    "@backstage/test-utils": "^1.1.0-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/core-app-api": "^1.0.2-next.1",
+    "@backstage/dev-utils": "^1.0.2-next.2",
+    "@backstage/test-utils": "^1.1.0-next.2",
    "@testing-library/jest-dom": "^5.10.1",
    "@testing-library/react": "^12.1.3",
    "@testing-library/user-event": "^14.0.0",
@@ -1,5 +1,17 @@
 # @backstage/plugin-catalog-backend-module-aws

+## 0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/plugin-catalog-backend@1.1.2-next.2
+  - @backstage/backend-tasks@0.3.1-next.1
+  - @backstage/config@1.0.1-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/integration@1.2.0-next.1
+
 ## 0.1.5-next.0

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-catalog-backend-module-aws",
  "description": "A Backstage catalog backend module that helps integrate towards AWS",
-  "version": "0.1.5-next.0",
+  "version": "0.1.5-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -33,13 +33,13 @@
    "start": "backstage-cli package start"
  },
  "dependencies": {
-    "@backstage/backend-common": "^0.13.3-next.0",
-    "@backstage/backend-tasks": "^0.3.1-next.0",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/config": "^1.0.0",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/backend-tasks": "^0.3.1-next.1",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
    "@backstage/errors": "^1.0.0",
-    "@backstage/integration": "^1.2.0-next.0",
-    "@backstage/plugin-catalog-backend": "^1.1.2-next.0",
+    "@backstage/integration": "^1.2.0-next.1",
+    "@backstage/plugin-catalog-backend": "^1.1.2-next.2",
    "@backstage/types": "^1.0.0",
    "aws-sdk": "^2.840.0",
    "lodash": "^4.17.21",
@@ -48,7 +48,7 @@
    "winston": "^3.2.1"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.0",
+    "@backstage/cli": "^0.17.1-next.2",
    "@types/lodash": "^4.14.151",
    "aws-sdk-mock": "^5.2.1",
    "yaml": "^1.9.2"
@@ -1,5 +1,16 @@
 # @backstage/plugin-catalog-backend-module-azure

+## 0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/plugin-catalog-backend@1.1.2-next.2
+  - @backstage/config@1.0.1-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/integration@1.2.0-next.1
+
 ## 0.1.3-next.0

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-catalog-backend-module-azure",
  "description": "A Backstage catalog backend module that helps integrate towards Azure",
-  "version": "0.1.3-next.0",
+  "version": "0.1.3-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -33,12 +33,12 @@
    "start": "backstage-cli package start"
  },
  "dependencies": {
-    "@backstage/backend-common": "^0.13.3-next.0",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/config": "^1.0.0",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
    "@backstage/errors": "^1.0.0",
-    "@backstage/integration": "^1.2.0-next.0",
-    "@backstage/plugin-catalog-backend": "^1.1.2-next.0",
+    "@backstage/integration": "^1.2.0-next.1",
+    "@backstage/plugin-catalog-backend": "^1.1.2-next.2",
    "@backstage/types": "^1.0.0",
    "lodash": "^4.17.21",
    "msw": "^0.35.0",
@@ -46,8 +46,8 @@
    "winston": "^3.2.1"
  },
  "devDependencies": {
-    "@backstage/backend-test-utils": "^0.1.24-next.0",
-    "@backstage/cli": "^0.17.1-next.0",
+    "@backstage/backend-test-utils": "^0.1.24-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
    "@types/lodash": "^4.14.151"
  },
  "files": [
@@ -1,5 +1,16 @@
 # @backstage/plugin-catalog-backend-module-bitbucket

+## 0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/plugin-catalog-backend@1.1.2-next.2
+  - @backstage/config@1.0.1-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/integration@1.2.0-next.1
+
 ## 0.1.3-next.0

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-catalog-backend-module-bitbucket",
  "description": "A Backstage catalog backend module that helps integrate towards Bitbucket",
-  "version": "0.1.3-next.0",
+  "version": "0.1.3-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -33,12 +33,12 @@
    "start": "backstage-cli package start"
  },
  "dependencies": {
-    "@backstage/backend-common": "^0.13.3-next.0",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/config": "^1.0.0",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
    "@backstage/errors": "^1.0.0",
-    "@backstage/integration": "^1.2.0-next.0",
-    "@backstage/plugin-catalog-backend": "^1.1.2-next.0",
+    "@backstage/integration": "^1.2.0-next.1",
+    "@backstage/plugin-catalog-backend": "^1.1.2-next.2",
    "@backstage/types": "^1.0.0",
    "lodash": "^4.17.21",
    "msw": "^0.35.0",
@@ -46,8 +46,8 @@
    "winston": "^3.2.1"
  },
  "devDependencies": {
-    "@backstage/backend-test-utils": "^0.1.24-next.0",
-    "@backstage/cli": "^0.17.1-next.0",
+    "@backstage/backend-test-utils": "^0.1.24-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
    "@types/lodash": "^4.14.151"
  },
  "files": [
@@ -1,5 +1,17 @@
 # @backstage/plugin-catalog-backend-module-gerrit

+## 0.1.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/plugin-catalog-backend@1.1.2-next.2
+  - @backstage/backend-tasks@0.3.1-next.1
+  - @backstage/config@1.0.1-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/integration@1.2.0-next.1
+
 ## 0.1.0-next.1

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@backstage/plugin-catalog-backend-module-gerrit",
-  "version": "0.1.0-next.1",
+  "version": "0.1.0-next.2",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -28,13 +28,13 @@
    "postpack": "backstage-cli package postpack"
  },
  "dependencies": {
-    "@backstage/backend-common": "^0.13.3-next.1",
-    "@backstage/backend-tasks": "^0.3.1-next.0",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/config": "^1.0.0",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/backend-tasks": "^0.3.1-next.1",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
    "@backstage/errors": "^1.0.0",
-    "@backstage/integration": "^1.2.0-next.0",
-    "@backstage/plugin-catalog-backend": "^1.1.2-next.1",
+    "@backstage/integration": "^1.2.0-next.1",
+    "@backstage/plugin-catalog-backend": "^1.1.2-next.2",
    "fs-extra": "10.1.0",
    "msw": "^0.35.0",
    "node-fetch": "^2.6.7",
@@ -42,8 +42,8 @@
    "winston": "^3.2.1"
  },
  "devDependencies": {
-    "@backstage/backend-test-utils": "^0.1.24-next.0",
-    "@backstage/cli": "^0.17.1-next.1",
+    "@backstage/backend-test-utils": "^0.1.24-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
    "@types/fs-extra": "^9.0.1"
  },
  "files": [
@@ -1,5 +1,38 @@
 # @backstage/plugin-catalog-backend-module-github

+## 0.1.3-next.1
+
+### Patch Changes
+
+- a7de43f648: `GitHubOrgEntityProvider.fromConfig` now supports a `schedule` option like other
+  entity providers, that makes it more convenient to leverage using the common
+  task scheduler.
+
+  If you want to use this in your own project, it is used something like the following:
+
+  ```ts
+  // In packages/backend/src/plugins/catalog.ts
+  builder.addEntityProvider(
+    GitHubOrgEntityProvider.fromConfig(env.config, {
+      id: 'production',
+      orgUrl: 'https://github.com/backstage',
+      schedule: env.scheduler.createScheduledTaskRunner({
+        frequency: { cron: '*/30 * * * *' },
+        timeout: { minutes: 10 },
+      }),
+      logger: env.logger,
+    }),
+  );
+  ```
+
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/plugin-catalog-backend@1.1.2-next.2
+  - @backstage/backend-tasks@0.3.1-next.1
+  - @backstage/config@1.0.1-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/integration@1.2.0-next.1
+
 ## 0.1.3-next.0

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-catalog-backend-module-github",
  "description": "A Backstage catalog backend module that helps integrate towards GitHub",
-  "version": "0.1.3-next.0",
+  "version": "0.1.3-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -33,13 +33,13 @@
    "start": "backstage-cli package start"
  },
  "dependencies": {
-    "@backstage/backend-common": "^0.13.3-next.0",
-    "@backstage/backend-tasks": "^0.3.1-next.0",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/config": "^1.0.0",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/backend-tasks": "^0.3.1-next.1",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
    "@backstage/errors": "^1.0.0",
-    "@backstage/integration": "^1.2.0-next.0",
-    "@backstage/plugin-catalog-backend": "^1.1.2-next.0",
+    "@backstage/integration": "^1.2.0-next.1",
+    "@backstage/plugin-catalog-backend": "^1.1.2-next.2",
    "@backstage/types": "^1.0.0",
    "@octokit/graphql": "^4.5.8",
    "lodash": "^4.17.21",
@@ -49,8 +49,8 @@
    "winston": "^3.2.1"
  },
  "devDependencies": {
-    "@backstage/backend-test-utils": "^0.1.24-next.0",
-    "@backstage/cli": "^0.17.1-next.0",
+    "@backstage/backend-test-utils": "^0.1.24-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
    "@types/lodash": "^4.14.151"
  },
  "files": [
@@ -1,5 +1,16 @@
 # @backstage/plugin-catalog-backend-module-gitlab

+## 0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/plugin-catalog-backend@1.1.2-next.2
+  - @backstage/config@1.0.1-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/integration@1.2.0-next.1
+
 ## 0.1.3-next.0

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-catalog-backend-module-gitlab",
  "description": "A Backstage catalog backend module that helps integrate towards GitLab",
-  "version": "0.1.3-next.0",
+  "version": "0.1.3-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -33,12 +33,12 @@
    "start": "backstage-cli package start"
  },
  "dependencies": {
-    "@backstage/backend-common": "^0.13.3-next.0",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/config": "^1.0.0",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
    "@backstage/errors": "^1.0.0",
-    "@backstage/integration": "^1.2.0-next.0",
-    "@backstage/plugin-catalog-backend": "^1.1.2-next.0",
+    "@backstage/integration": "^1.2.0-next.1",
+    "@backstage/plugin-catalog-backend": "^1.1.2-next.2",
    "@backstage/types": "^1.0.0",
    "lodash": "^4.17.21",
    "msw": "^0.35.0",
@@ -46,8 +46,8 @@
    "winston": "^3.2.1"
  },
  "devDependencies": {
-    "@backstage/backend-test-utils": "^0.1.24-next.0",
-    "@backstage/cli": "^0.17.1-next.0",
+    "@backstage/backend-test-utils": "^0.1.24-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
    "@types/lodash": "^4.14.151"
  },
  "files": [
@@ -1,5 +1,15 @@
 # @backstage/plugin-catalog-backend-module-ldap

+## 0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.1.2-next.2
+  - @backstage/backend-tasks@0.3.1-next.1
+  - @backstage/config@1.0.1-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+
 ## 0.4.3-next.0

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-catalog-backend-module-ldap",
  "description": "A Backstage catalog backend module that helps integrate towards LDAP",
-  "version": "0.4.3-next.0",
+  "version": "0.4.3-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -33,11 +33,11 @@
    "start": "backstage-cli package start"
  },
  "dependencies": {
-    "@backstage/backend-tasks": "^0.3.1-next.0",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/config": "^1.0.0",
+    "@backstage/backend-tasks": "^0.3.1-next.1",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
    "@backstage/errors": "^1.0.0",
-    "@backstage/plugin-catalog-backend": "^1.1.2-next.0",
+    "@backstage/plugin-catalog-backend": "^1.1.2-next.2",
    "@backstage/types": "^1.0.0",
    "@types/ldapjs": "^2.2.0",
    "ldapjs": "^2.2.0",
@@ -46,7 +46,7 @@
    "winston": "^3.2.1"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.0",
+    "@backstage/cli": "^0.17.1-next.2",
    "@types/lodash": "^4.14.151"
  },
  "files": [
@@ -1,5 +1,15 @@
 # @backstage/plugin-catalog-backend-module-msgraph

+## 0.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.1.2-next.2
+  - @backstage/backend-tasks@0.3.1-next.1
+  - @backstage/config@1.0.1-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+
 ## 0.3.2-next.0

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-catalog-backend-module-msgraph",
  "description": "A Backstage catalog backend module that helps integrate towards Microsoft Graph",
-  "version": "0.3.2-next.0",
+  "version": "0.3.2-next.1",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -34,10 +34,10 @@
  },
  "dependencies": {
    "@azure/msal-node": "^1.1.0",
-    "@backstage/backend-tasks": "^0.3.1-next.0",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/config": "^1.0.0",
-    "@backstage/plugin-catalog-backend": "^1.1.2-next.0",
+    "@backstage/backend-tasks": "^0.3.1-next.1",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
+    "@backstage/plugin-catalog-backend": "^1.1.2-next.2",
    "@microsoft/microsoft-graph-types": "^2.6.0",
    "@types/node-fetch": "^2.5.12",
    "lodash": "^4.17.21",
@@ -48,9 +48,9 @@
    "qs": "^6.9.4"
  },
  "devDependencies": {
-    "@backstage/backend-common": "^0.13.3-next.0",
-    "@backstage/backend-test-utils": "^0.1.24-next.0",
-    "@backstage/cli": "^0.17.1-next.0",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/backend-test-utils": "^0.1.24-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
    "@types/lodash": "^4.14.151",
    "msw": "^0.35.0"
  },
@@ -1,5 +1,23 @@
 # @backstage/plugin-catalog-backend

+## 1.1.2-next.2
+
+### Patch Changes
+
+- 16a40ac4c0: Fix wrong return type of the `isGroupEntity` function.
+- 2909746147: Updated parseEntityTransformParams to handle keys with '.' in them. This will allow for querying of entities based off annotations such as 'backstage.io/orgin-location' or other entity field keys that have '.' in them.
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/plugin-scaffolder-common@1.1.0-next.0
+  - @backstage/config@1.0.1-next.0
+  - @backstage/plugin-search-common@0.3.4-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/integration@1.2.0-next.1
+  - @backstage/plugin-permission-common@0.6.1-next.0
+  - @backstage/plugin-permission-node@0.6.1-next.1
+  - @backstage/catalog-client@1.0.2-next.0
+  - @backstage/plugin-catalog-common@1.0.2-next.0
+
 ## 1.1.2-next.1

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-catalog-backend",
  "description": "The Backstage backend plugin that provides the Backstage catalog",
-  "version": "1.1.2-next.1",
+  "version": "1.1.2-next.2",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -34,17 +34,17 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/backend-common": "^0.13.3-next.1",
-    "@backstage/catalog-client": "^1.0.1",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/config": "^1.0.0",
+    "@backstage/backend-common": "^0.13.3-next.2",
+    "@backstage/catalog-client": "^1.0.2-next.0",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
    "@backstage/errors": "^1.0.0",
-    "@backstage/integration": "^1.2.0-next.0",
-    "@backstage/plugin-catalog-common": "^1.0.1",
-    "@backstage/plugin-permission-common": "^0.6.0",
-    "@backstage/plugin-permission-node": "^0.6.1-next.0",
-    "@backstage/plugin-scaffolder-common": "^1.0.1",
-    "@backstage/plugin-search-common": "^0.3.3",
+    "@backstage/integration": "^1.2.0-next.1",
+    "@backstage/plugin-catalog-common": "^1.0.2-next.0",
+    "@backstage/plugin-permission-common": "^0.6.1-next.0",
+    "@backstage/plugin-permission-node": "^0.6.1-next.1",
+    "@backstage/plugin-scaffolder-common": "^1.1.0-next.0",
+    "@backstage/plugin-search-common": "^0.3.4-next.0",
    "@backstage/types": "^1.0.0",
    "@types/express": "^4.17.6",
    "codeowners-utils": "^1.0.2",
@@ -68,10 +68,10 @@
    "zod": "^3.11.6"
  },
  "devDependencies": {
-    "@backstage/backend-test-utils": "^0.1.24-next.0",
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/plugin-permission-common": "^0.6.0",
-    "@backstage/plugin-search-backend-node": "0.6.1-next.0",
+    "@backstage/backend-test-utils": "^0.1.24-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/plugin-permission-common": "^0.6.1-next.0",
+    "@backstage/plugin-search-backend-node": "0.6.1-next.1",
    "@types/core-js": "^2.5.4",
    "@types/git-url-parse": "^9.0.0",
    "@types/lodash": "^4.14.151",
@@ -24,6 +24,11 @@ describe('parseEntityTransformParams', () => {
    metadata: {
      name: 'n',
      tags: ['t1', 't2'],
+      annotations: {
+        'example.test/url-like-key': 'ul1',
+        'example.com/other-url-like-key': 'ul2',
+        'other-example.test/next-url-like-key': 'ul3',
+      },
    },
    spec: {
      type: 't',
@@ -61,7 +66,115 @@ describe('parseEntityTransformParams', () => {
      parseEntityTransformParams({ fields: 'kind,metadata.name' })!(entity),
    ).toEqual({ kind: 'k', metadata: { name: 'n' } });
    expect(parseEntityTransformParams({ fields: 'metadata' })!(entity)).toEqual(
-      { metadata: { name: 'n', tags: ['t1', 't2'] } },
+      {
+        metadata: {
+          name: 'n',
+          tags: ['t1', 't2'],
+          annotations: {
+            'example.test/url-like-key': 'ul1',
+            'example.com/other-url-like-key': 'ul2',
+            'other-example.test/next-url-like-key': 'ul3',
+          },
+        },
+      },
    );
  });
+
+  it('supports dot notated fields properly', () => {
+    expect(
+      parseEntityTransformParams({
+        fields: 'kind,metadata.annotations.example.com/other-url-like-key',
+      })!(entity),
+    ).toEqual({
+      kind: 'k',
+      metadata: { annotations: { 'example.com/other-url-like-key': 'ul2' } },
+    });
+  });
+
+  it('supports nested dot notated fields properly', () => {
+    entity.spec = {
+      ...entity.spec,
+      'field-with.dot': 'fd1',
+      'other-field-with.dot-also': {
+        subItem: 'fd2.sub',
+        'subite.with/dot': 'fd2.sub.dot',
+      },
+      'third-field-with.dot-again': 'fd3',
+    };
+
+    expect(
+      parseEntityTransformParams({
+        fields: 'kind,spec.other-field-with.dot-also',
+      })!(entity),
+    ).toEqual({
+      kind: 'k',
+      spec: {
+        'other-field-with.dot-also': {
+          subItem: 'fd2.sub',
+          'subite.with/dot': 'fd2.sub.dot',
+        },
+      },
+    });
+    expect(
+      parseEntityTransformParams({
+        fields: 'kind,spec.other-field-with.dot-also.subite.with/dot',
+      })!(entity),
+    ).toEqual({
+      kind: 'k',
+      spec: {
+        'other-field-with.dot-also': {
+          'subite.with/dot': 'fd2.sub.dot',
+        },
+      },
+    });
+  });
+
+  it('does not return a sub key if an incorrect longer key is requested', () => {
+    entity.spec = {
+      ...entity.spec,
+      strValue: 'st1',
+      boolValue: true,
+      numValue: 4,
+      arrValue: [4, 5],
+      nullValue: null,
+      undefValue: undefined,
+      'field-with.dot': 'fd1',
+    };
+
+    expect(
+      parseEntityTransformParams({ fields: 'kind,spec.strValue.other' })!(
+        entity,
+      ),
+    ).toEqual({ kind: 'k' });
+    expect(
+      parseEntityTransformParams({ fields: 'kind,spec.boolValue.other' })!(
+        entity,
+      ),
+    ).toEqual({ kind: 'k' });
+    expect(
+      parseEntityTransformParams({ fields: 'kind,spec.numValue.other' })!(
+        entity,
+      ),
+    ).toEqual({ kind: 'k' });
+    expect(
+      parseEntityTransformParams({ fields: 'kind,spec.arrValue.other' })!(
+        entity,
+      ),
+    ).toEqual({ kind: 'k' });
+    expect(
+      parseEntityTransformParams({ fields: 'kind,spec.nullValue.other' })!(
+        entity,
+      ),
+    ).toEqual({ kind: 'k' });
+    expect(
+      parseEntityTransformParams({ fields: 'kind,spec.undefValue.other' })!(
+        entity,
+      ),
+    ).toEqual({ kind: 'k' });
+    expect(
+      parseEntityTransformParams({ fields: 'kind,spec.field-with.dot.other' })!(
+        entity,
+      ),
+    ).toEqual({ kind: 'k' });
+  });
 });
@@ -20,6 +20,22 @@ import lodash from 'lodash';
 import { RecursivePartial } from '../../util/RecursivePartial';
 import { parseStringsParam } from './common';

+function getPathArrayAndValue(input: Entity, field: string) {
+  return field.split('.').reduce(
+    ([pathArray, inputSubset], pathPart, index, fieldParts) => {
+      if (lodash.hasIn(inputSubset, pathPart)) {
+        return [pathArray.concat(pathPart), inputSubset[pathPart]];
+      } else if (fieldParts[index + 1] !== undefined) {
+        fieldParts[index + 1] = `${pathPart}.${fieldParts[index + 1]}`;
+        return [pathArray, inputSubset];
+      }
+
+      return [pathArray, undefined];
+    },
+    [[] as string[], input as any],
+  );
+}
+
 export function parseEntityTransformParams(
  params: Record<string, unknown>,
 ): ((entity: Entity) => Entity) | undefined {
@@ -46,9 +62,10 @@ export function parseEntityTransformParams(
    const output: RecursivePartial<Entity> = {};

    for (const field of fields) {
-      const value = lodash.get(input, field);
+      const [pathArray, value] = getPathArrayAndValue(input, field);
+
      if (value !== undefined) {
-        lodash.set(output, field, value);
+        lodash.set(output, pathArray, value);
      }
    }

@@ -1,5 +1,13 @@
 # @backstage/plugin-catalog-common

+## 1.0.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.6.1-next.0
+  - @backstage/search-common@0.3.4-next.0
+
 ## 1.0.1

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-catalog-common",
  "description": "Common functionalities for the catalog plugin",
-  "version": "1.0.1",
+  "version": "1.0.2-next.0",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -34,11 +34,11 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/plugin-permission-common": "^0.6.0",
-    "@backstage/search-common": "^0.3.3"
+    "@backstage/plugin-permission-common": "^0.6.1-next.0",
+    "@backstage/search-common": "^0.3.4-next.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.0"
+    "@backstage/cli": "^0.17.1-next.2"
  },
  "files": [
    "dist",
@@ -1,5 +1,16 @@
 # @backstage/plugin-catalog-graph

+## 0.2.17-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.9.4-next.1
+  - @backstage/plugin-catalog-react@1.1.0-next.2
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/core-plugin-api@1.0.2-next.1
+  - @backstage/catalog-client@1.0.2-next.0
+
 ## 0.2.17-next.1

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@backstage/plugin-catalog-graph",
-  "version": "0.2.17-next.1",
+  "version": "0.2.17-next.2",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -24,11 +24,11 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/catalog-client": "^1.0.1",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/core-components": "^0.9.4-next.0",
-    "@backstage/core-plugin-api": "^1.0.2-next.0",
-    "@backstage/plugin-catalog-react": "^1.1.0-next.1",
+    "@backstage/catalog-client": "^1.0.2-next.0",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/core-components": "^0.9.4-next.2",
+    "@backstage/core-plugin-api": "^1.0.2-next.1",
+    "@backstage/plugin-catalog-react": "^1.1.0-next.2",
    "@backstage/theme": "^0.2.15",
    "@material-ui/core": "^4.12.2",
    "@material-ui/icons": "^4.9.1",
@@ -45,11 +45,11 @@
    "react": "^16.13.1 || ^17.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/core-app-api": "^1.0.2-next.0",
-    "@backstage/dev-utils": "^1.0.2-next.1",
-    "@backstage/plugin-catalog": "^1.2.0-next.1",
-    "@backstage/test-utils": "^1.1.0-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/plugin-catalog": "^1.2.0-next.2",
+    "@backstage/core-app-api": "^1.0.2-next.1",
+    "@backstage/dev-utils": "^1.0.2-next.2",
+    "@backstage/test-utils": "^1.1.0-next.2",
    "@backstage/types": "^1.0.0",
    "@testing-library/jest-dom": "^5.10.1",
    "@testing-library/react": "^12.1.3",
@@ -109,7 +109,7 @@ describe('<SelectedKindsFilter/>', () => {
    );

    await userEvent.click(getByRole('combobox'));
-    userEvent.tab();
+    await userEvent.tab();

    await waitFor(() => {
      expect(onChange).toBeCalledWith(undefined);
@@ -101,7 +101,7 @@ describe('<SelectedRelationsFilter/>', () => {
    );

    await userEvent.click(getByRole('combobox'));
-    userEvent.tab();
+    await userEvent.tab();

    await waitFor(() => {
      expect(onChange).toBeCalledWith(undefined);
@@ -1,5 +1,13 @@
 # @backstage/plugin-catalog-graphql

+## 0.3.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.1-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+
 ## 0.3.8

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-catalog-graphql",
  "description": "An experimental Backstage catalog GraphQL module",
-  "version": "0.3.8",
+  "version": "0.3.9-next.0",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -34,8 +34,8 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/config": "^1.0.0",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
    "@backstage/types": "^1.0.0",
    "apollo-server": "^3.0.0",
    "graphql": "^16.0.0",
@@ -46,8 +46,8 @@
    "winston": "^3.2.1"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/test-utils": "^1.1.0-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/test-utils": "^1.1.0-next.2",
    "@graphql-codegen/cli": "^2.3.1",
    "@graphql-codegen/graphql-modules-preset": "^2.3.2",
    "@graphql-codegen/typescript": "^2.4.2",
@@ -1,5 +1,19 @@
 # @backstage/plugin-catalog-import

+## 0.8.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.9.4-next.1
+  - @backstage/config@1.0.1-next.0
+  - @backstage/plugin-catalog-react@1.1.0-next.2
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/core-plugin-api@1.0.2-next.1
+  - @backstage/integration@1.2.0-next.1
+  - @backstage/integration-react@1.1.0-next.2
+  - @backstage/catalog-client@1.0.2-next.0
+
 ## 0.8.8-next.1

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-catalog-import",
  "description": "A Backstage plugin the helps you import entities into your catalog",
-  "version": "0.8.8-next.1",
+  "version": "0.8.8-next.2",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -34,15 +34,15 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/catalog-client": "^1.0.1",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/config": "^1.0.0",
-    "@backstage/core-components": "^0.9.4-next.0",
-    "@backstage/core-plugin-api": "^1.0.2-next.0",
+    "@backstage/catalog-client": "^1.0.2-next.0",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/config": "^1.0.1-next.0",
+    "@backstage/core-components": "^0.9.4-next.2",
+    "@backstage/core-plugin-api": "^1.0.2-next.1",
    "@backstage/errors": "^1.0.0",
-    "@backstage/integration": "^1.2.0-next.0",
-    "@backstage/integration-react": "^1.1.0-next.1",
-    "@backstage/plugin-catalog-react": "^1.1.0-next.1",
+    "@backstage/integration": "^1.2.0-next.1",
+    "@backstage/integration-react": "^1.1.0-next.2",
+    "@backstage/plugin-catalog-react": "^1.1.0-next.2",
    "@material-ui/core": "^4.12.2",
    "@material-ui/icons": "^4.9.1",
    "@material-ui/lab": "4.0.0-alpha.57",
@@ -60,10 +60,10 @@
    "react": "^16.13.1 || ^17.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/core-app-api": "^1.0.2-next.0",
-    "@backstage/dev-utils": "^1.0.2-next.1",
-    "@backstage/test-utils": "^1.1.0-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/core-app-api": "^1.0.2-next.1",
+    "@backstage/dev-utils": "^1.0.2-next.2",
+    "@backstage/test-utils": "^1.1.0-next.2",
    "@testing-library/jest-dom": "^5.10.1",
    "@testing-library/react": "^12.1.3",
    "@testing-library/react-hooks": "^8.0.0",
@@ -67,7 +67,7 @@ describe('<PreparePullRequestForm />', () => {
    );

    await act(async () => {
-      userEvent.clear(getByLabelText('Main Field'));
+      await userEvent.clear(getByLabelText('Main Field'));
      await userEvent.type(getByLabelText('Main Field'), 'My Text');
      await userEvent.click(getByRole('button', { name: /submit/i }));
    });
@@ -1,5 +1,20 @@
 # @backstage/plugin-catalog-react

+## 1.1.0-next.2
+
+### Patch Changes
+
+- 57f41fb8d6: Make Menu item on filters accessible through keyboard
+- Updated dependencies
+  - @backstage/core-components@0.9.4-next.1
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/core-plugin-api@1.0.2-next.1
+  - @backstage/integration@1.2.0-next.1
+  - @backstage/plugin-permission-common@0.6.1-next.0
+  - @backstage/plugin-permission-react@0.4.1-next.1
+  - @backstage/catalog-client@1.0.2-next.0
+  - @backstage/plugin-catalog-common@1.0.2-next.0
+
 ## 1.1.0-next.1

 ### Patch Changes
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-catalog-react",
  "description": "A frontend library that helps other Backstage plugins interact with the catalog",
-  "version": "1.1.0-next.1",
+  "version": "1.1.0-next.2",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -34,15 +34,15 @@
    "start": "backstage-cli package start"
  },
  "dependencies": {
-    "@backstage/catalog-client": "^1.0.1",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/core-components": "^0.9.4-next.0",
-    "@backstage/core-plugin-api": "^1.0.2-next.0",
+    "@backstage/catalog-client": "^1.0.2-next.0",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/core-components": "^0.9.4-next.1",
+    "@backstage/core-plugin-api": "^1.0.2-next.1",
    "@backstage/errors": "^1.0.0",
-    "@backstage/integration": "^1.2.0-next.0",
-    "@backstage/plugin-catalog-common": "^1.0.1",
-    "@backstage/plugin-permission-common": "^0.6.0",
-    "@backstage/plugin-permission-react": "^0.4.1-next.0",
+    "@backstage/integration": "^1.2.0-next.1",
+    "@backstage/plugin-catalog-common": "^1.0.2-next.0",
+    "@backstage/plugin-permission-common": "^0.6.1-next.0",
+    "@backstage/plugin-permission-react": "^0.4.1-next.1",
    "@backstage/theme": "^0.2.15",
    "@backstage/types": "^1.0.0",
    "@backstage/version-bridge": "^1.0.1",
@@ -63,11 +63,11 @@
    "react": "^16.13.1 || ^17.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/core-app-api": "^1.0.2-next.0",
-    "@backstage/plugin-catalog-common": "^1.0.1",
-    "@backstage/plugin-scaffolder-common": "^1.0.1",
-    "@backstage/test-utils": "^1.1.0-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/core-app-api": "^1.0.2-next.1",
+    "@backstage/plugin-catalog-common": "^1.0.2-next.0",
+    "@backstage/plugin-scaffolder-common": "^1.1.0-next.0",
+    "@backstage/test-utils": "^1.1.0-next.2",
    "@testing-library/jest-dom": "^5.10.1",
    "@testing-library/react": "^12.1.3",
    "@testing-library/react-hooks": "^8.0.0",
@@ -1,5 +1,22 @@
 # @backstage/plugin-catalog

+## 1.2.0-next.2
+
+### Patch Changes
+
+- 2bcb0a0e2b: Sidebar NAV now includes aria-label. Component AboutField now uses h2 variant instead of subtitle2 (font properties unchanged)
+- 3a74e203a8: Updated search result components to support rendering content with highlighted matched terms
+- Updated dependencies
+  - @backstage/core-components@0.9.4-next.1
+  - @backstage/plugin-search-react@0.2.0-next.2
+  - @backstage/plugin-search-common@0.3.4-next.0
+  - @backstage/plugin-catalog-react@1.1.0-next.2
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/core-plugin-api@1.0.2-next.1
+  - @backstage/integration-react@1.1.0-next.2
+  - @backstage/catalog-client@1.0.2-next.0
+  - @backstage/plugin-catalog-common@1.0.2-next.0
+
 ## 1.2.0-next.1

 ### Patch Changes
@@ -17,6 +17,7 @@ import { Observable } from '@backstage/types';
 import { Overrides } from '@material-ui/core/styles/overrides';
 import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
+import { ResultHighlight } from '@backstage/plugin-search-common';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { StarredEntitiesApi } from '@backstage/plugin-catalog-react';
 import { StorageApi } from '@backstage/core-plugin-api';
@@ -108,6 +109,8 @@ export function CatalogSearchResultListItem(

 // @public
 export interface CatalogSearchResultListItemProps {
+  // (undocumented)
+  highlight?: ResultHighlight;
  // (undocumented)
  result: IndexableDocument;
 }
@@ -1,7 +1,7 @@
 {
  "name": "@backstage/plugin-catalog",
  "description": "The Backstage plugin for browsing the Backstage catalog",
-  "version": "1.2.0-next.1",
+  "version": "1.2.0-next.2",
  "main": "src/index.ts",
  "types": "src/index.ts",
  "license": "Apache-2.0",
@@ -34,15 +34,16 @@
    "clean": "backstage-cli package clean"
  },
  "dependencies": {
-    "@backstage/catalog-client": "^1.0.1",
-    "@backstage/catalog-model": "^1.0.1",
-    "@backstage/core-components": "^0.9.4-next.0",
-    "@backstage/core-plugin-api": "^1.0.2-next.0",
+    "@backstage/catalog-client": "^1.0.2-next.0",
+    "@backstage/catalog-model": "^1.0.2-next.0",
+    "@backstage/core-components": "^0.9.4-next.2",
+    "@backstage/core-plugin-api": "^1.0.2-next.1",
    "@backstage/errors": "^1.0.0",
-    "@backstage/integration-react": "^1.1.0-next.1",
-    "@backstage/plugin-catalog-common": "^1.0.1",
-    "@backstage/plugin-catalog-react": "^1.1.0-next.1",
-    "@backstage/plugin-search-common": "^0.3.3",
+    "@backstage/integration-react": "^1.1.0-next.2",
+    "@backstage/plugin-catalog-common": "^1.0.2-next.0",
+    "@backstage/plugin-catalog-react": "^1.1.0-next.2",
+    "@backstage/plugin-search-common": "^0.3.4-next.0",
+    "@backstage/plugin-search-react": "^0.2.0-next.2",
    "@backstage/theme": "^0.2.15",
    "@backstage/types": "^1.0.0",
    "@material-ui/core": "^4.12.2",
@@ -60,11 +61,11 @@
    "react": "^16.13.1 || ^17.0.0"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.17.1-next.1",
-    "@backstage/core-app-api": "^1.0.2-next.0",
-    "@backstage/dev-utils": "^1.0.2-next.1",
-    "@backstage/plugin-permission-react": "^0.4.1-next.0",
-    "@backstage/test-utils": "^1.1.0-next.1",
+    "@backstage/cli": "^0.17.1-next.2",
+    "@backstage/core-app-api": "^1.0.2-next.1",
+    "@backstage/dev-utils": "^1.0.2-next.2",
+    "@backstage/plugin-permission-react": "^0.4.1-next.1",
+    "@backstage/test-utils": "^1.1.0-next.2",
    "@testing-library/jest-dom": "^5.10.1",
    "@testing-library/react": "^12.1.3",
    "@testing-library/user-event": "^14.0.0",
@@ -66,7 +66,7 @@ export function AboutField(props: AboutFieldProps) {
    );
  return (
    <Grid item {...gridSizes}>
-      <Typography variant="subtitle2" className={classes.label}>
+      <Typography variant="h2" className={classes.label}>
        {label}
      </Typography>
      {content}
@@ -24,7 +24,11 @@ import {
  makeStyles,
 } from '@material-ui/core';
 import { Link } from '@backstage/core-components';
-import { IndexableDocument } from '@backstage/plugin-search-common';
+import {
+  IndexableDocument,
+  ResultHighlight,
+} from '@backstage/plugin-search-common';
+import { HighlightedSearchResultText } from '@backstage/plugin-search-react';

 const useStyles = makeStyles({
  flexContainer: {
@@ -44,6 +48,7 @@ const useStyles = makeStyles({
 */
 export interface CatalogSearchResultListItemProps {
  result: IndexableDocument;
+  highlight?: ResultHighlight;
 }

 /** @public */
@@ -59,8 +64,28 @@ export function CatalogSearchResultListItem(
        <ListItemText
          className={classes.itemText}
          primaryTypographyProps={{ variant: 'h6' }}
-          primary={result.title}
-          secondary={result.text}
+          primary={
+            props.highlight?.fields.title ? (
+              <HighlightedSearchResultText
+                text={props.highlight.fields.title}
+                preTag={props.highlight.preTag}
+                postTag={props.highlight.postTag}
+              />
+            ) : (
+              result.title
+            )
+          }
+          secondary={
+            props.highlight?.fields.text ? (
+              <HighlightedSearchResultText
+                text={props.highlight.fields.text}
+                preTag={props.highlight.preTag}
+                postTag={props.highlight.postTag}
+              />
+            ) : (
+              result.text
+            )
+          }
        />
        <Box>
          {result.kind && <Chip label={`Kind: ${result.kind}`} size="small" />}
--- a/Show More
+++ b/Show More