From a971957d5023ad8f1bd5f033c0c955f6b73d74ad Mon Sep 17 00:00:00 2001
From: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
Date: Fri, 16 Jul 2021 20:53:11 +0200
Subject: [PATCH 01/83] Add authHandler and login resolver for OAuth2 provider

Signed-off-by: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
---
 plugins/auth-backend/src/providers/index.ts   |   1 +
 .../src/providers/oauth2/index.ts             |   2 +-
 .../src/providers/oauth2/provider.test.ts     |  93 ++++++++
 .../src/providers/oauth2/provider.ts          | 202 ++++++++++++++----
 4 files changed, 255 insertions(+), 43 deletions(-)
 create mode 100644 plugins/auth-backend/src/providers/oauth2/provider.test.ts

diff --git a/plugins/auth-backend/src/providers/index.ts b/plugins/auth-backend/src/providers/index.ts
index 6b262dcf68..576c5011af 100644
--- a/plugins/auth-backend/src/providers/index.ts
+++ b/plugins/auth-backend/src/providers/index.ts
@@ -16,6 +16,7 @@
 
 export * from './google';
 export * from './microsoft';
+export * from './oauth2';
 export { factories as defaultAuthProviderFactories } from './factories';
 
 // Export the minimal interface required for implementing a
diff --git a/plugins/auth-backend/src/providers/oauth2/index.ts b/plugins/auth-backend/src/providers/oauth2/index.ts
index d68208a148..4e2509735d 100644
--- a/plugins/auth-backend/src/providers/oauth2/index.ts
+++ b/plugins/auth-backend/src/providers/oauth2/index.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-export { createOAuth2Provider } from './provider';
+export { createOAuth2Provider, oAuth2EmailSignInResolver } from './provider';
 export type { OAuth2ProviderOptions } from './provider';
diff --git a/plugins/auth-backend/src/providers/oauth2/provider.test.ts b/plugins/auth-backend/src/providers/oauth2/provider.test.ts
new file mode 100644
index 0000000000..773471c42f
--- /dev/null
+++ b/plugins/auth-backend/src/providers/oauth2/provider.test.ts
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2020 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 { OAuth2AuthProvider } from './provider';
+import * as helpers from '../../lib/passport/PassportStrategyHelper';
+import { OAuthResult } from '../../lib/oauth';
+import { getVoidLogger } from '@backstage/backend-common';
+import { TokenIssuer } from '../../identity/types';
+import { CatalogIdentityClient } from '../../lib/catalog';
+
+const mockFrameHandler = (jest.spyOn(
+  helpers,
+  'executeFrameHandlerStrategy',
+) as unknown) as jest.MockedFunction<
+  () => Promise<{ result: OAuthResult; privateInfo: any }>
+>;
+
+describe('createOAuth2Provider', () => {
+  it('should auth', async () => {
+    const tokenIssuer = {
+      issueToken: jest.fn(),
+      listPublicKeys: jest.fn(),
+    };
+    const catalogIdentityClient = {
+      findUser: jest.fn(),
+    };
+
+    const provider = new OAuth2AuthProvider({
+      logger: getVoidLogger(),
+      catalogIdentityClient: (catalogIdentityClient as unknown) as CatalogIdentityClient,
+      tokenIssuer: (tokenIssuer as unknown) as TokenIssuer,
+      authHandler: async ({ fullProfile }) => ({
+        profile: {
+          email: fullProfile.emails![0]!.value,
+          displayName: fullProfile.displayName,
+          picture: 'http://backstage.io/lols',
+        },
+      }),
+      clientId: 'mock',
+      clientSecret: 'mock',
+      callbackUrl: 'mock',
+      authorizationUrl: 'mock',
+      tokenUrl: 'mock',
+    });
+
+    mockFrameHandler.mockResolvedValueOnce({
+      result: {
+        fullProfile: {
+          emails: [{ value: 'conrad@example.com' }],
+          displayName: 'Conrad',
+          id: 'conrad',
+          provider: 'oAuth2',
+        },
+        params: {
+          id_token: 'idToken',
+          scope: 'scope',
+          expires_in: 123,
+        },
+        accessToken: 'accessToken',
+      },
+      privateInfo: {
+        refreshToken: 'wacka',
+      },
+    });
+    const { response } = await provider.handler({} as any);
+    expect(response).toEqual({
+      providerInfo: {
+        accessToken: 'accessToken',
+        expiresInSeconds: 123,
+        idToken: 'idToken',
+        scope: 'scope',
+      },
+      profile: {
+        email: 'conrad@example.com',
+        displayName: 'Conrad',
+        picture: 'http://backstage.io/lols',
+      },
+    });
+  });
+});
diff --git a/plugins/auth-backend/src/providers/oauth2/provider.ts b/plugins/auth-backend/src/providers/oauth2/provider.ts
index f174543a63..7e09487c32 100644
--- a/plugins/auth-backend/src/providers/oauth2/provider.ts
+++ b/plugins/auth-backend/src/providers/oauth2/provider.ts
@@ -18,15 +18,15 @@ import express from 'express';
 import passport from 'passport';
 import { Strategy as OAuth2Strategy } from 'passport-oauth2';
 import {
-  OAuthAdapter,
-  OAuthProviderOptions,
-  OAuthHandlers,
-  OAuthResponse,
-  OAuthEnvironmentHandler,
-  OAuthStartRequest,
   encodeState,
+  OAuthAdapter,
+  OAuthEnvironmentHandler,
+  OAuthHandlers,
+  OAuthProviderOptions,
   OAuthRefreshRequest,
+  OAuthResponse,
   OAuthResult,
+  OAuthStartRequest,
 } from '../../lib/oauth';
 import {
   executeFetchUserProfileStrategy,
@@ -36,22 +36,46 @@ import {
   makeProfileInfo,
   PassportDoneCallback,
 } from '../../lib/passport';
-import { RedirectInfo, AuthProviderFactory } from '../types';
+import {
+  AuthHandler,
+  AuthProviderFactory,
+  RedirectInfo,
+  SignInResolver,
+} from '../types';
+import { CatalogIdentityClient, getEntityClaims } from '../../lib/catalog';
+import { TokenIssuer } from '../../identity';
+import { Logger } from 'winston';
 
 type PrivateInfo = {
   refreshToken: string;
 };
 
 export type OAuth2AuthProviderOptions = OAuthProviderOptions & {
+  signInResolver?: SignInResolver<OAuthResult>;
+  authHandler: AuthHandler<OAuthResult>;
+  tokenIssuer: TokenIssuer;
+  catalogIdentityClient: CatalogIdentityClient;
   authorizationUrl: string;
   tokenUrl: string;
   scope?: string;
+  logger: Logger;
 };
 
 export class OAuth2AuthProvider implements OAuthHandlers {
   private readonly _strategy: OAuth2Strategy;
+  private readonly signInResolver?: SignInResolver<OAuthResult>;
+  private readonly authHandler: AuthHandler<OAuthResult>;
+  private readonly tokenIssuer: TokenIssuer;
+  private readonly catalogIdentityClient: CatalogIdentityClient;
+  private readonly logger: Logger;
 
   constructor(options: OAuth2AuthProviderOptions) {
+    this.signInResolver = options.signInResolver;
+    this.authHandler = options.authHandler;
+    this.tokenIssuer = options.tokenIssuer;
+    this.catalogIdentityClient = options.catalogIdentityClient;
+    this.logger = options.logger;
+
     this._strategy = new OAuth2Strategy(
       {
         clientID: options.clientId,
@@ -102,18 +126,8 @@ export class OAuth2AuthProvider implements OAuthHandlers {
       PrivateInfo
     >(req, this._strategy);
 
-    const profile = makeProfileInfo(result.fullProfile, result.params.id_token);
-
     return {
-      response: await this.populateIdentity({
-        profile,
-        providerInfo: {
-          idToken: result.params.id_token,
-          accessToken: result.accessToken,
-          scope: result.params.scope,
-          expiresInSeconds: result.params.expires_in,
-        },
-      }),
+      response: await this.handleResult(result),
       refreshToken: privateInfo.refreshToken,
     };
   }
@@ -130,46 +144,124 @@ export class OAuth2AuthProvider implements OAuthHandlers {
       refreshToken: updatedRefreshToken,
     } = refreshTokenResponse;
 
-    const rawProfile = await executeFetchUserProfileStrategy(
+    const fullProfile = await executeFetchUserProfileStrategy(
       this._strategy,
       accessToken,
     );
-    const profile = makeProfileInfo(rawProfile, params.id_token);
 
-    return this.populateIdentity({
-      providerInfo: {
-        accessToken,
-        refreshToken: updatedRefreshToken,
-        idToken: params.id_token,
-        expiresInSeconds: params.expires_in,
-        scope: params.scope,
-      },
-      profile,
+    return this.handleResult({
+      fullProfile,
+      params,
+      accessToken,
+      refreshToken: updatedRefreshToken,
     });
   }
 
-  // Use this function to grab the user profile info from the token
-  // Then populate the profile with it
-  private async populateIdentity(
-    response: OAuthResponse,
-  ): Promise<OAuthResponse> {
-    const { profile } = response;
+  private async handleResult(result: OAuthResult) {
+    const { profile } = await this.authHandler(result);
 
-    if (!profile.email) {
-      throw new Error('Profile does not contain an email');
+    const response: OAuthResponse = {
+      providerInfo: {
+        idToken: result.params.id_token,
+        accessToken: result.accessToken,
+        scope: result.params.scope,
+        expiresInSeconds: result.params.expires_in,
+      },
+      profile,
+    };
+
+    if (this.signInResolver) {
+      response.backstageIdentity = await this.signInResolver(
+        {
+          result,
+          profile,
+        },
+        {
+          tokenIssuer: this.tokenIssuer,
+          catalogIdentityClient: this.catalogIdentityClient,
+          logger: this.logger,
+        },
+      );
     }
-    const id = profile.email.split('@')[0];
 
-    return { ...response, backstageIdentity: { id } };
+    return response;
   }
 }
 
-export type OAuth2ProviderOptions = {};
+export const oAuth2EmailSignInResolver: SignInResolver<OAuthResult> = async (
+  info,
+  ctx,
+) => {
+  const { profile } = info;
+
+  if (!profile.email) {
+    throw new Error('OAuth2 profile contained no email');
+  }
+
+  const entity = await ctx.catalogIdentityClient.findUser({
+    annotations: {
+      'oauth2/email': profile.email,
+    },
+  });
+
+  const claims = getEntityClaims(entity);
+  const token = await ctx.tokenIssuer.issueToken({ claims });
+
+  return { id: entity.metadata.name, entity, token };
+};
+
+export const oAuth2DefaultSignInResolver: SignInResolver<OAuthResult> = async (
+  info,
+  ctx,
+) => {
+  const { profile } = info;
+
+  if (!profile.email) {
+    throw new Error('Profile contained no email');
+  }
+
+  let userId: string;
+
+  try {
+    const entity = await ctx.catalogIdentityClient.findUser({
+      annotations: {
+        'oauth2/email': profile.email,
+      },
+    });
+    userId = entity.metadata.name;
+  } catch (error) {
+    ctx.logger.warn(
+      `Failed to look up user, ${error}, falling back to allowing login based on email pattern, this will probably break in the future`,
+    );
+    userId = profile.email.split('@')[0];
+  }
+
+  const token = await ctx.tokenIssuer.issueToken({
+    claims: { sub: userId, ent: [`user:default/${userId}`] },
+  });
+
+  return { id: userId, token };
+};
+
+export type OAuth2ProviderOptions = {
+  authHandler?: AuthHandler<OAuthResult>;
+
+  signIn?: {
+    resolver?: SignInResolver<OAuthResult>;
+  };
+};
 
 export const createOAuth2Provider = (
-  _options?: OAuth2ProviderOptions,
+  options?: OAuth2ProviderOptions,
 ): AuthProviderFactory => {
-  return ({ providerId, globalConfig, config, tokenIssuer }) =>
+  return ({
+    providerId,
+    globalConfig,
+    config,
+    tokenIssuer,
+    catalogApi,
+    logger,
+  }) =>
     OAuthEnvironmentHandler.mapConfig(config, envConfig => {
       const clientId = envConfig.getString('clientId');
       const clientSecret = envConfig.getString('clientSecret');
@@ -178,13 +270,39 @@ export const createOAuth2Provider = (
       const tokenUrl = envConfig.getString('tokenUrl');
       const scope = envConfig.getOptionalString('scope');
 
+      const catalogIdentityClient = new CatalogIdentityClient({
+        catalogApi,
+        tokenIssuer,
+      });
+
+      const authHandler: AuthHandler<OAuthResult> = options?.authHandler
+        ? options.authHandler
+        : async ({ fullProfile, params }) => ({
+            profile: makeProfileInfo(fullProfile, params.id_token),
+          });
+
+      const signInResolverFn =
+        options?.signIn?.resolver ?? oAuth2DefaultSignInResolver;
+
+      const signInResolver: SignInResolver<OAuthResult> = info =>
+        signInResolverFn(info, {
+          catalogIdentityClient,
+          tokenIssuer,
+          logger,
+        });
+
       const provider = new OAuth2AuthProvider({
         clientId,
         clientSecret,
+        tokenIssuer,
+        catalogIdentityClient,
         callbackUrl,
+        signInResolver,
+        authHandler,
         authorizationUrl,
         tokenUrl,
         scope,
+        logger,
       });
 
       return OAuthAdapter.fromConfig(globalConfig, provider, {

From e9b1e2a9f40950b955a15c55109c7863701b95a5 Mon Sep 17 00:00:00 2001
From: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
Date: Fri, 16 Jul 2021 21:04:55 +0200
Subject: [PATCH 02/83] Added changeset for oAuth2 provider refactoring

Signed-off-by: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
---
 .changeset/strong-ravens-smoke.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/strong-ravens-smoke.md

diff --git a/.changeset/strong-ravens-smoke.md b/.changeset/strong-ravens-smoke.md
new file mode 100644
index 0000000000..8579e74d37
--- /dev/null
+++ b/.changeset/strong-ravens-smoke.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': minor
+---
+
+Added signIn and authHandler resolver for oAuth2 provider

From ce0260753273ef24fd9d43659b635457d4a453ce Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aureliosaraiva@gmail.com>
Date: Wed, 18 Aug 2021 18:22:37 -0300
Subject: [PATCH 03/83] added title

Signed-off-by: Aurelio Saraiva <aureliosaraiva@gmail.com>
---
 .../examples/documented-component/catalog-info.yaml       | 1 +
 plugins/techdocs/src/home/components/columns.tsx          | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml b/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml
index 125c18200d..e6d14025e1 100644
--- a/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml
+++ b/plugins/techdocs-backend/examples/documented-component/catalog-info.yaml
@@ -2,6 +2,7 @@ apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
   name: documented-component
+  title: Documented Component
   description: A Service with TechDocs documentation
   annotations:
     backstage.io/techdocs-ref: dir:.
diff --git a/plugins/techdocs/src/home/components/columns.tsx b/plugins/techdocs/src/home/components/columns.tsx
index 5cdcc66c37..80dfd80a35 100644
--- a/plugins/techdocs/src/home/components/columns.tsx
+++ b/plugins/techdocs/src/home/components/columns.tsx
@@ -19,6 +19,10 @@ import { Link, SubvalueCell, TableColumn } from '@backstage/core-components';
 import { EntityRefLinks } from '@backstage/plugin-catalog-react';
 import { DocsTableRow } from './types';
 
+function formatTitle(entity): String {
+  return entity.metadata.title || entity.metadata.name;
+}
+
 export function createNameColumn(): TableColumn<DocsTableRow> {
   return {
     title: 'Document',
@@ -26,9 +30,7 @@ export function createNameColumn(): TableColumn<DocsTableRow> {
     highlight: true,
     render: (row: DocsTableRow) => (
       <SubvalueCell
-        value={
-          <Link to={row.resolved.docsUrl}>{row.entity.metadata.name}</Link>
-        }
+        value={<Link to={row.resolved.docsUrl}>{formatTitle(row.entity)}</Link>}
         subvalue={row.entity.metadata.description}
       />
     ),

From 60169a761d5c98821e4f1bf6488a3c2e30188778 Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aureliosaraiva@gmail.com>
Date: Wed, 18 Aug 2021 19:34:16 -0300
Subject: [PATCH 04/83] renamed function to customTitle

Signed-off-by: Aurelio Saraiva <aureliosaraiva@gmail.com>
---
 plugins/techdocs/src/home/components/columns.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/techdocs/src/home/components/columns.tsx b/plugins/techdocs/src/home/components/columns.tsx
index 80dfd80a35..b7ec8271a4 100644
--- a/plugins/techdocs/src/home/components/columns.tsx
+++ b/plugins/techdocs/src/home/components/columns.tsx
@@ -17,9 +17,10 @@
 import React from 'react';
 import { Link, SubvalueCell, TableColumn } from '@backstage/core-components';
 import { EntityRefLinks } from '@backstage/plugin-catalog-react';
+import { Entity } from '@backstage/catalog-model';
 import { DocsTableRow } from './types';
 
-function formatTitle(entity): String {
+function customTitle(entity: Entity): String {
   return entity.metadata.title || entity.metadata.name;
 }
 
@@ -30,7 +31,7 @@ export function createNameColumn(): TableColumn<DocsTableRow> {
     highlight: true,
     render: (row: DocsTableRow) => (
       <SubvalueCell
-        value={<Link to={row.resolved.docsUrl}>{formatTitle(row.entity)}</Link>}
+        value={<Link to={row.resolved.docsUrl}>{customTitle(row.entity)}</Link>}
         subvalue={row.entity.metadata.description}
       />
     ),

From 4578d0708c528a22eed08d759113dcfb0bc6eb3e Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aureliosaraiva@gmail.com>
Date: Wed, 18 Aug 2021 19:49:37 -0300
Subject: [PATCH 05/83] updated docs with new property title

Signed-off-by: Aurelio Saraiva <aureliosaraiva@gmail.com>
---
 docs/features/software-catalog/descriptor-format.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md
index fb17f4a434..f39454a797 100644
--- a/docs/features/software-catalog/descriptor-format.md
+++ b/docs/features/software-catalog/descriptor-format.md
@@ -231,6 +231,14 @@ follows.
 
 Example: `visits-tracking-service`, `CircleciBuildsDumpV2_avro_gcs`
 
+### `title` [optional]
+
+The title of the entity. This is a friendly title to be used in the Backstage
+interface. This is an optional property, if it doesn't exist the `name` property
+will be used.
+
+Only available for Templates and Docs.
+
 ### `namespace` [optional]
 
 The ID of a namespace that the entity belongs to. This is a string that follows

From bda7fd72c7c1c8c1856f8f664b2fb605849d4a16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 04:08:14 +0000
Subject: [PATCH 06/83] chore(deps): bump @rjsf/material-ui from 3.0.0 to 3.1.0

Bumps [@rjsf/material-ui](https://github.com/rjsf-team/react-jsonschema-form) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/rjsf-team/react-jsonschema-form/releases)
- [Commits](https://github.com/rjsf-team/react-jsonschema-form/compare/v3.0.0...v3.1.0)

---
updated-dependencies:
- dependency-name: "@rjsf/material-ui"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 94b81f35ee..59deeb3b96 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5053,9 +5053,9 @@
     react-is "^16.9.0"
 
 "@rjsf/material-ui@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@rjsf/material-ui/-/material-ui-3.0.0.tgz#69ece2cb549f0e860b5f89898db90edcc95b15ba"
-  integrity sha512-T2B8QnrDQphbFNxDz7baAa0zTd5TXJmO9soHBPTKKdniRbMEOQ19AJBbZkA3ED2XZa/xrUY/6XjERQLpNACddw==
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/@rjsf/material-ui/-/material-ui-3.1.0.tgz#ed15fc75de1594f87cd8336b7f2ebc492a432d8b"
+  integrity sha512-kWz37spT5SOXkb8Axq4g4BzQjXRylQr6B7eFAg1NPhSK7KrJYwSMSsFJ9Ze2vEBxwEiR0Z0n/4puaamGuGFRBw==
 
 "@roadiehq/backstage-plugin-buildkite@^1.0.8":
   version "1.0.8"

From 4e7c25ff66f858141eb10a992102ac58bfdfe83d Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Mon, 23 Aug 2021 19:03:54 +0530
Subject: [PATCH 07/83] Created Allure Plugin

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 app-config.yaml                               |  3 +
 packages/app/package.json                     |  1 +
 .../app/src/components/catalog/EntityPage.tsx |  5 ++
 plugins/allure/.eslintrc.js                   |  3 +
 plugins/allure/README.md                      | 47 +++++++++++++
 plugins/allure/package.json                   | 68 ++++++++++++++++++
 plugins/allure/src/api/AllureApi.ts           | 24 +++++++
 plugins/allure/src/api/AllureApiClient.ts     | 30 ++++++++
 plugins/allure/src/api/index.ts               | 17 +++++
 .../AllureReportComponent.test.tsx            | 44 ++++++++++++
 .../AllureReportComponent.tsx                 | 70 +++++++++++++++++++
 .../components/AllureReportComponent/index.ts | 16 +++++
 .../src/components/useAllureProjectId.ts      | 25 +++++++
 plugins/allure/src/index.ts                   | 16 +++++
 plugins/allure/src/plugin.test.ts             | 22 ++++++
 plugins/allure/src/plugin.ts                  | 53 ++++++++++++++
 plugins/allure/src/setupTests.ts              | 17 +++++
 17 files changed, 461 insertions(+)
 create mode 100644 plugins/allure/.eslintrc.js
 create mode 100644 plugins/allure/README.md
 create mode 100644 plugins/allure/package.json
 create mode 100644 plugins/allure/src/api/AllureApi.ts
 create mode 100644 plugins/allure/src/api/AllureApiClient.ts
 create mode 100644 plugins/allure/src/api/index.ts
 create mode 100644 plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
 create mode 100644 plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
 create mode 100644 plugins/allure/src/components/AllureReportComponent/index.ts
 create mode 100644 plugins/allure/src/components/useAllureProjectId.ts
 create mode 100644 plugins/allure/src/index.ts
 create mode 100644 plugins/allure/src/plugin.test.ts
 create mode 100644 plugins/allure/src/plugin.ts
 create mode 100644 plugins/allure/src/setupTests.ts

diff --git a/app-config.yaml b/app-config.yaml
index 9f365becef..c5c4a23bdd 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -133,6 +133,9 @@ kafka:
       brokers:
         - localhost:9092
 
+allure:
+  baseUrl: http://localhost:5050/allure-docker-service
+
 integrations:
   github:
     - host: github.com
diff --git a/packages/app/package.json b/packages/app/package.json
index 78ebe32e25..a5407abe09 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -10,6 +10,7 @@
     "@backstage/core-components": "^0.3.2",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/integration-react": "^0.1.7",
+    "@backstage/plugin-allure": "^0.1.0",
     "@backstage/plugin-api-docs": "^0.6.6",
     "@backstage/plugin-badges": "^0.2.7",
     "@backstage/plugin-catalog": "^0.6.12",
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index d84a7341bc..89bc39952f 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -110,6 +110,7 @@ import {
 } from '@roadiehq/backstage-plugin-travis-ci';
 import { EntityCodeCoverageContent } from '@backstage/plugin-code-coverage';
 import { EmptyState } from '@backstage/core-components';
+import { EntityAllureReportContent } from '@backstage/plugin-allure';
 
 const EntityLayoutWrapper = (props: { children?: ReactNode }) => {
   const [badgesDialogOpen, setBadgesDialogOpen] = useState(false);
@@ -356,6 +357,10 @@ const serviceEntityPage = (
     <EntityLayout.Route path="/todos" title="TODOs">
       <EntityTodoContent />
     </EntityLayout.Route>
+
+    <EntityLayout.Route path="/allure" title="Allure Report">
+      <EntityAllureReportContent />
+    </EntityLayout.Route>
   </EntityLayoutWrapper>
 );
 
diff --git a/plugins/allure/.eslintrc.js b/plugins/allure/.eslintrc.js
new file mode 100644
index 0000000000..13573efa9c
--- /dev/null
+++ b/plugins/allure/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  extends: [require.resolve('@backstage/cli/config/eslint')],
+};
diff --git a/plugins/allure/README.md b/plugins/allure/README.md
new file mode 100644
index 0000000000..d28fe913b1
--- /dev/null
+++ b/plugins/allure/README.md
@@ -0,0 +1,47 @@
+# Allure
+
+Welcome to the Backstage Allure plugin. This plugin add an entity service page to display Allure test reports related to the service.
+
+## Install
+
+Run the below command from the `app` package directory.
+
+```shell
+yarn add @backstage/plugin-allure
+```
+
+alternatively, you can execute below command from the root directory of your Backstage app.
+
+```shell
+yarn workspace app add @backstage/plugin-allure
+```
+
+## Configure
+
+### Configure Allure service
+
+Add below configuration in the `app-config.yaml`.
+
+```yaml
+allure:
+  baseUrl: <ALLURE_SERVICE_BASE_URL> # Example: http://localhost:5050/allure-docker-service
+```
+
+### Setup entity service page
+
+Add `EntityAllureReportContent` in the `EntityPage.tsx` like below:
+
+```diff
++ import { EntityAllureReportContent } from '@backstage/plugin-allure';
+
+...
+
+const serviceEntityPage = (
+  <EntityLayoutWrapper>
+    ...
++    <EntityLayout.Route path="/allure" title="Allure Report">
++        <EntityAllureReportContent />
++    </EntityLayout.Route>
+  </EntityLayoutWrapper>
+);
+```
diff --git a/plugins/allure/package.json b/plugins/allure/package.json
new file mode 100644
index 0000000000..81a37ed996
--- /dev/null
+++ b/plugins/allure/package.json
@@ -0,0 +1,68 @@
+{
+  "name": "@backstage/plugin-allure",
+  "version": "0.1.0",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.esm.js",
+    "types": "dist/index.d.ts"
+  },
+  "scripts": {
+    "build": "backstage-cli plugin:build",
+    "start": "backstage-cli plugin:serve",
+    "lint": "backstage-cli lint",
+    "test": "backstage-cli test",
+    "diff": "backstage-cli plugin:diff",
+    "prepack": "backstage-cli prepack",
+    "postpack": "backstage-cli postpack",
+    "clean": "backstage-cli clean"
+  },
+  "dependencies": {
+    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/core-components": "^0.3.2",
+    "@backstage/core-plugin-api": "^0.1.6",
+    "@backstage/plugin-catalog-react": "^0.4.3",
+    "@backstage/theme": "^0.2.10",
+    "@material-ui/core": "^4.12.2",
+    "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "4.0.0-alpha.45",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
+    "react-router-dom": "6.0.0-beta.0",
+    "react-use": "^17.2.4"
+  },
+  "devDependencies": {
+    "@backstage/cli": "^0.7.9",
+    "@backstage/core-app-api": "^0.1.9",
+    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/test-utils": "^0.1.17",
+    "@testing-library/jest-dom": "^5.10.1",
+    "@testing-library/react": "^11.2.5",
+    "@testing-library/user-event": "^13.1.8",
+    "@types/jest": "^26.0.7",
+    "@types/node": "^14.14.32",
+    "cross-fetch": "^3.0.6",
+    "msw": "^0.29.0"
+  },
+  "files": [
+    "dist"
+  ],
+  "configSchema": {
+    "$schema": "https://backstage.io/schema/config-v1",
+    "title": "@backstage/allure",
+    "type": "object",
+    "properties": {
+      "allure": {
+        "type": "object",
+        "properties": {
+          "baseUrl": {
+            "type": "string",
+            "visibility": "frontend"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/plugins/allure/src/api/AllureApi.ts b/plugins/allure/src/api/AllureApi.ts
new file mode 100644
index 0000000000..a926da03d0
--- /dev/null
+++ b/plugins/allure/src/api/AllureApi.ts
@@ -0,0 +1,24 @@
+/*
+ * 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 { createApiRef } from '@backstage/core-plugin-api';
+
+export type AllureApi = {
+  getReportUrl(projectId: string): Promise<string>;
+};
+
+export const allureApiRef = createApiRef<AllureApi>({
+  id: 'allure-api',
+});
diff --git a/plugins/allure/src/api/AllureApiClient.ts b/plugins/allure/src/api/AllureApiClient.ts
new file mode 100644
index 0000000000..698713c837
--- /dev/null
+++ b/plugins/allure/src/api/AllureApiClient.ts
@@ -0,0 +1,30 @@
+/*
+ * 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 { ConfigApi } from '@backstage/core-plugin-api';
+import { AllureApi } from './AllureApi';
+
+export class AllureApiClient implements AllureApi {
+  readonly configApi: ConfigApi;
+
+  constructor(options: { configApi: ConfigApi }) {
+    this.configApi = options.configApi;
+  }
+
+  async getReportUrl(projectId: string): Promise<string> {
+    const baseUrl = this.configApi.getString('allure.baseUrl');
+    return `${baseUrl}/projects/${projectId}/reports/latest/index.html`;
+  }
+}
diff --git a/plugins/allure/src/api/index.ts b/plugins/allure/src/api/index.ts
new file mode 100644
index 0000000000..1c1adb1db2
--- /dev/null
+++ b/plugins/allure/src/api/index.ts
@@ -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 { allureApiRef } from './AllureApi';
+export { AllureApiClient } from './AllureApiClient';
diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
new file mode 100644
index 0000000000..38fa4c0923
--- /dev/null
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
@@ -0,0 +1,44 @@
+/*
+ * 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 React from 'react';
+import { AllureReportComponent } from './AllureReportComponent';
+import { ThemeProvider } from '@material-ui/core';
+import { lightTheme } from '@backstage/theme';
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
+import { msw, renderInTestApp } from '@backstage/test-utils';
+
+describe('ExampleComponent', () => {
+  const server = setupServer();
+  // Enable sane handlers for network requests
+  msw.setupDefaultHandlers(server);
+
+  // setup mock response
+  beforeEach(() => {
+    server.use(
+      rest.get('/*', (_, res, ctx) => res(ctx.status(200), ctx.json({}))),
+    );
+  });
+
+  it('should render', async () => {
+    const rendered = await renderInTestApp(
+      <ThemeProvider theme={lightTheme}>
+        <AllureReportComponent />
+      </ThemeProvider>,
+    );
+    expect(rendered.getByText('Welcome to allure!')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
new file mode 100644
index 0000000000..c59284b3ef
--- /dev/null
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
@@ -0,0 +1,70 @@
+/*
+ * 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 React from 'react';
+import { useApi } from '@backstage/core-plugin-api';
+import { allureApiRef } from '../../api';
+import { AllureApi } from '../../api/AllureApi';
+import { useEntity } from '@backstage/plugin-catalog-react';
+import {
+  ALLURE_PROJECT_ID_ANNOTATION,
+  isAllureReportAvailable,
+  useAllureProjectId,
+} from '../useAllureProjectId';
+import {
+  MissingAnnotationEmptyState,
+  Progress,
+} from '@backstage/core-components';
+import { useAsync } from 'react-use';
+import { Entity } from '@backstage/catalog-model';
+
+const AllureReport = (props: { entity: Entity }) => {
+  const allureApi = useApi<AllureApi>(allureApiRef);
+
+  const allureProjectId = useAllureProjectId(props.entity);
+  const { value, loading } = useAsync(async () => {
+    const url = await allureApi.getReportUrl(allureProjectId);
+    return url;
+  });
+
+  if (loading) {
+    return <Progress />;
+  }
+  return (
+    <>
+      {!loading && (
+        <iframe
+          style={{
+            display: 'table',
+            width: '100%',
+            height: '100%',
+          }}
+          title="Allure Report"
+          src={value}
+        />
+      )}
+    </>
+  );
+};
+
+export const AllureReportComponent = () => {
+  const { entity } = useEntity();
+  const isReportAvailable = isAllureReportAvailable(entity);
+
+  if (isReportAvailable) return <AllureReport entity={entity} />;
+  return (
+    <MissingAnnotationEmptyState annotation={ALLURE_PROJECT_ID_ANNOTATION} />
+  );
+};
diff --git a/plugins/allure/src/components/AllureReportComponent/index.ts b/plugins/allure/src/components/AllureReportComponent/index.ts
new file mode 100644
index 0000000000..7b2fab744b
--- /dev/null
+++ b/plugins/allure/src/components/AllureReportComponent/index.ts
@@ -0,0 +1,16 @@
+/*
+ * 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 { AllureReportComponent } from './AllureReportComponent';
diff --git a/plugins/allure/src/components/useAllureProjectId.ts b/plugins/allure/src/components/useAllureProjectId.ts
new file mode 100644
index 0000000000..d1bcf39b53
--- /dev/null
+++ b/plugins/allure/src/components/useAllureProjectId.ts
@@ -0,0 +1,25 @@
+/*
+ * 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 { Entity } from '@backstage/catalog-model';
+
+export const ALLURE_PROJECT_ID_ANNOTATION = 'allure/project-id';
+
+export const isAllureReportAvailable = (entity: Entity) =>
+  Boolean(entity.metadata.annotations?.[ALLURE_PROJECT_ID_ANNOTATION]);
+
+export const useAllureProjectId = (entity: Entity) => {
+  return entity?.metadata.annotations?.[ALLURE_PROJECT_ID_ANNOTATION] ?? '';
+};
diff --git a/plugins/allure/src/index.ts b/plugins/allure/src/index.ts
new file mode 100644
index 0000000000..016d33c2ff
--- /dev/null
+++ b/plugins/allure/src/index.ts
@@ -0,0 +1,16 @@
+/*
+ * 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 { allurePlugin, EntityAllureReportContent } from './plugin';
diff --git a/plugins/allure/src/plugin.test.ts b/plugins/allure/src/plugin.test.ts
new file mode 100644
index 0000000000..dab1088ad3
--- /dev/null
+++ b/plugins/allure/src/plugin.test.ts
@@ -0,0 +1,22 @@
+/*
+ * 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 { allurePlugin } from './plugin';
+
+describe('allure', () => {
+  it('should export plugin', () => {
+    expect(allurePlugin).toBeDefined();
+  });
+});
diff --git a/plugins/allure/src/plugin.ts b/plugins/allure/src/plugin.ts
new file mode 100644
index 0000000000..3907707b18
--- /dev/null
+++ b/plugins/allure/src/plugin.ts
@@ -0,0 +1,53 @@
+/*
+ * 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 {
+  configApiRef,
+  createApiFactory,
+  createPlugin,
+  createRoutableExtension,
+  createRouteRef,
+} from '@backstage/core-plugin-api';
+import { AllureApiClient, allureApiRef } from './api';
+
+export const allureRouteRef = createRouteRef({
+  title: 'allure-report',
+});
+
+export const allurePlugin = createPlugin({
+  id: 'allure',
+  apis: [
+    createApiFactory({
+      api: allureApiRef,
+      deps: {
+        configApi: configApiRef,
+      },
+      factory: ({ configApi }) => new AllureApiClient({ configApi }),
+    }),
+  ],
+  routes: {
+    root: allureRouteRef,
+  },
+});
+
+export const EntityAllureReportContent = allurePlugin.provide(
+  createRoutableExtension({
+    component: () =>
+      import('./components/AllureReportComponent').then(
+        m => m.AllureReportComponent,
+      ),
+    mountPoint: allureRouteRef,
+  }),
+);
diff --git a/plugins/allure/src/setupTests.ts b/plugins/allure/src/setupTests.ts
new file mode 100644
index 0000000000..fc6dbd98f8
--- /dev/null
+++ b/plugins/allure/src/setupTests.ts
@@ -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.
+ */
+import '@testing-library/jest-dom';
+import 'cross-fetch/polyfill';

From e163d98f043d5c37f72705622e5a667a2d675bf1 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Mon, 23 Aug 2021 19:06:38 +0530
Subject: [PATCH 08/83] Updated changeset

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .changeset/plenty-waves-share.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/plenty-waves-share.md

diff --git a/.changeset/plenty-waves-share.md b/.changeset/plenty-waves-share.md
new file mode 100644
index 0000000000..ed70d17c80
--- /dev/null
+++ b/.changeset/plenty-waves-share.md
@@ -0,0 +1,6 @@
+---
+'example-app': patch
+'@backstage/plugin-allure': patch
+---
+
+Created a new plugin to display Allure reports.

From b5706f4b04c05925084f6bc2f68ec7ae902fd59e Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Mon, 23 Aug 2021 19:30:20 +0530
Subject: [PATCH 09/83] Added api-report.md

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 plugins/allure/api-report.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 plugins/allure/api-report.md

diff --git a/plugins/allure/api-report.md b/plugins/allure/api-report.md
new file mode 100644
index 0000000000..c39b092954
--- /dev/null
+++ b/plugins/allure/api-report.md
@@ -0,0 +1,27 @@
+## API Report File for "@backstage/plugin-allure"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+/// <reference types="react" />
+
+import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { RouteRef } from '@backstage/core-plugin-api';
+
+// Warning: (ae-missing-release-tag) "allurePlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const allurePlugin: BackstagePlugin<
+  {
+    root: RouteRef<undefined>;
+  },
+  {}
+>;
+
+// Warning: (ae-missing-release-tag) "EntityAllureReportContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const EntityAllureReportContent: () => JSX.Element;
+
+// (No @packageDocumentation comment for this package)
+```

From 269aba5b36e940a49bd683290e5f35b5c60d3961 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Mon, 23 Aug 2021 20:03:53 +0530
Subject: [PATCH 10/83] Fixed test case

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .../AllureReportComponent/AllureReportComponent.test.tsx        | 2 +-
 .../components/AllureReportComponent/AllureReportComponent.tsx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
index 38fa4c0923..19c7796e55 100644
--- a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
@@ -39,6 +39,6 @@ describe('ExampleComponent', () => {
         <AllureReportComponent />
       </ThemeProvider>,
     );
-    expect(rendered.getByText('Welcome to allure!')).toBeInTheDocument();
+    expect(rendered.getByText('Missing Annotation')).toBeInTheDocument();
   });
 });
diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
index c59284b3ef..fd46fa0361 100644
--- a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
@@ -61,7 +61,7 @@ const AllureReport = (props: { entity: Entity }) => {
 
 export const AllureReportComponent = () => {
   const { entity } = useEntity();
-  const isReportAvailable = isAllureReportAvailable(entity);
+  const isReportAvailable = entity && isAllureReportAvailable(entity);
 
   if (isReportAvailable) return <AllureReport entity={entity} />;
   return (

From 0c44f924dbdf2c0b69c3b1ca6fc97654a7e4ea90 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Mon, 23 Aug 2021 20:23:54 +0530
Subject: [PATCH 11/83] Added dev/index.tsx

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 plugins/allure/dev/index.tsx | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 plugins/allure/dev/index.tsx

diff --git a/plugins/allure/dev/index.tsx b/plugins/allure/dev/index.tsx
new file mode 100644
index 0000000000..fc61dced03
--- /dev/null
+++ b/plugins/allure/dev/index.tsx
@@ -0,0 +1,27 @@
+/*
+ * 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 React from 'react';
+import { createDevApp } from '@backstage/dev-utils';
+import { EntityAllureReportContent } from '../src/plugin';
+
+createDevApp()
+  .registerPlugin()
+  .addPage({
+    element: <EntityAllureReportContent />,
+    title: 'Allure Report',
+    path: '/allure',
+  })
+  .render();

From ce17a1693141436b3c4ca9cc32b95dab5a0c22e6 Mon Sep 17 00:00:00 2001
From: Roy Jacobs <roy.jacobs@gmail.com>
Date: Wed, 25 Aug 2021 14:43:06 +0200
Subject: [PATCH 12/83] Allow the entities indexed by DefaultCatalogCollator to
 be filtered by kind

Signed-off-by: Roy Jacobs <roy.jacobs@gmail.com>
---
 .changeset/happy-cups-tap.md                  |  6 ++
 packages/backend/src/plugins/search.ts        |  2 +-
 plugins/catalog-backend/api-report.md         | 11 ++++
 plugins/catalog-backend/config.d.ts           | 12 ++++
 .../src/search/DefaultCatalogCollator.test.ts | 60 +++++++++++++++----
 .../src/search/DefaultCatalogCollator.ts      | 21 ++++++-
 6 files changed, 97 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/happy-cups-tap.md

diff --git a/.changeset/happy-cups-tap.md b/.changeset/happy-cups-tap.md
new file mode 100644
index 0000000000..307b6fb4fc
--- /dev/null
+++ b/.changeset/happy-cups-tap.md
@@ -0,0 +1,6 @@
+---
+'example-backend': patch
+'@backstage/plugin-catalog-backend': patch
+---
+
+Allow the catalog search collator to filter the entities that it indexes
diff --git a/packages/backend/src/plugins/search.ts b/packages/backend/src/plugins/search.ts
index 3470110408..2da108608e 100644
--- a/packages/backend/src/plugins/search.ts
+++ b/packages/backend/src/plugins/search.ts
@@ -68,7 +68,7 @@ export default async function createPlugin({
   // particular collator gathers entities from the software catalog.
   indexBuilder.addCollator({
     defaultRefreshIntervalSeconds: 600,
-    collator: new DefaultCatalogCollator({ discovery }),
+    collator: DefaultCatalogCollator.fromConfig(config, { discovery }),
   });
 
   indexBuilder.addCollator({
diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md
index a7a100db65..b46f860207 100644
--- a/plugins/catalog-backend/api-report.md
+++ b/plugins/catalog-backend/api-report.md
@@ -581,9 +581,11 @@ export class DefaultCatalogCollator implements DocumentCollator {
   constructor({
     discovery,
     locationTemplate,
+    allow,
   }: {
     discovery: PluginEndpointDiscovery;
     locationTemplate?: string;
+    allow?: string[];
   });
   // (undocumented)
   protected applyArgsToFormat(
@@ -595,6 +597,15 @@ export class DefaultCatalogCollator implements DocumentCollator {
   // (undocumented)
   execute(): Promise<CatalogEntityDocument[]>;
   // (undocumented)
+  protected filterUrl: string;
+  // (undocumented)
+  static fromConfig(
+    config: Config,
+    options: {
+      discovery: PluginEndpointDiscovery;
+    },
+  ): DefaultCatalogCollator;
+  // (undocumented)
   protected locationTemplate: string;
   // (undocumented)
   readonly type: string;
diff --git a/plugins/catalog-backend/config.d.ts b/plugins/catalog-backend/config.d.ts
index 7da9cad139..5a9291541c 100644
--- a/plugins/catalog-backend/config.d.ts
+++ b/plugins/catalog-backend/config.d.ts
@@ -179,5 +179,17 @@ export interface Config {
         };
       };
     };
+
+    /**
+     * Configuration for search collation
+     */
+    search?: {
+      /**
+       * Request search to only index these particular kinds.
+       *
+       * E.g. ["Component", "API", "Template", "Location"]
+       */
+      allow: Array<string>;
+    };
   };
 }
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
index 2b9745298c..c19d2d21a6 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
@@ -17,6 +17,11 @@
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
 import { DefaultCatalogCollator } from './DefaultCatalogCollator';
+import { setupServer } from 'msw/node';
+import { rest } from 'msw';
+import { ConfigReader } from '@backstage/config';
+
+const server = setupServer();
 
 const expectedEntities: Entity[] = [
   {
@@ -34,27 +39,37 @@ const expectedEntities: Entity[] = [
   },
 ];
 
-jest.mock('cross-fetch', () => ({
-  __esModule: true,
-  default: async () => {
-    return {
-      json: async () => {
-        return expectedEntities;
-      },
-    };
-  },
-}));
-
 describe('DefaultCatalogCollator', () => {
   let mockDiscoveryApi: jest.Mocked<PluginEndpointDiscovery>;
   let collator: DefaultCatalogCollator;
 
-  beforeEach(() => {
+  beforeAll(() => {
     mockDiscoveryApi = {
-      getBaseUrl: jest.fn().mockResolvedValueOnce('http://localhost:7000'),
+      getBaseUrl: jest.fn().mockResolvedValue('http://localhost:7000'),
       getExternalBaseUrl: jest.fn(),
     };
     collator = new DefaultCatalogCollator({ discovery: mockDiscoveryApi });
+    server.listen();
+  });
+  beforeEach(() => {
+    server.use(
+      rest.get('http://localhost:7000/entities', (req, res, ctx) => {
+        if (req.url.searchParams.has('filter')) {
+          const filter = req.url.searchParams.get('filter');
+          if (filter === 'kind=Foo,Bar') {
+            // When filtering on the 'Foo,Bar' kinds we simply return no items, to simulate a filter
+            return res(ctx.json([]));
+          }
+          throw new Error('Unexpected filter parameter');
+        }
+        return res(ctx.json(expectedEntities));
+      }),
+    );
+  });
+  afterEach(() => server.resetHandlers());
+  afterAll(() => {
+    server.close();
+    jest.useRealTimers();
   });
 
   it('fetches from the configured catalog service', async () => {
@@ -88,4 +103,23 @@ describe('DefaultCatalogCollator', () => {
       location: '/software/test-entity',
     });
   });
+
+  it('allows filtering of the retrieved catalog entities', async () => {
+    const config = new ConfigReader({
+      catalog: {
+        search: {
+          allow: ['Foo', 'Bar'],
+        },
+      },
+    });
+
+    // Provide an alternate location template.
+    collator = DefaultCatalogCollator.fromConfig(config, {
+      discovery: mockDiscoveryApi,
+    });
+
+    const documents = await collator.execute();
+    // The simulated 'Foo,Bar' filter should return in an empty list
+    expect(documents).toHaveLength(0);
+  });
 });
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
index 1f9c68e549..4043cf1c1d 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
@@ -18,6 +18,7 @@ import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
 import { IndexableDocument, DocumentCollator } from '@backstage/search-common';
 import fetch from 'cross-fetch';
+import { Config } from '@backstage/config';
 
 export interface CatalogEntityDocument extends IndexableDocument {
   componentType: string;
@@ -30,18 +31,36 @@ export interface CatalogEntityDocument extends IndexableDocument {
 export class DefaultCatalogCollator implements DocumentCollator {
   protected discovery: PluginEndpointDiscovery;
   protected locationTemplate: string;
+  protected filterUrl: string;
   public readonly type: string = 'software-catalog';
 
+  static fromConfig(
+    config: Config,
+    options: { discovery: PluginEndpointDiscovery },
+  ) {
+    return new DefaultCatalogCollator({
+      ...options,
+      allow: config.getOptionalStringArray('catalog.search.allow'),
+    });
+  }
+
   constructor({
     discovery,
     locationTemplate,
+    allow,
   }: {
     discovery: PluginEndpointDiscovery;
     locationTemplate?: string;
+    allow?: string[];
   }) {
     this.discovery = discovery;
     this.locationTemplate =
       locationTemplate || '/catalog/:namespace/:kind/:name';
+    if (allow && allow.length) {
+      this.filterUrl = `?filter=kind=${allow.join(',')}`;
+    } else {
+      this.filterUrl = '';
+    }
   }
 
   protected applyArgsToFormat(
@@ -57,7 +76,7 @@ export class DefaultCatalogCollator implements DocumentCollator {
 
   async execute() {
     const baseUrl = await this.discovery.getBaseUrl('catalog');
-    const res = await fetch(`${baseUrl}/entities`);
+    const res = await fetch(`${baseUrl}/entities${this.filterUrl}`);
     const entities: Entity[] = await res.json();
     return entities.map((entity: Entity): CatalogEntityDocument => {
       return {

From 159e107ab33b41565d0e275ba98408bf8a8990c9 Mon Sep 17 00:00:00 2001
From: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
Date: Wed, 25 Aug 2021 16:07:48 +0200
Subject: [PATCH 13/83] Simplified default sign-in resolver to split on e-mail
 address

Signed-off-by: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
---
 .../src/providers/oauth2/provider.ts           | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/plugins/auth-backend/src/providers/oauth2/provider.ts b/plugins/auth-backend/src/providers/oauth2/provider.ts
index 2f22411154..fc315a69ca 100644
--- a/plugins/auth-backend/src/providers/oauth2/provider.ts
+++ b/plugins/auth-backend/src/providers/oauth2/provider.ts
@@ -200,7 +200,7 @@ export const oAuth2EmailSignInResolver: SignInResolver<OAuthResult> = async (
 
   const entity = await ctx.catalogIdentityClient.findUser({
     annotations: {
-      'oauth2/email': profile.email,
+      'backstage.io/email': profile.email,
     },
   });
 
@@ -220,21 +220,7 @@ export const oAuth2DefaultSignInResolver: SignInResolver<OAuthResult> = async (
     throw new Error('Profile contained no email');
   }
 
-  let userId: string;
-
-  try {
-    const entity = await ctx.catalogIdentityClient.findUser({
-      annotations: {
-        'oauth2/email': profile.email,
-      },
-    });
-    userId = entity.metadata.name;
-  } catch (error) {
-    ctx.logger.warn(
-      `Failed to look up user, ${error}, falling back to allowing login based on email pattern, this will probably break in the future`,
-    );
-    userId = profile.email.split('@')[0];
-  }
+  const userId = profile.email.split('@')[0];
 
   const token = await ctx.tokenIssuer.issueToken({
     claims: { sub: userId, ent: [`user:default/${userId}`] },

From 7ad9f1016e0da6984ca9c6d1dd56880204e2bf66 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Thu, 26 Aug 2021 14:43:36 +0530
Subject: [PATCH 14/83] Removed example add from changeset

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .changeset/plenty-waves-share.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.changeset/plenty-waves-share.md b/.changeset/plenty-waves-share.md
index ed70d17c80..3e8e94b4c5 100644
--- a/.changeset/plenty-waves-share.md
+++ b/.changeset/plenty-waves-share.md
@@ -1,5 +1,4 @@
 ---
-'example-app': patch
 '@backstage/plugin-allure': patch
 ---
 

From 8b0f6f860faf7c8fe9e12f0450a7be32ba1b4bf7 Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Tue, 10 Aug 2021 15:09:03 +0200
Subject: [PATCH 15/83] Set the correct `edit_uri` or `repo_url` for
 documentation pages that are hosted on GitHub and GitLab

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 .changeset/techdocs-warm-walls-smile.md       |  17 ++
 packages/techdocs-common/api-report.md        |   4 +-
 packages/techdocs-common/package.json         |   1 +
 .../__fixtures__/mkdocs_with_edit_uri.yml     |   4 +
 .../src/stages/generate/generators.test.ts    |   3 +-
 .../src/stages/generate/generators.ts         |   3 +-
 .../src/stages/generate/helpers.test.ts       | 228 +++++++++---------
 .../src/stages/generate/helpers.ts            | 110 ++++-----
 .../src/stages/generate/techdocs.ts           |  25 +-
 .../src/service/standaloneServer.ts           |   3 +-
 10 files changed, 213 insertions(+), 185 deletions(-)
 create mode 100644 .changeset/techdocs-warm-walls-smile.md
 create mode 100644 packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_edit_uri.yml

diff --git a/.changeset/techdocs-warm-walls-smile.md b/.changeset/techdocs-warm-walls-smile.md
new file mode 100644
index 0000000000..ab7469ec65
--- /dev/null
+++ b/.changeset/techdocs-warm-walls-smile.md
@@ -0,0 +1,17 @@
+---
+'@backstage/techdocs-common': minor
+---
+
+Set the correct `edit_uri` or `repo_url` for documentation pages that are hosted on GitHub and GitLab.
+
+The constructor of the `TechDocsGenerator` changed.
+Prefer the use of `TechdocsGenerator.fromConfig(…)` instead:
+
+```diff
+- const techdocsGenerator = new TechdocsGenerator({
++ const techdocsGenerator = TechdocsGenerator.fromConfig(config, {
+    logger,
+    containerRunner,
+-   config,
+  });
+```
diff --git a/packages/techdocs-common/api-report.md b/packages/techdocs-common/api-report.md
index 0c7e5b03c7..32ada1ad29 100644
--- a/packages/techdocs-common/api-report.md
+++ b/packages/techdocs-common/api-report.md
@@ -230,10 +230,12 @@ export class TechdocsGenerator implements GeneratorBase {
     logger,
     containerRunner,
     config,
+    scmIntegrations,
   }: {
     logger: Logger_2;
     containerRunner: ContainerRunner;
     config: Config;
+    scmIntegrations: ScmIntegrationRegistry;
   });
   // (undocumented)
   static fromConfig(
@@ -245,7 +247,7 @@ export class TechdocsGenerator implements GeneratorBase {
       containerRunner: ContainerRunner;
       logger: Logger_2;
     },
-  ): Promise<TechdocsGenerator>;
+  ): TechdocsGenerator;
   // (undocumented)
   run({
     inputDir,
diff --git a/packages/techdocs-common/package.json b/packages/techdocs-common/package.json
index f529d93ca6..b4c407cbd3 100644
--- a/packages/techdocs-common/package.json
+++ b/packages/techdocs-common/package.json
@@ -49,6 +49,7 @@
     "aws-sdk": "^2.840.0",
     "express": "^4.17.1",
     "fs-extra": "9.1.0",
+    "git-url-parse": "~11.4.4",
     "js-yaml": "^4.0.0",
     "json5": "^2.1.3",
     "mime-types": "^2.1.27",
diff --git a/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_edit_uri.yml b/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_edit_uri.yml
new file mode 100644
index 0000000000..c7f402ec12
--- /dev/null
+++ b/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_edit_uri.yml
@@ -0,0 +1,4 @@
+site_name: Test site name
+site_description: Test site description
+
+edit_uri: https://github.com/backstage/backstage/edit/main/docs
diff --git a/packages/techdocs-common/src/stages/generate/generators.test.ts b/packages/techdocs-common/src/stages/generate/generators.test.ts
index a2ace2628c..56343763e9 100644
--- a/packages/techdocs-common/src/stages/generate/generators.test.ts
+++ b/packages/techdocs-common/src/stages/generate/generators.test.ts
@@ -44,10 +44,9 @@ describe('generators', () => {
 
   it('should return correct registered generator', async () => {
     const generators = new Generators();
-    const techdocs = new TechdocsGenerator({
+    const techdocs = TechdocsGenerator.fromConfig(new ConfigReader({}), {
       logger,
       containerRunner,
-      config: new ConfigReader({}),
     });
 
     generators.register('techdocs', techdocs);
diff --git a/packages/techdocs-common/src/stages/generate/generators.ts b/packages/techdocs-common/src/stages/generate/generators.ts
index af7958dcfb..3d1ad2b73b 100644
--- a/packages/techdocs-common/src/stages/generate/generators.ts
+++ b/packages/techdocs-common/src/stages/generate/generators.ts
@@ -38,10 +38,9 @@ export class Generators implements GeneratorBuilder {
   ): Promise<GeneratorBuilder> {
     const generators = new Generators();
 
-    const techdocsGenerator = new TechdocsGenerator({
+    const techdocsGenerator = TechdocsGenerator.fromConfig(config, {
       logger,
       containerRunner,
-      config,
     });
     generators.register('techdocs', techdocsGenerator);
 
diff --git a/packages/techdocs-common/src/stages/generate/helpers.test.ts b/packages/techdocs-common/src/stages/generate/helpers.test.ts
index 4039d340f2..50bcc45343 100644
--- a/packages/techdocs-common/src/stages/generate/helpers.test.ts
+++ b/packages/techdocs-common/src/stages/generate/helpers.test.ts
@@ -13,19 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { getVoidLogger } from '@backstage/backend-common';
+import { ConfigReader } from '@backstage/config';
+import { ScmIntegrations } from '@backstage/integration';
 import fs from 'fs-extra';
 import mockFs from 'mock-fs';
 import os from 'os';
 import path, { resolve as resolvePath } from 'path';
 import { ParsedLocationAnnotation } from '../../helpers';
-import { RemoteProtocol } from '../prepare/types';
 import {
   addBuildTimestampMetadata,
   getGeneratorKey,
   getMkdocsYml,
   getRepoUrlFromLocationAnnotation,
-  isValidRepoUrlForMkdocs,
   patchMkdocsYmlPreBuild,
   storeEtagMetadata,
   validateMkdocsYaml,
@@ -48,6 +49,9 @@ const mkdocsYmlWithExtensions = fs.readFileSync(
 const mkdocsYmlWithRepoUrl = fs.readFileSync(
   resolvePath(__filename, '../__fixtures__/mkdocs_with_repo_url.yml'),
 );
+const mkdocsYmlWithEditUri = fs.readFileSync(
+  resolvePath(__filename, '../__fixtures__/mkdocs_with_edit_uri.yml'),
+);
 const mkdocsYmlWithValidDocDir = fs.readFileSync(
   resolvePath(__filename, '../__fixtures__/mkdocs_valid_doc_dir.yml'),
 );
@@ -60,6 +64,8 @@ const mkdocsYmlWithInvalidDocDir2 = fs.readFileSync(
 const mockLogger = getVoidLogger();
 const rootDir = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
 
+const scmIntegrations = ScmIntegrations.fromConfig(new ConfigReader({}));
+
 describe('helpers', () => {
   describe('getGeneratorKey', () => {
     it('should return techdocs as the only generator key', () => {
@@ -68,120 +74,85 @@ describe('helpers', () => {
     });
   });
 
-  describe('isValidRepoUrlForMkdocs', () => {
-    it('should return true for valid repo_url values for mkdocs', () => {
-      const validRepoUrls = [
-        'https://github.com/org/repo',
-        'https://github.com/backstage/backstage/',
-        'https://github.com/org123/repo1-2-3/',
-        'http://github.com/insecureOrg/insecureRepo',
-        'https://gitlab.com/org/repo',
-        'https://gitlab.com/backstage/backstage/',
-        'https://gitlab.com/org123/repo1-2-3/',
-        'http://gitlab.com/insecureOrg/insecureRepo',
-      ];
-
-      const validRemoteProtocols = ['github', 'gitlab'];
-
-      validRepoUrls.forEach(url => {
-        validRemoteProtocols.forEach(targetType => {
-          expect(
-            isValidRepoUrlForMkdocs(url, targetType as RemoteProtocol),
-          ).toBe(true);
-        });
-      });
-    });
-
-    it('should return false for invalid repo_urls values for mkdocs', () => {
-      const invalidRepoUrls = [
-        'git@github.com:org/repo',
-        'https://github.com/backstage/backstage/tree/master/plugins/techdocs-backend',
-      ];
-
-      invalidRepoUrls.forEach(url => {
-        expect(isValidRepoUrlForMkdocs(url, 'github')).toBe(false);
-      });
-    });
-
-    it('should return false for unsupported remote protocols', () => {
-      const validRepoUrl = 'https://github.com/backstage/backstage';
-
-      const unsupportedRemoteProtocols = ['dir', 'file', 'url'];
-
-      unsupportedRemoteProtocols.forEach(targetType => {
-        expect(
-          isValidRepoUrlForMkdocs(validRepoUrl, targetType as RemoteProtocol),
-        ).toBe(false);
-      });
-    });
-  });
-
   describe('getRepoUrlFromLocationAnnotation', () => {
-    it('should return undefined for unsupported location type', () => {
-      const parsedLocationAnnotation1: ParsedLocationAnnotation = {
+    it.each`
+      url                                                                        | repo_url                                    | edit_uri
+      ${'https://github.com/backstage/backstage'}                                | ${'https://github.com/backstage/backstage'} | ${undefined}
+      ${'https://github.com/backstage/backstage/tree/main/examples/techdocs/'}   | ${undefined}                                | ${'https://github.com/backstage/backstage/edit/main/examples/techdocs/docs'}
+      ${'https://github.com/backstage/backstage/tree/main/'}                     | ${undefined}                                | ${'https://github.com/backstage/backstage/edit/main/docs'}
+      ${'https://gitlab.com/backstage/backstage'}                                | ${'https://gitlab.com/backstage/backstage'} | ${undefined}
+      ${'https://gitlab.com/backstage/backstage/-/blob/main/examples/techdocs/'} | ${undefined}                                | ${'https://gitlab.com/backstage/backstage/-/edit/main/examples/techdocs/docs'}
+      ${'https://gitlab.com/backstage/backstage/-/blob/main/'}                   | ${undefined}                                | ${'https://gitlab.com/backstage/backstage/-/edit/main/docs'}
+    `('should convert $url', ({ url: target, repo_url, edit_uri }) => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
+        type: 'url',
+        target,
+      };
+
+      expect(
+        getRepoUrlFromLocationAnnotation(
+          parsedLocationAnnotation,
+          scmIntegrations,
+        ),
+      ).toEqual({ repo_url, edit_uri });
+    });
+
+    it.each`
+      url                                                                        | edit_uri
+      ${'https://github.com/backstage/backstage/tree/main/examples/techdocs/'}   | ${'https://github.com/backstage/backstage/edit/main/examples/techdocs/custom/folder'}
+      ${'https://github.com/backstage/backstage/tree/main/'}                     | ${'https://github.com/backstage/backstage/edit/main/custom/folder'}
+      ${'https://gitlab.com/backstage/backstage/-/blob/main/examples/techdocs/'} | ${'https://gitlab.com/backstage/backstage/-/edit/main/examples/techdocs/custom/folder'}
+      ${'https://gitlab.com/backstage/backstage/-/blob/main/'}                   | ${'https://gitlab.com/backstage/backstage/-/edit/main/custom/folder'}
+    `(
+      'should convert $url with custom docsFolder',
+      ({ url: target, edit_uri }) => {
+        const parsedLocationAnnotation: ParsedLocationAnnotation = {
+          type: 'url',
+          target,
+        };
+
+        expect(
+          getRepoUrlFromLocationAnnotation(
+            parsedLocationAnnotation,
+            scmIntegrations,
+            './custom/folder',
+          ),
+        ).toEqual({ edit_uri });
+      },
+    );
+
+    it.each`
+      url
+      ${'https://bitbucket.org/backstage/backstage/src/master/examples/techdocs/'}
+      ${'https://bitbucket.org/backstage/backstage/src/master/'}
+      ${'https://dev.azure.com/organization/project/_git/repository?path=%2Fexamples%2Ftechdocs'}
+      ${'https://dev.azure.com/organization/project/_git/repository?path=%2F'}
+    `('should ignore $url', ({ url: target }) => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
+        type: 'url',
+        target,
+      };
+
+      expect(
+        getRepoUrlFromLocationAnnotation(
+          parsedLocationAnnotation,
+          scmIntegrations,
+        ),
+      ).toEqual({});
+    });
+
+    it('should ignore unsupported location type', () => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
         type: 'dir',
         target: '/home/user/workspace/docs-repository',
       };
 
-      const parsedLocationAnnotation2: ParsedLocationAnnotation = {
-        type: 'file' as RemoteProtocol,
-        target: '/home/user/workspace/docs-repository/catalog-info.yaml',
-      };
-
-      const parsedLocationAnnotation3: ParsedLocationAnnotation = {
-        type: 'url',
-        target: 'https://my-website.com/storage/this/docs/repository',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation1)).toBe(
-        undefined,
-      );
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation2)).toBe(
-        undefined,
-      );
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation3)).toBe(
-        undefined,
-      );
-    });
-
-    it('should return correct target url for supported hosts', () => {
-      const parsedLocationAnnotation1: ParsedLocationAnnotation = {
-        type: 'github' as RemoteProtocol,
-        target: 'https://github.com/backstage/backstage.git',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation1)).toBe(
-        'https://github.com/backstage/backstage',
-      );
-
-      const parsedLocationAnnotation2: ParsedLocationAnnotation = {
-        type: 'github' as RemoteProtocol,
-        target: 'https://github.com/org/repo',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation2)).toBe(
-        'https://github.com/org/repo',
-      );
-
-      const parsedLocationAnnotation3: ParsedLocationAnnotation = {
-        type: 'gitlab' as RemoteProtocol,
-        target: 'https://gitlab.com/org/repo',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation3)).toBe(
-        'https://gitlab.com/org/repo',
-      );
-
-      const parsedLocationAnnotation4: ParsedLocationAnnotation = {
-        type: 'github' as RemoteProtocol,
-        target:
-          'github.com/backstage/backstage/blob/master/plugins/techdocs-backend/examples/documented-component',
-      };
-
-      expect(getRepoUrlFromLocationAnnotation(parsedLocationAnnotation4)).toBe(
-        'github.com/backstage/backstage/blob/master/plugins/techdocs-backend/examples/documented-component',
-      );
+      expect(
+        getRepoUrlFromLocationAnnotation(
+          parsedLocationAnnotation,
+          scmIntegrations,
+        ),
+      ).toEqual({});
     });
   });
 
@@ -190,6 +161,7 @@ describe('helpers', () => {
       mockFs({
         '/mkdocs.yml': mkdocsYml,
         '/mkdocs_with_repo_url.yml': mkdocsYmlWithRepoUrl,
+        '/mkdocs_with_edit_uri.yml': mkdocsYmlWithEditUri,
         '/mkdocs_with_extensions.yml': mkdocsYmlWithExtensions,
       });
     });
@@ -198,9 +170,9 @@ describe('helpers', () => {
       mockFs.restore();
     });
 
-    it('should add repo_url to mkdocs.yml', async () => {
+    it('should add edit_uri to mkdocs.yml', async () => {
       const parsedLocationAnnotation: ParsedLocationAnnotation = {
-        type: 'github' as RemoteProtocol,
+        type: 'url',
         target: 'https://github.com/backstage/backstage',
       };
 
@@ -208,6 +180,7 @@ describe('helpers', () => {
         '/mkdocs.yml',
         mockLogger,
         parsedLocationAnnotation,
+        scmIntegrations,
       );
 
       const updatedMkdocsYml = await fs.readFile('/mkdocs.yml');
@@ -219,7 +192,7 @@ describe('helpers', () => {
 
     it('should add repo_url to mkdocs.yml that contains custom yaml tags', async () => {
       const parsedLocationAnnotation: ParsedLocationAnnotation = {
-        type: 'github' as RemoteProtocol,
+        type: 'url',
         target: 'https://github.com/backstage/backstage',
       };
 
@@ -227,6 +200,7 @@ describe('helpers', () => {
         '/mkdocs_with_extensions.yml',
         mockLogger,
         parsedLocationAnnotation,
+        scmIntegrations,
       );
 
       const updatedMkdocsYml = await fs.readFile('/mkdocs_with_extensions.yml');
@@ -241,7 +215,7 @@ describe('helpers', () => {
 
     it('should not override existing repo_url in mkdocs.yml', async () => {
       const parsedLocationAnnotation: ParsedLocationAnnotation = {
-        type: 'github' as RemoteProtocol,
+        type: 'url',
         target: 'https://github.com/neworg/newrepo',
       };
 
@@ -249,6 +223,7 @@ describe('helpers', () => {
         '/mkdocs_with_repo_url.yml',
         mockLogger,
         parsedLocationAnnotation,
+        scmIntegrations,
       );
 
       const updatedMkdocsYml = await fs.readFile('/mkdocs_with_repo_url.yml');
@@ -260,6 +235,29 @@ describe('helpers', () => {
         'repo_url: https://github.com/neworg/newrepo',
       );
     });
+
+    it('should not override existing edit_uri in mkdocs.yml', async () => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
+        type: 'url',
+        target: 'https://github.com/neworg/newrepo',
+      };
+
+      await patchMkdocsYmlPreBuild(
+        '/mkdocs_with_edit_uri.yml',
+        mockLogger,
+        parsedLocationAnnotation,
+        scmIntegrations,
+      );
+
+      const updatedMkdocsYml = await fs.readFile('/mkdocs_with_edit_uri.yml');
+
+      expect(updatedMkdocsYml.toString()).toContain(
+        'edit_uri: https://github.com/backstage/backstage/edit/main/docs',
+      );
+      expect(updatedMkdocsYml.toString()).not.toContain(
+        'https://github.com/neworg/newrepo',
+      );
+    });
   });
 
   describe('addBuildTimestampMetadata', () => {
diff --git a/packages/techdocs-common/src/stages/generate/helpers.ts b/packages/techdocs-common/src/stages/generate/helpers.ts
index 7c60c7667f..aa4402323c 100644
--- a/packages/techdocs-common/src/stages/generate/helpers.ts
+++ b/packages/techdocs-common/src/stages/generate/helpers.ts
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-import { Entity } from '@backstage/catalog-model';
 import { isChildPath } from '@backstage/backend-common';
+import { Entity } from '@backstage/catalog-model';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import { spawn } from 'child_process';
 import fs from 'fs-extra';
+import gitUrlParse from 'git-url-parse';
 import yaml, { DEFAULT_SCHEMA, Type } from 'js-yaml';
 import path, { resolve as resolvePath } from 'path';
 import { PassThrough, Writable } from 'stream';
@@ -80,63 +82,42 @@ export const runCommand = async ({
 };
 
 /**
- * Return true if mkdocs can compile docs with provided repo_url
- *
- * Valid repo_url examples in mkdocs.yml
- * - https://github.com/backstage/backstage
- * - https://gitlab.com/org/repo/
- * - http://github.com/backstage/backstage
- * - A http(s) protocol URL to the root of the repository
- *
- * Invalid repo_url examples in mkdocs.yml
- * - https://github.com/backstage/backstage/blob/master/plugins/techdocs-backend/examples/documented-component
- * - (anything that is not valid as described above)
- *
- * @param {string} repoUrl URL supposed to be used as repo_url in mkdocs.yml
- * @param {string} locationType Type of source code host - github, gitlab, dir, url, etc.
- * @returns {boolean}
- */
-export const isValidRepoUrlForMkdocs = (
-  repoUrl: string,
-  locationType: string,
-): boolean => {
-  // Trim trailing slash
-  const cleanRepoUrl = repoUrl.replace(/\/$/, '');
-
-  if (locationType === 'github' || locationType === 'gitlab') {
-    // A valid repoUrl to the root of the repository will be split into 5 strings if split using the / delimiter.
-    // We do not want URLs which have more than that number of forward slashes since they will signify a non-root location
-    // Note: This is not the best possible implementation but will work most of the times.. Feel free to improve or
-    // highlight edge cases.
-    return cleanRepoUrl.split('/').length === 5;
-  }
-
-  return false;
-};
-
-/**
- * Return a valid URL of the repository used in backstage.io/techdocs-ref annotation.
- * Return undefined if the `target` is not valid in context of repo_url in mkdocs.yml
- * Alter URL so that it is a valid repo_url config in mkdocs.yml
+ * Return the source url for MkDocs based on the backstage.io/techdocs-ref annotation.
+ * Depending on the type of target, it can either return a repo_url, an edit_uri, both, or none.
  *
  * @param {ParsedLocationAnnotation} parsedLocationAnnotation Object with location url and type
- * @returns {string | undefined}
+ * @param {ScmIntegrationRegistry} scmIntegrations the scmIntegration to do url transformations
+ * @param {string} docsFolder the configured docs folder in the mkdocs.yml (defaults to 'docs')
+ * @returns the settings for the mkdocs.yml
  */
 export const getRepoUrlFromLocationAnnotation = (
   parsedLocationAnnotation: ParsedLocationAnnotation,
-): string | undefined => {
+  scmIntegrations: ScmIntegrationRegistry,
+  docsFolder: string = 'docs',
+): { repo_url?: string; edit_uri?: string } => {
   const { type: locationType, target } = parsedLocationAnnotation;
 
-  // Add more options from the RemoteProtocol type of parsedLocationAnnotation.type here
-  // when TechDocs supports more hosts and if mkdocs can generated an Edit URL for them.
-  const supportedHosts = ['github', 'gitlab'];
+  if (locationType === 'url') {
+    const integration = scmIntegrations.byUrl(target);
 
-  if (supportedHosts.includes(locationType)) {
-    // Trim .git or .git/ from the end of repository url
-    return target.replace(/.git\/*$/, '');
+    // We only support it for github and gitlab for now as the edit_uri
+    // is not properly supported for others yet.
+    if (integration && ['github', 'gitlab'].includes(integration.type)) {
+      // handle the case where a user manually writes url:https://github.com/backstage/backstage i.e. without /blob/...
+      const { filepathtype } = gitUrlParse(target);
+      if (filepathtype === '') {
+        return { repo_url: target };
+      }
+
+      const sourceFolder = integration.resolveUrl({
+        url: `./${docsFolder}`,
+        base: target,
+      });
+      return { edit_uri: integration.resolveEditUrl(sourceFolder) };
+    }
   }
 
-  return undefined;
+  return {};
 };
 
 class UnknownTag {
@@ -217,7 +198,7 @@ export const validateMkdocsYaml = async (
  * Update the mkdocs.yml file before TechDocs generator uses it to generate docs site.
  *
  * List of tasks:
- * - Add repo_url if it does not exists
+ * - Add repo_url or edit_uri if it does not exists
  * If mkdocs.yml has a repo_url, the generated docs site gets an Edit button on the pages by default.
  * If repo_url is missing in mkdocs.yml, we will use techdocs annotation of the entity to possibly get
  * the repository URL.
@@ -228,11 +209,13 @@ export const validateMkdocsYaml = async (
  * @param {string} mkdocsYmlPath Absolute path to mkdocs.yml or equivalent of a docs site
  * @param {Logger} logger
  * @param {ParsedLocationAnnotation} parsedLocationAnnotation Object with location url and type
+ * @param {ScmIntegrationRegistry} scmIntegrations the scmIntegration to do url transformations
  */
 export const patchMkdocsYmlPreBuild = async (
   mkdocsYmlPath: string,
   logger: Logger,
   parsedLocationAnnotation: ParsedLocationAnnotation,
+  scmIntegrations: ScmIntegrationRegistry,
 ) => {
   let mkdocsYmlFileString;
   try {
@@ -260,16 +243,25 @@ export const patchMkdocsYmlPreBuild = async (
     return;
   }
 
-  // Add repo_url to mkdocs.yml if it is missing. This will enable the Page edit button generated by MkDocs.
-  if (!('repo_url' in mkdocsYml)) {
-    const repoUrl = getRepoUrlFromLocationAnnotation(parsedLocationAnnotation);
-    if (repoUrl !== undefined) {
-      // mkdocs.yml will not build with invalid repo_url. So, make sure it is valid.
-      // TODO: this is no longer working/meaningful because annotation type is
-      // now only ever "url" or "dir." Should be re-implemented!
-      if (isValidRepoUrlForMkdocs(repoUrl, parsedLocationAnnotation.type)) {
-        mkdocsYml.repo_url = repoUrl;
-      }
+  // Add edit_uri and/or repo_url to mkdocs.yml if it is missing.
+  // This will enable the Page edit button generated by MkDocs.
+  // If the either has been set, keep the original value
+  if (!('repo_url' in mkdocsYml) && !('edit_uri' in mkdocsYml)) {
+    const result = getRepoUrlFromLocationAnnotation(
+      parsedLocationAnnotation,
+      scmIntegrations,
+      mkdocsYml.docs_dir,
+    );
+
+    if (result.repo_url || result.edit_uri) {
+      mkdocsYml.repo_url = result.repo_url;
+      mkdocsYml.edit_uri = result.edit_uri;
+
+      logger.info(
+        `Set ${JSON.stringify(
+          result,
+        )}. You can disable this feature by manually setting 'repo_url' or 'edit_uri' according to the MkDocs documentation at https://www.mkdocs.org/user-guide/configuration/#repo_url`,
+      );
     }
   }
 
diff --git a/packages/techdocs-common/src/stages/generate/techdocs.ts b/packages/techdocs-common/src/stages/generate/techdocs.ts
index 1a6577cad9..c3d48507ce 100644
--- a/packages/techdocs-common/src/stages/generate/techdocs.ts
+++ b/packages/techdocs-common/src/stages/generate/techdocs.ts
@@ -18,6 +18,10 @@ import { ContainerRunner } from '@backstage/backend-common';
 import { Config } from '@backstage/config';
 import path from 'path';
 import { Logger } from 'winston';
+import {
+  ScmIntegrationRegistry,
+  ScmIntegrations,
+} from '@backstage/integration';
 import {
   addBuildTimestampMetadata,
   getMkdocsYml,
@@ -39,29 +43,39 @@ export class TechdocsGenerator implements GeneratorBase {
   private readonly logger: Logger;
   private readonly containerRunner: ContainerRunner;
   private readonly options: GeneratorConfig;
+  private readonly scmIntegrations: ScmIntegrationRegistry;
 
-  static async fromConfig(
+  static fromConfig(
     config: Config,
     {
       containerRunner,
       logger,
     }: { containerRunner: ContainerRunner; logger: Logger },
   ) {
-    return new TechdocsGenerator({ logger, containerRunner, config });
+    const scmIntegrations = ScmIntegrations.fromConfig(config);
+    return new TechdocsGenerator({
+      logger,
+      containerRunner,
+      config,
+      scmIntegrations,
+    });
   }
 
   constructor({
     logger,
     containerRunner,
     config,
+    scmIntegrations,
   }: {
     logger: Logger;
     containerRunner: ContainerRunner;
     config: Config;
+    scmIntegrations: ScmIntegrationRegistry;
   }) {
     this.logger = logger;
     this.options = readGeneratorConfig(config, logger);
     this.containerRunner = containerRunner;
+    this.scmIntegrations = scmIntegrations;
   }
 
   public async run({
@@ -74,16 +88,19 @@ export class TechdocsGenerator implements GeneratorBase {
   }: GeneratorRunOptions): Promise<void> {
     // Do some updates to mkdocs.yml before generating docs e.g. adding repo_url
     const { path: mkdocsYmlPath, content } = await getMkdocsYml(inputDir);
+
+    // validate the docs_dir first
+    await validateMkdocsYaml(inputDir, content);
+
     if (parsedLocationAnnotation) {
       await patchMkdocsYmlPreBuild(
         mkdocsYmlPath,
         childLogger,
         parsedLocationAnnotation,
+        this.scmIntegrations,
       );
     }
 
-    await validateMkdocsYaml(inputDir, content);
-
     // Directories to bind on container
     const mountDirs = {
       [inputDir]: '/input',
diff --git a/plugins/techdocs-backend/src/service/standaloneServer.ts b/plugins/techdocs-backend/src/service/standaloneServer.ts
index 57298d8852..e8981963f1 100644
--- a/plugins/techdocs-backend/src/service/standaloneServer.ts
+++ b/plugins/techdocs-backend/src/service/standaloneServer.ts
@@ -70,10 +70,9 @@ export async function startStandaloneServer(
   const containerRunner = new DockerContainerRunner({ dockerClient });
 
   const generators = new Generators();
-  const techdocsGenerator = new TechdocsGenerator({
+  const techdocsGenerator = TechdocsGenerator.fromConfig(config, {
     logger,
     containerRunner,
-    config,
   });
   generators.register('techdocs', techdocsGenerator);
 

From 67ba7e088a744e1d30502d516e521f6001ef0311 Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Tue, 10 Aug 2021 15:09:22 +0200
Subject: [PATCH 16/83] Only write the updated `mkdocs.yml` file if the content
 was updated

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 .changeset/techdocs-three-icons-collect.md    |  7 +++++
 .../__fixtures__/mkdocs_with_comments.yml     |  3 +++
 .../src/stages/generate/helpers.test.ts       | 26 +++++++++++++++++++
 .../src/stages/generate/helpers.ts            | 17 ++++++++----
 4 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/techdocs-three-icons-collect.md
 create mode 100644 packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_comments.yml

diff --git a/.changeset/techdocs-three-icons-collect.md b/.changeset/techdocs-three-icons-collect.md
new file mode 100644
index 0000000000..a3c005f82d
--- /dev/null
+++ b/.changeset/techdocs-three-icons-collect.md
@@ -0,0 +1,7 @@
+---
+'@backstage/techdocs-common': patch
+---
+
+Only write the updated `mkdocs.yml` file if the content was updated.
+
+This keeps local files unchanged if the `dir` annotation is used in combination with the `file` location.
diff --git a/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_comments.yml b/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_comments.yml
new file mode 100644
index 0000000000..3924224560
--- /dev/null
+++ b/packages/techdocs-common/src/stages/generate/__fixtures__/mkdocs_with_comments.yml
@@ -0,0 +1,3 @@
+site_name: Test site name
+site_description: Test site description
+# This is a comment that is removed after editing
diff --git a/packages/techdocs-common/src/stages/generate/helpers.test.ts b/packages/techdocs-common/src/stages/generate/helpers.test.ts
index 50bcc45343..fcf506098e 100644
--- a/packages/techdocs-common/src/stages/generate/helpers.test.ts
+++ b/packages/techdocs-common/src/stages/generate/helpers.test.ts
@@ -61,6 +61,9 @@ const mkdocsYmlWithInvalidDocDir = fs.readFileSync(
 const mkdocsYmlWithInvalidDocDir2 = fs.readFileSync(
   resolvePath(__filename, '../__fixtures__/mkdocs_invalid_doc_dir2.yml'),
 );
+const mkdocsYmlWithComments = fs.readFileSync(
+  resolvePath(__filename, '../__fixtures__/mkdocs_with_comments.yml'),
+);
 const mockLogger = getVoidLogger();
 const rootDir = os.platform() === 'win32' ? 'C:\\rootDir' : '/rootDir';
 
@@ -163,6 +166,7 @@ describe('helpers', () => {
         '/mkdocs_with_repo_url.yml': mkdocsYmlWithRepoUrl,
         '/mkdocs_with_edit_uri.yml': mkdocsYmlWithEditUri,
         '/mkdocs_with_extensions.yml': mkdocsYmlWithExtensions,
+        '/mkdocs_with_comments.yml': mkdocsYmlWithComments,
       });
     });
 
@@ -258,6 +262,28 @@ describe('helpers', () => {
         'https://github.com/neworg/newrepo',
       );
     });
+
+    it('should not update mkdocs.yml if nothing should be changed', async () => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
+        type: 'dir',
+        target: '/unsupported/path',
+      };
+
+      await patchMkdocsYmlPreBuild(
+        '/mkdocs_with_comments.yml',
+        mockLogger,
+        parsedLocationAnnotation,
+        scmIntegrations,
+      );
+
+      const updatedMkdocsYml = await fs.readFile('/mkdocs_with_comments.yml');
+
+      expect(updatedMkdocsYml.toString()).toContain(
+        '# This is a comment that is removed after editing',
+      );
+      expect(updatedMkdocsYml.toString()).not.toContain('edit_uri');
+      expect(updatedMkdocsYml.toString()).not.toContain('repo_url');
+    });
   });
 
   describe('addBuildTimestampMetadata', () => {
diff --git a/packages/techdocs-common/src/stages/generate/helpers.ts b/packages/techdocs-common/src/stages/generate/helpers.ts
index aa4402323c..0ac05e7dd2 100644
--- a/packages/techdocs-common/src/stages/generate/helpers.ts
+++ b/packages/techdocs-common/src/stages/generate/helpers.ts
@@ -217,6 +217,10 @@ export const patchMkdocsYmlPreBuild = async (
   parsedLocationAnnotation: ParsedLocationAnnotation,
   scmIntegrations: ScmIntegrationRegistry,
 ) => {
+  // We only want to override the mkdocs.yml if it has actually changed. This is relevant if
+  // used with a 'dir' location on the file system as this would permanently update the file.
+  let didEdit = false;
+
   let mkdocsYmlFileString;
   try {
     mkdocsYmlFileString = await fs.readFile(mkdocsYmlPath, 'utf8');
@@ -256,6 +260,7 @@ export const patchMkdocsYmlPreBuild = async (
     if (result.repo_url || result.edit_uri) {
       mkdocsYml.repo_url = result.repo_url;
       mkdocsYml.edit_uri = result.edit_uri;
+      didEdit = true;
 
       logger.info(
         `Set ${JSON.stringify(
@@ -266,11 +271,13 @@ export const patchMkdocsYmlPreBuild = async (
   }
 
   try {
-    await fs.writeFile(
-      mkdocsYmlPath,
-      yaml.dump(mkdocsYml, { schema: MKDOCS_SCHEMA }),
-      'utf8',
-    );
+    if (didEdit) {
+      await fs.writeFile(
+        mkdocsYmlPath,
+        yaml.dump(mkdocsYml, { schema: MKDOCS_SCHEMA }),
+        'utf8',
+      );
+    }
   } catch (error) {
     logger.warn(
       `Could not write to ${mkdocsYmlPath} after updating it before running the generator. ${error.message}`,

From 56c2684b8f39c2042eb5d9724be1c93f274d7e19 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Fri, 27 Aug 2021 16:16:55 +0530
Subject: [PATCH 17/83] Fixed review comments

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 microsite/data/plugins/allure.yaml            |  9 ++++++
 packages/app/package.json                     |  1 -
 .../app/src/components/catalog/EntityPage.tsx |  5 ---
 plugins/allure/README.md                      |  4 +--
 plugins/allure/dev/example-entity.yaml        | 11 +++++++
 plugins/allure/dev/index.tsx                  | 32 +++++++++++++++++--
 plugins/allure/package.json                   |  1 +
 .../AllureReportComponent.tsx                 | 30 ++++++++---------
 ...llureProjectId.ts => annotationHelpers.ts} |  4 +--
 9 files changed, 68 insertions(+), 29 deletions(-)
 create mode 100644 microsite/data/plugins/allure.yaml
 create mode 100644 plugins/allure/dev/example-entity.yaml
 rename plugins/allure/src/components/{useAllureProjectId.ts => annotationHelpers.ts} (87%)

diff --git a/microsite/data/plugins/allure.yaml b/microsite/data/plugins/allure.yaml
new file mode 100644
index 0000000000..a6f4c5d941
--- /dev/null
+++ b/microsite/data/plugins/allure.yaml
@@ -0,0 +1,9 @@
+---
+title: Allure Reports
+author: Deepak Bhardwaj
+authorUrl: https://github.com/deepak-bhardwaj-ps
+category: Reporting
+description: View Allure reports for your components in Backstage.
+documentation: https://github.com/backstage/backstage/blob/plugin-allure/plugins/allure/README.md
+iconUrl: https://avatars.githubusercontent.com/u/5879127
+npmPackageName: '@backstage/plugin-allure'
\ No newline at end of file
diff --git a/packages/app/package.json b/packages/app/package.json
index a5407abe09..78ebe32e25 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -10,7 +10,6 @@
     "@backstage/core-components": "^0.3.2",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-allure": "^0.1.0",
     "@backstage/plugin-api-docs": "^0.6.6",
     "@backstage/plugin-badges": "^0.2.7",
     "@backstage/plugin-catalog": "^0.6.12",
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index 89bc39952f..d84a7341bc 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -110,7 +110,6 @@ import {
 } from '@roadiehq/backstage-plugin-travis-ci';
 import { EntityCodeCoverageContent } from '@backstage/plugin-code-coverage';
 import { EmptyState } from '@backstage/core-components';
-import { EntityAllureReportContent } from '@backstage/plugin-allure';
 
 const EntityLayoutWrapper = (props: { children?: ReactNode }) => {
   const [badgesDialogOpen, setBadgesDialogOpen] = useState(false);
@@ -357,10 +356,6 @@ const serviceEntityPage = (
     <EntityLayout.Route path="/todos" title="TODOs">
       <EntityTodoContent />
     </EntityLayout.Route>
-
-    <EntityLayout.Route path="/allure" title="Allure Report">
-      <EntityAllureReportContent />
-    </EntityLayout.Route>
   </EntityLayoutWrapper>
 );
 
diff --git a/plugins/allure/README.md b/plugins/allure/README.md
index d28fe913b1..b9a8435a34 100644
--- a/plugins/allure/README.md
+++ b/plugins/allure/README.md
@@ -1,4 +1,4 @@
-# Allure
+# [Allure](https://docs.qameta.io/allure/)
 
 Welcome to the Backstage Allure plugin. This plugin add an entity service page to display Allure test reports related to the service.
 
@@ -24,7 +24,7 @@ Add below configuration in the `app-config.yaml`.
 
 ```yaml
 allure:
-  baseUrl: <ALLURE_SERVICE_BASE_URL> # Example: http://localhost:5050/allure-docker-service
+  baseUrl: <ALLURE_SERVICE_BASE_URL> # Example: https://allure.my-company.net or when running allure locally, http://localhost:5050/allure-docker-service
 ```
 
 ### Setup entity service page
diff --git a/plugins/allure/dev/example-entity.yaml b/plugins/allure/dev/example-entity.yaml
new file mode 100644
index 0000000000..58a9ffd110
--- /dev/null
+++ b/plugins/allure/dev/example-entity.yaml
@@ -0,0 +1,11 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: allure-example-service
+  description: Allure Example Service
+  annotations:
+    qameta.io/allure-project: sample
+spec:
+  type: service
+  lifecycle: experimental
+  owner: team-a
diff --git a/plugins/allure/dev/index.tsx b/plugins/allure/dev/index.tsx
index fc61dced03..d697febd56 100644
--- a/plugins/allure/dev/index.tsx
+++ b/plugins/allure/dev/index.tsx
@@ -16,11 +16,39 @@
 import React from 'react';
 import { createDevApp } from '@backstage/dev-utils';
 import { EntityAllureReportContent } from '../src/plugin';
+import { Content, Header, Page } from '@backstage/core-components';
+import { EntityProvider } from '@backstage/plugin-catalog-react';
+import { Entity } from '@backstage/catalog-model';
+
+import exampleEntity from './example-entity.yaml';
+import { allureApiRef } from '../src/api';
 
 createDevApp()
-  .registerPlugin()
+  .registerApi({
+    api: allureApiRef,
+    deps: {},
+    factory: () =>
+      ({
+        async getReportUrl(projectId: string) {
+          return Promise.resolve(
+            // Follow the instructions from https://github.com/fescobar/allure-docker-service-ui
+            // to setup Allure service locally
+            `http://localhost:5050/allure-docker-service/projects/${projectId}/reports/latest/index.html`,
+          );
+        },
+      } as unknown as typeof allureApiRef.T),
+  })
   .addPage({
-    element: <EntityAllureReportContent />,
+    element: (
+      <Page themeId="home">
+        <Header title="Allure Report" />
+        <Content>
+          <EntityProvider entity={exampleEntity as any as Entity}>
+            <EntityAllureReportContent />
+          </EntityProvider>
+        </Content>
+      </Page>
+    ),
     title: 'Allure Report',
     path: '/allure',
   })
diff --git a/plugins/allure/package.json b/plugins/allure/package.json
index 81a37ed996..d55562a537 100644
--- a/plugins/allure/package.json
+++ b/plugins/allure/package.json
@@ -4,6 +4,7 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
+  "private": false,
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
index fd46fa0361..444930a3b0 100644
--- a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
@@ -21,8 +21,8 @@ import { useEntity } from '@backstage/plugin-catalog-react';
 import {
   ALLURE_PROJECT_ID_ANNOTATION,
   isAllureReportAvailable,
-  useAllureProjectId,
-} from '../useAllureProjectId';
+  getAllureProjectId,
+} from '../annotationHelpers';
 import {
   MissingAnnotationEmptyState,
   Progress,
@@ -31,9 +31,9 @@ import { useAsync } from 'react-use';
 import { Entity } from '@backstage/catalog-model';
 
 const AllureReport = (props: { entity: Entity }) => {
-  const allureApi = useApi<AllureApi>(allureApiRef);
+  const allureApi = useApi(allureApiRef);
 
-  const allureProjectId = useAllureProjectId(props.entity);
+  const allureProjectId = getAllureProjectId(props.entity);
   const { value, loading } = useAsync(async () => {
     const url = await allureApi.getReportUrl(allureProjectId);
     return url;
@@ -43,19 +43,15 @@ const AllureReport = (props: { entity: Entity }) => {
     return <Progress />;
   }
   return (
-    <>
-      {!loading && (
-        <iframe
-          style={{
-            display: 'table',
-            width: '100%',
-            height: '100%',
-          }}
-          title="Allure Report"
-          src={value}
-        />
-      )}
-    </>
+    <iframe
+      style={{
+        display: 'table',
+        width: '100%',
+        height: '100%',
+      }}
+      title="Allure Report"
+      src={value}
+    />
   );
 };
 
diff --git a/plugins/allure/src/components/useAllureProjectId.ts b/plugins/allure/src/components/annotationHelpers.ts
similarity index 87%
rename from plugins/allure/src/components/useAllureProjectId.ts
rename to plugins/allure/src/components/annotationHelpers.ts
index d1bcf39b53..7500c1d88b 100644
--- a/plugins/allure/src/components/useAllureProjectId.ts
+++ b/plugins/allure/src/components/annotationHelpers.ts
@@ -15,11 +15,11 @@
  */
 import { Entity } from '@backstage/catalog-model';
 
-export const ALLURE_PROJECT_ID_ANNOTATION = 'allure/project-id';
+export const ALLURE_PROJECT_ID_ANNOTATION = 'qameta.io/allure-project';
 
 export const isAllureReportAvailable = (entity: Entity) =>
   Boolean(entity.metadata.annotations?.[ALLURE_PROJECT_ID_ANNOTATION]);
 
-export const useAllureProjectId = (entity: Entity) => {
+export const getAllureProjectId = (entity: Entity) => {
   return entity?.metadata.annotations?.[ALLURE_PROJECT_ID_ANNOTATION] ?? '';
 };

From e0e936362846c23d69d5551fcc2a377192b7718e Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Fri, 27 Aug 2021 16:21:01 +0530
Subject: [PATCH 18/83] Fixed formatting issue in allure.yaml

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 microsite/data/plugins/allure.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsite/data/plugins/allure.yaml b/microsite/data/plugins/allure.yaml
index a6f4c5d941..b24a4157f9 100644
--- a/microsite/data/plugins/allure.yaml
+++ b/microsite/data/plugins/allure.yaml
@@ -6,4 +6,4 @@ category: Reporting
 description: View Allure reports for your components in Backstage.
 documentation: https://github.com/backstage/backstage/blob/plugin-allure/plugins/allure/README.md
 iconUrl: https://avatars.githubusercontent.com/u/5879127
-npmPackageName: '@backstage/plugin-allure'
\ No newline at end of file
+npmPackageName: '@backstage/plugin-allure'

From 7eef341921a74934040fc3413bc95938fbe4ecb9 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Fri, 27 Aug 2021 16:26:53 +0530
Subject: [PATCH 19/83] Removed unused variable

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .../components/AllureReportComponent/AllureReportComponent.tsx   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
index 444930a3b0..2ca3e87691 100644
--- a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.tsx
@@ -16,7 +16,6 @@
 import React from 'react';
 import { useApi } from '@backstage/core-plugin-api';
 import { allureApiRef } from '../../api';
-import { AllureApi } from '../../api/AllureApi';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import {
   ALLURE_PROJECT_ID_ANNOTATION,

From 49e3c5f07d8c65d0b90d6336518d5bcea19b8d41 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Fri, 27 Aug 2021 16:29:14 +0530
Subject: [PATCH 20/83] Removed changeset as suggested

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .changeset/plenty-waves-share.md | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .changeset/plenty-waves-share.md

diff --git a/.changeset/plenty-waves-share.md b/.changeset/plenty-waves-share.md
deleted file mode 100644
index 3e8e94b4c5..0000000000
--- a/.changeset/plenty-waves-share.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-allure': patch
----
-
-Created a new plugin to display Allure reports.

From 05688962057280993197a19ef423a721aed558f0 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Fri, 27 Aug 2021 16:44:45 +0530
Subject: [PATCH 21/83] Updated dependency versions

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 plugins/allure/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/allure/package.json b/plugins/allure/package.json
index d55562a537..8066877650 100644
--- a/plugins/allure/package.json
+++ b/plugins/allure/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.2",
+    "@backstage/core-components": "^0.3.3",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/plugin-catalog-react": "^0.4.3",
     "@backstage/theme": "^0.2.10",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.9",
+    "@backstage/core-app-api": "^0.1.10",
     "@backstage/dev-utils": "^0.2.7",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",

From 0b92a1e7401bcf996e285774538cb72054b59663 Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Mon, 30 Aug 2021 11:10:25 +0200
Subject: [PATCH 22/83] refactor(plugin-scaffolder-backend): GitHub integration

Created `github/helpers.ts` in order to extract common functions related to token and Octokit client.

Duplicated tests have been moved appropriately.

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .changeset/yellow-windows-fix.md              |  5 ++
 .../github/githubActionsDispatch.test.ts      | 36 --------
 .../builtin/github/githubActionsDispatch.ts   | 52 ++----------
 .../builtin/github/githubWebhook.test.ts      | 36 --------
 .../actions/builtin/github/githubWebhook.ts   | 50 ++---------
 .../actions/builtin/github/helpers.test.ts    | 81 ++++++++++++++++++
 .../actions/builtin/github/helpers.ts         | 83 +++++++++++++++++++
 .../actions/builtin/publish/github.test.ts    | 36 --------
 .../actions/builtin/publish/github.ts         | 55 ++----------
 9 files changed, 185 insertions(+), 249 deletions(-)
 create mode 100644 .changeset/yellow-windows-fix.md
 create mode 100644 plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
 create mode 100644 plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts

diff --git a/.changeset/yellow-windows-fix.md b/.changeset/yellow-windows-fix.md
new file mode 100644
index 0000000000..7572fdce88
--- /dev/null
+++ b/.changeset/yellow-windows-fix.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+refactor: extract common Octokit related code and use it in actions: `publish:github`, `github:actions:dispatch`, `github:webhook`.
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts
index 29e4338a39..ab1bbfc488 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts
@@ -54,42 +54,6 @@ describe('github:actions:dispatch', () => {
     jest.resetAllMocks();
   });
 
-  it('should throw an error when the repoUrl is not well formed', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'github.com?repo=bob' },
-      }),
-    ).rejects.toThrow(/missing owner/);
-
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'github.com?owner=owner' },
-      }),
-    ).rejects.toThrow(/missing repo/);
-  });
-
-  it('should throw if there is no integration config provided', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'missing.com?repo=bob&owner=owner' },
-      }),
-    ).rejects.toThrow(/No matching integration configuration/);
-  });
-
-  it('should throw if there is no token in the integration config that is returned', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: {
-          repoUrl: 'ghe.github.com?repo=bob&owner=owner',
-        },
-      }),
-    ).rejects.toThrow(/No token available for host/);
-  });
-
   it('should call the githubApis for creating WorkflowDispatch', async () => {
     mockGithubClient.rest.actions.createWorkflowDispatch.mockResolvedValue({
       data: {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
index 5dfba7776e..c2d750051e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
@@ -13,27 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { InputError } from '@backstage/errors';
-import {
-  GithubCredentialsProvider,
-  ScmIntegrationRegistry,
-} from '@backstage/integration';
-import { Octokit } from '@octokit/rest';
-import { parseRepoUrl } from '../publish/util';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '../../createTemplateAction';
+import { getOctokit } from './helpers';
 
 export function createGithubActionsDispatchAction(options: {
   integrations: ScmIntegrationRegistry;
 }) {
   const { integrations } = options;
 
-  const credentialsProviders = new Map(
-    integrations.github.list().map(integration => {
-      const provider = GithubCredentialsProvider.create(integration.config);
-      return [integration.config.host, provider];
-    }),
-  );
-
   return createTemplateAction<{
     repoUrl: string;
     workflowId: string;
@@ -69,43 +57,13 @@ export function createGithubActionsDispatchAction(options: {
     async handler(ctx) {
       const { repoUrl, workflowId, branchOrTagName } = ctx.input;
 
-      const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
-
-      if (!owner) {
-        throw new InputError(
-          `No owner provided for host: ${host}, and repo ${repo}`,
-        );
-      }
-
       ctx.logger.info(
         `Dispatching workflow ${workflowId} for repo ${repoUrl} on ${branchOrTagName}`,
       );
 
-      const credentialsProvider = credentialsProviders.get(host);
-      const integrationConfig = integrations.github.byHost(host);
-
-      if (!credentialsProvider || !integrationConfig) {
-        throw new InputError(
-          `No matching integration configuration for host ${host}, please check your integrations config`,
-        );
-      }
-
-      const { token } = await credentialsProvider.getCredentials({
-        url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
-          repo,
-        )}`,
-      });
-
-      if (!token) {
-        throw new InputError(
-          `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
-        );
-      }
-
-      const client = new Octokit({
-        auth: token,
-        baseUrl: integrationConfig.config.apiBaseUrl,
-        previews: ['nebula-preview'],
+      const { client, owner, repo } = await getOctokit({
+        integrations,
+        repoUrl,
       });
 
       await client.rest.actions.createWorkflowDispatch({
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
index 8f11eefce1..3ea3037b90 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
@@ -54,42 +54,6 @@ describe('github:repository:webhook:create', () => {
     jest.resetAllMocks();
   });
 
-  it('should throw an error when the repoUrl is not well formed', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'github.com?repo=bob' },
-      }),
-    ).rejects.toThrow(/missing owner/);
-
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'github.com?owner=owner' },
-      }),
-    ).rejects.toThrow(/missing repo/);
-  });
-
-  it('should throw if there is no integration config provided', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'missing.com?repo=bob&owner=owner' },
-      }),
-    ).rejects.toThrow(/No matching integration configuration/);
-  });
-
-  it('should throw if there is no token in the integration config that is returned', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: {
-          repoUrl: 'ghe.github.com?repo=bob&owner=owner',
-        },
-      }),
-    ).rejects.toThrow(/No token available for host/);
-  });
-
   it('should call the githubApi for creating repository Webhook', async () => {
     const repoUrl = 'github.com?repo=repo&owner=owner';
     const webhookUrl = 'https://example.com/payload';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
index 50877d3bca..5b83eca3fd 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
@@ -13,14 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { InputError } from '@backstage/errors';
-import {
-  GithubCredentialsProvider,
-  ScmIntegrationRegistry,
-} from '@backstage/integration';
-import { Octokit } from '@octokit/rest';
-import { parseRepoUrl } from '../publish/util';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '../../createTemplateAction';
+import { getOctokit } from './helpers';
 
 type ContentType = 'form' | 'json';
 
@@ -29,13 +24,6 @@ export function createGithubWebhookAction(options: {
 }) {
   const { integrations } = options;
 
-  const credentialsProviders = new Map(
-    integrations.github.list().map(integration => {
-      const provider = GithubCredentialsProvider.create(integration.config);
-      return [integration.config.host, provider];
-    }),
-  );
-
   return createTemplateAction<{
     repoUrl: string;
     webhookUrl: string;
@@ -106,39 +94,11 @@ export function createGithubWebhookAction(options: {
         insecureSsl = false,
       } = ctx.input;
 
-      const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
-
-      if (!owner) {
-        throw new InputError(`No owner provided for repo ${repoUrl}`);
-      }
-
       ctx.logger.info(`Creating webhook ${webhookUrl} for repo ${repoUrl}`);
 
-      const credentialsProvider = credentialsProviders.get(host);
-      const integrationConfig = integrations.github.byHost(host);
-
-      if (!credentialsProvider || !integrationConfig) {
-        throw new InputError(
-          `No matching integration configuration for host ${host}, please check your integrations config`,
-        );
-      }
-
-      const { token } = await credentialsProvider.getCredentials({
-        url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
-          repo,
-        )}`,
-      });
-
-      if (!token) {
-        throw new InputError(
-          `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
-        );
-      }
-
-      const client = new Octokit({
-        auth: token,
-        baseUrl: integrationConfig.config.apiBaseUrl,
-        previews: ['nebula-preview'],
+      const { client, owner, repo } = await getOctokit({
+        integrations,
+        repoUrl,
       });
 
       try {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
new file mode 100644
index 0000000000..e16f76d89f
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
@@ -0,0 +1,81 @@
+/*
+ * 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 { getOctokit } from './helpers';
+import { ScmIntegrations } from '@backstage/integration';
+import { ConfigReader } from '@backstage/config';
+
+describe('getOctokit', () => {
+  const config = new ConfigReader({
+    integrations: {
+      github: [
+        { host: 'github.com', token: 'tokenlols' },
+        { host: 'ghe.github.com' },
+      ],
+    },
+  });
+
+  const integrations = ScmIntegrations.fromConfig(config);
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should throw an error when the repoUrl is not well formed', async () => {
+    await expect(
+      getOctokit({
+        integrations,
+        repoUrl: 'github.com?repo=bob',
+      }),
+    ).rejects.toThrow(/missing owner/);
+
+    await expect(
+      getOctokit({
+        integrations,
+        repoUrl: 'github.com?owner=owner',
+      }),
+    ).rejects.toThrow(/missing repo/);
+  });
+
+  it('should throw if there is no integration config provided', async () => {
+    await expect(
+      getOctokit({
+        integrations,
+        repoUrl: 'missing.com?repo=bob&owner=owner',
+      }),
+    ).rejects.toThrow(/No matching integration configuration/);
+  });
+
+  it('should throw if there is no token in the integration config that is returned', async () => {
+    await expect(
+      getOctokit({
+        integrations,
+        repoUrl: 'ghe.github.com?repo=bob&owner=owner',
+      }),
+    ).rejects.toThrow(/No token available for host/);
+  });
+
+  it('should return proper Octokit', async () => {
+    const { client, token, owner, repo } = await getOctokit({
+      integrations,
+      repoUrl: 'github.com?repo=bob&owner=owner',
+    });
+    expect(client).toBeDefined();
+    expect(token).toBe('tokenlols');
+    expect(owner).toBe('owner');
+    expect(repo).toBe('bob');
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
new file mode 100644
index 0000000000..89c7b43a1a
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
@@ -0,0 +1,83 @@
+/*
+ * 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 { InputError } from '@backstage/errors';
+import {
+  GithubCredentialsProvider,
+  ScmIntegrationRegistry,
+} from '@backstage/integration';
+import { Octokit } from '@octokit/rest';
+import { parseRepoUrl } from '../publish/util';
+
+type OctokitOptions = {
+  integrations: ScmIntegrationRegistry;
+  repoUrl: string;
+};
+
+type OctokitIntegration = {
+  client: Octokit;
+  token: string;
+  owner: string;
+  repo: string;
+};
+
+export const getOctokit = async ({
+  integrations,
+  repoUrl,
+}: OctokitOptions): Promise<OctokitIntegration> => {
+  const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
+
+  if (!owner) {
+    throw new InputError(`No owner provided for repo ${repoUrl}`);
+  }
+
+  const integrationConfig = integrations.github.byHost(host)?.config;
+
+  if (!integrationConfig) {
+    throw new InputError(`No integration for host ${host}`);
+  }
+
+  const credentialsProvider =
+    GithubCredentialsProvider.create(integrationConfig);
+
+  if (!credentialsProvider) {
+    throw new InputError(
+      `No matching credentials for host ${host}, please check your integrations config`,
+    );
+  }
+
+  // TODO(blam): Consider changing this API to have owner, repo interface instead of URL as the it's
+  // needless to create URL and then parse again the other side.
+  const { token } = await credentialsProvider.getCredentials({
+    url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
+      repo,
+    )}`,
+  });
+
+  if (!token) {
+    throw new InputError(
+      `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
+    );
+  }
+
+  const client = new Octokit({
+    auth: token,
+    baseUrl: integrationConfig.apiBaseUrl,
+    previews: ['nebula-preview'],
+  });
+
+  return { client, token, owner, repo };
+};
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
index 4461d227e8..6a3ccf5e38 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
@@ -60,42 +60,6 @@ describe('publish:github', () => {
     jest.resetAllMocks();
   });
 
-  it('should throw an error when the repoUrl is not well formed', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'github.com?repo=bob' },
-      }),
-    ).rejects.toThrow(/missing owner/);
-
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'github.com?owner=owner' },
-      }),
-    ).rejects.toThrow(/missing repo/);
-  });
-
-  it('should throw if there is no integration config provided', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: { repoUrl: 'missing.com?repo=bob&owner=owner' },
-      }),
-    ).rejects.toThrow(/No matching integration configuration/);
-  });
-
-  it('should throw if there is no token in the integration config that is returned', async () => {
-    await expect(
-      action.handler({
-        ...mockContext,
-        input: {
-          repoUrl: 'ghe.github.com?repo=bob&owner=owner',
-        },
-      }),
-    ).rejects.toThrow(/No token available for host/);
-  });
-
   it('should call the githubApis with the correct values for createInOrg', async () => {
     mockGithubClient.users.getByUsername.mockResolvedValue({
       data: { type: 'Organization' },
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
index 5a358822af..857847825a 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
@@ -13,19 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { InputError } from '@backstage/errors';
-import {
-  GithubCredentialsProvider,
-  ScmIntegrationRegistry,
-} from '@backstage/integration';
-import { Octokit } from '@octokit/rest';
+import { ScmIntegrationRegistry } from '@backstage/integration';
 import {
   enableBranchProtectionOnDefaultRepoBranch,
   initRepoAndPush,
 } from '../helpers';
-import { getRepoSourceDirectory, parseRepoUrl } from './util';
+import { getRepoSourceDirectory } from './util';
 import { createTemplateAction } from '../../createTemplateAction';
 import { Config } from '@backstage/config';
+import { getOctokit } from '../github/helpers';
 
 type Permission = 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
 type Collaborator = { access: Permission; username: string };
@@ -36,13 +32,6 @@ export function createPublishGithubAction(options: {
 }) {
   const { integrations, config } = options;
 
-  const credentialsProviders = new Map(
-    integrations.github.list().map(integration => {
-      const provider = GithubCredentialsProvider.create(integration.config);
-      return [integration.config.host, provider];
-    }),
-  );
-
   return createTemplateAction<{
     repoUrl: string;
     description?: string;
@@ -151,41 +140,9 @@ export function createPublishGithubAction(options: {
         topics,
       } = ctx.input;
 
-      const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
-
-      if (!owner) {
-        throw new InputError(
-          `No owner provided for host: ${host}, and repo ${repo}`,
-        );
-      }
-
-      const credentialsProvider = credentialsProviders.get(host);
-      const integrationConfig = integrations.github.byHost(host);
-
-      if (!credentialsProvider || !integrationConfig) {
-        throw new InputError(
-          `No matching integration configuration for host ${host}, please check your integrations config`,
-        );
-      }
-
-      // TODO(blam): Consider changing this API to have owner, repo interface instead of URL as the it's
-      // needless to create URL and then parse again the other side.
-      const { token } = await credentialsProvider.getCredentials({
-        url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
-          repo,
-        )}`,
-      });
-
-      if (!token) {
-        throw new InputError(
-          `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
-        );
-      }
-
-      const client = new Octokit({
-        auth: token,
-        baseUrl: integrationConfig.config.apiBaseUrl,
-        previews: ['nebula-preview'],
+      const { client, token, owner, repo } = await getOctokit({
+        integrations,
+        repoUrl,
       });
 
       const user = await client.users.getByUsername({

From dd35e9e59f11cddedcfa4d519f689f46ed3c6a4b Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Mon, 30 Aug 2021 18:36:23 +0200
Subject: [PATCH 23/83] Make local publisher respect case expectations/configs.

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 .../src/stages/publish/local.test.ts          | 35 +++++++++++++++++--
 .../src/stages/publish/local.ts               | 33 +++++++++++++----
 2 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/packages/techdocs-common/src/stages/publish/local.test.ts b/packages/techdocs-common/src/stages/publish/local.test.ts
index 0ced296a88..9609e4f12d 100644
--- a/packages/techdocs-common/src/stages/publish/local.test.ts
+++ b/packages/techdocs-common/src/stages/publish/local.test.ts
@@ -25,10 +25,10 @@ import mockFs from 'mock-fs';
 import * as os from 'os';
 import { LocalPublish } from './local';
 
-const createMockEntity = (annotations = {}) => {
+const createMockEntity = (annotations = {}, lowerCase = false) => {
   return {
     apiVersion: 'version',
-    kind: 'TestKind',
+    kind: lowerCase ? 'testkind' : 'TestKind',
     metadata: {
       name: 'test-component-name',
       annotations: {
@@ -65,11 +65,42 @@ describe('local publisher', () => {
 
     const publisher = new LocalPublish(mockConfig, logger, testDiscovery);
     const mockEntity = createMockEntity();
+    const lowerMockEntity = createMockEntity(undefined, true);
 
     await publisher.publish({ entity: mockEntity, directory: tmpDir });
 
     expect(await publisher.hasDocsBeenGenerated(mockEntity)).toBe(true);
 
+    // Lower/upper should be treated the same.
+    expect(await publisher.hasDocsBeenGenerated(lowerMockEntity)).toBe(true);
+
+    mockFs.restore();
+  });
+
+  it('should respect legacy casing', async () => {
+    mockFs({
+      [tmpDir]: {
+        'index.html': '',
+      },
+    });
+
+    const mockConfig = new ConfigReader({
+      techdocs: {
+        legacyUseCaseSensitiveTripletPaths: true,
+      },
+    });
+
+    const publisher = new LocalPublish(mockConfig, logger, testDiscovery);
+    const mockEntity = createMockEntity();
+    const lowerMockEntity = createMockEntity(undefined, true);
+
+    await publisher.publish({ entity: mockEntity, directory: tmpDir });
+
+    expect(await publisher.hasDocsBeenGenerated(mockEntity)).toBe(true);
+
+    // Lower/upper should be treated differently.
+    expect(await publisher.hasDocsBeenGenerated(lowerMockEntity)).toBe(false);
+
     mockFs.restore();
   });
 
diff --git a/packages/techdocs-common/src/stages/publish/local.ts b/packages/techdocs-common/src/stages/publish/local.ts
index 24af34932f..b59bae88bb 100644
--- a/packages/techdocs-common/src/stages/publish/local.ts
+++ b/packages/techdocs-common/src/stages/publish/local.ts
@@ -58,6 +58,8 @@ try {
  * called "static" at the root of techdocs-backend plugin.
  */
 export class LocalPublish implements PublisherBase {
+  private legacyPathCasing: boolean;
+
   // TODO: Use a static fromConfig method to create a LocalPublish instance, similar to aws/gcs publishers.
   // Move the logic of setting staticDocsDir based on config over to fromConfig,
   // and set the value as a class parameter.
@@ -70,6 +72,10 @@ export class LocalPublish implements PublisherBase {
     this.config = config;
     this.logger = logger;
     this.discovery = discovery;
+    this.legacyPathCasing =
+      config.getOptionalBoolean(
+        'techdocs.legacyUseCaseSensitiveTripletPaths',
+      ) || false;
   }
 
   async getReadiness(): Promise<ReadinessResponse> {
@@ -81,8 +87,7 @@ export class LocalPublish implements PublisherBase {
   publish({ entity, directory }: PublishRequest): Promise<PublishResponse> {
     const entityNamespace = entity.metadata.namespace ?? 'default';
 
-    const publishDir = path.join(
-      staticDocsDir,
+    const publishDir = this.staticEntityPathJoin(
       entityNamespace,
       entity.kind,
       entity.metadata.name,
@@ -119,8 +124,7 @@ export class LocalPublish implements PublisherBase {
   async fetchTechDocsMetadata(
     entityName: EntityName,
   ): Promise<TechDocsMetadata> {
-    const metadataPath = path.join(
-      staticDocsDir,
+    const metadataPath = this.staticEntityPathJoin(
       entityName.namespace,
       entityName.kind,
       entityName.name,
@@ -153,8 +157,7 @@ export class LocalPublish implements PublisherBase {
   async hasDocsBeenGenerated(entity: Entity): Promise<boolean> {
     const namespace = entity.metadata.namespace ?? 'default';
 
-    const indexHtmlPath = path.join(
-      staticDocsDir,
+    const indexHtmlPath = this.staticEntityPathJoin(
       namespace,
       entity.kind,
       entity.metadata.name,
@@ -210,4 +213,22 @@ export class LocalPublish implements PublisherBase {
       ),
     );
   }
+
+  /**
+   * Utility wrapper around path.join(), used to control legacy case logic.
+   */
+  protected staticEntityPathJoin(...allParts: string[]): string {
+    if (this.legacyPathCasing) {
+      const [namespace, kind, name, ...parts] = allParts;
+      return path.join(staticDocsDir, namespace, kind, name, ...parts);
+    }
+    const [namespace, kind, name, ...parts] = allParts;
+    return path.join(
+      staticDocsDir,
+      namespace.toLowerCase(),
+      kind.toLowerCase(),
+      name.toLowerCase(),
+      ...parts,
+    );
+  }
 }

From 3624616e739565cab5deb1b1e9b037a2063add6d Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Mon, 30 Aug 2021 18:48:46 +0200
Subject: [PATCH 24/83] Changeset.

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 .changeset/techdocs-the-beta-local.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/techdocs-the-beta-local.md

diff --git a/.changeset/techdocs-the-beta-local.md b/.changeset/techdocs-the-beta-local.md
new file mode 100644
index 0000000000..9f94627a60
--- /dev/null
+++ b/.changeset/techdocs-the-beta-local.md
@@ -0,0 +1,6 @@
+---
+'@backstage/techdocs-common': patch
+---
+
+"Local" (out-of-the-box) publisher explicitly follows lower-case entity triplet
+logic.

From 31d4a456bfaf0274e960f97c7e0b9d7bf501bf88 Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Mon, 30 Aug 2021 20:00:01 +0200
Subject: [PATCH 25/83] Update local publisher reader to respect case configs
 on read.

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 .../src/stages/publish/local.test.ts          | 39 +++++++++++++
 .../src/stages/publish/local.ts               | 57 ++++++++++++++++---
 2 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/packages/techdocs-common/src/stages/publish/local.test.ts b/packages/techdocs-common/src/stages/publish/local.test.ts
index 9609e4f12d..4372dcdc1f 100644
--- a/packages/techdocs-common/src/stages/publish/local.test.ts
+++ b/packages/techdocs-common/src/stages/publish/local.test.ts
@@ -117,6 +117,13 @@ describe('local publisher', () => {
         [resolvedDir]: {
           'unsafe.html': '<html></html>',
           'unsafe.svg': '<svg></svg>',
+          default: {
+            testkind: {
+              testname: {
+                'index.html': 'found it',
+              },
+            },
+          },
         },
       });
     });
@@ -138,5 +145,37 @@ describe('local publisher', () => {
         'content-type': 'text/plain; charset=utf-8',
       });
     });
+
+    it('should redirect case-sensitive triplet path to lower-case', async () => {
+      await request(app)
+        .get('/default/TestKind/TestName/index.html')
+        .expect(301)
+        .expect('Location', '/default/testkind/testname/index.html');
+    });
+
+    it('should resolve lower-case triplet path content eventually', async () => {
+      const response = await request(app)
+        .get('/default/TestKind/TestName/index.html')
+        .redirects(1);
+      expect(response.text).toEqual('found it');
+    });
+
+    it('should not redirect when legacy case setting is used', async () => {
+      const legacyConfig = new ConfigReader({
+        techdocs: {
+          legacyUseCaseSensitiveTripletPaths: true,
+        },
+      });
+      const legacyPublisher = new LocalPublish(
+        legacyConfig,
+        logger,
+        testDiscovery,
+      );
+      app = express().use(legacyPublisher.docsRouter());
+
+      await request(app)
+        .get('/default/TestKind/TestName/index.html')
+        .expect(404);
+    });
   });
 });
diff --git a/packages/techdocs-common/src/stages/publish/local.ts b/packages/techdocs-common/src/stages/publish/local.ts
index b59bae88bb..c547b65406 100644
--- a/packages/techdocs-common/src/stages/publish/local.ts
+++ b/packages/techdocs-common/src/stages/publish/local.ts
@@ -142,16 +142,55 @@ export class LocalPublish implements PublisherBase {
   }
 
   docsRouter(): express.Handler {
-    return express.static(staticDocsDir, {
-      // Handle content-type header the same as all other publishers.
-      setHeaders: (res, filePath) => {
-        const fileExtension = path.extname(filePath);
-        const headers = getHeadersForFileExtension(fileExtension);
-        for (const [header, value] of Object.entries(headers)) {
-          res.setHeader(header, value);
-        }
-      },
+    const router = express.Router();
+
+    // Redirect middleware ensuring that requests to case-sensitive entity
+    // triplet paths are always sent to lower-case versions.
+    router.use((req, res, next) => {
+      // If legacy path casing is on, let the request immediately continue.
+      if (this.legacyPathCasing) {
+        return next();
+      }
+
+      // Generate a lower-case entity triplet path.
+      const [_, namespace, kind, name, ...rest] = req.path.split('/');
+
+      // Ignore non-triplet objects.
+      if (!namespace || !kind || !name) {
+        return next();
+      }
+
+      const newPath = [
+        _,
+        namespace.toLowerCase(),
+        kind.toLowerCase(),
+        name.toLowerCase(),
+        ...rest,
+      ].join('/');
+
+      // If there was no change, then let express.static() handle the request.
+      if (newPath === req.path) {
+        return next();
+      }
+
+      // Otherwise, redirect to the new path.
+      return res.redirect(req.baseUrl + newPath, 301);
     });
+
+    router.use(
+      express.static(staticDocsDir, {
+        // Handle content-type header the same as all other publishers.
+        setHeaders: (res, filePath) => {
+          const fileExtension = path.extname(filePath);
+          const headers = getHeadersForFileExtension(fileExtension);
+          for (const [header, value] of Object.entries(headers)) {
+            res.setHeader(header, value);
+          }
+        },
+      }),
+    );
+
+    return router;
   }
 
   async hasDocsBeenGenerated(entity: Entity): Promise<boolean> {

From 3cb2124bcd99b10372a097d52fe792c5d765628b Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aureliosaraiva@gmail.com>
Date: Mon, 30 Aug 2021 18:19:49 -0300
Subject: [PATCH 26/83] removed doc in favor #6888

Signed-off-by: Aurelio Saraiva <aureliosaraiva@gmail.com>
---
 docs/features/software-catalog/descriptor-format.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md
index c2141db0e5..8b07e1a51a 100644
--- a/docs/features/software-catalog/descriptor-format.md
+++ b/docs/features/software-catalog/descriptor-format.md
@@ -231,14 +231,6 @@ follows.
 
 Example: `visits-tracking-service`, `CircleciBuildsDumpV2_avro_gcs`
 
-### `title` [optional]
-
-The title of the entity. This is a friendly title to be used in the Backstage
-interface. This is an optional property, if it doesn't exist the `name` property
-will be used.
-
-Only available for Templates and Docs.
-
 ### `namespace` [optional]
 
 The ID of a namespace that the entity belongs to. This is a string that follows

From 434dfc5d47ded59ca4625232e26fededc0d94146 Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aureliosaraiva@gmail.com>
Date: Mon, 30 Aug 2021 18:24:25 -0300
Subject: [PATCH 27/83] added changeset for techdocs title

Signed-off-by: Aurelio Saraiva <aureliosaraiva@gmail.com>
---
 .changeset/two-hats-judge.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/two-hats-judge.md

diff --git a/.changeset/two-hats-judge.md b/.changeset/two-hats-judge.md
new file mode 100644
index 0000000000..11909c8926
--- /dev/null
+++ b/.changeset/two-hats-judge.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-techdocs': patch
+'@backstage/plugin-techdocs-backend': patch
+---
+
+added support for title in Techdocs

From 216264e46edadf61e2564f25ba0c33d188846237 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Aug 2021 04:09:44 +0000
Subject: [PATCH 28/83] chore(deps): bump @octokit/graphql from 4.6.4 to 4.7.0

Bumps [@octokit/graphql](https://github.com/octokit/graphql.js) from 4.6.4 to 4.7.0.
- [Release notes](https://github.com/octokit/graphql.js/releases)
- [Commits](https://github.com/octokit/graphql.js/compare/v4.6.4...v4.7.0)

---
updated-dependencies:
- dependency-name: "@octokit/graphql"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e643ac9750..9ec9426b6c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4749,9 +4749,9 @@
     universal-user-agent "^5.0.0"
 
 "@octokit/graphql@^4.5.8":
-  version "4.6.4"
-  resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.4.tgz#0c3f5bed440822182e972317122acb65d311a5ed"
-  integrity sha512-SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg==
+  version "4.7.0"
+  resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.7.0.tgz#cbe12edc2bc61e9eaa5f9e5d092644c92b6fcb74"
+  integrity sha512-diY0qMPyQjfu4rDu3kDhJ9qIZadIm4IISO3RJSv9ajYUWJUCO0AykbgzLcg1xclxtXgzY583u3gAv66M6zz5SA==
   dependencies:
     "@octokit/request" "^5.6.0"
     "@octokit/types" "^6.0.3"
@@ -10933,9 +10933,9 @@ core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
   integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw==
 
 core-js@^3.6.0:
-  version "3.16.2"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.16.2.tgz#3f485822889c7fc48ef463e35be5cc2a4a01a1f4"
-  integrity sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ==
+  version "3.16.4"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.16.4.tgz#0fb1029a554fc2688c0963d7c900e188188a78e0"
+  integrity sha512-Tq4GVE6XCjE+hcyW6hPy0ofN3hwtLudz5ZRdrlCnsnD/xkm/PWQRudzYHiKgZKUcefV6Q57fhDHjZHJP5dpfSg==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -22372,9 +22372,9 @@ react-helmet@6.1.0:
     react-side-effect "^2.1.0"
 
 react-hook-form@^6.15.4:
-  version "6.15.4"
-  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-6.15.4.tgz#328003e1ccc096cd158899ffe7e3b33735a9b024"
-  integrity sha512-K+Sw33DtTMengs8OdqFJI3glzNl1wBzSefD/ksQw/hJf9CnOHQAU6qy82eOrh0IRNt2G53sjr7qnnw1JDjvx1w==
+  version "6.15.8"
+  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-6.15.8.tgz#725c139d308c431c4611e4b9d85a49f01cfc0e7a"
+  integrity sha512-prq82ofMbnRyj5wqDe8hsTRcdR25jQ+B8KtCS7BLCzjFHAwNuCjRwzPuP4eYLsEBjEIeYd6try+pdLdw0kPkpg==
 
 react-hook-form@^7.12.2:
   version "7.12.2"
@@ -27481,10 +27481,10 @@ write-pkg@^4.0.0:
     type-fest "^0.4.1"
     write-json-file "^3.2.0"
 
-ws@7.4.5, ws@^7.4.6, ws@^7.5.3:
-  version "7.5.3"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
-  integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
+ws@7.4.5, ws@^7.4.6:
+  version "7.5.4"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.5.4.tgz#56bfa20b167427e138a7795de68d134fe92e21f9"
+  integrity sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg==
 
 ws@^5.2.0:
   version "5.2.3"
@@ -27510,6 +27510,11 @@ ws@^7.2.3, ws@^7.3.1:
   resolved "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
   integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
 
+ws@^7.5.3:
+  version "7.5.3"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
+  integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
+
 xcase@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/xcase/-/xcase-2.0.1.tgz#c7fa72caa0f440db78fd5673432038ac984450b9"

From d5119a13478c89e36a9d351428c83f76061318b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Aug 2021 04:10:36 +0000
Subject: [PATCH 29/83] chore(deps): bump @typescript-eslint/eslint-plugin from
 4.28.3 to 4.30.0

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.28.3 to 4.30.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.30.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/cli/package.json |  2 +-
 yarn.lock                 | 85 ++++++++++++++++++++++++++++-----------
 2 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 13d146de72..09054cd351 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -51,7 +51,7 @@
     "@svgr/rollup": "5.5.x",
     "@svgr/webpack": "5.5.x",
     "@types/webpack-env": "^1.15.2",
-    "@typescript-eslint/eslint-plugin": "^v4.28.3",
+    "@typescript-eslint/eslint-plugin": "^v4.30.0",
     "@typescript-eslint/parser": "^v4.28.3",
     "@yarnpkg/lockfile": "^1.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
diff --git a/yarn.lock b/yarn.lock
index e643ac9750..6f039aaf19 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7546,28 +7546,28 @@
   resolved "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.2.tgz#808c9fa7e4517274ed555fa158f2de4b4f468e71"
   integrity sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg==
 
-"@typescript-eslint/eslint-plugin@^v4.28.3":
-  version "4.28.3"
-  resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.3.tgz#36cdcd9ca6f9e5cb49b9f61b970b1976708d084b"
-  integrity sha512-jW8sEFu1ZeaV8xzwsfi6Vgtty2jf7/lJmQmDkDruBjYAbx5DA8JtbcMnP0rNPUG+oH5GoQBTSp+9613BzuIpYg==
+"@typescript-eslint/eslint-plugin@^v4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz#4a0c1ae96b953f4e67435e20248d812bfa55e4fb"
+  integrity sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.28.3"
-    "@typescript-eslint/scope-manager" "4.28.3"
+    "@typescript-eslint/experimental-utils" "4.30.0"
+    "@typescript-eslint/scope-manager" "4.30.0"
     debug "^4.3.1"
     functional-red-black-tree "^1.0.1"
     regexpp "^3.1.0"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@4.28.3", "@typescript-eslint/experimental-utils@^4.0.1":
-  version "4.28.3"
-  resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.3.tgz#976f8c1191b37105fd06658ed57ddfee4be361ca"
-  integrity sha512-zZYl9TnrxwEPi3FbyeX0ZnE8Hp7j3OCR+ELoUfbwGHGxWnHg9+OqSmkw2MoCVpZksPCZYpQzC559Ee9pJNHTQw==
+"@typescript-eslint/experimental-utils@4.30.0", "@typescript-eslint/experimental-utils@^4.0.1":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz#9e49704fef568432ae16fc0d6685c13d67db0fd5"
+  integrity sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==
   dependencies:
     "@types/json-schema" "^7.0.7"
-    "@typescript-eslint/scope-manager" "4.28.3"
-    "@typescript-eslint/types" "4.28.3"
-    "@typescript-eslint/typescript-estree" "4.28.3"
+    "@typescript-eslint/scope-manager" "4.30.0"
+    "@typescript-eslint/types" "4.30.0"
+    "@typescript-eslint/typescript-estree" "4.30.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
@@ -7589,11 +7589,24 @@
     "@typescript-eslint/types" "4.28.3"
     "@typescript-eslint/visitor-keys" "4.28.3"
 
+"@typescript-eslint/scope-manager@4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz#1a3ffbb385b1a06be85cd5165a22324f069a85ee"
+  integrity sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==
+  dependencies:
+    "@typescript-eslint/types" "4.30.0"
+    "@typescript-eslint/visitor-keys" "4.30.0"
+
 "@typescript-eslint/types@4.28.3":
   version "4.28.3"
   resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.3.tgz#8fffd436a3bada422c2c1da56060a0566a9506c7"
   integrity sha512-kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA==
 
+"@typescript-eslint/types@4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz#fb9d9b0358426f18687fba82eb0b0f869780204f"
+  integrity sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==
+
 "@typescript-eslint/typescript-estree@4.28.3":
   version "4.28.3"
   resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.3.tgz#253d7088100b2a38aefe3c8dd7bd1f8232ec46fb"
@@ -7607,6 +7620,19 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz#ae57833da72a753f4846cd3053758c771670c2ac"
+  integrity sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==
+  dependencies:
+    "@typescript-eslint/types" "4.30.0"
+    "@typescript-eslint/visitor-keys" "4.30.0"
+    debug "^4.3.1"
+    globby "^11.0.3"
+    is-glob "^4.0.1"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/visitor-keys@4.28.3":
   version "4.28.3"
   resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.3.tgz#26ac91e84b23529968361045829da80a4e5251c4"
@@ -7615,6 +7641,14 @@
     "@typescript-eslint/types" "4.28.3"
     eslint-visitor-keys "^2.0.0"
 
+"@typescript-eslint/visitor-keys@4.30.0":
+  version "4.30.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz#a47c6272fc71b0c627d1691f68eaecf4ad71445e"
+  integrity sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==
+  dependencies:
+    "@typescript-eslint/types" "4.30.0"
+    eslint-visitor-keys "^2.0.0"
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -10933,9 +10967,9 @@ core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
   integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw==
 
 core-js@^3.6.0:
-  version "3.16.2"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.16.2.tgz#3f485822889c7fc48ef463e35be5cc2a4a01a1f4"
-  integrity sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ==
+  version "3.16.4"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.16.4.tgz#0fb1029a554fc2688c0963d7c900e188188a78e0"
+  integrity sha512-Tq4GVE6XCjE+hcyW6hPy0ofN3hwtLudz5ZRdrlCnsnD/xkm/PWQRudzYHiKgZKUcefV6Q57fhDHjZHJP5dpfSg==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -22372,9 +22406,9 @@ react-helmet@6.1.0:
     react-side-effect "^2.1.0"
 
 react-hook-form@^6.15.4:
-  version "6.15.4"
-  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-6.15.4.tgz#328003e1ccc096cd158899ffe7e3b33735a9b024"
-  integrity sha512-K+Sw33DtTMengs8OdqFJI3glzNl1wBzSefD/ksQw/hJf9CnOHQAU6qy82eOrh0IRNt2G53sjr7qnnw1JDjvx1w==
+  version "6.15.8"
+  resolved "https://registry.npmjs.org/react-hook-form/-/react-hook-form-6.15.8.tgz#725c139d308c431c4611e4b9d85a49f01cfc0e7a"
+  integrity sha512-prq82ofMbnRyj5wqDe8hsTRcdR25jQ+B8KtCS7BLCzjFHAwNuCjRwzPuP4eYLsEBjEIeYd6try+pdLdw0kPkpg==
 
 react-hook-form@^7.12.2:
   version "7.12.2"
@@ -27481,10 +27515,10 @@ write-pkg@^4.0.0:
     type-fest "^0.4.1"
     write-json-file "^3.2.0"
 
-ws@7.4.5, ws@^7.4.6, ws@^7.5.3:
-  version "7.5.3"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
-  integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
+ws@7.4.5, ws@^7.4.6:
+  version "7.5.4"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.5.4.tgz#56bfa20b167427e138a7795de68d134fe92e21f9"
+  integrity sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg==
 
 ws@^5.2.0:
   version "5.2.3"
@@ -27510,6 +27544,11 @@ ws@^7.2.3, ws@^7.3.1:
   resolved "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
   integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
 
+ws@^7.5.3:
+  version "7.5.3"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
+  integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
+
 xcase@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/xcase/-/xcase-2.0.1.tgz#c7fa72caa0f440db78fd5673432038ac984450b9"

From 957ae8059b806d019a592c0600a860dc6b7c2d76 Mon Sep 17 00:00:00 2001
From: Mustansar Anwar ul Samad <mustansar.samad@gmail.com>
Date: Tue, 31 Aug 2021 16:47:18 +1200
Subject: [PATCH 30/83] Use themeId in TemplateCard from theme object

The themeId should be picked up from the object to make sure that
when a custom theme is provided, it's pageTheme list is used instead
of one in the default theme package

Signed-off-by: Mustansar Anwar ul Samad <mustansar.samad@gmail.com>
---
 .changeset/lovely-guests-smell.md                           | 5 +++++
 .../scaffolder/src/components/TemplateCard/TemplateCard.tsx | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/lovely-guests-smell.md

diff --git a/.changeset/lovely-guests-smell.md b/.changeset/lovely-guests-smell.md
new file mode 100644
index 0000000000..ef6bb8c8f4
--- /dev/null
+++ b/.changeset/lovely-guests-smell.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Use themeId in TemplateCard from theme object
diff --git a/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx b/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
index 9d2e827be9..a02e6d3b14 100644
--- a/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
+++ b/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
@@ -27,7 +27,7 @@ import {
   getEntityRelations,
   getEntitySourceLocation,
 } from '@backstage/plugin-catalog-react';
-import { BackstageTheme, pageTheme } from '@backstage/theme';
+import { BackstageTheme } from '@backstage/theme';
 import {
   Box,
   Card,
@@ -149,7 +149,9 @@ export const TemplateCard = ({ template, deprecated }: TemplateCardProps) => {
     template as Entity,
     RELATION_OWNED_BY,
   );
-  const themeId = pageTheme[templateProps.type] ? templateProps.type : 'other';
+  const themeId = backstageTheme.getPageTheme({ themeId: templateProps.type })
+    ? templateProps.type
+    : 'other';
   const theme = backstageTheme.getPageTheme({ themeId });
   const classes = useStyles({ backgroundImage: theme.backgroundImage });
   const href = generatePath(`${rootLink()}/templates/:templateName`, {

From cba687a27fe4d138bfd09f71dd2fed03232e95e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ruben=20Lindstr=C3=B6m?= <ruben.lindstrom@gmail.com>
Date: Tue, 31 Aug 2021 09:21:10 +0200
Subject: [PATCH 31/83] feat: add home to plugin marketplace (#7000)

feat: add home to plugin marketplace
---
 microsite/data/plugins/home.yaml |   9 +++++++++
 microsite/static/img/home.png    | Bin 0 -> 14172 bytes
 2 files changed, 9 insertions(+)
 create mode 100644 microsite/data/plugins/home.yaml
 create mode 100644 microsite/static/img/home.png

diff --git a/microsite/data/plugins/home.yaml b/microsite/data/plugins/home.yaml
new file mode 100644
index 0000000000..e37b8c5e03
--- /dev/null
+++ b/microsite/data/plugins/home.yaml
@@ -0,0 +1,9 @@
+---
+title: Home
+author: Spotify
+authorUrl: https://github.com/spotify
+category: Discovery
+description: This plugin provides a composable home page, and ability to create home page components
+documentation: https://github.com/backstage/backstage/blob/master/plugins/home/README.md
+iconUrl: img/home.png
+npmPackageName: '@backstage/plugin-home'
diff --git a/microsite/static/img/home.png b/microsite/static/img/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..e217581586c20fba42ccf05d2df887a5d18bb695
GIT binary patch
literal 14172
zcmc(G2Un9#u<(-*Aas-}QbnZ~1qGxkf+$srARSQ%7CO>NXrfXSL3&3(KtM#L2?-!Y
z>AgvlUPB8#@NInWJ>O5bp2KmOXLfdWc4l^Fc6g<ybBm6egBpS$y4xBz^&tq3A^jjJ
z0ED*v7eDxq%30&S8w8aKlYU?}d7^j#gt_V8x&ak;a4v#h5cb!#uY<2|XpU^iA?WJH
z?VHyPy<n?j?XE_HsWQhCBk$;RHa)i^(hAaUK3;Ku#Jq5w(%IvFZP28MB=>ppwZIJ)
z$k^Jui`9W4q6D``jq88Z`zwPlyBPhne&a)4(Q{9DJ*vbWPqt@-`9O5tkvrVVKc}zp
zRN(ZrL*IZWMflf%i~s9?m}U)_<mq|G36tSkPkY6@AEz}NJ9Dv>1_7t?Q#dV;f3-(`
zvo(WB!r{E1yOz2<OMdu@yB>J397QQDVv}8~?h{*YJvtRHQIwj1zy+O#0z<bY_i9r4
zb(&#@=&@PBzgfIU(Q`0H6IpvDY``^^{nf`y<)^hjB-|7he_Bjj3WiL0)gaNgGL9D5
zxB5ROWRLn?KdIlh445v{6-VIUmtY9irr}QI8cv}a*3_1>$+vWBSs)q}2r)Ol?e0{2
zXmh31?2Y(r#q$L;J+{iF&B4aHmI{M2mv=incpTjuCa1g~;`Bsc%k{M}Cp~N~5kj^V
zT|3I*G|uxS9GpkM-8%Rft;LCRI|8@tPai+-S1voYAB0Imb8i7=s#Lm#l~sqs)hT@R
zHALKgQ)1__haxl=0lvMb<U$i>N<x$3n|kgD$CVuK4CKwjt)q|_+@HOwX(#Krb2UXG
zj0pntfsk7!JzDOsAFYXSYdF4kuO}2@mxVF1|8S&98_kvEU{?aad>W_z?-$aS58Tvg
z0u0K<>TK@haI%XKJh)f2ZtMI+xbc#1Pg%e6EhIv{Nyyq-uS(oYM{Z1Edv?k;KEUOH
z{>e2%PNg{gsxuaP>~yrTRJ@Yx9(8V}zj>bbZy481S_JI2yc+a8?5t8my(@RE+*-<E
zJJ~RWXfXg2X~Cv2|B~hn4f<O<n@(DXnhW2xOu!v0j4`3Im?mv`-E*<!Rk-dU-oo^-
zzj5tGMm@?}Ruo1i)eqJ<v-k%e#fi38Mz;@l7TmUo9*>F=jG(a7h7fkS%l@7&%9ayH
z)iK6@p@NfVc?DPA?N(R2nb=56%ENiPs!99Z_55u-ak#G;sk1vE@GidfZ^J^tMRkC|
z4=@UqsMD6CuvLFAm^#lX7ndwiBUmFL<aTaJ(ERuM3H}?rpHV4r3ZHKKI=8P{HqxI_
zT2Np|`<KbeXVlq&YSwV1`{M!f&SwVfbfRz=<3gL>f8tK?jKc)#(3bv(=Y0W!7oByj
za~ow=C)?715T;TR|4nK;3u8nz{$Nok*EZ&r)J3RdlzNMKIVLkA+i3DIf$DRW|3kqB
zj^rFVN5TV~KfH*+1&W&fM^6=;<Kg#@|Iwp;f5F<?s!4DC&(+XwTo=%qw8;GbNbsG4
z0`oYY{Ldsl2(Bx=12(xxjd%g{o?EldO(sOedI0S9dCp{|JlNiSDHtL^rOpivxGn=*
z^$QD{4-f*vzYZa4b0@v80=Rz}f>uk&D@`%9Tg3{YqEfeo0mpN|3)R0A^5VV-po0h%
zb|Lc4hFlTGg?A8=|HGuW5;9Q5I0gP9`tG`dG9Y4c2^Mk+jIm(+>@qAQT5nxpf;2u2
z*&vt|Bq#tGGf`MWkiq&7F96r3!hFU7xHy0_!Ffe_$vdYrBspXSVT`O1LGv!%EJ)4}
z2uX9ZZcCOb5EmdvPD^v6Zp#bszSD|eWW@y8bKhmBTM4D&ZIdJK^h*XBCxK8&u%%8L
zj;u#bI)JrO^w-;Z!B)6$K_PM<CKGG)!31?M&YDaN23Fvg4k6uc)JbVCP$O!!0X$<e
z@hUP9$FBoxzzKQfiU9%M(t>ONpS>)h-I9(MF_J(z7T?vQ*kxdh6dH9>{(#K%BPw<Z
zbub1RG|dmyV+6hI?lG%3R3I^u5OvxaIGD-}=WR;}vVU>Ym^UIALP`N{_)f!ZHo&%|
z05_R{v+zy?qn%2f)Yc6fY0-;JDhr80_H(c5Q6^e&-fghdmIi=xYvQ_?$UEEQL%ToA
zB2*RvgX~#D0S+yk*B#)51DrNx7~?fSQw^NfTrz~@(pzt1M+Qn_!D+<_dD)2q){ejl
zv4Zg@F!lo{7YA5wBaKf%ndH=I*8vqKu+rNg`#o?#l74Vr>5R!U&+{ZXUI00f>8;c1
zlE#`)h`;_it#6(P<BQv14B&?Xi28L|a$4UHlV|9GiPFBI;#~n;qQZdCD40~dsL4CK
zxB*STu>uL6UXMyp)Wof`Q>SH`QD@scN2m;i2H7tF`~*4}W35`9)V8jT^tLV(62`31
zu(CiM5<rDvq)xLzhNvvOF~CKn1=+I$_3GkbQc>5glcJ5OM=iur@n+{to_V2ZBkisU
zJ&Xl2*M%ZpteL>=+`-rnsLm=AbcThzQ!<@dU9}paqJF(js!bV?;fB2p&6_;K8dj`=
z3WHj17_8HV-$I7WrNHfMguGrfevsryl7c<t17jC(`joctmioKvw9~*L(yK!cGX=d~
zYyk3y_EZU>nUiOlfVHor0y;oAeL%$HNKD%m@=n|?U?-0WN;IQR3v343u6q%>9M7yk
zrpu40pOzzU`vYjMfTQ(NU{aZT9b`Yr3nqIeLYHL#5@n7gM=jWwxS$tB640HA&xp23
zAuoy%z#Kw_LZ?oui#)VD0xZi5pjEk&NteKGImtU!tlY^j--Gi8XHA}2NM>wd2P;_v
zB6i@&Z6Cs0c)|FE3K-kKTiU?X7eE<p`Jl@NfXmFg?CtD8fOdcZRX|b=aLfeY-Wgzg
z0qPL}yZQle&Ygx9BZKU%Ef=XDb|W#{z``W)Au6n|3~=s%v(HFo^)d}DXfYPxoDzz#
z8&8CK&VadD`t0pLn4rZF0PhCywEOT}4?zDCps8>ga(EBm5zOjRP6!oKAXs)_18q#O
zw@rW@g$$9m-h5Ec%OHCU{xm$1QU~T{O`Qe{0QRtjL%bye!d!Q!&ORf|q_P8a1UD`i
zVfPWCvIDdWcMQfaMPX(3U;@34jkM}H=!*atCmFD}>me};(SYc4zz-6k0$i+=iVP6p
z6F6@*(EKhjzPI;XsS|j>;dTN4+4hc#cLMO1fu_!0Os3+s0?H$KmNbT1z;-di`s~{2
zqOk1AGuA51>b;aO=NZ5~?VEa3)kP?ZgkfXAt{soSodU!qdECi+SYXZ%0ZJPi-&=86
za)on%uQ?LBHC*;IX$;I~<N;h34#up(V0;b&Xq`~FnvL|c&xjwub&-hz6PD(K#05!k
zU`mu1AaQmup3ag?3TA}ZNJ4YzVQB$o1zfBYu7WCXCCmUv1AGxgojuIJgp&jIfWZTC
z^d>+Zm%!8&VA;C-PzSgaAO+x~(te&^=L9U{EP<S4;FBpp-Z*g2%pD?dazGxKi_Gd<
z&)}1sdh18L&;)U*B=14KSLJ~zXS-VE$e8?nR-J;}Q91uDz2BF-w-4od?iB>g9z3*-
z{{Gr`maTGVc;r{(z?<~_?uWMR4H1o*B5!XYaDiui>$bK}(23&_hH0#O39p3D=YC1h
zB72ZT(R{lq{lp~fXG5!Ur4a9Brx2CL@JWnzGof<tb8FDN{mFcnh$`pcAQRSiHkGE|
zeXbqDSC|+6sOpT+m}vMl&H%!#y0@9hwM}!Yg{eiNRDr<)5Pe?)O`30l&yD#d856np
zF<%6W`!n?%#8p2?`usrPU`ebBZ@y0J?%8I}R@~F2o(|aG$h1$dw!729m{LguA-<@@
z&0EjUVF?nqbQ}@E=OB8mK`wMX4{dX>kd1lktT9jGJ4sE8Fcpiy27ZXXWr!xN^LYQ@
z+0>ivq%_0giy@6Y?>T3icXYaCLc6EI^q&BunjS0ZSs-a5o+Bc(d8?k+|1P^CH+(We
z$Sc5*aJrmqsNX%`OXyhwZ4V`w#0z!24VtGcSe!WQ-^RN`y2cVr5-jmDg8_u=D!1Ip
z#g$;r>P?pGM=kDf({W-6w38Qr(b=VKQe(JV#fuRCer~}+(Gq|8sJ~S$tX9GA>B3aW
zbI<v;d}yb{hxl>4F1@&1H-&g~&|g-Lp6KR&&{Pocf>W5DN7KXOF58lFLx0(4?w5!f
zDcH&|5T>W?KAWkbl~Mebe5Ho5mJuqZexcD8K9ucH=XO{3xQYtx(LA9Lip`I$8aY8u
zOIa9cI1L)qN%bd-#ITHf*{}cATPY}hQ{ewc*+Ia&D&{}YY4WLVj+qfOCPR&7&)Qsn
z``!G%xYYWmK4ES)vQw#&al8JsGXrU_=k1*=I$`d`2iL1taL8wR>^1BNTvTMu<i0}^
z1+JZ6;ONX;e#clv>1O{)yK<2-w%mXIM6_9|x6>e2#9N?b#*pWuhKSteoxb$=`~wr+
zylUZw)SMsD;oDKX8cfvL^XXysx0n_1kx)yQwx-K6uA;2$fLCxXJ372y!#iNNBsXDY
z=BNY9DOY*QSq0!HhuKpCeBitl3VAS{KYKcVU*<_|wKhrT&}k&k>EVnm#_i8e4PPej
zJmiPIpq6ImR^OKdB(|m!mRO!EYEK~PeT9aPRgxIt^D$xe;knc6=6*wu>bA;G+!o%e
zafH!eBCZoh^kNrh&*hrk7zjIq+`1>cC4Y6ojgjy@&)56#vAu}Z4eMnE1+%QleQShD
z)56NC@(<2O-jAzpd7(6$xW7tgNcsdUz@CB|+*<kS;PKRSJAd=Uh~Ly+sh`Barp~?(
zOI2|rW8a|LdlxgFvy_<tJt0lH4;<(ZRt5ZfDqg?raZMJ@SszihlAJXT#7>9wTe53z
zhr9Cz_bp#WEl@x0Xefh`ceaB#vHBYAoc&fw_>u>2)rdJ(z+2>Xj++j3nH6<*SbM`3
zhFPIp6$;5K+@;NRop&cRxL&in=)`%jSs8w9c!(jiyJ2>!QWpgE7ohra?Yy9{-jeXk
zop!>g+X-ZP?2204X@?n;mHu#E&bCBlf7febECklr{)K+8dxEGp#keUKYOgokEDAJe
z9HaTczGi%(j7l%l&wgy`O{apKAG6z;2K6hqh))aCUAp_z`wzB#2oc5U{dH+bjIZ9C
zlIkC0+2USGq&%#i=d)EAbx@^XM|usx!T#*geFcKlnx4y^$({UUF`XNewI)iwAU+!V
zf}mYp@^z>PATtx6H5RKW<)O~D??kLq0dKyQi+^RUv;Q%l<}gRnX9t06{wRN}|9Ur@
zKiqPiw(TAlVp-9cAgt=%-gB1H*<sa~t(qqAlxFn!cVof^0%x&(cU|-dW>L6n-d{*d
z@NnxUNUz%<kJ{6f&J2t-(VB9>v)fV$d;Pvfp|~+B%!C16b3y#5pFp+WuZA5XV~@Lr
z9B8fYrF`~#%p=E$&)HiDTo<i#;Q}(}=8dZl$`)}wYfm%K8g*MwWf5><(oQK?fs@_B
zX7SVy53~UGFCmJk$37;(g!Ag!@RV?}S_R(3*X0L0yzFW!#qsJZ<ElTtMo#rIR1dM^
zX1<Gdc@}{}1LbI+-4`_l3=v9@uop!WstShftqEkfkr5_#m?>GMoK24*1q!}~ZDuv5
z&wxjG4L;;ZR`FzyDd$Xjv#-EHY-A6I^X9WO#-7G{>WWZ)kgSr=P9ag-D?T_sN6h+^
z8^|SEW5g8yK)~N?ttnE+((S%Eb#}E>74#8Y*Pa%R^(9WUmAgk4Mw~0j^$U&>!lc<=
zUz~Qx=R~@{ED?6U>RZy^uyH?BXM$K1$X42$MoNo-|FBwpuyk2$wuX2Zwc}pe!mM8Y
zWJ;z>#EbiCn2PmK$Dd>3zF{0&mXWsz+hT$$A7@DY!gJAWgdPYrq{ddTK6(t(dPrbF
zRa`V@Nrb;<$1o<?dK~V{r>_38D;0`xbmSw;0GIf44{0g|nE`5g5V?%C)sy3@CcWkI
z*6OV+){p8pY{g?JnsUP#E0|rzwfQ&={jC?ru!;equE)GpdSSTB6S7;w*y84(`yWXg
z&M@n}7Im*AN>jukuiEim({-EeV=*nr5X3oeNT&YS<L|o%WBQWXLJ{NXp-3Qp*ntOX
zvC{3?TFn<`t+UMP__05fDj+@}7VcWUAKmXqtup84SdRct;57IBrg7cY13d)Y)-%)J
z@`_%A9plTXEl$MN=oqoJOAkR>qC9M_L)t8@s>N@!obLnQTlzHXsIwe`>lXx)tN$H|
zNv@`2Q7WyD2mpuIFEl3?{sSk_vxF@PO`bQ6?jX+Trn?g^rbpjpuc@x2A~E@*P>I<U
zD`+<Ag*9h(!~RN}(qkv8x}EyBmQ~>)%;1y6-&LBnxcUVr+JD-Xz|%{_2o<Z*=$n3L
zdpjT$5n$Z~1BZh<`Zc=YBcfTCi*dhcvyJ(81pCs8-idLhax71&HH@1q*%d2JTY$_q
z3(3K1OxW_5Hx-;}pCuZL*X+F+gkO^!s9(6QO<Gzs%3NI}Y*`Do*keMIP5DoOMB_9i
z(kcdi2QvD?7KhjY_#c;|xr>2sSrgzr-%453I~7PuXkyMV?p5xrZGMH^T^?z1*1%?4
z>mNIfGBp>ALu2AvH8o4fx2<VIyQOGIQfSIdEBI<aW00ogIjt^0Mz&Y0CJ~W#8&WXK
zu_Q%?F0yI<dHc+gMSr{lMw#D^Z-cO+@U}G`wq7^a+;{g<7SJ}nf;>!r@0zQ$;f$Yf
z#w`mr^}!h2{S~SeMMy{Y@VTuku=X$eo&qHZC^!Z`JLlBFMPWm6)k@ZTHsE(^|IZIO
zv%81m<6TdnPrF19_Yq?tQk=FfqP&Zy;;Z4&wG8`IR(0dyg|#iui3n~2E3_;!?)qAM
z#}T9`2~6Gs9QaP1XnP-@cN<GzB&&|y#^#wnmqT8paO8U)8f<b-Q@%X-1B*<sq{tYH
z`mS$FemRuz`uTs~3=;LHYew?Dnl4L9^%~i@r-!BZ{2?0}=faX^4!XH41kVWwr&8GM
zm`X(GRF;$J)F5y&jwe$nvvPkD2Tr|r5>P+<zAs5js&+ZrxSQ_hogD3^t1<XcVP=V`
z_v+Juj2gR|Y#8$b&%C}$lij*nUDzEQ5QlNA<cI_mOwNbJGfX_KqD^uAL`i$|Nocpc
z!xf*;oNk$>N|sR!o#R#9H2DV&?|whf&-IgHY5b<Tv2u$cP9wvtztb?v`!4q5+}HO7
zR+Rw;vi{Lx7YXx=0mruD&%e`4oXq5=r|#>a(>wlD1zb=|i3+|`YB^{pODp@-gYM5*
z$+3@c-0S%8l&HBZ4(e}T#h$+9s4a-AT$$~3Q-(>h#7u4!@Pwpnb}xmlqhe<lS1Zo;
z(@f7kR`T8GNqT)Y!Dk)!5q*#QSiJ!4c2H89Qt+m=)M7lc41Me_^4nc1ui_qMgKDRe
zr?wzxZtT{r=$=K?WQXqYfh%Du+uC`l(8?fj{7;9cPF~Ifj=fxEtQ`3pW6?ZvYE0{;
zSC@yv7OVeW*1>KJ3$RW2Z{*OxR<ya83xDYmq`q2GHe6$_-Pp%!li7%44;FgDPrSs~
zLsT_8Eeh-F?!`Fh-4!hggJcB>Kk=5{^Ebq&+ZScECP(A{c1_*h&M3#<Arv2BS$$?k
zbC_e6=I7t5rBGb82>PSoS}&qW=JpNoC+=WgsQH^99?eVJF+Qwph2_xR*_`!r+X{_o
z4!WM8Lv%G?T^JcW)nW$9&By5r*PRqGaxxOfoJC8N`Nx6!-jLWwbXozGFDU!oo0{Gk
z9>t=I0#M{q-4)E&a<cs`(;KI$(CtRyIfGdOM3(FE-H*+777Ug3T3Z{#xDC6q4z3%;
z#V>~qoK5$4t?M*CiObrP<)}K0IU&q>HHBcGGb_@!`p{q)*3fNNAINMtpI#Uf|N7}*
z__vzN@m)q*pRKhKW$EJJUyV{&TDv=YPZ}R?g)-I9wfg*^E*__>`g%&*fQWgfjGp&{
zR(;tKJYsZ|#FoZys1N20c5{(tgAz!zSc?mvPu~+L<?172DjAeuYMCK9mrsSX-`oIU
zm-xw}L^NsDSNPn0cv|$qJpV2BJJN&8+a&|QjAt)fGH?`DzlSgMZGYDI_VohddEwfV
z2)ldFA`>ICn2$%^;u}S}%f`tj-6gCwcV{Ebyhmubw=>3l&6-vx#t*j5yIw7RbEcC+
z_F${<5;B#)Li3lNcun<49F%x3D?$THhnuc<&5;}$BBLi07HpZSx}cQ4iqVka9`C#S
zih>idI5C!5ofo8@JB0`J=u2c$RG4pz0V**#bywF@*S7POc+Vl8^WW<A$I$a_7iny`
zI$J;b;8sSB{+39N8*xAFB{5K6_m=FooY^KOjVf@gMeXrdT66VEj%^V+KM);j-vp&-
zTdch6QEEbFA_dO0X0671=BMenkX4DgY2<ET#GTD3HoHvvz#YW*!XY8-ONtc4niXr+
z?js-aM^U};ma-eaeU;G;bKdrH6n}d<t*XrZD~^&!(>cX{Z@b=EG!$Oe9Mi7k?i~9q
zDMCoYNu?8)wRfq?`6Y6a^CK?a3l4bHnbBO>+HOD)nfO%VDe}6)+hO(Lw3*XLY*6Ag
z-({aDih{*Ob2LNq@d<ihZgKfU_hcWhT&Ns3x@(+=EiEfcGVm{PB3!)0Rw(6NmhixJ
z0n5NMD*L=m?3NhnV7}CAt!qj7q<umr>HHT@OYHop^+gP%yIDkenEgiCONNLd&wRNE
z%O`Z?%`iC5d1DV&`ZMTaP?Eo@cd?$wx_(>pWL}_*Zo-Z)(%$Xw!{#Ozc8(u6wC4Yj
zOXWe-_b=SM=CN~fvfVc~k-D;adN<Ta+c4Q&=({<y2TMfF%x6j|WdywIefu}`-rg9$
zfaS?S#(m>Rvd$0XEM+qBZe@7g#Fg8@HQ+(%?nj0s4^~8Be*f4!zACLWQ+iB#Vy2`M
z&btx~AtUZ^A$a~&Ctl4`Guo52rykO}FHJvJ2wQmtzI6m2cTYQM=LHIty9db>CBU!7
z)Q;@qAs<jv&%TmM;h1OJ-Sf^_k(`!Zl%+imlg!B*SPF{ocMJ0ZdoN7gyBO#&+h%`K
z#m%YFk)Purx-JdpmGtRltcWpP+|+c~_jBfL+|(~q<t=UwQDlN(!ts_0E=BKy`Gj~p
z*k`PN4}qF1$PXX}E@66$h^9kW@9)&~Bf>1iE(v3t%p|?6dFTCLr(<dC@quU)Amq9j
z;n(CG<&Dk!|4@8gO&?dWIrl56ShpZlF!*Y#08Y9w;;$2KI!xec2v%$FbFO0Qva@*F
z{v(Js7D9dwPw9P+%5attleC8O;>2B}9o5Mm#TM4pGMDx}op{*cgRpr6C|NMe&$4x^
zOj(Zji{SCn)EGJQ3zWX#@nhwj#Fb=7{f-U{Z*XULkk;oM1b4rYFkE7O^)PAnAr<@1
z9SAYhnDdP(2K5u+JQ4RgU5!kQIR@If2_dW*^&7fU8W4;mBx`nkN5iyKS1tGu6O0ja
z9d!*Bk)uFm4W3Rg7Ackf{#Q6kIV-K?WRjur6X6q2$QLZNlI0>)s#E3fJ-x%jF_C&S
zjXgr0#*t)LjWWOURC%OUn&>mgG#F{y9O5{{4`Z}u^OhrCUeN9>@$8@rueN#kZ*z}6
z-69jBI)6B|Oh*J_dfxl_-3MAt++nnSS#^wmjSZS4%tUUDmUj5<yRjGbecjh~BH!l<
zVE*^puSff)((b6`N@WV)FEwuViX5AS7sOLQ;u5n4-8VaAQZ>fH41aKH@A))<=SFD4
zb#7}pFIoJ=j`H-*g&aFdmER9fcvj*`N1Fd~t6T3|h~I^wn1iPGxrZkOw}!t#J8BTZ
zYk}m8rBjdl(+($i{5e<Jb;=g4ivA355MKBLzJ=|TPl)-P?Rn@&Ga@_Ls}^?_2fH=K
zeem-V_g%vPMqqbgJYV*Zx3a0;%)@<8W&KKSy4X{L@FDPS!TxRH&+!cEx62jR$6jo!
zeWWXb2jT0wv!$zhg;+)N$5|3+vnk;V-c`qVbZFODg#Q`BcffDI+!Q(%UO5RSGoi;s
z=R2iU7>`%J&GsuxQc=^qxM+DS2=?LoITfGsc$?6<KbK>bl7jf`1ZW9+bWS|4^{q`(
zE>aJ7{W+_NmAyo@Gqct)X3&rLJp9F1{{#-Il5m=mw5wyURtI0FbZW=@x_y1-y4Tu(
zNBG9Q_A1)g&Fm^i{=-^svmYEZhz_t2yOJh8A~#c7&B<nnT^ZZ%^BAr;ar#pEyysY1
zmY3v&u=~9Nx5Dk?EOj0!B`qELxqZ@NvmYIu-zDqKu@XS<<_J#v^-fvcJAp@nhc@#B
zok(GMtM?+Uaz%5o#t-uM?i0)k``z&<@!$OpIU4(trta(qwU18k{(bP-o}oCPFc(e7
zG})o!@QaIs5eg)e2M+kKdXYQNZ{5aw@w%_kYbUrR3&kO|--HV~&yP@J^+TF!r?~b&
z>`L)iVg->bshbSx41qi7M$2(d*1m@?A*~hS0P3`ppCn_sHx@k|$Ge+fJn4|_ZniHa
zEdUHbmFrlXOU`Cu0`~P1v9}z#$_TJE_T($R=c4ml;>p1CCc>-WhY^0C>6pIweGR(m
zB;$$>j7(v8=2$0yP?OH%IXR6Pukaw=aI`s?U#I-qj9{EB?P<!CVBm2Z*`3U-K?`Be
zv}<2waa4Vx1;GMPr`42dDxcT8+Nv@*5>WwkR^JfVQ!1oywQ=Q3!Q6ztPRp{nrRs#j
zlKDlH<GZ!lH*i!W6)#SDFDJ6WN@=&Fsnpi&x=4@y4<4~UEZGO-BVZ@f?|a)*Hd*RQ
z{EN7byqqV#)S$aA1NBTaC$IVI$~?>BdsKBvaqsST{lf<blw835HX3UmoNN3>nb|pB
zE1p{IZ~I7oqK0ENVZk!Q5gcDozJQ<6Q22v)uPb&|1~T7>;dkaqao|nU$g2y);0}P2
z@-f&ViJ~&)!Mn}vNp&K=uoL7d`A5@l$^)cN?bzkjt`(Vnd6vCZlDo@r?L2q^ea0;p
z4L8-p9~R!&AN9EAq*}{Xg6KM<h=HW_0WkNoapC%4#d_u3B&EA9gvf|q-P9S|E$3MM
z_{56y2onWd0H?{=E?cyYnwhJ)Br$kxm<)*v)M`!3POZg`xGxUYF)V;bOz3cD{ioBD
zDG5>HjS_?kw39=R7HT}~zNm@q5&>RP@vwbWH!AlWmP@Q4KEUJnI+lbqL$ZW;x5q_m
zvzfo9Bp9$PDx}G2kE>S9ZjMelneMIZur7dSP8?He4PmizVE4%Ax5oU+Vel}}8m~`b
zis+)XeP7;ZM{6w`p6~=Ju&<S+NV9aunU^xzkA(7)@wLu>YLyfC01J58|LvTZ&+e|h
zy>Aq71(OI$Rk*>Wm|CIc{^EKo|AhvCtO$_veXtY3F}0-}MXhF}=lf7)b_z`##BVII
zf6oBB>lQ^=xKrxBR>P02I)md)fZ!2BU;kd1KiloFC!*t2O#H3QBgqRQ5B_b`k_=sd
z+%*GYk%al_V{2#Np-;(q9ya~1*<7nMZ`xlNl0M>+bGd}617@S1Ww|!i;aM;_xaQ$l
zo$s`-w@upsJd0?B!?)HR_e#%it+V4LERBm3_jf|CgPWPPFR`;ET}SQ506_`sG*cw_
zw{LEwM2X(I3#>!FN#MrDPJFsCaYwnX<lgSltns+~=DPy61Tt`k!V|=|SQiIJ_d6CB
zxv?o(Rt}H6g)HSgr<)#550w@{6rjN&!9Y1-r+>P3Jb0o!$8A)(#&<~ueK6C%8{l{v
zshW%Au-19@iEGqnr?ug1beyiy)RSy#bQyz%+`aht*Jqvlc7BCI6yUwvI!e*pk+?Ti
zBD=*iXl$Er{$}>?x4zj`Zr$kczemHJCD@eszXZ)EYbT+ZpfkpVm(=s&x;QUkQM+9(
zVEJqJffzov#2Bmi>b^#)WoTDn|GV{Whyq+SCVFq`C+DJ>p6rHin!K*y^e;P48+;y|
z2hR72#F!tcE5!Z^ONuzv#KHC|L;?B+*rT0v$qyNV7XN^CtrS58VcxhK2Hr2>5q(-g
z)~^Yx>Eksnb3257$W9%gSB?i;NA({#zhp#~@k4M)f(N7MYntwFVSHUwHl#OR48G#)
zPGLB~Cb~nHPFEKxzy}_}A;cu*Qp34kgN9TInn6z_O<)(eyD-fK@u7tdlOnx^bJzG0
zHzr8h{xOZhkz4NgUU@H$lCP_daUl#Se43vWU7K+hlSAX8^?v}x1d24jZ)Gv{!Vfao
z;K1UpDhino^y28_LJAp8Rz5I{vBSrJ4#~bH)m?V1Z&wf*6AYB9h)1crWDB4f0T<Y>
zSs(Vgp}A_9EkUP-l%m2>sSr|y|Ll|I?@RuH7KV*8S+eMz9lRAyh7nkzDB)hCyNm3H
zKf_(8kgMS0MzwD{Yb^6g7Kuu*(TA#p1NKe(ZzJ1EeenC$PLy5LV2cADr{Hcs7yl(h
zP$Y05?pgn;c9yrLNf$s@;*P4d>23K;9!3s8alw!a&OgtPB_=c=My@Ia7EP7^y8Wjz
zwx=ESD#scHP9Ve0<Gy=ks#WAbaby`Ytu_dnwzF!lt_9q!<q&dGJ1a`w5D1ppo~!v5
z?>Kk4hD9ttK8WRJ!!ZfC)I%d6Uhe7SY&slp+_C>JJjw73d#%crT|>mob0Pyt(a(Z~
zzu<><B8EN$cMQn4-K^n}eE#>rSH8xBf1ObnMSzr$*v_WwXgIZM`jt25kuQuCa6)#%
zPR+|jqU6c&`ZTa!o8cHkLa)9^UXV7-#)<TO%~|14=c|kG5HsV>Lpe<Mza&TPt_0t|
z@`qeOXP)Nk#t)(o^#6!pE7CV-YSOWNBNku37Amp$&6O>e<ee*4S7pe<48pxcK}bL=
z*I$19)6BMDZ|;FiwqPMcYrapZrpIKFt4&p+!F}?Ezoz^B9nCkUoXveUets)M*9H_F
zd@s7i1W3eN9yLFKt$-L-J%{?`t-=uJuYz0o5At7v+Q-)<&U?LC4;Jr4ZBA=G5x7{_
zHj`Rmq756&&NNimT9zaaY5qdV$X>oUBboa8%a4@b75+P0%f=u#B0iaSthRd2x+G*x
z(5^fk`95##6zv;u(tc*&{7k~?RyWtssg)i?f8z*(#Du1knyteusVGKkZ4A7S?T44W
zZ*qfl;&$?iL-T8Q;<GbjL6-0wI6VdJD=b=#n?_7^$FYz67`12J4V}Y4O&{{zCfr;f
z$a5OC8Yo({#IY8?^z~v#>~Vvrd7`J1WWF|4eMJX1ou%g_k)UG+A^VcEknm-lRF&Xc
zxG8Ud`|4`{=x`RQRfP~JUbe=48Ksl*vpW>ev$gVFE@+j;bds-g!Fg3wJu2OQyBHy#
zPLK*}l!FIX^!(AHWDTBxiDw_<Lqc%_{hkP8+kw_@4bw_c=1}Cofo3DjcVu8{%cEn#
zB;hzKno023u96&r8&H&`?Rk1eHdG(AcNNB%@yrM*`n)G>C-vLM&_~wa6xSnXA=wO2
zaM!2(sZ5;5o_snsah$NyzFWK!JNx)l<5Dmg$3BV+%DP2R_5{`Q`9fW@iorOaGqNn*
z3(`)cREaQU3W0t`_Tzo0<KytK^nlV)w59I!TG3N%N~=l9MfYXGudW62YrCUn=>Z%6
z9&#i5T5<L#M~nB~e`4UA30JV72oQiYaX8thobulZYa<(PuD;<!KiLYMZr-dhX_cQ{
z?ng_%q8C$3Dd+ioK|4Osmx?IKgHW-K6(|1vIrFb1AZA;lR{GVl=#f>F&WHDgbLGKv
zuKO<14|sSLKq{17Ub(}-gY}*HxlAzpoXne`L&e?BW$LqLD!uK@!yAzXatl30mK2IQ
z`nVScrb;~0m&HOIy=0uJTXA~e%B#(@<S5P!EHT{5YTE4z5NoUwvZisZIzwm3G){nk
z^vC*oN$;Lk?V!)k^a1ryP}3n~YoyE%3|rTo^rB=&6WGtZ4lc5vryr6%TOo6okR*LG
z3d6PR2cznG^f#6#ak+=k*|ko0Mg*X!n14~1AjTYn5>#_^PbMd5`_c!g7y#|%?u*GY
zZ(8n75U<L0?Ox~AV1>X9Gn9RB?aMtMc=&95Fqz2n-x67`VmaY9+kle4Ail8?CHTnb
zy!K3v9TU#^G&_J2KQ7xO#hn`T?4jnR^mHgX=AJ1+O%|Rcqd6oWfMt|sQ*(jRZpQPR
zcwCXKNZ}yI9il63d3dwIt+moSHQOMQtdkKJeuL#Ue|ubDxM2eB@?+9G#f7XV6%1k*
zm_AatO4CfrH9p3@1iDMvy{<DNj7w0tBK6Ad9+^4_xn(gw%C?$ODr^?2+J)BEGk_~H
z!8GsO#nYdutjY3G&ygQE>WV2MKr#;k{uOB&-Z;$JUv#=K0V}k+4r#svn+5+xOr)sH
zA2JlYwFN8#@ssY$8*!L3q^qyemWn$GxKaAaw$<grZVgATmx#&9f9pKRpF#+M=GHcF
z43uv@*GkmM<Ya1p!6$K~&n-g4%N#AgPD_$HDsiw6%*)*>ry9>gb|5pCeQW2rA7?|w
zp1=jHKfNR1crpJmU3oX(+bqH4u?q^WIyR(B1*en~8^A^PtT^>ZHi0kiGl?N<o~2&~
zQL<cgGn|7#>Pds^pmPKR9qPrpC?(y2TN{8XxH?Raj=`3cwcI`1i!~MA{FV_N`)8Jh
zbOrf3lTz#0>BrJCr6(no=2vMjKI~`Y0bPc*_nzW6qxw-FlXxv@lFWnySm_pQ9<G4B
z<atdG5NPCjlDl8{x?Dnus+Do1eWG{~4b(bq^7`JBsmWUkvP9oSHi3)R&)&-poMA-r
zmvcf#DmC*?@)N|*)X$c?-=(xhX0Qk~J|@)2Re-_+`z0oj^vi7x69~dbV=q}7tR8Jv
zvsoPoqST^XuW(eH7#-s=r$8g6*MdyBvRqY4czIr3$uD;Y88s!YuMe)Jis7%0knR1e
zNRYHm(ueR<LacFL&@6S&zv%b7c!~S~hxV~U&o{a1%f{YMriU(tsjy!GnNChsU!~x*
zyUvEI029_pE9K~!v84`HYqkz+BbS#9;|GGvmbAF~1N2|Vg~uDP?71es(c!=8S%(kg
zWFuj-{4vgkUFhNksdHA^g0^xc8hypJG%5Z5!D4WR9uKR=t@76D!qSunBT#&nfP*dY
zLOh7oJNu}Z$+UU|BSK{o*D+o-PB?ms{~g8?PATzZLiE&5+)k~N>q4t)T!8#tava6P
zpm`jeH#?7lBEvt%Pr}lrE5qOE&#~$i;*;kz8ieu5a12TQBUk9qJ46qDyrJe1UCr)R
zycTo@WC9tA^;U!W8?MrNR?Tb}2-$Uds)SPL%JO5aUoggxKw;?m4K7TT_<Fq8?I6J3
zQn<20e4v39CHTzTXKK&v`uum#wNHcmxQlD?vpi%VYoSN!PvEOTI?Cdtm>=ha9{c1e
z=p+Zh8BE|5L*-vx7Frvcua4nI3;#HuSe>EA;DAv<zJ_?hs8DOUR`h{P&0@|Ji*tY5
zv?)Y#K?Z$w5@NG7@mfcA_IXLiSAO*6fI15?I1H$p#ca{z2kvsOH(yW6_~ySH%o?V^
zz4|5Q2d=%nIENg~-^OW&o0SaavsY;u;?aZIflp6({6O>>VXn9s{)7O7WjbY;njC98
zLV<WtA1F=i>&@WYx4S>{X2PsYRMuTg^hEtwSaiCf9ErhYB`6%6&s*B!jA3>tjBx#8
z$Q<LoFr0jHB!fOtlQcHHe_WJ{c612DgO=K#SKp+dDn3(;-Ff6A#SwK<pga>#wnwkl
z1<@M+&dcI!#jdM@P%zk?RDCL(ns_X2z0dX>=#!*IZv&6^33nXY21E}~u$1CabTZfR
z$NR^jq{x6)=Wf$J>SKgo<EF$4@JiNtON&+{8)uQTpd!T^P;gJvcFE;ozp0;;{~{r4
z$=qISU;VhU=Se*iiGn)N3v=RS4+(LKbraHrb!WWQ^z6hE-eq`-!3$*gpycO(xB76-
zihlAHDZ(o*ior&2wYPtZsXCby`VX>bb>(CfIhjxTt)O<R{QYA365Egzn4EY=O|uuv
z$@X9MFwvXj5Q_S06OQX@kr=nNKapoeV3J`Y1^$VbiOc<!qiKp;I#5c@ZRz!Y-XEIN
z1C_54n}fkJ-;Msq(o$4*cc7Hg*q(dRpUs)Ev>3VGzdcSLE~nD?7_F^vMqYGv++N9+
zgE=?3I_`*njFgvx9rVrhIQcI(S4(i82rd{!|D8o;XkEmVU4%Nu&vR%*>kd;Q+roYD
zCgGacwWHMNl+An;uUgfawpd8k*4uvm4Jp{!I@);xlcWT$&eZInNHcwGe-v9)UU~-;
zNx@JlN{&0j1lg}9{xy|0{P6UIM$*gP$=^r(mXFlPrC+<7^4IYr3(vH6!(TKoB%Oxr
zS9(Ua$Cl40eH_<5`R-!_YQP1%M5E;ZF^gT+-VwH5>~TL|Z79{+&s|5*F>+nQI4d*f
z<yJ472_`V#DmnM?m_z)mlKz~Z+N$Qs2=#{CUsFjp_#`xQx!gHOOk3t2O(3p|S<ZiG
zycYZ8eeE45@|wp|Kl8u=+UY=?7*e{#njfn3VTt_v&}|;-K%CwWm*w8b6t}XD3MZlL
z&)cJA2Z=ooUZy|&cYgq3^17Oiykwn;eUpTMtLnuomU}H^uW8rpRP#4;9W8Wc|FU|*
zH~!u~m=CnMO?mC4-pj>&Te2_}-lC&a#oYI1JT_I>zRMGLC~V2#W5BbgAvb|?+gC!f
z<f6$)Q%Ic`-*YhxAKvF^IHeP}2&48+CziUrUCC7f#k1@4eNMVdS!)M}#>(;q^DU##
zxc+!&RIK>Qa<<l4_Zi?;-RI2<m7NLl<>r=3hx0x>I#usp{~aNgtetE$cOIei!#W_;
zT`q1?+l|pbuc||Qo<Z-2-d`#y)I4>|Hs8xzenRfOK7sak_tlz6vY4Rja)<Z7JvB4L
zR}IC0*y`xai@=48N2QFeDfh;tMB^}&c3X`xXN^R$tdQHyy=kh8^%Ltz3|VaXG+}@~
z1ajBfo8H*GM=CxAgXX|4_m~wOb6QMbavC$su@`MkBq(yw_qhwn>WAkA!A6XXYqWG<
z*NeOUB>(Tz&|LJilUm1)Hn8}bsqEDPHdgi56@H5?R3i7u<`A=-Uelc?&$HVLV@Ykg
zT_sglAIeV@m5`e;45|HIoU4}LRA!}3qMGFN+I1@AIUl29-4x(<7?W+ZSIu{{AxoIi
z-AiTweV;>qQ!|U^%xrLLilqkbRym7jcvDGM-4U<d7OFu)I~B}1>R&6K;Fg*2159n7
zW-TEAyHi4L>oQYxxu<fm)?@AkBx}FaTjwp`KTWs|xi64{o!!lye$K^qj0FfaHf!A5
z947W{$%vftTY0+R897TSw48%~mJ#WmZMj*L#yGD{9I{X(i1htvyTs5b=SljjkX-v^
z&-vNKrBS&mw#P8W5hGoqe$+14wza2sVG`1b^LTSz{%mv9aFlejf&$x3E(EBt@QmKn
zgF<!^4mP}kCbBlx%~gOFP0bpvrF2~Kr^Is5Xh9)!OFr?l=0Bb-HScN_BsgDqz4?1?
z<ky?v(7#ialS{v>U1W)u;|Vmrl^m5Ok+I93yM?77#Fni%2*KBEc94fDs5|Lv`<I`4
xAM-NnKw&~Oz<pta^!$cC^?&pSU|nBMD7Cu9!Cx5QFOXQct)_Fc_=a`R{{x;-F+u<U

literal 0
HcmV?d00001


From 159428615330e768ab5f2af8021452408d48dc37 Mon Sep 17 00:00:00 2001
From: Aj-vrod <ammyvrodriguez@hotmail.com>
Date: Tue, 31 Aug 2021 09:43:56 +0200
Subject: [PATCH 32/83] Added condition for pagination

Signed-off-by: Aj-vrod <ammyvrodriguez@hotmail.com>
---
 .../app/src/components/search/SearchPage.tsx     | 16 +++++++++-------
 .../src/components/CatalogTable/CatalogTable.tsx |  3 ++-
 .../Cards/Group/MembersList/MembersListCard.tsx  |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/app/src/components/search/SearchPage.tsx b/packages/app/src/components/search/SearchPage.tsx
index cf4e610b80..9b0ae7eecf 100644
--- a/packages/app/src/components/search/SearchPage.tsx
+++ b/packages/app/src/components/search/SearchPage.tsx
@@ -83,13 +83,15 @@ const SearchResultList = ({ results }: SearchResultSet) => {
             }
           })}
       </List>
-      <Pagination
-        count={pageAmount}
-        page={page}
-        onChange={changePage}
-        showFirstButton
-        showLastButton
-      />
+      {pageAmount > 1 && (
+        <Pagination
+          count={pageAmount}
+          page={page}
+          onChange={changePage}
+          showFirstButton
+          showLastButton
+        />
+      )}
     </>
   );
 };
diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
index c85a60c7c1..f293710847 100644
--- a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
+++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
@@ -145,13 +145,14 @@ export const CatalogTable = ({ columns, actions }: CatalogTableProps) => {
   if (typeColumn) {
     typeColumn.hidden = !showTypeColumn;
   }
+  const showPagination = rows.length > 20;
 
   return (
     <Table<EntityRow>
       isLoading={loading}
       columns={columns || defaultColumns}
       options={{
-        paging: true,
+        paging: showPagination,
         pageSize: 20,
         actionsColumnIndex: -1,
         loadingType: 'linear',
diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
index 862fc51aa7..0642e80a7b 100644
--- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
+++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
@@ -174,7 +174,7 @@ export const MembersListCard = (_props: {
       <InfoCard
         title={`Members (${members?.length || 0}${paginationLabel})`}
         subheader={`of ${displayName}`}
-        actions={pagination}
+        {...(nbPages <= 1 ? {} : { actions: pagination })}
       >
         <Grid container spacing={3}>
           {members && members.length > 0 ? (

From 7e5f14dda2544888757731afed53a1be03839eeb Mon Sep 17 00:00:00 2001
From: Aj-vrod <ammyvrodriguez@hotmail.com>
Date: Tue, 31 Aug 2021 09:48:07 +0200
Subject: [PATCH 33/83] Changeset added

Signed-off-by: Aj-vrod <ammyvrodriguez@hotmail.com>
---
 .changeset/shiny-guests-explain.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changeset/shiny-guests-explain.md

diff --git a/.changeset/shiny-guests-explain.md b/.changeset/shiny-guests-explain.md
new file mode 100644
index 0000000000..c2645ed6dd
--- /dev/null
+++ b/.changeset/shiny-guests-explain.md
@@ -0,0 +1,7 @@
+---
+'example-app': patch
+'@backstage/plugin-catalog': patch
+'@backstage/plugin-org': patch
+---
+
+This change hides pagination counter of search tables and group memberslist when results/items fit in one page

From b894b4cfb9307b68e45a5c19fcd7ad52405eec54 Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Tue, 31 Aug 2021 10:25:40 +0200
Subject: [PATCH 34/83] Explicit assertion for linting.

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 .../techdocs-common/src/stages/publish/local.test.ts  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/techdocs-common/src/stages/publish/local.test.ts b/packages/techdocs-common/src/stages/publish/local.test.ts
index 4372dcdc1f..38ead236bd 100644
--- a/packages/techdocs-common/src/stages/publish/local.test.ts
+++ b/packages/techdocs-common/src/stages/publish/local.test.ts
@@ -147,10 +147,10 @@ describe('local publisher', () => {
     });
 
     it('should redirect case-sensitive triplet path to lower-case', async () => {
-      await request(app)
+      const response = await request(app)
         .get('/default/TestKind/TestName/index.html')
-        .expect(301)
         .expect('Location', '/default/testkind/testname/index.html');
+      expect(response.status).toBe(301);
     });
 
     it('should resolve lower-case triplet path content eventually', async () => {
@@ -173,9 +173,10 @@ describe('local publisher', () => {
       );
       app = express().use(legacyPublisher.docsRouter());
 
-      await request(app)
-        .get('/default/TestKind/TestName/index.html')
-        .expect(404);
+      const response = await request(app).get(
+        '/default/TestKind/TestName/index.html',
+      );
+      expect(response.status).toBe(404);
     });
   });
 });

From deeb70807706c00e7baf9ec1c736c6e43b9c65ae Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Tue, 31 Aug 2021 11:19:27 +0200
Subject: [PATCH 35/83] Provide the form context so nested controllers can use
 it

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 .../PreparePullRequestForm.tsx                       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
index 616e77518c..a1a20381f9 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreparePullRequestForm.tsx
@@ -16,6 +16,7 @@
 
 import React from 'react';
 import {
+  FormProvider,
   SubmitHandler,
   UnpackNestedValue,
   useForm,
@@ -55,12 +56,15 @@ export const PreparePullRequestForm = <
   onSubmit,
   render,
 }: Props<TFieldValues>) => {
+  const methods = useForm<TFieldValues>({ mode: 'onTouched', defaultValues });
   const { handleSubmit, watch, control, register, formState, setValue } =
-    useForm<TFieldValues>({ mode: 'onTouched', defaultValues });
+    methods;
 
   return (
-    <form onSubmit={handleSubmit(onSubmit)}>
-      {render({ values: watch(), formState, register, control, setValue })}
-    </form>
+    <FormProvider {...methods}>
+      <form onSubmit={handleSubmit(onSubmit)}>
+        {render({ values: watch(), formState, register, control, setValue })}
+      </form>
+    </FormProvider>
   );
 };

From 2b69f8a4fd4d10c21d50e88d5f611e61251d06bd Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Tue, 31 Aug 2021 11:43:58 +0200
Subject: [PATCH 36/83] refactor: replace `getOctokit` with
 `OctokitProvider.getOctokit` to allow credentails caching

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .../builtin/github/githubActionsDispatch.ts   |   8 +-
 .../actions/builtin/github/githubWebhook.ts   |   8 +-
 .../actions/builtin/github/helpers.test.ts    |  30 ++----
 .../actions/builtin/github/helpers.ts         | 100 ++++++++++--------
 .../actions/builtin/publish/github.ts         |   8 +-
 5 files changed, 72 insertions(+), 82 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
index c2d750051e..c7d2919efb 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
@@ -15,12 +15,13 @@
  */
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '../../createTemplateAction';
-import { getOctokit } from './helpers';
+import { OctokitProvider } from './helpers';
 
 export function createGithubActionsDispatchAction(options: {
   integrations: ScmIntegrationRegistry;
 }) {
   const { integrations } = options;
+  const octokitProvider = new OctokitProvider(integrations);
 
   return createTemplateAction<{
     repoUrl: string;
@@ -61,10 +62,7 @@ export function createGithubActionsDispatchAction(options: {
         `Dispatching workflow ${workflowId} for repo ${repoUrl} on ${branchOrTagName}`,
       );
 
-      const { client, owner, repo } = await getOctokit({
-        integrations,
-        repoUrl,
-      });
+      const { client, owner, repo } = await octokitProvider.getOctokit(repoUrl);
 
       await client.rest.actions.createWorkflowDispatch({
         owner,
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
index 5b83eca3fd..eabfebeb28 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
@@ -15,7 +15,7 @@
  */
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '../../createTemplateAction';
-import { getOctokit } from './helpers';
+import { OctokitProvider } from './helpers';
 
 type ContentType = 'form' | 'json';
 
@@ -23,6 +23,7 @@ export function createGithubWebhookAction(options: {
   integrations: ScmIntegrationRegistry;
 }) {
   const { integrations } = options;
+  const octokitProvider = new OctokitProvider(integrations);
 
   return createTemplateAction<{
     repoUrl: string;
@@ -96,10 +97,7 @@ export function createGithubWebhookAction(options: {
 
       ctx.logger.info(`Creating webhook ${webhookUrl} for repo ${repoUrl}`);
 
-      const { client, owner, repo } = await getOctokit({
-        integrations,
-        repoUrl,
-      });
+      const { client, owner, repo } = await octokitProvider.getOctokit(repoUrl);
 
       try {
         const insecure_ssl = insecureSsl ? '1' : '0';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
index e16f76d89f..a72a775701 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { getOctokit } from './helpers';
+import { OctokitProvider } from './helpers';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 
@@ -29,6 +29,7 @@ describe('getOctokit', () => {
   });
 
   const integrations = ScmIntegrations.fromConfig(config);
+  const octokitProvider = new OctokitProvider(integrations);
 
   beforeEach(() => {
     jest.resetAllMocks();
@@ -36,43 +37,30 @@ describe('getOctokit', () => {
 
   it('should throw an error when the repoUrl is not well formed', async () => {
     await expect(
-      getOctokit({
-        integrations,
-        repoUrl: 'github.com?repo=bob',
-      }),
+      octokitProvider.getOctokit('github.com?repo=bob'),
     ).rejects.toThrow(/missing owner/);
 
     await expect(
-      getOctokit({
-        integrations,
-        repoUrl: 'github.com?owner=owner',
-      }),
+      octokitProvider.getOctokit('github.com?owner=owner'),
     ).rejects.toThrow(/missing repo/);
   });
 
   it('should throw if there is no integration config provided', async () => {
     await expect(
-      getOctokit({
-        integrations,
-        repoUrl: 'missing.com?repo=bob&owner=owner',
-      }),
+      octokitProvider.getOctokit('missing.com?repo=bob&owner=owner'),
     ).rejects.toThrow(/No matching integration configuration/);
   });
 
   it('should throw if there is no token in the integration config that is returned', async () => {
     await expect(
-      getOctokit({
-        integrations,
-        repoUrl: 'ghe.github.com?repo=bob&owner=owner',
-      }),
+      octokitProvider.getOctokit('ghe.github.com?repo=bob&owner=owner'),
     ).rejects.toThrow(/No token available for host/);
   });
 
   it('should return proper Octokit', async () => {
-    const { client, token, owner, repo } = await getOctokit({
-      integrations,
-      repoUrl: 'github.com?repo=bob&owner=owner',
-    });
+    const { client, token, owner, repo } = await octokitProvider.getOctokit(
+      'github.com?repo=bob&owner=owner',
+    );
     expect(client).toBeDefined();
     expect(token).toBe('tokenlols');
     expect(owner).toBe('owner');
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
index 89c7b43a1a..4ed10b9d64 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
@@ -22,62 +22,68 @@ import {
 import { Octokit } from '@octokit/rest';
 import { parseRepoUrl } from '../publish/util';
 
-type OctokitOptions = {
-  integrations: ScmIntegrationRegistry;
-  repoUrl: string;
-};
-
-type OctokitIntegration = {
+export type OctokitIntegration = {
   client: Octokit;
   token: string;
   owner: string;
   repo: string;
 };
 
-export const getOctokit = async ({
-  integrations,
-  repoUrl,
-}: OctokitOptions): Promise<OctokitIntegration> => {
-  const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
+export class OctokitProvider {
+  private readonly integrations: ScmIntegrationRegistry;
+  private readonly credentialsProviders: Map<string, GithubCredentialsProvider>;
 
-  if (!owner) {
-    throw new InputError(`No owner provided for repo ${repoUrl}`);
-  }
-
-  const integrationConfig = integrations.github.byHost(host)?.config;
-
-  if (!integrationConfig) {
-    throw new InputError(`No integration for host ${host}`);
-  }
-
-  const credentialsProvider =
-    GithubCredentialsProvider.create(integrationConfig);
-
-  if (!credentialsProvider) {
-    throw new InputError(
-      `No matching credentials for host ${host}, please check your integrations config`,
+  constructor(integrations: ScmIntegrationRegistry) {
+    this.integrations = integrations;
+    this.credentialsProviders = new Map(
+      integrations.github.list().map(integration => {
+        const provider = GithubCredentialsProvider.create(integration.config);
+        return [integration.config.host, provider];
+      }),
     );
   }
 
-  // TODO(blam): Consider changing this API to have owner, repo interface instead of URL as the it's
-  // needless to create URL and then parse again the other side.
-  const { token } = await credentialsProvider.getCredentials({
-    url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
-      repo,
-    )}`,
-  });
+  async getOctokit(repoUrl: string): Promise<OctokitIntegration> {
+    const { owner, repo, host } = parseRepoUrl(repoUrl, this.integrations);
 
-  if (!token) {
-    throw new InputError(
-      `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
-    );
+    if (!owner) {
+      throw new InputError(`No owner provided for repo ${repoUrl}`);
+    }
+
+    const integrationConfig = this.integrations.github.byHost(host)?.config;
+
+    if (!integrationConfig) {
+      throw new InputError(`No integration for host ${host}`);
+    }
+
+    const credentialsProvider = this.credentialsProviders.get(host);
+
+    if (!credentialsProvider) {
+      throw new InputError(
+        `No matching credentials for host ${host}, please check your integrations config`,
+      );
+    }
+
+    // TODO(blam): Consider changing this API to have owner, repo interface instead of URL as the it's
+    // needless to create URL and then parse again the other side.
+    const { token } = await credentialsProvider.getCredentials({
+      url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(
+        repo,
+      )}`,
+    });
+
+    if (!token) {
+      throw new InputError(
+        `No token available for host: ${host}, with owner ${owner}, and repo ${repo}`,
+      );
+    }
+
+    const client = new Octokit({
+      auth: token,
+      baseUrl: integrationConfig.apiBaseUrl,
+      previews: ['nebula-preview'],
+    });
+
+    return { client, token, owner, repo };
   }
-
-  const client = new Octokit({
-    auth: token,
-    baseUrl: integrationConfig.apiBaseUrl,
-    previews: ['nebula-preview'],
-  });
-
-  return { client, token, owner, repo };
-};
+}
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
index 857847825a..eaedbf275f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
@@ -21,7 +21,7 @@ import {
 import { getRepoSourceDirectory } from './util';
 import { createTemplateAction } from '../../createTemplateAction';
 import { Config } from '@backstage/config';
-import { getOctokit } from '../github/helpers';
+import { OctokitProvider } from '../github/helpers';
 
 type Permission = 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
 type Collaborator = { access: Permission; username: string };
@@ -31,6 +31,7 @@ export function createPublishGithubAction(options: {
   config: Config;
 }) {
   const { integrations, config } = options;
+  const octokitProvider = new OctokitProvider(integrations);
 
   return createTemplateAction<{
     repoUrl: string;
@@ -140,10 +141,9 @@ export function createPublishGithubAction(options: {
         topics,
       } = ctx.input;
 
-      const { client, token, owner, repo } = await getOctokit({
-        integrations,
+      const { client, token, owner, repo } = await octokitProvider.getOctokit(
         repoUrl,
-      });
+      );
 
       const user = await client.users.getByUsername({
         username: owner,

From 458a3549b3ac621795a76552424e6ac8f77c5019 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 31 Aug 2021 11:51:02 +0200
Subject: [PATCH 37/83] chore: bump tar versions

Signed-off-by: blam <ben@blam.sh>
i#
---
 yarn.lock | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e643ac9750..6cf0175909 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10107,7 +10107,7 @@ chokidar@^3.2.2, chokidar@^3.3.1, chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@^1.1.1:
+chownr@^1.1.1, chownr@^1.1.4:
   version "1.1.4"
   resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
@@ -14062,7 +14062,7 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-minipass@^1.2.5:
+fs-minipass@^1.2.7:
   version "1.2.7"
   resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
   integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
@@ -19213,7 +19213,7 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+minipass@^2.6.0, minipass@^2.9.0:
   version "2.9.0"
   resolved "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
   integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
@@ -19228,7 +19228,7 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^1.2.1:
+minizlib@^1.3.3:
   version "1.3.3"
   resolved "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
   integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
@@ -23726,7 +23726,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -25404,22 +25404,22 @@ tar@^2.0.0:
     inherits "2"
 
 tar@^4, tar@^4.4.12, tar@^4.4.2:
-  version "4.4.13"
-  resolved "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  version "4.4.19"
+  resolved "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
+  integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==
   dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
+    chownr "^1.1.4"
+    fs-minipass "^1.2.7"
+    minipass "^2.9.0"
+    minizlib "^1.3.3"
+    mkdirp "^0.5.5"
+    safe-buffer "^5.2.1"
+    yallist "^3.1.1"
 
 tar@^6.0.2, tar@^6.1.0, tar@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.npmjs.org/tar/-/tar-6.1.2.tgz#1f045a90a6eb23557a603595f41a16c57d47adc6"
-  integrity sha512-EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q==
+  version "6.1.11"
+  resolved "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
@@ -27644,7 +27644,7 @@ yallist@^2.1.2:
   resolved "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==

From 15d0a10c573f2a7947d3a0402ed4d31b86f84277 Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Tue, 31 Aug 2021 11:59:47 +0200
Subject: [PATCH 38/83] Document beta versions of TechDocs ecosystem.

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 docs/features/techdocs/how-to-guides.md | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/features/techdocs/how-to-guides.md b/docs/features/techdocs/how-to-guides.md
index 5fa14472d1..326ac02969 100644
--- a/docs/features/techdocs/how-to-guides.md
+++ b/docs/features/techdocs/how-to-guides.md
@@ -148,12 +148,18 @@ const AppRoutes = () => {
 > an external storage provider and external CI/CD is used). If you use the
 > "basic" or "out-of-the-box" setup, you can stop here! No action needed.
 
-The beta version of TechDocs (v0.x.y) made a breaking change to the way TechDocs
-content was accessed and stored, allowing pages to be accessed with
-case-insensitive entity triplet paths (e.g. `/docs/namespace/kind/name` whereas
-in prior versions, they could only be accessed at `/docs/namespace/Kind/name`).
-In order to enable this change, documentation has to be stored in an external
-storage provider using an object key whose entity triplet is lower-cased.
+For the purposes of this guide, TechDocs Beta version is defined as:
+
+- **TechDocs Plugin**: At least `v0.11.0`
+- **TechDocs Backend Plugin**: At least `v0.10.0`
+- **TechDocs CLI**: At least `v0.7.0`
+
+The beta version of TechDocs made a breaking change to the way TechDocs content
+was accessed and stored, allowing pages to be accessed with case-insensitive
+entity triplet paths (e.g. `/docs/namespace/kind/name` whereas in prior
+versions, they could only be accessed at `/docs/namespace/Kind/name`). In order
+to enable this change, documentation has to be stored in an external storage
+provider using an object key whose entity triplet is lower-cased.
 
 New installations of TechDocs since the beta version will work fine with no
 action, but for those who were running TechDocs prior to this version, a

From a004b8da1a9ddf502e3eba58b666131211abbb11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Mon, 30 Aug 2021 07:32:58 +0200
Subject: [PATCH 39/83] add a 'life of an entity' catalog article
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .../catalog/life-of-an-entity_ingestion.svg   |   3 +
 .../catalog/life-of-an-entity_overview.svg    |   3 +
 .../software-catalog/life-of-an-entity.md     | 130 ++++++++++++++++++
 microsite/sidebars.json                       |   1 +
 mkdocs.yml                                    |   1 +
 5 files changed, 138 insertions(+)
 create mode 100644 docs/assets/features/catalog/life-of-an-entity_ingestion.svg
 create mode 100644 docs/assets/features/catalog/life-of-an-entity_overview.svg
 create mode 100644 docs/features/software-catalog/life-of-an-entity.md

diff --git a/docs/assets/features/catalog/life-of-an-entity_ingestion.svg b/docs/assets/features/catalog/life-of-an-entity_ingestion.svg
new file mode 100644
index 0000000000..b250744fcd
--- /dev/null
+++ b/docs/assets/features/catalog/life-of-an-entity_ingestion.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="451px" height="321px" viewBox="-0.5 -0.5 451 321" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-08-30T07:58:22.063Z&quot; agent=&quot;5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36&quot; etag=&quot;JQdt2U1OCyaNFYmrhq2o&quot; version=&quot;15.0.3&quot; type=&quot;google&quot;&gt;&lt;diagram name=&quot;Page-1&quot; id=&quot;c7558073-3199-34d8-9f00-42111426c3f3&quot;&gt;7ZrLcpswFIafxst0AAEhy8RxmkU66Uym08tOBgFqZOQR8i1P3yNLAnNx4rZO7NbJJuggDuj/xPklkgEaTpYfBZ7mn3hC2MBzkuUAXQ88z/UDF36pyMpEnHNPRzJBExOrAw/0idiOJjqjCSkbHSXnTNJpMxjzoiCxbMSwEHzR7JZy1rzrFGekE3iIMetGv9JE5joaeWEdvyU0y+2d3fBCnxnj+DETfFaY+xW8IPrMBNs0ZoxljhO+2Aih0QANBedSH02WQ8KUrlYxfd3NlrPVIwtSyF0uoGfRwhles9t7dPkjJI/hzd3VmRngHLOZkeJLMRU8JmVJEjgxKiSVFNDoIciVVWyRU0kepjhW7QVMiwG6yuWEQcuFwzkRkoK+l4xmBcQkVx2wacXwyERAoIQEtMjuSKqGEKocXNAnXkisMjkQSCljQ864WN8XpWnqxbG6VAr+SDbOJOE4DFQKMyR4ArLcqpVbEYBZTfiESLGCLvaCwEAzExpZiIt6dvi2T745M0ITxGZGZlXuGg0cGDq/Qcq+KhsMSAKT2DS5kDnPeIHZqI5erWcmSYyUdZ87rnisSf0kUq7MG4lnkjc5gl5i9U1d/yGwze+b566XJrlurapWcqneSwWb4bKksQ7eUGZT6+GoMTwPCYbMZyImz2hjio3EIiPymX5+P3RBGJZ03nyO/QP0jgmg808CPD8kQM/vFMs4xwUMH1SYw5i7VVKJc4fHYJcNKLYOCl04OtVyQpNE4yclfcLjdTpFZcqpug3kDq4GwXVdQU313Fr6jHGaVLUpbcJ6ZtZuLZRnzgcEPzrZzhhMus9qNBtdeJqWgL/NqbrrX6DrkFsbmxrIZ8HnsPgQHXbg11N1aOwQ1H3B8+q1wP1MMloQE285WBKQKPH7HCzyxihUGEv9Njv7MbMKtjEzz++amev1mJn/al7mdtR+9zKjDdqxFAYH9TJ0TACPy8t2BRgd1MvQvr2MrdfwR21l6CUrcysrWzVu+afGZjO7jaR20/X6tteFfEK257vHZnvd9eNoCftgKIEDL2Tq7RkDjzBTRw+6zPzmtru9WY5i0r9ZHkeB2r/uZ33hN4Wu9sAbQkdvqXPwf+rsoyPT+byjc0fH2vPdlyvJC1aivyEluMyrhHtQ1b1oferpKxN9sla1Y++6Rv+Drig6Ol3dnsJg/HCrvM7u8lZfNbeugdqWiEmU9paNMI7IOG2sibw9FWunhSXo+bLZQ+X1oHQ/QZ8elPbn5vNDQ+mW9tOD0vpsUq0nDwal6wsnBwW1ypff94eZN4Vy8Q7Fb3tKdGAoNvFJQ2mva3t2C28LxX2H4gdHVr7s1uKUoSC7L7BvysWrQYFm/Q8f+itf/R81aPQL&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><rect x="0" y="160" width="450" height="160" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)rotate(-90 7 237)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 152px; height: 1px; padding-top: 237px; margin-left: -69px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Unprocessed Entities</div></div></div></foreignObject><text x="7" y="249" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Unprocessed Entities</text></switch></g><path d="M 130 80 L 130 46.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 130 41.12 L 133.5 48.12 L 130 46.37 L 126.5 48.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 130 120 L 130 173.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 130 178.88 L 126.5 171.88 L 130 173.63 L 133.5 171.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 141px; margin-left: 125px;"><div style="box-sizing: border-box; font-size: 0; text-align: right; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">change events</div></div></div></foreignObject><text x="125" y="144" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="end">change events</text></switch></g><rect x="70" y="80" width="120" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 70 80 L 70 120 M 190 80 L 190 120" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 100px; margin-left: 71px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity Provider</div></div></div></foreignObject><text x="130" y="104" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity Provider</text></switch></g><path d="M 320 80 L 320 46.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 320 41.12 L 323.5 48.12 L 320 46.37 L 316.5 48.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 320 120 L 320 173.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 320 178.88 L 316.5 171.88 L 320 173.63 L 323.5 171.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 1px; height: 1px; padding-top: 141px; margin-left: 326px;"><div style="box-sizing: border-box; font-size: 0; text-align: left; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">change events</div></div></div></foreignObject><text x="326" y="144" fill="#000000" font-family="Helvetica" font-size="11px">change events</text></switch></g><rect x="260" y="80" width="120" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 260 80 L 260 120 M 380 80 L 380 120" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 100px; margin-left: 261px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity Provider</div></div></div></foreignObject><text x="320" y="104" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity Provider</text></switch></g><rect x="90" y="0" width="80" height="40" fill="#f8cecc" stroke="#b85450" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 20px; margin-left: 91px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">External<br />Source</div></div></div></foreignObject><text x="130" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">External...</text></switch></g><rect x="280" y="0" width="80" height="40" fill="#f8cecc" stroke="#b85450" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 20px; margin-left: 281px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">External<br />Source</div></div></div></foreignObject><text x="320" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">External...</text></switch></g><rect x="40" y="180" width="180" height="120" rx="18" ry="18" fill="#ffffff" stroke="#000000" stroke-dasharray="3 3" pointer-events="all"/><rect x="230" y="180" width="180" height="120" rx="18" ry="18" fill="#ffffff" stroke="#000000" stroke-dasharray="3 3" pointer-events="all"/><rect x="50" y="190" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 200px; margin-left: 51px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="70" y="204" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="100" y="210" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 220px; margin-left: 101px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="120" y="224" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="70" y="250" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 260px; margin-left: 71px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="90" y="264" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="150" y="260" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 270px; margin-left: 151px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="170" y="274" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="250" y="220" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 230px; margin-left: 251px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="270" y="234" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="340" y="200" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 210px; margin-left: 341px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="360" y="214" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="300" y="260" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 270px; margin-left: 301px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="320" y="274" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g><rect x="165" y="230" width="40" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 240px; margin-left: 166px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity</div></div></div></foreignObject><text x="185" y="244" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/assets/features/catalog/life-of-an-entity_overview.svg b/docs/assets/features/catalog/life-of-an-entity_overview.svg
new file mode 100644
index 0000000000..3fc35b4775
--- /dev/null
+++ b/docs/assets/features/catalog/life-of-an-entity_overview.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="442px" height="621px" viewBox="-0.5 -0.5 442 621" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-08-30T06:48:48.032Z&quot; agent=&quot;5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36&quot; etag=&quot;hHhhmKG2AaxT-2zBWbgZ&quot; version=&quot;15.0.3&quot; type=&quot;google&quot;&gt;&lt;diagram name=&quot;Page-1&quot; id=&quot;c7558073-3199-34d8-9f00-42111426c3f3&quot;&gt;7Vxbc6M2FP41eWwGcfdjknW2md7SejrtPioggzYYeYQc2/31FSCuwhgHG2Ovk4eggyTE+c5dInfa02LzlcKl/xtxUXCnKu7mTvtyp6pANwD/E1O2ggLUSUrxKHYFrSDM8H9IEBVBXWEXRZWOjJCA4WWV6JAwRA6r0CClZF3tNidB9alL6CGJMHNgIFP/wS7zU6qtmgX9Z4Q9P3syMMX7vUHn3aNkFYrnhSRE6Z0FzKYR7xj50CXrEkmb3mlPlBCWXi02TyiI+ZpxLB33vONuvmSKQtZlgAN/Cf/Ufn9HrxHzXxZouiCPP4EMgYhtM2Ygl/NGNAllPvFICINpQX1MXhjF8yq8VfT5lZAlJwJO/I4Y2wqg4YoRTvLZIhB3+ZLp9t94/L2RNb+J6ZLGl02ltRUt+Z0FGyKyog5qedGJgJJB6iHWxhFFT3vGbCg9QzD1KyILxJfEO1AUQIY/qiIEhSR6eb986CvBfNWqItRGA0Y6RCiNaivVKdKlilEFsPyitIyClMB9APQZRz5gsBLv8He4pMRBUcSxVZVpyDDDXC3rAlKFf+1jhmZLmLB/zQ1EFeo5DoInEhCajNXm87nqOJweMUreUemOa76ZhtkG8geiDG1aMRF3VV2p8lYR7XWh3cAQNL+k2bqyG8YKAIdyGwCrl6KBYRUNhe5DbFd50wlgFGEnJT7jIJu6hy5anXXROLYu9gIxW3hJZV6vU2E08/wKY1+ZwqANZqWZeetb6U4xb9w4gsOzz6dkyVDODrgtdVjGjiza7Q91reoPda0Wz+zxn7X+/CJdwXGdpi1ZgL8SrpDwEtVeV/arvTWs1mtniUcz1SwppnKvGq26mZsKUDEUYlg3W5HkC2VD0VPpJx2VPgv+RuJYAdDHA7v1OditG+wHW9OJZE1jfK/BkjZlHPagllQBEnOfMdeO6wpUDe3sgaqiSoyeIUgd/wLZWxfjJvYOK8ZqvwLV+NKAz5t5oGgd7fxYYnqjPUYfR0yfs7XshjiI9BLto26PLaJXLqrw1Uc79a5RmDWqKAwol1VpGbSMcgCq9shQnVwSqkMglBv6U2/t1N2eVreuO7Z2DnWvdXeZPWeXe921rtO6V7O9pIOCN7LeLYPfV4tl1pUH1QdIZTIxb8bOEzs88dkhqNU0/oAs/hQRXmdrc/RM/lMSmO/gZ2mv2S6Bar3gOEyAp0sBnti3aQryIh8u40uxF7o/0CsOAfyxYgGOSztNAaBrINvVmwJAW33TzFNtfdpnT5Bz8b+IMwYnVnCjs7MC44onVPWS4onRoKiOwk7XIwUDtNtpvV5mA4PYaUOy0zOGmeMjeuVWWjfObqXBRVnpPsrb9SjYyHZLgGmMMpBuzMfzFLx9D62GOjivVe98RtA8+hnBnrm+fJYv2eOJl8Aj3Q/soqsPdPOdgvOZUFPOM6Ybhmiy62YGLGYh92SmF1/NEnlsqzGDw2vMtoOaa8xvthH7mONw3qpV6c+9R2S2l7puhrGnYTS7nyUbWdJite8e3iRjOMkYSSJk1RKbySAlUPnY4BNkMCCe7BceXl+uwCeYDd54WKdgyedfZFsgHclyYeTnjG5hqhH/NjHVTH7amLpXA0osa4pfMlrPTYp6KRYoNShS7Zc2KaSJzHogVp/oxB+yAEu9IX0I0lmRvjfS0kQnR1o+qXFDugVpXT0S0tJEJ0daTqVuSLcgbUwm95PSj30c3PdMe3IpkAvCYuMOh54kDzxUYVXcq/gKIYEB9kLepCkoj1mM/iDoC+y6STLQFGdVC55zErJyeUOJf48TUOmTHbZ2X3mjrqlHjKjkKlNanv/hwNC71ppOCIb8LeJL6KEo/hTpxwIDdP249xNg8GbxhX5q1op/gaBN/wc=&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><path d="M 115 200 L 115 233.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 238.88 L 111.5 231.88 L 115 233.63 L 118.5 231.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="160" width="150" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 180px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Unprocessed Entities</div></div></div></foreignObject><text x="115" y="184" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Unprocessed Entities</text></switch></g><path d="M 115 360 L 115 403.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 408.88 L 111.5 401.88 L 115 403.63 L 118.5 401.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="320" width="150" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 340px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processed Entities</div></div></div></foreignObject><text x="115" y="344" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processed Entities</text></switch></g><path d="M 235 360 L 235 380 Q 235 390 225 390 L 125 390 Q 115 390 115 396.82 L 115 403.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 408.88 L 111.5 401.88 L 115 403.63 L 118.5 401.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="200" y="320" width="70" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 340px; margin-left: 201px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Relations</div></div></div></foreignObject><text x="235" y="344" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Relations</text></switch></g><path d="M 200 170 L 190 170" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 200 190 L 190 190" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><rect x="200" y="160" width="80" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 180px; margin-left: 201px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Edges</div></div></div></foreignObject><text x="240" y="184" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Edges</text></switch></g><rect x="40" y="490" width="150" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 510px; margin-left: 41px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Final Entities</div></div></div></foreignObject><text x="115" y="514" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Final Entities</text></switch></g><rect x="200" y="490" width="80" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 510px; margin-left: 201px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Search</div></div></div></foreignObject><text x="240" y="514" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Search</text></switch></g><path d="M 315 360 L 315 380 Q 315 390 305 390 L 125 390 Q 115 390 115 396.82 L 115 403.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 408.88 L 111.5 401.88 L 115 403.63 L 118.5 401.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="280" y="320" width="70" height="40" fill="#fff2cc" stroke="#d6b656" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 340px; margin-left: 281px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Errors</div></div></div></foreignObject><text x="315" y="344" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Errors</text></switch></g><path d="M 115 280 L 115 313.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 318.88 L 111.5 311.88 L 115 313.63 L 118.5 311.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 280 L 115 290 Q 115 300 125 300 L 225 300 Q 235 300 235 306.82 L 235 313.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 235 318.88 L 231.5 311.88 L 235 313.63 L 238.5 311.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 280 L 115 290 Q 115 300 125 300 L 305 300 Q 315 300 315 306.82 L 315 313.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 315 318.88 L 311.5 311.88 L 315 313.63 L 318.5 311.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 40 260 L 20 260 Q 10 260 10 250 L 10 190 Q 10 180 20 180 L 33.63 180" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 38.88 180 L 31.88 183.5 L 33.63 180 L 31.88 176.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="240" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 55 240 L 55 280 M 175 240 L 175 280" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 260px; margin-left: 56px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processors</div></div></div></foreignObject><text x="115" y="264" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Processors</text></switch></g><path d="M 115 450 L 115 483.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 488.88 L 111.5 481.88 L 115 483.63 L 118.5 481.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 450 L 115 460 Q 115 470 125 470 L 230 470 Q 240 470 240 476.82 L 240 483.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 240 488.88 L 236.5 481.88 L 240 483.63 L 243.5 481.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="410" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 55 410 L 55 450 M 175 410 L 175 450" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 430px; margin-left: 56px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Stitcher</div></div></div></foreignObject><text x="115" y="434" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Stitcher</text></switch></g><path d="M 115 120 L 115 153.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 158.88 L 111.5 151.88 L 115 153.63 L 118.5 151.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 80 L 115 46.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 41.12 L 118.5 48.12 L 115 46.37 L 111.5 48.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="40" y="80" width="150" height="40" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><path d="M 55 80 L 55 120 M 175 80 L 175 120" fill="none" stroke="#82b366" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 100px; margin-left: 56px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Entity Providers</div></div></div></foreignObject><text x="115" y="104" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Entity Providers</text></switch></g><rect x="75" y="0" width="80" height="40" rx="6" ry="6" fill="#f8cecc" stroke="#b85450" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 20px; margin-left: 76px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">External<br />Sources</div></div></div></foreignObject><text x="115" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">External...</text></switch></g><path d="M 115 580 L 115 536.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 115 531.12 L 118.5 538.12 L 115 536.37 L 111.5 538.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 115 580 L 115 560 Q 115 550 125 550 L 230 550 Q 240 550 240 543.18 L 240 536.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 240 531.12 L 243.5 538.12 L 240 536.37 L 236.5 538.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><rect x="75" y="580" width="80" height="40" rx="6" ry="6" fill="#f8cecc" stroke="#b85450" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 600px; margin-left: 76px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Catalog<br />API</div></div></div></foreignObject><text x="115" y="604" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Catalog...</text></switch></g><path d="M 0 60 L 440 60" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 0 220 L 440 220" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 0 380 L 440 380" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 0 560 L 440 560" fill="none" stroke="#666666" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><rect x="290" y="220" width="150" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 148px; height: 1px; padding-top: 230px; margin-left: 290px;"><div style="box-sizing: border-box; font-size: 0; text-align: right; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #808080; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Processing</div></div></div></foreignObject><text x="438" y="234" fill="#808080" font-family="Helvetica" font-size="12px" text-anchor="end">Processing</text></switch></g><rect x="290" y="380" width="150" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 148px; height: 1px; padding-top: 390px; margin-left: 290px;"><div style="box-sizing: border-box; font-size: 0; text-align: right; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #808080; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Stitching</div></div></div></foreignObject><text x="438" y="394" fill="#808080" font-family="Helvetica" font-size="12px" text-anchor="end">Stitching</text></switch></g><rect x="290" y="60" width="150" height="20" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 148px; height: 1px; padding-top: 70px; margin-left: 290px;"><div style="box-sizing: border-box; font-size: 0; text-align: right; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #808080; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">Ingestion</div></div></div></foreignObject><text x="438" y="74" fill="#808080" font-family="Helvetica" font-size="12px" text-anchor="end">Ingestion</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/features/software-catalog/life-of-an-entity.md b/docs/features/software-catalog/life-of-an-entity.md
new file mode 100644
index 0000000000..817529c0f2
--- /dev/null
+++ b/docs/features/software-catalog/life-of-an-entity.md
@@ -0,0 +1,130 @@
+---
+id: life-of-an-entity
+title: The Life of an Entity
+sidebar_label: The Life of an Entity
+# prettier-ignore
+description: The life cycle of entities, from being introduced into the catalog, through processing, to being removed again
+---
+
+This document gives a high level overview of the catalog backend, and the
+technical processes involved in making entities flow through it. It is mainly
+aimed at developers who want to understand the internals while installing or
+extending the catalog. However, it can be informative for other personas too.
+
+## Key Concepts
+
+The catalog forms a hub of sorts, where entities are ingested from various
+authoritative sources and held in a database, subject to automated processing,
+and then presented through an API for quick and easy access by Backstage and
+others. The most common source is [YAML files](descriptor-format.md) on a
+standard format, living in version control systems near the source code of
+systems that they describe. Those files are registered with the catalog and
+maintained by the respective owners. The catalog makes sure to keep itself up to
+date with changes to those files.
+
+The main extension points where developers can customize the catalog are:
+
+- _Entity providers_, that feed initial raw entity data into the catalog,
+- _Policies_, that establish baseline rules about the shape of entities,
+- _Processors_, that validate, analyze, and mutate the raw entity data into its
+  final form.
+
+The high level processes involved are:
+
+- _Ingestion_, where entity providers fetch raw entity data from external
+  sources and seed it into the database,
+- _Processing_, where the policies and processors continually treat the ingested
+  data and may emit both other raw entities (that are also subject to
+  processing), errors, relations to other entities, etc.,
+- _Stitching_, where all of the data emitted by various processors are assembled
+  together into the final output entity.
+
+An entity is not visible to the outside world (through the catalog API), until
+it has passed through the last process and landed among the final entities.
+
+![General overview](../../assets/features/catalog/life-of-an-entity_overview.svg)
+
+The details of these processes are described below.
+
+## Ingestion
+
+Each catalog deployment has a number of entity providers installed. They are
+responsible for fetching data from external authoritative sources in any way
+that they see fit, to translate those into entity objects, and to notify the
+database when those entities are added or removed. These are the _unprocessed
+entities_ that will be subject to later processing (see below), and they form
+the very basis of existence for entities. If there were no entity providers, no
+entities would ever enter the system.
+
+The database always keeps track of the set of entities that belong to each
+provider; no two providers can try to output the same entity. And when a
+provider signals the removal of an entity, then that leads to an _eager
+deletion_: the entity and all auxiliary data that it has led to in the database
+is immediately purged.
+
+![Ingestion overview](../../assets/features/catalog/life-of-an-entity_ingestion.svg)
+
+There are two providers installed by default: the one that deals with user
+registered locations (e.g. URLs to YAML files), and the one that deals with
+static locations in the app-config. You can add more third party providers by
+passing them to the catalog builder in your backend initialization code, and you
+can easily write your own.
+
+An entity provider is a class that implements the `EntityProvider` interface. It
+has three main parts:
+
+- The identity: Each provider instance has a unique, stable identifier that the
+  database can use to keep track of the originator of each unprocessed entity.
+- The connection: During backend startup, each provider is attached to the
+  catalog runtime.
+- The stream of events: During its lifetime, the provider can issue change
+  events to the runtime at any point in time, to modify its set of unprocessed
+  entities.
+
+It is entirely up to the provider to choose how and when it produces these
+change events. For example, the app-config provider only fires off an update at
+startup and then lies dormant. The location database provider does an initial
+update at startup, and then small delta updates every time a location database
+change is detected. The LDAP provider is driven externally by a timer loop that
+occasionally triggers a full update. Some future provider may be entirely event
+driven, feeding off an event bus or web hook. There is no magic coordination
+among providers; if they need to arrange synchronization or locking among
+themselves for example to avoid duplicate work across multiple catalog service
+machines, they need to handle that out-of-band.
+
+The entities that are emitted get some coarse validation applied to them, to
+ensure that they at least adhere to the most basic schema rules about how an
+entity should be shaped. For example, they need to have a `kind`, a
+`metadata.name`, and optionally a `metadata.namespace`, among others. Apart from
+that, the ingestion stage considers its work done, and stores the unprocessed
+entities to be picked up at a later time by the processing system. This means
+that the more precise validation rules that you put in place on entities are
+_not_ yet applied at this stage.
+
+## Processing
+
+Every unprocessed entity comes with a timestamp, which tells at what time that
+the processing loop should next try to process it. When the entity first
+appears, this timestamp is set to "now" - asking for it to be picked up as soon
+as possible.
+
+Each catalog deployment has a number of processors installed. They are
+responsible for receiving unprocessed entities that the catalog decided are due
+for processing, and then running that data through a number of processing
+stages. mutating the entity and emitting auxiliary data about it. When all of
+that is done, the catalog takes all of that information and stores it as the
+processed entity, and errors and relations to other entities separately. Then,
+the catalog checks to see what entities are touched by that output, and triggers
+the final assembly of those (see Stitching below).
+
+There are several stages involved in the processing.
+
+> TODO: More info here
+
+## Stitching
+
+The stitching is currently a fixed process, that cannot be modified or extended.
+This means that any modifications you want to make on the final result, has to
+happen during ingestion or processing.
+
+> TODO: More info here
diff --git a/microsite/sidebars.json b/microsite/sidebars.json
index d787fb28aa..d200b615f1 100644
--- a/microsite/sidebars.json
+++ b/microsite/sidebars.json
@@ -36,6 +36,7 @@
         "label": "Software Catalog",
         "ids": [
           "features/software-catalog/software-catalog-overview",
+          "features/software-catalog/life-of-an-entity",
           "features/software-catalog/configuration",
           "features/software-catalog/system-model",
           "features/software-catalog/descriptor-format",
diff --git a/mkdocs.yml b/mkdocs.yml
index 73ad52341e..bddce144d3 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -33,6 +33,7 @@ nav:
   - Core Features:
       - Software Catalog:
           - Overview: 'features/software-catalog/index.md'
+          - The Life of an Entity: 'features/software-catalog/life-of-an-entity.md'
           - Catalog Configuration: 'features/software-catalog/configuration.md'
           - System Model: 'features/software-catalog/system-model.md'
           - YAML File Format: 'features/software-catalog/descriptor-format.md'

From 2e4b7684455b7a918ded5e35e7903a22be568efe Mon Sep 17 00:00:00 2001
From: Roy Jacobs <roy.jacobs@gmail.com>
Date: Tue, 31 Aug 2021 13:12:59 +0200
Subject: [PATCH 40/83] Configure DefaultCatalogCollator programmatically

Signed-off-by: Roy Jacobs <roy.jacobs@gmail.com>
---
 .changeset/happy-cups-tap.md                  |  1 -
 plugins/catalog-backend/config.d.ts           | 12 ------
 .../src/search/DefaultCatalogCollator.test.ts | 37 +++++++++++++-----
 .../src/search/DefaultCatalogCollator.ts      | 38 +++++++++++++------
 plugins/catalog-backend/src/search/index.ts   |  2 +-
 5 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/.changeset/happy-cups-tap.md b/.changeset/happy-cups-tap.md
index 307b6fb4fc..051f9def1c 100644
--- a/.changeset/happy-cups-tap.md
+++ b/.changeset/happy-cups-tap.md
@@ -1,5 +1,4 @@
 ---
-'example-backend': patch
 '@backstage/plugin-catalog-backend': patch
 ---
 
diff --git a/plugins/catalog-backend/config.d.ts b/plugins/catalog-backend/config.d.ts
index 5a9291541c..7da9cad139 100644
--- a/plugins/catalog-backend/config.d.ts
+++ b/plugins/catalog-backend/config.d.ts
@@ -179,17 +179,5 @@ export interface Config {
         };
       };
     };
-
-    /**
-     * Configuration for search collation
-     */
-    search?: {
-      /**
-       * Request search to only index these particular kinds.
-       *
-       * E.g. ["Component", "API", "Template", "Location"]
-       */
-      allow: Array<string>;
-    };
   };
 }
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
index c19d2d21a6..f1b7cfe862 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
@@ -16,7 +16,10 @@
 
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
-import { DefaultCatalogCollator } from './DefaultCatalogCollator';
+import {
+  DefaultCatalogCollator,
+  mapFilterToQueryString,
+} from './DefaultCatalogCollator';
 import { setupServer } from 'msw/node';
 import { rest } from 'msw';
 import { ConfigReader } from '@backstage/config';
@@ -105,21 +108,35 @@ describe('DefaultCatalogCollator', () => {
   });
 
   it('allows filtering of the retrieved catalog entities', async () => {
-    const config = new ConfigReader({
-      catalog: {
-        search: {
-          allow: ['Foo', 'Bar'],
-        },
-      },
-    });
-
     // Provide an alternate location template.
-    collator = DefaultCatalogCollator.fromConfig(config, {
+    collator = DefaultCatalogCollator.fromConfig(new ConfigReader({}), {
       discovery: mockDiscoveryApi,
+      filter: {
+        kind: ['Foo', 'Bar'],
+      },
     });
 
     const documents = await collator.execute();
     // The simulated 'Foo,Bar' filter should return in an empty list
     expect(documents).toHaveLength(0);
   });
+
+  it('can map filters to query strings', () => {
+    expect(
+      mapFilterToQueryString({
+        a: 'Foo',
+      }),
+    ).toEqual('?filter=a=Foo');
+    expect(
+      mapFilterToQueryString({
+        a: ['Foo', 'Bar'],
+      }),
+    ).toEqual('?filter=a=Foo,Bar');
+    expect(
+      mapFilterToQueryString({
+        a: ['Foo', 'Bar'],
+        b: ['Quu', 'Qux'],
+      }),
+    ).toEqual('?filter=a=Foo,Bar,b=Quu,Qux');
+  });
 });
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
index 4043cf1c1d..b372350a08 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
@@ -19,6 +19,7 @@ import { Entity } from '@backstage/catalog-model';
 import { IndexableDocument, DocumentCollator } from '@backstage/search-common';
 import fetch from 'cross-fetch';
 import { Config } from '@backstage/config';
+import { CatalogEntitiesRequest } from '@backstage/catalog-client';
 
 export interface CatalogEntityDocument extends IndexableDocument {
   componentType: string;
@@ -31,36 +32,34 @@ export interface CatalogEntityDocument extends IndexableDocument {
 export class DefaultCatalogCollator implements DocumentCollator {
   protected discovery: PluginEndpointDiscovery;
   protected locationTemplate: string;
-  protected filterUrl: string;
+  protected filterUrl?: string;
   public readonly type: string = 'software-catalog';
 
   static fromConfig(
-    config: Config,
-    options: { discovery: PluginEndpointDiscovery },
+    _config: Config,
+    options: {
+      discovery: PluginEndpointDiscovery;
+      filter?: CatalogEntitiesRequest['filter'];
+    },
   ) {
     return new DefaultCatalogCollator({
       ...options,
-      allow: config.getOptionalStringArray('catalog.search.allow'),
     });
   }
 
   constructor({
     discovery,
     locationTemplate,
-    allow,
+    filter,
   }: {
     discovery: PluginEndpointDiscovery;
     locationTemplate?: string;
-    allow?: string[];
+    filter?: CatalogEntitiesRequest['filter'];
   }) {
     this.discovery = discovery;
     this.locationTemplate =
       locationTemplate || '/catalog/:namespace/:kind/:name';
-    if (allow && allow.length) {
-      this.filterUrl = `?filter=kind=${allow.join(',')}`;
-    } else {
-      this.filterUrl = '';
-    }
+    this.filterUrl = mapFilterToQueryString(filter);
   }
 
   protected applyArgsToFormat(
@@ -76,7 +75,7 @@ export class DefaultCatalogCollator implements DocumentCollator {
 
   async execute() {
     const baseUrl = await this.discovery.getBaseUrl('catalog');
-    const res = await fetch(`${baseUrl}/entities${this.filterUrl}`);
+    const res = await fetch(`${baseUrl}/entities${this.filterUrl || ''}`);
     const entities: Entity[] = await res.json();
     return entities.map((entity: Entity): CatalogEntityDocument => {
       return {
@@ -96,3 +95,18 @@ export class DefaultCatalogCollator implements DocumentCollator {
     });
   }
 }
+
+export function mapFilterToQueryString(
+  filter: CatalogEntitiesRequest['filter'],
+): string | undefined {
+  if (!filter) {
+    return undefined;
+  }
+
+  const mappedFilters = Object.entries(filter).map(kvp => {
+    const type = kvp[0];
+    const values = [].concat(kvp[1]);
+    return `${type}=${values.join(',')}`;
+  });
+  return `?filter=${mappedFilters.join(',')}`;
+}
diff --git a/plugins/catalog-backend/src/search/index.ts b/plugins/catalog-backend/src/search/index.ts
index 7e13999864..dfe1cf541e 100644
--- a/plugins/catalog-backend/src/search/index.ts
+++ b/plugins/catalog-backend/src/search/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export * from './DefaultCatalogCollator';
+export { DefaultCatalogCollator } from './DefaultCatalogCollator';

From 21f87ec5bc7e1fbdefc219596f6da9152982f1ac Mon Sep 17 00:00:00 2001
From: Roy Jacobs <roy.jacobs@gmail.com>
Date: Tue, 31 Aug 2021 13:56:05 +0200
Subject: [PATCH 41/83] Update api-report.md

Signed-off-by: Roy Jacobs <roy.jacobs@gmail.com>
---
 plugins/catalog-backend/api-report.md | 28 ++++++++-------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md
index b46f860207..f6e864221c 100644
--- a/plugins/catalog-backend/api-report.md
+++ b/plugins/catalog-backend/api-report.md
@@ -7,6 +7,7 @@
 
 import { Account } from 'aws-sdk/clients/organizations';
 import { BitbucketIntegration } from '@backstage/integration';
+import { CatalogEntitiesRequest } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { DocumentCollator } from '@backstage/search-common';
 import { Entity } from '@backstage/catalog-model';
@@ -204,22 +205,6 @@ export class CatalogBuilder {
   ): CatalogBuilder;
 }
 
-// Warning: (ae-missing-release-tag) "CatalogEntityDocument" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export interface CatalogEntityDocument extends IndexableDocument {
-  // (undocumented)
-  componentType: string;
-  // (undocumented)
-  kind: string;
-  // (undocumented)
-  lifecycle: string;
-  // (undocumented)
-  namespace: string;
-  // (undocumented)
-  owner: string;
-}
-
 // Warning: (ae-missing-release-tag) "CatalogProcessingOrchestrator" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -581,11 +566,11 @@ export class DefaultCatalogCollator implements DocumentCollator {
   constructor({
     discovery,
     locationTemplate,
-    allow,
+    filter,
   }: {
     discovery: PluginEndpointDiscovery;
     locationTemplate?: string;
-    allow?: string[];
+    filter?: CatalogEntitiesRequest['filter'];
   });
   // (undocumented)
   protected applyArgsToFormat(
@@ -594,15 +579,18 @@ export class DefaultCatalogCollator implements DocumentCollator {
   ): string;
   // (undocumented)
   protected discovery: PluginEndpointDiscovery;
+  // Warning: (ae-forgotten-export) The symbol "CatalogEntityDocument" needs to be exported by the entry point index.d.ts
+  //
   // (undocumented)
   execute(): Promise<CatalogEntityDocument[]>;
   // (undocumented)
-  protected filterUrl: string;
+  protected filterUrl?: string;
   // (undocumented)
   static fromConfig(
-    config: Config,
+    _config: Config,
     options: {
       discovery: PluginEndpointDiscovery;
+      filter?: CatalogEntitiesRequest['filter'];
     },
   ): DefaultCatalogCollator;
   // (undocumented)

From 75ce44439a018d77af91ea4be7c562d0c81f0062 Mon Sep 17 00:00:00 2001
From: Aj-vrod <ammyvrodriguez@hotmail.com>
Date: Tue, 31 Aug 2021 14:08:50 +0200
Subject: [PATCH 42/83] changeset corrected

Signed-off-by: Aj-vrod <ammyvrodriguez@hotmail.com>
---
 .changeset/shiny-guests-explain.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/shiny-guests-explain.md b/.changeset/shiny-guests-explain.md
index c2645ed6dd..9f4a4a5b94 100644
--- a/.changeset/shiny-guests-explain.md
+++ b/.changeset/shiny-guests-explain.md
@@ -4,4 +4,4 @@
 '@backstage/plugin-org': patch
 ---
 
-This change hides pagination counter of search tables and group memberslist when results/items fit in one page
+This change hides pagination counter of search tables and group members list when results fit in one page

From 690550862a1a80ef766721608bba7d431f0fc905 Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aureliosaraiva@gmail.com>
Date: Tue, 31 Aug 2021 09:43:25 -0300
Subject: [PATCH 43/83] adjusted changeset description

Signed-off-by: Aurelio Saraiva <aureliosaraiva@gmail.com>
---
 .changeset/two-hats-judge.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.changeset/two-hats-judge.md b/.changeset/two-hats-judge.md
index 11909c8926..27768aba8b 100644
--- a/.changeset/two-hats-judge.md
+++ b/.changeset/two-hats-judge.md
@@ -1,6 +1,5 @@
 ---
 '@backstage/plugin-techdocs': patch
-'@backstage/plugin-techdocs-backend': patch
 ---
 
-added support for title in Techdocs
+Display [metadata.title](https://backstage.io/docs/features/software-catalog/descriptor-format#title-optional) for components on the TechDocs homepage, if defined; otherwise fall back to `metadata.name` as displayed before.

From d288ffc77a8ed81cd706a38ba525e9b97fe3f4f5 Mon Sep 17 00:00:00 2001
From: Aurelio Saraiva <aureliosaraiva@gmail.com>
Date: Tue, 31 Aug 2021 09:51:07 -0300
Subject: [PATCH 44/83] fixed typo camelcase

Signed-off-by: Aurelio Saraiva <aureliosaraiva@gmail.com>
---
 plugins/techdocs/src/home/components/columns.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/techdocs/src/home/components/columns.tsx b/plugins/techdocs/src/home/components/columns.tsx
index b7ec8271a4..d29f44da75 100644
--- a/plugins/techdocs/src/home/components/columns.tsx
+++ b/plugins/techdocs/src/home/components/columns.tsx
@@ -20,7 +20,7 @@ import { EntityRefLinks } from '@backstage/plugin-catalog-react';
 import { Entity } from '@backstage/catalog-model';
 import { DocsTableRow } from './types';
 
-function customTitle(entity: Entity): String {
+function customTitle(entity: Entity): string {
   return entity.metadata.title || entity.metadata.name;
 }
 

From a42a142c2fab3c58d37652343177bb3521f9c958 Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Tue, 31 Aug 2021 15:24:04 +0200
Subject: [PATCH 45/83] Reduce log fatigue during startup.

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 .changeset/techdocs-search-log-fatigue.md                   | 6 ++++++
 .../techdocs-backend/src/search/DefaultTechDocsCollator.ts  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/techdocs-search-log-fatigue.md

diff --git a/.changeset/techdocs-search-log-fatigue.md b/.changeset/techdocs-search-log-fatigue.md
new file mode 100644
index 0000000000..dc81563d8c
--- /dev/null
+++ b/.changeset/techdocs-search-log-fatigue.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-techdocs-backend': patch
+---
+
+Errors encountered while attempting to load TechDocs search indices at
+collation-time are now logged at `DEBUG` instead of `WARN` level.
diff --git a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
index f525d7af7e..850be2823c 100644
--- a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
+++ b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts
@@ -110,7 +110,7 @@ export class DefaultTechDocsCollator implements DocumentCollator {
                   ?.target?.name || '',
             }));
           } catch (e) {
-            this.logger.warn(
+            this.logger.debug(
               `Failed to retrieve tech docs search index for entity ${entityInfo.namespace}/${entityInfo.kind}/${entityInfo.name}`,
               e,
             );

From 2a105f451423ff895a075209dad236b7fa857f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Tue, 31 Aug 2021 16:13:19 +0200
Subject: [PATCH 46/83] Add a warning log message that `passport-saml` will
 require a `cert` config parameter imminently
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/friendly-tables-heal.md                  | 7 +++++++
 plugins/auth-backend/src/providers/saml/provider.ts | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/friendly-tables-heal.md

diff --git a/.changeset/friendly-tables-heal.md b/.changeset/friendly-tables-heal.md
new file mode 100644
index 0000000000..8aa987d409
--- /dev/null
+++ b/.changeset/friendly-tables-heal.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Add a warning log message that `passport-saml` will require a `cert` config parameter imminently.
+
+We intend to upgrade this package soon, past the point where we will start to strictly require the `auth.saml.cert` configuration parameter to be present. To avoid issues starting your auth backend, please
diff --git a/plugins/auth-backend/src/providers/saml/provider.ts b/plugins/auth-backend/src/providers/saml/provider.ts
index fe721fa376..5b95634414 100644
--- a/plugins/auth-backend/src/providers/saml/provider.ts
+++ b/plugins/auth-backend/src/providers/saml/provider.ts
@@ -119,7 +119,7 @@ export type SamlProviderOptions = {};
 export const createSamlProvider = (
   _options?: SamlProviderOptions,
 ): AuthProviderFactory => {
-  return ({ providerId, globalConfig, config, tokenIssuer }) => {
+  return ({ providerId, globalConfig, config, tokenIssuer, logger }) => {
     const opts = {
       callbackUrl: `${globalConfig.baseUrl}/${providerId}/handler/frame`,
       entryPoint: config.getString('entryPoint'),
@@ -141,8 +141,14 @@ export const createSamlProvider = (
     // passport-saml will return an error if the `cert` key is set, and the value is empty.
     // Since we read from config (such as environment variables) an empty string should be equal to being unset.
     if (!opts.cert) {
+      logger.warn(
+        'SamlAuthProvider was initialized without a cert configuration parameter. ' +
+          'This will soon be required by the underlying passport-saml library, which may soon lead to failures to start the auth backend. ' +
+          'Please add an "auth.saml.cert" config parameter.',
+      );
       delete opts.cert;
     }
+
     return new SamlAuthProvider(opts);
   };
 };

From 723df8e8cee9c40f56ce692bc40a31de5afc4038 Mon Sep 17 00:00:00 2001
From: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
Date: Tue, 31 Aug 2021 16:41:29 +0200
Subject: [PATCH 47/83] processed review comments. Ran prettier, api-report,
 minor to patch

Signed-off-by: Pepijn Schildkamp <pepijn.schildkamp@gmail.com>
---
 .changeset/strong-ravens-smoke.md             |  2 +-
 plugins/auth-backend/api-report.md            | 17 +++++++++++++
 .../src/providers/oauth2/index.ts             |  2 +-
 .../src/providers/oauth2/provider.test.ts     |  9 +++----
 .../src/providers/oauth2/provider.ts          | 24 +------------------
 5 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/.changeset/strong-ravens-smoke.md b/.changeset/strong-ravens-smoke.md
index 8579e74d37..478eb1c4c2 100644
--- a/.changeset/strong-ravens-smoke.md
+++ b/.changeset/strong-ravens-smoke.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/plugin-auth-backend': minor
+'@backstage/plugin-auth-backend': patch
 ---
 
 Added signIn and authHandler resolver for oAuth2 provider
diff --git a/plugins/auth-backend/api-report.md b/plugins/auth-backend/api-report.md
index 6e65342828..6785222fa6 100644
--- a/plugins/auth-backend/api-report.md
+++ b/plugins/auth-backend/api-report.md
@@ -105,6 +105,13 @@ export const createMicrosoftProvider: (
   options?: MicrosoftProviderOptions | undefined,
 ) => AuthProviderFactory;
 
+// Warning: (ae-missing-release-tag) "createOAuth2Provider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const createOAuth2Provider: (
+  options?: OAuth2ProviderOptions | undefined,
+) => AuthProviderFactory;
+
 // Warning: (ae-missing-release-tag) "createOktaProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -199,6 +206,16 @@ export type MicrosoftProviderOptions = {
   };
 };
 
+// Warning: (ae-missing-release-tag) "OAuth2ProviderOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type OAuth2ProviderOptions = {
+  authHandler?: AuthHandler<OAuthResult>;
+  signIn?: {
+    resolver?: SignInResolver<OAuthResult>;
+  };
+};
+
 // Warning: (ae-missing-release-tag) "OAuthAdapter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
diff --git a/plugins/auth-backend/src/providers/oauth2/index.ts b/plugins/auth-backend/src/providers/oauth2/index.ts
index 4e2509735d..d68208a148 100644
--- a/plugins/auth-backend/src/providers/oauth2/index.ts
+++ b/plugins/auth-backend/src/providers/oauth2/index.ts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-export { createOAuth2Provider, oAuth2EmailSignInResolver } from './provider';
+export { createOAuth2Provider } from './provider';
 export type { OAuth2ProviderOptions } from './provider';
diff --git a/plugins/auth-backend/src/providers/oauth2/provider.test.ts b/plugins/auth-backend/src/providers/oauth2/provider.test.ts
index 773471c42f..7030d91343 100644
--- a/plugins/auth-backend/src/providers/oauth2/provider.test.ts
+++ b/plugins/auth-backend/src/providers/oauth2/provider.test.ts
@@ -21,10 +21,10 @@ import { getVoidLogger } from '@backstage/backend-common';
 import { TokenIssuer } from '../../identity/types';
 import { CatalogIdentityClient } from '../../lib/catalog';
 
-const mockFrameHandler = (jest.spyOn(
+const mockFrameHandler = jest.spyOn(
   helpers,
   'executeFrameHandlerStrategy',
-) as unknown) as jest.MockedFunction<
+) as unknown as jest.MockedFunction<
   () => Promise<{ result: OAuthResult; privateInfo: any }>
 >;
 
@@ -40,8 +40,9 @@ describe('createOAuth2Provider', () => {
 
     const provider = new OAuth2AuthProvider({
       logger: getVoidLogger(),
-      catalogIdentityClient: (catalogIdentityClient as unknown) as CatalogIdentityClient,
-      tokenIssuer: (tokenIssuer as unknown) as TokenIssuer,
+      catalogIdentityClient:
+        catalogIdentityClient as unknown as CatalogIdentityClient,
+      tokenIssuer: tokenIssuer as unknown as TokenIssuer,
       authHandler: async ({ fullProfile }) => ({
         profile: {
           email: fullProfile.emails![0]!.value,
diff --git a/plugins/auth-backend/src/providers/oauth2/provider.ts b/plugins/auth-backend/src/providers/oauth2/provider.ts
index fc315a69ca..36e2f6ed99 100644
--- a/plugins/auth-backend/src/providers/oauth2/provider.ts
+++ b/plugins/auth-backend/src/providers/oauth2/provider.ts
@@ -42,7 +42,7 @@ import {
   RedirectInfo,
   SignInResolver,
 } from '../types';
-import { CatalogIdentityClient, getEntityClaims } from '../../lib/catalog';
+import { CatalogIdentityClient } from '../../lib/catalog';
 import { TokenIssuer } from '../../identity';
 import { Logger } from 'winston';
 
@@ -188,28 +188,6 @@ export class OAuth2AuthProvider implements OAuthHandlers {
   }
 }
 
-export const oAuth2EmailSignInResolver: SignInResolver<OAuthResult> = async (
-  info,
-  ctx,
-) => {
-  const { profile } = info;
-
-  if (!profile.email) {
-    throw new Error('OAuth2 profile contained no email');
-  }
-
-  const entity = await ctx.catalogIdentityClient.findUser({
-    annotations: {
-      'backstage.io/email': profile.email,
-    },
-  });
-
-  const claims = getEntityClaims(entity);
-  const token = await ctx.tokenIssuer.issueToken({ claims });
-
-  return { id: entity.metadata.name, entity, token };
-};
-
 export const oAuth2DefaultSignInResolver: SignInResolver<OAuthResult> = async (
   info,
   ctx,

From 5dca42b174dd9bb81c48df6d224c6659a9b5ab2d Mon Sep 17 00:00:00 2001
From: Andre Wanlin <awanlin@rapidrtc.com>
Date: Tue, 31 Aug 2021 10:55:37 -0500
Subject: [PATCH 48/83] Properly handle Azure DevOps Server download URL

Signed-off-by: Andre Wanlin <awanlin@rapidrtc.com>
---
 .changeset/fuzzy-pigs-wash.md               |  5 +++++
 packages/integration/src/azure/core.test.ts | 15 +++++++++++++++
 packages/integration/src/azure/core.ts      | 12 +++++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/fuzzy-pigs-wash.md

diff --git a/.changeset/fuzzy-pigs-wash.md b/.changeset/fuzzy-pigs-wash.md
new file mode 100644
index 0000000000..d4a0ce4602
--- /dev/null
+++ b/.changeset/fuzzy-pigs-wash.md
@@ -0,0 +1,5 @@
+---
+'@backstage/integration': patch
+---
+
+Update to properly handle Azure DevOps Server download URL
diff --git a/packages/integration/src/azure/core.test.ts b/packages/integration/src/azure/core.test.ts
index 9937008b61..37fe50f3ea 100644
--- a/packages/integration/src/azure/core.test.ts
+++ b/packages/integration/src/azure/core.test.ts
@@ -97,5 +97,20 @@ describe('azure core', () => {
       );
       expect(new URL(result).searchParams.get('scopePath')).toEqual('docs');
     });
+
+    it.each([
+      {
+        url: 'https://dev.azure.com/org-name/project-name/_git/repo-name',
+        result:
+          'https://dev.azure.com/org-name/project-name/_apis/git/repositories/repo-name/items?recursionLevel=full&download=true&api-version=6.0',
+      },
+      {
+        url: 'https://api.com/org-name/project-name/_git/repo-name',
+        result:
+          'https://api.com/org-name/project-name/_apis/git/repositories/repo-name/items?recursionLevel=full&download=true&api-version=6.0',
+      },
+    ])('should handle happy path %#', async ({ url, result }) => {
+      expect(getAzureDownloadUrl(url)).toBe(result);
+    });
   });
 });
diff --git a/packages/integration/src/azure/core.ts b/packages/integration/src/azure/core.ts
index 18de5aa1d2..7d7bf2742d 100644
--- a/packages/integration/src/azure/core.ts
+++ b/packages/integration/src/azure/core.ts
@@ -100,7 +100,17 @@ export function getAzureDownloadUrl(url: string): string {
     ? `&scopePath=${encodeURIComponent(filepath)}`
     : '';
 
-  return `${protocol}://${resource}/${organization}/${project}/_apis/git/repositories/${repoName}/items?recursionLevel=full&download=true&api-version=6.0${scopePath}`;
+  if (url.includes('dev.azure.com')) {
+    return `${protocol}://${resource}/${organization}/${project}/_apis/git/repositories/${repoName}/items?recursionLevel=full&download=true&api-version=6.0${scopePath}`;
+  }
+
+  // For Azure DevOps Server `parseGitUrl` returns the same values
+  // for `organization` and `project` like this: `organization/project/_git`
+  // so we drop `project` and then strip `/_git` from `organization`
+  return `${protocol}://${resource}/${organization.replace(
+    '/_git',
+    '',
+  )}/_apis/git/repositories/${repoName}/items?recursionLevel=full&download=true&api-version=6.0${scopePath}`;
 }
 
 /**

From b5118ff766164d0d468e1e6eb65b940b5516a67f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Tue, 31 Aug 2021 18:56:59 +0200
Subject: [PATCH 49/83] add changeset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/serious-pumpkins-hug.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/serious-pumpkins-hug.md

diff --git a/.changeset/serious-pumpkins-hug.md b/.changeset/serious-pumpkins-hug.md
new file mode 100644
index 0000000000..9441f3aeb7
--- /dev/null
+++ b/.changeset/serious-pumpkins-hug.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Updated dependencies

From 5e803edb869cb540a9a0ea32515231e039ff73bf Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 31 Aug 2021 19:16:26 +0200
Subject: [PATCH 50/83] cli: added support for importing for files

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/big-eyes-dance.md               |  5 +++++
 packages/cli/asset-types/asset-types.d.ts  | 20 ++++++++++++++++++++
 packages/cli/src/lib/builder/config.ts     | 12 +++++++++++-
 packages/cli/src/lib/bundler/transforms.ts | 11 +++++++++++
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/big-eyes-dance.md

diff --git a/.changeset/big-eyes-dance.md b/.changeset/big-eyes-dance.md
new file mode 100644
index 0000000000..ab14979619
--- /dev/null
+++ b/.changeset/big-eyes-dance.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Added support for importing font files. Imports in CSS via `url()` are supported for the final frontend bundle, but not for packages that are built for publishing. Module imports of fonts files from TypeScript are supported everywhere.
diff --git a/packages/cli/asset-types/asset-types.d.ts b/packages/cli/asset-types/asset-types.d.ts
index 879e9b0b05..0bd0922004 100644
--- a/packages/cli/asset-types/asset-types.d.ts
+++ b/packages/cli/asset-types/asset-types.d.ts
@@ -68,6 +68,26 @@ declare module '*.svg' {
   export default src;
 }
 
+declare module '*.eot' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.woff' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.woff2' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.ttf' {
+  const src: string;
+  export default src;
+}
+
 declare module '*.css' {
   const classes: { readonly [key: string]: string };
   export default classes;
diff --git a/packages/cli/src/lib/builder/config.ts b/packages/cli/src/lib/builder/config.ts
index 60a5f0efca..3c95a87bdd 100644
--- a/packages/cli/src/lib/builder/config.ts
+++ b/packages/cli/src/lib/builder/config.ts
@@ -80,7 +80,17 @@ export const makeConfigs = async (
         postcss(),
         forwardFileImports({
           exclude: /\.icon\.svg$/,
-          include: [/\.svg$/, /\.png$/, /\.gif$/, /\.jpg$/, /\.jpeg$/],
+          include: [
+            /\.svg$/,
+            /\.png$/,
+            /\.gif$/,
+            /\.jpg$/,
+            /\.jpeg$/,
+            /\.eot$/,
+            /\.woff$/,
+            /\.woff2$/,
+            /\.ttf$/,
+          ],
         }),
         json(),
         yaml(),
diff --git a/packages/cli/src/lib/bundler/transforms.ts b/packages/cli/src/lib/bundler/transforms.ts
index 34a441139c..b0a9b25466 100644
--- a/packages/cli/src/lib/bundler/transforms.ts
+++ b/packages/cli/src/lib/bundler/transforms.ts
@@ -89,6 +89,17 @@ export const transforms = (options: TransformOptions): Transforms => {
         name: 'static/[name].[hash:8].[ext]',
       },
     },
+    {
+      test: /\.(eot|woff|woff2|ttf)$/,
+      use: [
+        {
+          loader: require.resolve('file-loader'),
+          options: {
+            name: 'static/[name].[hash:8].[ext]',
+          },
+        },
+      ],
+    },
     {
       test: /\.ya?ml$/,
       use: require.resolve('yml-loader'),

From 00bc49f8fe8ad3c51e7ee911e2913eff3062bc66 Mon Sep 17 00:00:00 2001
From: Andre Wanlin <67169551+awanlin@users.noreply.github.com>
Date: Tue, 31 Aug 2021 13:19:46 -0500
Subject: [PATCH 51/83] Update packages/integration/src/azure/core.ts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Updated with suggested change

Co-authored-by: Fredrik Adelöw <freben@gmail.com>
Signed-off-by: Andre Wanlin <awanlin@rapidrtc.com>
---
 packages/integration/src/azure/core.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/integration/src/azure/core.ts b/packages/integration/src/azure/core.ts
index 7d7bf2742d..e22764f643 100644
--- a/packages/integration/src/azure/core.ts
+++ b/packages/integration/src/azure/core.ts
@@ -100,7 +100,7 @@ export function getAzureDownloadUrl(url: string): string {
     ? `&scopePath=${encodeURIComponent(filepath)}`
     : '';
 
-  if (url.includes('dev.azure.com')) {
+  if (resource === 'dev.azure.com') {
     return `${protocol}://${resource}/${organization}/${project}/_apis/git/repositories/${repoName}/items?recursionLevel=full&download=true&api-version=6.0${scopePath}`;
   }
 

From 6d243eb99e1aadcfda35c35bc33f5791529082f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 04:13:32 +0000
Subject: [PATCH 52/83] chore(deps-dev): bump @types/concat-stream from 1.6.0
 to 1.6.1

Bumps [@types/concat-stream](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/concat-stream) from 1.6.0 to 1.6.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/concat-stream)

---
updated-dependencies:
- dependency-name: "@types/concat-stream"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6fc86f7159..3edb4beafa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6299,9 +6299,9 @@
     "@types/express" "*"
 
 "@types/concat-stream@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.0.tgz#394dbe0bb5fee46b38d896735e8b68ef2390d00d"
-  integrity sha1-OU2+C7X+5Gs42JZzXoto7yOQ0A0=
+  version "1.6.1"
+  resolved "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.1.tgz#24bcfc101ecf68e886aaedce60dfd74b632a1b74"
+  integrity sha512-eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA==
   dependencies:
     "@types/node" "*"
 

From 968412fa4ea09bcbed39966d50f0182cb15319e9 Mon Sep 17 00:00:00 2001
From: Enrico Stahn <enrico.stahn@gmail.com>
Date: Wed, 1 Sep 2021 15:08:36 +1000
Subject: [PATCH 53/83] fix: export createGithubProvider

Signed-off-by: Enrico Stahn <enrico.stahn@gmail.com>
---
 plugins/auth-backend/src/providers/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/auth-backend/src/providers/index.ts b/plugins/auth-backend/src/providers/index.ts
index 133498f342..2eb9e439f7 100644
--- a/plugins/auth-backend/src/providers/index.ts
+++ b/plugins/auth-backend/src/providers/index.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+export * from './github';
 export * from './gitlab';
 export * from './google';
 export * from './microsoft';

From ca45b169d48371e8db97e6a462f2714a1a6df64b Mon Sep 17 00:00:00 2001
From: Enrico Stahn <enrico.stahn@gmail.com>
Date: Wed, 1 Sep 2021 16:06:49 +1000
Subject: [PATCH 54/83] chore: provide changeset for docs

Signed-off-by: Enrico Stahn <enrico.stahn@gmail.com>
---
 .changeset/tiny-crews-notice.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/tiny-crews-notice.md

diff --git a/.changeset/tiny-crews-notice.md b/.changeset/tiny-crews-notice.md
new file mode 100644
index 0000000000..3d61ca44eb
--- /dev/null
+++ b/.changeset/tiny-crews-notice.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend': patch
+---
+
+Export GitHub to allow use with Identity resolver

From a239a4a5e554d50bbf74a5e67e9e05aa0b441cfa Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Wed, 1 Sep 2021 09:30:50 +0200
Subject: [PATCH 55/83] refactor: rename helpers.ts to OctokitProvider.ts and
 add docstrings

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .../{helpers.test.ts => OctokitProvider.test.ts}       |  2 +-
 .../builtin/github/{helpers.ts => OctokitProvider.ts}  | 10 +++++++++-
 .../actions/builtin/github/githubActionsDispatch.ts    |  2 +-
 .../scaffolder/actions/builtin/github/githubWebhook.ts |  2 +-
 .../src/scaffolder/actions/builtin/publish/github.ts   |  2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)
 rename plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/{helpers.test.ts => OctokitProvider.test.ts} (97%)
 rename plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/{helpers.ts => OctokitProvider.ts} (90%)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.test.ts
similarity index 97%
rename from plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
rename to plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.test.ts
index a72a775701..91b23f40dd 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { OctokitProvider } from './helpers';
+import { OctokitProvider } from './OctokitProvider';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.ts
similarity index 90%
rename from plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
rename to plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.ts
index 4ed10b9d64..bea027a91b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/OctokitProvider.ts
@@ -28,7 +28,10 @@ export type OctokitIntegration = {
   owner: string;
   repo: string;
 };
-
+/**
+ * OctokitProvider provides Octokit client based on ScmIntegrationsRegistry configuration.
+ * OctokitProvider supports GitHub credentials caching out of the box.
+ */
 export class OctokitProvider {
   private readonly integrations: ScmIntegrationRegistry;
   private readonly credentialsProviders: Map<string, GithubCredentialsProvider>;
@@ -43,6 +46,11 @@ export class OctokitProvider {
     );
   }
 
+  /**
+   * gets standard Octokit client based on repository URL.
+   *
+   * @param repoUrl Repository URL
+   */
   async getOctokit(repoUrl: string): Promise<OctokitIntegration> {
     const { owner, repo, host } = parseRepoUrl(repoUrl, this.integrations);
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
index c7d2919efb..661101d184 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
@@ -15,7 +15,7 @@
  */
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '../../createTemplateAction';
-import { OctokitProvider } from './helpers';
+import { OctokitProvider } from './OctokitProvider';
 
 export function createGithubActionsDispatchAction(options: {
   integrations: ScmIntegrationRegistry;
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
index eabfebeb28..33ed415062 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
@@ -15,7 +15,7 @@
  */
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '../../createTemplateAction';
-import { OctokitProvider } from './helpers';
+import { OctokitProvider } from './OctokitProvider';
 
 type ContentType = 'form' | 'json';
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
index eaedbf275f..b32f9b5b3f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
@@ -21,7 +21,7 @@ import {
 import { getRepoSourceDirectory } from './util';
 import { createTemplateAction } from '../../createTemplateAction';
 import { Config } from '@backstage/config';
-import { OctokitProvider } from '../github/helpers';
+import { OctokitProvider } from '../github/OctokitProvider';
 
 type Permission = 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
 type Collaborator = { access: Permission; username: string };

From 6347fc991b65a866bb5184c1a504c5400d8d4d3a Mon Sep 17 00:00:00 2001
From: Aj-vrod <ammyvrodriguez@hotmail.com>
Date: Wed, 1 Sep 2021 09:48:22 +0200
Subject: [PATCH 56/83] removed line in changeset

Signed-off-by: Aj-vrod <ammyvrodriguez@hotmail.com>
---
 .changeset/shiny-guests-explain.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.changeset/shiny-guests-explain.md b/.changeset/shiny-guests-explain.md
index 9f4a4a5b94..6bd99e4aa6 100644
--- a/.changeset/shiny-guests-explain.md
+++ b/.changeset/shiny-guests-explain.md
@@ -1,5 +1,4 @@
 ---
-'example-app': patch
 '@backstage/plugin-catalog': patch
 '@backstage/plugin-org': patch
 ---

From 145f7a5dd16301f87d0b85d869f5addb88d55843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Wed, 1 Sep 2021 10:33:08 +0200
Subject: [PATCH 57/83] add api report
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 plugins/auth-backend/api-report.md | 35 ++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/plugins/auth-backend/api-report.md b/plugins/auth-backend/api-report.md
index 6e65342828..2070255c40 100644
--- a/plugins/auth-backend/api-report.md
+++ b/plugins/auth-backend/api-report.md
@@ -84,6 +84,13 @@ export type BackstageIdentity = {
   entity?: Entity;
 };
 
+// Warning: (ae-missing-release-tag) "createGithubProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const createGithubProvider: (
+  options?: GithubProviderOptions | undefined,
+) => AuthProviderFactory;
+
 // Warning: (ae-missing-release-tag) "createGitlabProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -145,6 +152,30 @@ export const encodeState: (state: OAuthState) => string;
 // @public (undocumented)
 export const ensuresXRequestedWith: (req: express.Request) => boolean;
 
+// Warning: (ae-missing-release-tag) "GithubOAuthResult" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type GithubOAuthResult = {
+  fullProfile: Profile;
+  params: {
+    scope: string;
+    expires_in?: string;
+    refresh_token_expires_in?: string;
+  };
+  accessToken: string;
+  refreshToken?: string;
+};
+
+// Warning: (ae-missing-release-tag) "GithubProviderOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type GithubProviderOptions = {
+  authHandler?: AuthHandler<GithubOAuthResult>;
+  signIn?: {
+    resolver?: SignInResolver<GithubOAuthResult>;
+  };
+};
+
 // Warning: (ae-missing-release-tag) "GitlabProviderOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -420,8 +451,8 @@ export type WebMessageResponse =
 //
 // src/identity/types.d.ts:25:5 - (ae-forgotten-export) The symbol "TokenParams" needs to be exported by the entry point index.d.ts
 // src/identity/types.d.ts:31:9 - (ae-forgotten-export) The symbol "AnyJWK" needs to be exported by the entry point index.d.ts
-// src/providers/gitlab/provider.d.ts:38:5 - (ae-forgotten-export) The symbol "AuthHandler" needs to be exported by the entry point index.d.ts
-// src/providers/gitlab/provider.d.ts:49:9 - (ae-forgotten-export) The symbol "SignInResolver" needs to be exported by the entry point index.d.ts
+// src/providers/github/provider.d.ts:50:5 - (ae-forgotten-export) The symbol "AuthHandler" needs to be exported by the entry point index.d.ts
+// src/providers/github/provider.d.ts:58:9 - (ae-forgotten-export) The symbol "SignInResolver" needs to be exported by the entry point index.d.ts
 // src/providers/types.d.ts:109:5 - (ae-forgotten-export) The symbol "AuthProviderConfig" needs to be exported by the entry point index.d.ts
 // src/providers/types.d.ts:115:5 - (ae-forgotten-export) The symbol "ExperimentalIdentityResolver" needs to be exported by the entry point index.d.ts
 // src/providers/types.d.ts:132:8 - (tsdoc-missing-deprecation-message) The @deprecated block must include a deprecation message, e.g. describing the recommended alternative

From 0b93caefb675032d1cb2767a9cf5fc2a0df7388d Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Wed, 1 Sep 2021 12:41:52 +0200
Subject: [PATCH 58/83] refactor: export `OctokitProvider`

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .../src/scaffolder/actions/builtin/github/index.ts               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
index 07614e8a03..865c433c16 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/index.ts
@@ -16,3 +16,4 @@
 
 export { createGithubActionsDispatchAction } from './githubActionsDispatch';
 export { createGithubWebhookAction } from './githubWebhook';
+export { OctokitProvider } from './OctokitProvider';

From d02960f76492028a6c5e10a17d9104480558927c Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Wed, 1 Sep 2021 12:52:06 +0200
Subject: [PATCH 59/83] fix: update plugins/scaffolder-backend/api-report.md

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 plugins/scaffolder-backend/api-report.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index dfda1ff2fc..5d848e42d2 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -14,6 +14,7 @@ import express from 'express';
 import { JsonObject } from '@backstage/config';
 import { JsonValue } from '@backstage/config';
 import { Logger as Logger_2 } from 'winston';
+import { Octokit } from '@octokit/rest';
 import { PluginDatabaseManager } from '@backstage/backend-common';
 import { Schema } from 'jsonschema';
 import { ScmIntegrationRegistry } from '@backstage/integration';
@@ -200,6 +201,16 @@ export function fetchContents({
   outputPath: string;
 }): Promise<void>;
 
+// Warning: (ae-missing-release-tag) "OctokitProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export class OctokitProvider {
+  constructor(integrations: ScmIntegrationRegistry);
+  // Warning: (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+  // Warning: (ae-forgotten-export) The symbol "OctokitIntegration" needs to be exported by the entry point index.d.ts
+  getOctokit(repoUrl: string): Promise<OctokitIntegration>;
+}
+
 // Warning: (ae-missing-release-tag) "RouterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)

From 774b08a5c4f5d8aa88ac78b9fa2ee28cfa27032a Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Wed, 1 Sep 2021 14:30:11 +0200
Subject: [PATCH 60/83] feat(plugin-scaffolder-backend): GitHub Webhook Action
 can be constructed with default Webhook secret

This allows using this action with secrets stored in environment variables.

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 .changeset/four-bobcats-confess.md            |  5 +++
 plugins/scaffolder-backend/api-report.md      |  1 +
 .../builtin/github/githubWebhook.test.ts      | 42 +++++++++++++++----
 .../actions/builtin/github/githubWebhook.ts   |  8 ++--
 4 files changed, 44 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/four-bobcats-confess.md

diff --git a/.changeset/four-bobcats-confess.md b/.changeset/four-bobcats-confess.md
new file mode 100644
index 0000000000..2126329e3e
--- /dev/null
+++ b/.changeset/four-bobcats-confess.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+GitHubWebhook Action can be created with a default webhook secret. This allows getting secret from environment variable as an alternative to get it from context.
diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index 5d848e42d2..8a6598da33 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -120,6 +120,7 @@ export function createGithubActionsDispatchAction(options: {
 // @public (undocumented)
 export function createGithubWebhookAction(options: {
   integrations: ScmIntegrationRegistry;
+  webhookSecretDefault?: string;
 }): TemplateAction<any>;
 
 // Warning: (ae-missing-release-tag) "createPublishAzureAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
index 3ea3037b90..6a49156d22 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
@@ -33,13 +33,16 @@ describe('github:repository:webhook:create', () => {
   });
 
   const integrations = ScmIntegrations.fromConfig(config);
-  const action = createGithubWebhookAction({ integrations });
+  const webhookSecretDefault = 'aafdfdivierernfdk23f';
+  const action = createGithubWebhookAction({
+    integrations,
+    webhookSecretDefault,
+  });
 
   const mockContext = {
     input: {
       repoUrl: 'github.com?repo=repo&owner=owner',
       webhookUrl: 'https://example.com/payload',
-      webhookSecret: 'aafdfdivierernfdk23f',
     },
     workspacePath: 'lol',
     logger: getVoidLogger(),
@@ -57,12 +60,33 @@ describe('github:repository:webhook:create', () => {
   it('should call the githubApi for creating repository Webhook', async () => {
     const repoUrl = 'github.com?repo=repo&owner=owner';
     const webhookUrl = 'https://example.com/payload';
-    const webhookSecret = 'aafdfdivierernfdk23f';
     const ctx = Object.assign({}, mockContext, {
-      input: { repoUrl, webhookUrl, webhookSecret },
+      input: { repoUrl, webhookUrl },
     });
     await action.handler(ctx);
 
+    expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repo',
+      events: ['push'],
+      active: true,
+      config: {
+        url: webhookUrl,
+        content_type: 'form',
+        secret: webhookSecretDefault,
+        insecure_ssl: '0',
+      },
+    });
+
+    const webhookSecret = 'yet_another_secret';
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        webhookSecret,
+      },
+    });
+
     expect(mockGithubClient.repos.createWebhook).toHaveBeenCalledWith({
       owner: 'owner',
       repo: 'repo',
@@ -92,7 +116,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecret,
+        secret: webhookSecretDefault,
         insecure_ssl: '0',
       },
     });
@@ -113,7 +137,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'json',
-        secret: webhookSecret,
+        secret: webhookSecretDefault,
         insecure_ssl: '0',
       },
     });
@@ -134,7 +158,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecret,
+        secret: webhookSecretDefault,
         insecure_ssl: '1',
       },
     });
@@ -155,7 +179,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecret,
+        secret: webhookSecretDefault,
         insecure_ssl: '1',
       },
     });
@@ -176,7 +200,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecret,
+        secret: webhookSecretDefault,
         insecure_ssl: '0',
       },
     });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
index 33ed415062..f0690cee95 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
@@ -21,8 +21,9 @@ type ContentType = 'form' | 'json';
 
 export function createGithubWebhookAction(options: {
   integrations: ScmIntegrationRegistry;
+  webhookSecretDefault?: string;
 }) {
-  const { integrations } = options;
+  const { integrations, webhookSecretDefault } = options;
   const octokitProvider = new OctokitProvider(integrations);
 
   return createTemplateAction<{
@@ -53,7 +54,8 @@ export function createGithubWebhookAction(options: {
           },
           webhookSecret: {
             title: 'Webhook Secret',
-            description: 'Webhook secret value',
+            description:
+              'Webhook secret value. The default can be provided internally in action creation',
             type: 'string',
           },
           events: {
@@ -88,7 +90,7 @@ export function createGithubWebhookAction(options: {
       const {
         repoUrl,
         webhookUrl,
-        webhookSecret,
+        webhookSecret = webhookSecretDefault,
         events = ['push'],
         active = true,
         contentType = 'form',

From a66b83e9c63ea9ef631e0f15f132e92734c0049a Mon Sep 17 00:00:00 2001
From: James Bourne <jamesmbourne@users.noreply.github.com>
Date: Wed, 1 Sep 2021 18:02:34 +0200
Subject: [PATCH 61/83] Fix broken links to 'String References' from
 'Descriptor Format'

Signed-off-by: James Bourne <james.bourne@contentful.com>
Signed-off-by: James Bourne <jamesmbourne@users.noreply.github.com>
---
 .../software-catalog/descriptor-format.md     | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md
index 8b07e1a51a..7a9aa099e9 100644
--- a/docs/features/software-catalog/descriptor-format.md
+++ b/docs/features/software-catalog/descriptor-format.md
@@ -547,8 +547,8 @@ The current set of well-known and common values for this field is:
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the component, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+component, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a component is the singular entity (commonly a team)
 that bears ultimate responsibility for the component, and has the authority and
@@ -566,8 +566,8 @@ component, but there will always be one ultimate owner.
 
 ### `spec.system` [optional]
 
-An [entity reference](#string-references) to the system that the component
-belongs to, e.g. `artist-engagement-portal`. This field is optional.
+An [entity reference](references.md#string-references) to the system that the
+component belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | --------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -575,8 +575,8 @@ belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 ### `spec.subcomponentOf` [optional]
 
-An [entity reference](#string-references) to another component of which the
-component is a part, e.g. `spotify-ios-app`. This field is optional.
+An [entity reference](references.md#string-references) to another component of
+which the component is a part, e.g. `spotify-ios-app`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required)  | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | ---------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -584,8 +584,8 @@ component is a part, e.g. `spotify-ios-app`. This field is optional.
 
 ### `spec.providesApis` [optional]
 
-An array of [entity references](#string-references) to the APIs that are
-provided by the component, e.g. `artist-api`. This field is optional.
+An array of [entity references](references.md#string-references) to the APIs
+that are provided by the component, e.g. `artist-api`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                                  |
 | --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------------- |
@@ -593,8 +593,8 @@ provided by the component, e.g. `artist-api`. This field is optional.
 
 ### `spec.consumesApis` [optional]
 
-An array of [entity references](#string-references) to the APIs that are
-consumed by the component, e.g. `artist-api`. This field is optional.
+An array of [entity references](references.md#string-references) to the APIs
+that are consumed by the component, e.g. `artist-api`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                                  |
 | --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------------- |
@@ -602,9 +602,9 @@ consumed by the component, e.g. `artist-api`. This field is optional.
 
 ### `spec.dependsOn` [optional]
 
-An array of [entity references](#string-references) to the components and
-resources that the component depends on, e.g. `artists-db`. This field is
-optional.
+An array of [entity references](references.md#string-references) to the
+components and resources that the component depends on, e.g. `artists-db`. This
+field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                            |
 | --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------- |
@@ -732,8 +732,8 @@ You can find out more about the `steps` key
 
 ### `spec.owner` [optional]
 
-An [entity reference](#string-references) to the owner of the template, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+template, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a Template is the singular entity (commonly a team)
 that bears ultimate responsibility for the Template, and has the authority and
@@ -842,8 +842,8 @@ The current set of well-known and common values for this field is:
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the component, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+component, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of an API is the singular entity (commonly a team) that
 bears ultimate responsibility for the API, and has the authority and capability
@@ -861,8 +861,8 @@ one ultimate owner.
 
 ### `spec.system` [optional]
 
-An [entity reference](#string-references) to the system that the API belongs to,
-e.g. `artist-engagement-portal`. This field is optional.
+An [entity reference](references.md#string-references) to the system that the
+API belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | --------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -1069,8 +1069,8 @@ Exactly equal to `backstage.io/v1alpha1` and `Resource`, respectively.
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the resource, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+resource, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a resource is the singular entity (commonly a team)
 that bears ultimate responsibility for the resource, and has the authority and
@@ -1101,8 +1101,8 @@ Some common values for this field could be:
 
 ### `spec.system` [optional]
 
-An [entity reference](#string-references) to the system that the resource
-belongs to, e.g. `artist-engagement-portal`. This field is optional.
+An [entity reference](references.md#string-references) to the system that the
+resource belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | --------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -1110,9 +1110,9 @@ belongs to, e.g. `artist-engagement-portal`. This field is optional.
 
 ### `spec.dependsOn` [optional]
 
-An array of [entity references](#string-references) to the components and
-resources that the resource depends on, e.g. `artist-lookup`. This field is
-optional.
+An array of [entity references](references.md#string-references) to the
+components and resources that the resource depends on, e.g. `artist-lookup`.
+This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                            |
 | --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------- |
@@ -1156,8 +1156,8 @@ Exactly equal to `backstage.io/v1alpha1` and `System`, respectively.
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the system, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+system, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a system is the singular entity (commonly a team)
 that bears ultimate responsibility for the system, and has the authority and
@@ -1175,8 +1175,8 @@ but there will always be one ultimate owner.
 
 ### `spec.domain` [optional]
 
-An [entity reference](#string-references) to the domain that the system belongs
-to, e.g. `artists`. This field is optional.
+An [entity reference](references.md#string-references) to the domain that the
+system belongs to, e.g. `artists`. This field is optional.
 
 | [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                            |
 | --------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
@@ -1215,8 +1215,8 @@ Exactly equal to `backstage.io/v1alpha1` and `Domain`, respectively.
 
 ### `spec.owner` [required]
 
-An [entity reference](#string-references) to the owner of the domain, e.g.
-`artist-relations-team`. This field is required.
+An [entity reference](references.md#string-references) to the owner of the
+domain, e.g. `artist-relations-team`. This field is required.
 
 In Backstage, the owner of a domain is the singular entity (commonly a team)
 that bears ultimate responsibility for the domain, and has the authority and

From 2fab1dd10d38e604b2cb64663d0f6121ae205ea5 Mon Sep 17 00:00:00 2001
From: Brent Schneider <Brent.schneider@adhocteam.us>
Date: Tue, 31 Aug 2021 10:47:21 -0700
Subject: [PATCH 62/83] Update app-custom-theme.md

added missing coma in the pageTheme header color list.

Signed-off-by: Brent Schneider <Brent.schneider@adhocteam.us>
---
 docs/getting-started/app-custom-theme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/app-custom-theme.md b/docs/getting-started/app-custom-theme.md
index 7973a54ab6..862c3c0cb6 100644
--- a/docs/getting-started/app-custom-theme.md
+++ b/docs/getting-started/app-custom-theme.md
@@ -128,7 +128,7 @@ const themeOptions = createThemeOptions({
     tool: genPageTheme(['#123456','#123456'], shapes.round),
     service: genPageTheme(['#123456','#123456'], shapes.wave),
     website: genPageTheme(['#123456','#123456'], shapes.wave),
-    library: genPageTheme(['#123456','#123456'] shapes.wave),
+    library: genPageTheme(['#123456','#123456'], shapes.wave),
     other: genPageTheme(['#123456','#123456'], shapes.wave),
     app: genPageTheme(['#123456','#123456'], shapes.wave),
     apis: genPageTheme(['#123456','#123456'], shapes.wave),

From 8301f4198c368be807be1ba24eae7c9643205c8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Sep 2021 04:16:02 +0000
Subject: [PATCH 63/83] chore(deps): bump azure-devops-node-api from 10.2.2 to
 11.0.1

Bumps [azure-devops-node-api](https://github.com/Microsoft/azure-devops-node-api) from 10.2.2 to 11.0.1.
- [Release notes](https://github.com/Microsoft/azure-devops-node-api/releases)
- [Commits](https://github.com/Microsoft/azure-devops-node-api/commits)

---
updated-dependencies:
- dependency-name: azure-devops-node-api
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/backend/package.json           |  2 +-
 plugins/scaffolder-backend/package.json |  2 +-
 yarn.lock                               | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 763d891f77..3dccb32b82 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -53,7 +53,7 @@
     "@backstage/plugin-todo-backend": "^0.1.11",
     "@gitbeaker/node": "^30.2.0",
     "@octokit/rest": "^18.5.3",
-    "azure-devops-node-api": "^10.2.2",
+    "azure-devops-node-api": "^11.0.1",
     "dockerode": "^3.2.1",
     "example-app": "^0.2.43",
     "express": "^4.17.1",
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 10edd55ba8..5ed50f1964 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -40,7 +40,7 @@
     "@gitbeaker/node": "^30.2.0",
     "@octokit/rest": "^18.5.3",
     "@types/express": "^4.17.6",
-    "azure-devops-node-api": "^10.2.2",
+    "azure-devops-node-api": "^11.0.1",
     "command-exists": "^1.2.9",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
diff --git a/yarn.lock b/yarn.lock
index 3edb4beafa..efa5da37ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8923,10 +8923,10 @@ axobject-query@^2.2.0:
   resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
   integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
 
-azure-devops-node-api@^10.2.2:
-  version "10.2.2"
-  resolved "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-10.2.2.tgz#9f557e622dd07bbaa9bd5e7e84e17c761e2151b2"
-  integrity sha512-4TVv2X7oNStT0vLaEfExmy3J4/CzfuXolEcQl/BRUmvGySqKStTG2O55/hUQ0kM7UJlZBLgniM0SBq4d/WkKow==
+azure-devops-node-api@^11.0.1:
+  version "11.0.1"
+  resolved "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.0.1.tgz#b7ec4783230e1de8fc972b23effe7ed2ebac17ff"
+  integrity sha512-YMdjAw9l5p/6leiyIloxj3k7VIvYThKjvqgiQn88r3nhT93ENwsoDS3A83CyJ4uTWzCZ5f5jCi6c27rTU5Pz+A==
   dependencies:
     tunnel "0.0.6"
     typed-rest-client "^1.8.4"
@@ -10967,9 +10967,9 @@ core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
   integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw==
 
 core-js@^3.6.0:
-  version "3.16.4"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.16.4.tgz#0fb1029a554fc2688c0963d7c900e188188a78e0"
-  integrity sha512-Tq4GVE6XCjE+hcyW6hPy0ofN3hwtLudz5ZRdrlCnsnD/xkm/PWQRudzYHiKgZKUcefV6Q57fhDHjZHJP5dpfSg==
+  version "3.17.1"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.17.1.tgz#b39e086f413789cf2ca4680c4ecd1b36a50ba277"
+  integrity sha512-C8i/FNpVN2Ti89QIJcFn9ZQmnM+HaAQr2OpE+ja3TRM9Q34FigsGlAVuwPGkIgydSVClo/1l1D1grP8LVt9IYA==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"

From e32576fb0f7280aeb5234ad182a22068c8992f43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Sep 2021 05:03:03 +0000
Subject: [PATCH 64/83] chore(deps): bump object-path from 0.11.5 to 0.11.7

Bumps [object-path](https://github.com/mariocasciaro/object-path) from 0.11.5 to 0.11.7.
- [Release notes](https://github.com/mariocasciaro/object-path/releases)
- [Commits](https://github.com/mariocasciaro/object-path/commits)

---
updated-dependencies:
- dependency-name: object-path
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3edb4beafa..c913bfb5d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20110,9 +20110,9 @@ object-keys@^1.0.12, object-keys@^1.1.1:
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-path@^0.11.4:
-  version "0.11.5"
-  resolved "https://registry.npmjs.org/object-path/-/object-path-0.11.5.tgz#d4e3cf19601a5140a55a16ad712019a9c50b577a"
-  integrity sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg==
+  version "0.11.7"
+  resolved "https://registry.npmjs.org/object-path/-/object-path-0.11.7.tgz#5f211161f34bb395e4b13a5f565b79d933b6f65d"
+  integrity sha512-T4evaK9VfGGQskXBDILcn6F90ZD+WO3OwRFFQ2rmZdUH4vQeDBpiolTpVlPY2yj5xSepyILTjDyM6UvbbdHMZw==
 
 object-visit@^1.0.0:
   version "1.0.1"

From 536f4d844f5d13d96a6c2c93cafe3b6788c4c8dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 2 Sep 2021 09:46:38 +0200
Subject: [PATCH 65/83] changeset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/real-pugs-rhyme.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/real-pugs-rhyme.md

diff --git a/.changeset/real-pugs-rhyme.md b/.changeset/real-pugs-rhyme.md
new file mode 100644
index 0000000000..94cec27487
--- /dev/null
+++ b/.changeset/real-pugs-rhyme.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Updated dependencies

From eb81a5fdfbadc53e7f779840b7be82cfdcc41c0f Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 09:30:32 +0200
Subject: [PATCH 66/83] Implement `offset` and `limit` based paging in search
 API

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 packages/search-common/src/types.ts          |  4 +++-
 plugins/search-backend/src/service/router.ts | 12 +++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/search-common/src/types.ts b/packages/search-common/src/types.ts
index 2a4447efac..0bd12fbd42 100644
--- a/packages/search-common/src/types.ts
+++ b/packages/search-common/src/types.ts
@@ -19,7 +19,8 @@ export interface SearchQuery {
   term: string;
   filters?: JsonObject;
   types?: string[];
-  pageCursor: string;
+  offset?: number;
+  limit?: number;
 }
 
 export interface SearchResult {
@@ -29,6 +30,7 @@ export interface SearchResult {
 
 export interface SearchResultSet {
   results: SearchResult[];
+  totalCount: number;
 }
 
 /**
diff --git a/plugins/search-backend/src/service/router.ts b/plugins/search-backend/src/service/router.ts
index 3a0a43522e..5a87fb1734 100644
--- a/plugins/search-backend/src/service/router.ts
+++ b/plugins/search-backend/src/service/router.ts
@@ -36,15 +36,21 @@ export async function createRouter({
       req: express.Request<any, unknown, unknown, SearchQuery>,
       res: express.Response<SearchResultSet>,
     ) => {
-      const { term, filters = {}, pageCursor = '' } = req.query;
+      const { term, filters = {}, types, offset, limit } = req.query;
       logger.info(
         `Search request received: term="${term}", filters=${JSON.stringify(
           filters,
-        )}, ${pageCursor}`,
+        )}, offset=${offset ?? ''}, limit=${limit ?? ''}`,
       );
 
       try {
-        const results = await engine?.query(req.query);
+        const results = await engine?.query({
+          term,
+          types,
+          filters,
+          offset: offset ? Number(offset) : undefined,
+          limit: limit ? Number(limit) : undefined,
+        });
         res.send(results);
       } catch (err) {
         throw new Error(

From 3abef1177e833d59e1c2f4377d4d98ee241e0aeb Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 09:30:55 +0200
Subject: [PATCH 67/83] Implement `offset` and `limit` based paging in Lunr
 search engine

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../src/engines/LunrSearchEngine.test.ts      | 123 +++++++++++++++---
 .../src/engines/LunrSearchEngine.ts           |  11 +-
 2 files changed, 111 insertions(+), 23 deletions(-)

diff --git a/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts b/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
index 3233c3adae..71c2b95a29 100644
--- a/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
+++ b/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
@@ -48,14 +48,12 @@ describe('LunrSearchEngine', () => {
       await testLunrSearchEngine.query({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
 
       // Then: the translator is invoked with expected args.
       expect(translatorSpy).toHaveBeenCalledWith({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
     });
 
@@ -68,12 +66,101 @@ describe('LunrSearchEngine', () => {
       const actualTranslatedQuery = translatorUnderTest({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
+        offset: 0,
+        limit: 50,
       }) as ConcreteLunrQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
         documentTypes: undefined,
         lunrQueryBuilder: expect.any(Function),
+        offset: 0,
+        limit: 50,
+      });
+
+      const query: jest.Mocked<lunr.Query> = {
+        allFields: [],
+        clauses: [],
+        term: jest.fn(),
+        clause: jest.fn(),
+      };
+
+      actualTranslatedQuery.lunrQueryBuilder.bind(query)(query);
+
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 100,
+        usePipeline: true,
+      });
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 10,
+        usePipeline: false,
+        wildcard: lunr.Query.wildcard.TRAILING,
+      });
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 1,
+        usePipeline: false,
+        editDistance: 2,
+      });
+    });
+
+    it('should have default offset and limit', async () => {
+      const inspectableSearchEngine = new LunrSearchEngineForTranslatorTests({
+        logger: getVoidLogger(),
+      });
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+
+      const actualTranslatedQuery = translatorUnderTest({
+        term: 'testTerm',
+      }) as ConcreteLunrQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        documentTypes: undefined,
+        lunrQueryBuilder: expect.any(Function),
+        offset: 0,
+        limit: 25,
+      });
+
+      const query: jest.Mocked<lunr.Query> = {
+        allFields: [],
+        clauses: [],
+        term: jest.fn(),
+        clause: jest.fn(),
+      };
+
+      actualTranslatedQuery.lunrQueryBuilder.bind(query)(query);
+
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 100,
+        usePipeline: true,
+      });
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 10,
+        usePipeline: false,
+        wildcard: lunr.Query.wildcard.TRAILING,
+      });
+      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
+        boost: 1,
+        usePipeline: false,
+        editDistance: 2,
+      });
+    });
+
+    it('should have maximum limit', async () => {
+      const inspectableSearchEngine = new LunrSearchEngineForTranslatorTests({
+        logger: getVoidLogger(),
+      });
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+
+      const actualTranslatedQuery = translatorUnderTest({
+        term: 'testTerm',
+        offset: 0,
+        limit: 1000,
+      }) as ConcreteLunrQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        documentTypes: undefined,
+        lunrQueryBuilder: expect.any(Function),
+        offset: 0,
+        limit: 100,
       });
 
       const query: jest.Mocked<lunr.Query> = {
@@ -110,7 +197,6 @@ describe('LunrSearchEngine', () => {
       const actualTranslatedQuery = translatorUnderTest({
         term: 'testTerm',
         filters: { kind: 'testKind' },
-        pageCursor: '',
       }) as ConcreteLunrQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -156,7 +242,6 @@ describe('LunrSearchEngine', () => {
       const actualTranslatedQuery = translatorUnderTest({
         term: 'testTerm',
         filters: { kind: 'testKind', namespace: 'testNameSpace' },
-        pageCursor: '',
       }) as ConcreteLunrQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -206,7 +291,6 @@ describe('LunrSearchEngine', () => {
       const actualTranslatedQuery = translatorUnderTest({
         term: 'testTerm',
         filters: { kind: 'testKind' },
-        pageCursor: '',
       }) as ConcreteLunrQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -235,18 +319,16 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
 
       expect(querySpy).toHaveBeenCalled();
       expect(querySpy).toHaveBeenCalledWith({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 0 results as nothing is indexed here
-      expect(mockedSearchResult).toMatchObject({ results: [] });
+      expect(mockedSearchResult).toMatchObject({ results: [], totalCount: 0 });
     });
 
     it('should perform search query and return 0 results on no match', async () => {
@@ -265,11 +347,10 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'unknown',
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 0 results as we are mocking the indexing of 1 document but with no match on the fields
-      expect(mockedSearchResult).toMatchObject({ results: [] });
+      expect(mockedSearchResult).toMatchObject({ results: [], totalCount: 0 });
     });
 
     it('should perform search query and return all results on empty term', async () => {
@@ -288,7 +369,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: '',
         filters: {},
-        pageCursor: '',
       });
 
       expect(mockedSearchResult).toMatchObject({
@@ -302,6 +382,7 @@ describe('LunrSearchEngine', () => {
             type: 'test-index',
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -321,7 +402,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         filters: {},
-        pageCursor: '',
       });
 
       expect(mockedSearchResult).toMatchObject({
@@ -334,6 +414,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -353,7 +434,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         filters: {},
-        pageCursor: '',
       });
 
       expect(mockedSearchResult).toMatchObject({
@@ -366,6 +446,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -385,7 +466,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitel', // Intentional typo
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 1 result as we are mocking the indexing of 1 document with match on the title field
@@ -399,6 +479,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -418,7 +499,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'World',
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 1 result as we are mocking the indexing of 1 document with match on the title field
@@ -432,6 +512,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -451,7 +532,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'Search',
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 1 result as we are mocking the indexing of 1 document with match on the title field
@@ -465,6 +545,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -489,7 +570,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         filters: { location: 'test/location2' },
-        pageCursor: '',
       });
 
       // Should return 1 of 2 results as we are
@@ -505,6 +585,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -532,7 +613,6 @@ describe('LunrSearchEngine', () => {
       // Perform search query scoped to "test-index-2" with a filter on the field "extraField"
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
-        pageCursor: '',
         filters: { extraField: 'testExtraField' },
       });
 
@@ -547,6 +627,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -571,7 +652,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         filters: { location: 'test:location2' },
-        pageCursor: '',
       });
 
       // Should return 1 of 2 results as we are
@@ -587,6 +667,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 1,
       });
     });
 
@@ -625,7 +706,6 @@ describe('LunrSearchEngine', () => {
       const mockedSearchResult = await testLunrSearchEngine.query({
         term: 'testTitle',
         types: ['test-index-2'],
-        pageCursor: '',
       });
 
       expect(mockedSearchResult).toMatchObject({
@@ -645,6 +725,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
+        totalCount: 2,
       });
     });
   });
diff --git a/plugins/search-backend-node/src/engines/LunrSearchEngine.ts b/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
index 0cb4fd8336..75e5fdc625 100644
--- a/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
+++ b/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
@@ -27,6 +27,8 @@ import { Logger } from 'winston';
 export type ConcreteLunrQuery = {
   lunrQueryBuilder: lunr.Index.QueryBuilder;
   documentTypes?: string[];
+  offset: number;
+  limit: number;
 };
 
 type LunrResultEnvelope = {
@@ -50,6 +52,8 @@ export class LunrSearchEngine implements SearchEngine {
     term,
     filters,
     types,
+    offset,
+    limit,
   }: SearchQuery): ConcreteLunrQuery => {
     return {
       lunrQueryBuilder: q => {
@@ -107,6 +111,8 @@ export class LunrSearchEngine implements SearchEngine {
         }
       },
       documentTypes: types,
+      offset: offset ?? 0,
+      limit: Math.min(limit ?? 25, 100),
     };
   };
 
@@ -141,7 +147,7 @@ export class LunrSearchEngine implements SearchEngine {
   }
 
   async query(query: SearchQuery): Promise<SearchResultSet> {
-    const { lunrQueryBuilder, documentTypes } = this.translator(
+    const { lunrQueryBuilder, documentTypes, offset, limit } = this.translator(
       query,
     ) as ConcreteLunrQuery;
 
@@ -179,9 +185,10 @@ export class LunrSearchEngine implements SearchEngine {
 
     // Translate results into SearchResultSet
     const realResultSet: SearchResultSet = {
-      results: results.map(d => {
+      results: results.slice(offset, offset + limit).map(d => {
         return { type: d.type, document: this.docStore[d.result.ref] };
       }),
+      totalCount: results.length,
     };
 
     return realResultSet;

From 81cf103cf65ca925a0244962f4dcb1d6e2d46bcd Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 09:31:10 +0200
Subject: [PATCH 68/83] Implement `offset` and `limit` based paging in elastic
 search engine

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../engines/ElasticSearchSearchEngine.test.ts | 100 +++++++++++++++---
 .../src/engines/ElasticSearchSearchEngine.ts  |   8 +-
 2 files changed, 89 insertions(+), 19 deletions(-)

diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
index b4bba9de9c..18ee1314ce 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
@@ -87,13 +87,11 @@ describe('ElasticSearchSearchEngine', () => {
       await testSearchEngine.query({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
 
       expect(translatorSpy).toHaveBeenCalledWith({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
     });
 
@@ -104,7 +102,6 @@ describe('ElasticSearchSearchEngine', () => {
         types: ['indexName'],
         term: 'testTerm',
         filters: { kind: 'testKind' },
-        pageCursor: '',
       }) as ConcreteElasticSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -132,6 +129,79 @@ describe('ElasticSearchSearchEngine', () => {
             },
           },
         },
+        from: 0,
+        size: 25,
+      });
+    });
+
+    it('should pass offset and limit', async () => {
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+
+      const actualTranslatedQuery = translatorUnderTest({
+        types: ['indexName'],
+        term: 'testTerm',
+        offset: 25,
+        limit: 50,
+      }) as ConcreteElasticSearchQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        documentTypes: ['indexName'],
+        elasticSearchQuery: expect.any(Object),
+      });
+
+      const queryBody = actualTranslatedQuery.elasticSearchQuery;
+
+      expect(queryBody).toEqual({
+        query: {
+          bool: {
+            filter: [],
+            must: {
+              multi_match: {
+                query: 'testTerm',
+                fields: ['*'],
+                fuzziness: 'auto',
+                minimum_should_match: 1,
+              },
+            },
+          },
+        },
+        from: 25,
+        size: 50,
+      });
+    });
+
+    it('should have maximum limit of 100', async () => {
+      const translatorUnderTest = inspectableSearchEngine.getTranslator();
+
+      const actualTranslatedQuery = translatorUnderTest({
+        types: ['indexName'],
+        term: 'testTerm',
+        offset: 25,
+        limit: 500,
+      }) as ConcreteElasticSearchQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        documentTypes: ['indexName'],
+        elasticSearchQuery: expect.any(Object),
+      });
+
+      const queryBody = actualTranslatedQuery.elasticSearchQuery;
+
+      expect(queryBody).toEqual({
+        query: {
+          bool: {
+            filter: [],
+            must: {
+              multi_match: {
+                query: 'testTerm',
+                fields: ['*'],
+                fuzziness: 'auto',
+                minimum_should_match: 1,
+              },
+            },
+          },
+        },
+        from: 25,
         size: 100,
       });
     });
@@ -143,7 +213,6 @@ describe('ElasticSearchSearchEngine', () => {
         types: ['indexName'],
         term: 'testTerm',
         filters: { kind: 'testKind', namespace: 'testNameSpace' },
-        pageCursor: '',
       }) as ConcreteElasticSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -178,7 +247,8 @@ describe('ElasticSearchSearchEngine', () => {
             ],
           },
         },
-        size: 100,
+        from: 0,
+        size: 25,
       });
     });
 
@@ -189,7 +259,6 @@ describe('ElasticSearchSearchEngine', () => {
         types: ['indexName'],
         term: 'testTerm',
         filters: { kind: ['testKind', 'kastTeint'] },
-        pageCursor: '',
       }) as ConcreteElasticSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -228,7 +297,8 @@ describe('ElasticSearchSearchEngine', () => {
             },
           },
         },
-        size: 100,
+        from: 0,
+        size: 25,
       });
     });
 
@@ -239,7 +309,6 @@ describe('ElasticSearchSearchEngine', () => {
           types: ['indexName'],
           term: 'testTerm',
           filters: { kind: { a: 'b' } },
-          pageCursor: '',
         }) as ConcreteElasticSearchQuery;
       expect(actualTranslatedQuery).toThrow();
     });
@@ -315,11 +384,10 @@ describe('ElasticSearchSearchEngine', () => {
       const mockedSearchResult = await testSearchEngine.query({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
 
       // Should return 0 results as nothing is indexed here
-      expect(mockedSearchResult).toMatchObject({ results: [] });
+      expect(mockedSearchResult).toMatchObject({ results: [], totalCount: 0 });
     });
 
     it('should handle index/search type filtering correctly', async () => {
@@ -327,7 +395,6 @@ describe('ElasticSearchSearchEngine', () => {
       await testSearchEngine.query({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
       });
 
       expect(elasticSearchQuerySpy).toHaveBeenCalled();
@@ -346,7 +413,8 @@ describe('ElasticSearchSearchEngine', () => {
               filter: [],
             },
           },
-          size: 100,
+          from: 0,
+          size: 25,
         },
         index: '*__search',
       });
@@ -359,7 +427,6 @@ describe('ElasticSearchSearchEngine', () => {
       await testSearchEngine.query({
         term: '',
         filters: {},
-        pageCursor: '',
       });
 
       expect(elasticSearchQuerySpy).toHaveBeenCalled();
@@ -373,7 +440,8 @@ describe('ElasticSearchSearchEngine', () => {
               filter: [],
             },
           },
-          size: 100,
+          from: 0,
+          size: 25,
         },
         index: '*__search',
       });
@@ -386,7 +454,6 @@ describe('ElasticSearchSearchEngine', () => {
       await testSearchEngine.query({
         term: '',
         filters: {},
-        pageCursor: '',
         types: ['test-type'],
       });
 
@@ -401,7 +468,8 @@ describe('ElasticSearchSearchEngine', () => {
               filter: [],
             },
           },
-          size: 100,
+          from: 0,
+          size: 25,
         },
         index: ['test-type__search'],
       });
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
index d1e831b2ca..c1c959778b 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
@@ -140,6 +140,8 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     term,
     filters = {},
     types,
+    offset,
+    limit,
   }: SearchQuery): ConcreteElasticSearchQuery {
     const filter = Object.entries(filters)
       .filter(([_, value]) => Boolean(value))
@@ -172,9 +174,8 @@ export class ElasticSearchSearchEngine implements SearchEngine {
       elasticSearchQuery: esb
         .requestBodySearch()
         .query(esb.boolQuery().filter(filter).must([query]))
-        // TODO: Replace size limit with page cursor after pagination approach decided
-        // See: https://github.com/backstage/backstage/issues/6062
-        .size(100)
+        .from(offset ?? 0)
+        .size(Math.min(limit ?? 25, 100))
         .toJSON(),
       documentTypes: types,
     };
@@ -262,6 +263,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
           type: this.getTypeFromIndex(d._index),
           document: d._source,
         })),
+        totalCount: result.body.hits.total.value,
       };
     } catch (e) {
       this.logger.error(

From 487b84b4a0079dafc90fa5f61078c95006d25ccb Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 09:31:23 +0200
Subject: [PATCH 69/83] Implement `offset` and `limit` based paging in pg
 search engine

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../src/PgSearchEngine/PgSearchEngine.test.ts | 53 +++++++++--
 .../src/PgSearchEngine/PgSearchEngine.ts      | 15 ++-
 .../database/DatabaseDocumentStore.test.ts    | 94 ++++++++++++++++++-
 .../src/database/DatabaseDocumentStore.ts     | 44 ++++++---
 .../src/database/types.ts                     |  3 +
 5 files changed, 185 insertions(+), 24 deletions(-)

diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts
index 7bedee6dea..0940e4d550 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts
@@ -27,6 +27,7 @@ describe('PgSearchEngine', () => {
       transaction: jest.fn(),
       insertDocuments: jest.fn(),
       query: jest.fn(),
+      count: jest.fn(),
       completeInsert: jest.fn(),
       prepareInsert: jest.fn(),
     };
@@ -44,24 +45,55 @@ describe('PgSearchEngine', () => {
       await searchEngine.query({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
+        offset: 25,
+        limit: 50,
       });
 
       expect(translatorSpy).toHaveBeenCalledWith({
         term: 'testTerm',
         filters: {},
-        pageCursor: '',
+        offset: 25,
+        limit: 50,
+      });
+    });
+
+    it('should pass offset and limit', async () => {
+      const actualTranslatedQuery = searchEngine.translator({
+        term: 'Hello',
+        offset: 25,
+        limit: 50,
+      }) as PgSearchQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        pgTerm: '("Hello" | "Hello":*)',
+        offset: 25,
+        limit: 50,
+      });
+    });
+
+    it('should have maximum limit of 100', async () => {
+      const actualTranslatedQuery = searchEngine.translator({
+        term: 'Hello',
+        offset: 25,
+        limit: 1000,
+      }) as PgSearchQuery;
+
+      expect(actualTranslatedQuery).toMatchObject({
+        pgTerm: '("Hello" | "Hello":*)',
+        offset: 25,
+        limit: 100,
       });
     });
 
     it('should return translated query term', async () => {
       const actualTranslatedQuery = searchEngine.translator({
         term: 'Hello World',
-        pageCursor: '',
       }) as PgSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
         pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        offset: 0,
+        limit: 25,
       });
     });
 
@@ -81,13 +113,14 @@ describe('PgSearchEngine', () => {
         term: 'testTerm',
         filters: { kind: 'testKind' },
         types: ['my-filter'],
-        pageCursor: '',
       }) as PgSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
         pgTerm: '("testTerm" | "testTerm":*)',
         fields: { kind: 'testKind' },
         types: ['my-filter'],
+        offset: 0,
+        limit: 25,
       });
     });
   });
@@ -138,6 +171,7 @@ describe('PgSearchEngine', () => {
   describe('query', () => {
     it('should perform query', async () => {
       database.transaction.mockImplementation(fn => fn(tx));
+      database.count.mockResolvedValue(1337);
       database.query.mockResolvedValue([
         {
           document: {
@@ -151,7 +185,6 @@ describe('PgSearchEngine', () => {
 
       const results = await searchEngine.query({
         term: 'Hello World',
-        pageCursor: '',
       });
 
       expect(results).toEqual({
@@ -165,10 +198,18 @@ describe('PgSearchEngine', () => {
             type: 'my-type',
           },
         ],
+        totalCount: 1337,
       });
-      expect(database.transaction).toHaveBeenCalledTimes(1);
+      expect(database.transaction).toHaveBeenCalledTimes(2);
       expect(database.query).toHaveBeenCalledWith(tx, {
         pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        offset: 0,
+        limit: 25,
+      });
+      expect(database.count).toHaveBeenCalledWith(tx, {
+        pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        offset: 0,
+        limit: 25,
       });
     });
   });
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
index 74a1e09010..d5cf498cc1 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
@@ -56,6 +56,8 @@ export class PgSearchEngine implements SearchEngine {
         .join('&'),
       fields: query.filters as Record<string, string | string[]>,
       types: query.types,
+      offset: query.offset ?? 0,
+      limit: Math.min(query.limit ?? 25, 100),
     };
   }
 
@@ -79,14 +81,19 @@ export class PgSearchEngine implements SearchEngine {
   async query(query: SearchQuery): Promise<SearchResultSet> {
     const pgQuery = this.translator(query);
 
-    const rows = await this.databaseStore.transaction(async tx =>
-      this.databaseStore.query(tx, pgQuery),
-    );
+    const [rows, totalCount] = await Promise.all([
+      this.databaseStore.transaction(async tx =>
+        this.databaseStore.query(tx, pgQuery),
+      ),
+      this.databaseStore.transaction(async tx =>
+        this.databaseStore.count(tx, pgQuery),
+      ),
+    ]);
     const results = rows.map(({ type, document }) => ({
       type,
       document,
     }));
 
-    return { results };
+    return { results, totalCount };
   }
 }
diff --git a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
index b860faca6a..a456d0caf5 100644
--- a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
+++ b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
@@ -192,6 +192,83 @@ describe('DatabaseDocumentStore', () => {
       60_000,
     );
 
+    it.each(databases.eachSupportedId())(
+      'should return requested range, %p',
+      async databaseId => {
+        const { store } = await createStore(databaseId);
+
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'test', [
+            {
+              title: 'Lorem Ipsum',
+              text: 'Hello World',
+              location: 'LOCATION-1',
+            },
+            {
+              title: 'Hello World',
+              text: 'Around the world',
+              location: 'LOCATION-1',
+            },
+            {
+              title: 'Another one',
+              text: 'From the next page',
+              location: 'LOCATION-1',
+            },
+          ]);
+          await store.completeInsert(tx, 'test');
+        });
+
+        const rows = await store.transaction(tx =>
+          store.query(tx, { pgTerm: 'Hello & World', offset: 1, limit: 1 }),
+        );
+
+        expect(rows).toEqual([
+          {
+            document: {
+              location: 'LOCATION-1',
+              text: 'Hello World',
+              title: 'Lorem Ipsum',
+            },
+            rank: expect.any(Number),
+            type: 'test',
+          },
+        ]);
+      },
+      60_000,
+    );
+
+    it.each(databases.eachSupportedId())(
+      'count by term, %p',
+      async databaseId => {
+        const { store } = await createStore(databaseId);
+
+        await store.transaction(async tx => {
+          await store.prepareInsert(tx);
+          await store.insertDocuments(tx, 'test', [
+            {
+              title: 'Lorem Ipsum',
+              text: 'Hello World',
+              location: 'LOCATION-1',
+            },
+            {
+              title: 'Hello World',
+              text: 'Around the world',
+              location: 'LOCATION-1',
+            },
+          ]);
+          await store.completeInsert(tx, 'test');
+        });
+
+        const totalCount = await store.transaction(tx =>
+          store.count(tx, { pgTerm: 'Hello & World', offset: 0, limit: 25 }),
+        );
+
+        expect(totalCount).toEqual(2);
+      },
+      60_000,
+    );
+
     it.each(databases.eachSupportedId())(
       'query by term, %p',
       async databaseId => {
@@ -215,7 +292,7 @@ describe('DatabaseDocumentStore', () => {
         });
 
         const rows = await store.transaction(tx =>
-          store.query(tx, { pgTerm: 'Hello & World' }),
+          store.query(tx, { pgTerm: 'Hello & World', offset: 0, limit: 25 }),
         );
 
         expect(rows).toEqual([
@@ -271,7 +348,12 @@ describe('DatabaseDocumentStore', () => {
         });
 
         const rows = await store.transaction(tx =>
-          store.query(tx, { pgTerm: 'Hello & World', types: ['my-type'] }),
+          store.query(tx, {
+            pgTerm: 'Hello & World',
+            types: ['my-type'],
+            offset: 0,
+            limit: 25,
+          }),
         );
 
         expect(rows).toEqual([
@@ -322,6 +404,8 @@ describe('DatabaseDocumentStore', () => {
           store.query(tx, {
             pgTerm: 'Hello & World',
             fields: { myField: 'this' },
+            offset: 0,
+            limit: 25,
           }),
         );
 
@@ -374,6 +458,8 @@ describe('DatabaseDocumentStore', () => {
           store.query(tx, {
             pgTerm: 'Hello & World',
             fields: { myField: ['this', 'that'] },
+            offset: 0,
+            limit: 25,
           }),
         );
 
@@ -433,6 +519,8 @@ describe('DatabaseDocumentStore', () => {
           store.query(tx, {
             pgTerm: 'Hello & World',
             fields: { myField: 'this', otherField: 'another' },
+            offset: 0,
+            limit: 25,
           }),
         );
 
@@ -480,6 +568,8 @@ describe('DatabaseDocumentStore', () => {
         const rows = await store.transaction(tx =>
           store.query(tx, {
             fields: { myField: 'this' },
+            offset: 0,
+            limit: 25,
           }),
         );
 
diff --git a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts
index 77f15746a6..80398ec707 100644
--- a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts
+++ b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts
@@ -128,7 +128,7 @@ export class DatabaseDocumentStore implements DatabaseStore {
 
   async query(
     tx: Knex.Transaction,
-    { types, pgTerm, fields }: PgSearchQuery,
+    searchQuery: PgSearchQuery,
   ): Promise<DocumentResultRow[]> {
     // Builds a query like:
     // SELECT ts_rank_cd(body, query) AS rank,  type, document
@@ -136,6 +136,36 @@ export class DatabaseDocumentStore implements DatabaseStore {
     // WHERE query @@ body AND (document @> '{"kind": "API"}')
     // ORDER BY rank DESC
     // LIMIT 10;
+    const query = this.buildQuery(tx, searchQuery);
+
+    query.select('type', 'document');
+
+    const { pgTerm, limit, offset } = searchQuery;
+
+    if (pgTerm) {
+      query
+        .select(tx.raw('ts_rank_cd(body, query) AS "rank"'))
+        .orderBy('rank', 'desc');
+    } else {
+      query.select(tx.raw('1 as rank'));
+    }
+
+    return await query.offset(offset).limit(limit);
+  }
+
+  async count(
+    tx: Knex.Transaction,
+    searchQuery: PgSearchQuery,
+  ): Promise<number> {
+    const query = this.buildQuery(tx, searchQuery);
+    const [row] = await query.count();
+    return Number(row.count);
+  }
+
+  private buildQuery(
+    tx: Knex.Transaction,
+    { types, pgTerm, fields }: PgSearchQuery,
+  ) {
     const query = tx<DocumentResultRow>('documents');
 
     if (pgTerm) {
@@ -164,16 +194,6 @@ export class DatabaseDocumentStore implements DatabaseStore {
       });
     }
 
-    query.select('type', 'document');
-
-    if (pgTerm) {
-      query
-        .select(tx.raw('ts_rank_cd(body, query) AS "rank"'))
-        .orderBy('rank', 'desc');
-    } else {
-      query.select(tx.raw('1 as rank'));
-    }
-
-    return await query.limit(100);
+    return query;
   }
 }
diff --git a/plugins/search-backend-module-pg/src/database/types.ts b/plugins/search-backend-module-pg/src/database/types.ts
index 8c98628caf..f8425c41b6 100644
--- a/plugins/search-backend-module-pg/src/database/types.ts
+++ b/plugins/search-backend-module-pg/src/database/types.ts
@@ -20,6 +20,8 @@ export interface PgSearchQuery {
   fields?: Record<string, string | string[]>;
   types?: string[];
   pgTerm?: string;
+  offset: number;
+  limit: number;
 }
 
 export interface DatabaseStore {
@@ -35,6 +37,7 @@ export interface DatabaseStore {
     tx: Knex.Transaction,
     pgQuery: PgSearchQuery,
   ): Promise<DocumentResultRow[]>;
+  count(tx: Knex.Transaction, pgQuery: PgSearchQuery): Promise<number>;
 }
 
 export interface RawDocumentRow {

From 6876c48423987812c5c13b5120eeff5ff6bb628d Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 11:17:32 +0200
Subject: [PATCH 70/83] Implement `offset` and `limit` based paging in frontend

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../app/src/components/search/SearchPage.tsx  | 93 +++++++------------
 plugins/search/src/apis.test.ts               |  6 +-
 .../components/SearchBar/SearchBar.test.tsx   |  2 +-
 .../SearchContext/SearchContext.test.tsx      | 42 ++++++---
 .../SearchContext/SearchContext.tsx           | 47 +++++-----
 .../SearchFilter/SearchFilter.test.tsx        |  2 +-
 .../components/SearchPage/SearchPage.test.tsx | 24 +++--
 .../SearchResult/SearchResult.test.tsx        | 66 ++++++++++++-
 .../components/SearchResult/SearchResult.tsx  | 26 +++++-
 .../components/SearchType/SearchType.test.tsx |  2 +-
 10 files changed, 193 insertions(+), 117 deletions(-)

diff --git a/packages/app/src/components/search/SearchPage.tsx b/packages/app/src/components/search/SearchPage.tsx
index 9b0ae7eecf..1c8d750e08 100644
--- a/packages/app/src/components/search/SearchPage.tsx
+++ b/packages/app/src/components/search/SearchPage.tsx
@@ -14,20 +14,18 @@
  * limitations under the License.
  */
 
-import React, { useState } from 'react';
-import { makeStyles, Theme, Grid, List, Paper } from '@material-ui/core';
-import Pagination from '@material-ui/lab/Pagination';
+import { Content, Header, Lifecycle, Page } from '@backstage/core-components';
 import { CatalogResultListItem } from '@backstage/plugin-catalog';
 import {
+  DefaultResultListItem,
   SearchBar,
   SearchFilter,
   SearchResult,
   SearchType,
-  DefaultResultListItem,
 } from '@backstage/plugin-search';
-import { Content, Header, Lifecycle, Page } from '@backstage/core-components';
 import { DocsResultListItem } from '@backstage/plugin-techdocs';
-import { SearchResultSet } from '@backstage/search-common';
+import { Grid, List, makeStyles, Paper, Theme } from '@material-ui/core';
+import React from 'react';
 
 const useStyles = makeStyles((theme: Theme) => ({
   bar: {
@@ -43,59 +41,6 @@ const useStyles = makeStyles((theme: Theme) => ({
   },
 }));
 
-// TODO: Move this into the search plugin once pagination is natively supported.
-// See: https://github.com/backstage/backstage/issues/6062
-const SearchResultList = ({ results }: SearchResultSet) => {
-  const pageSize = 10;
-  const [page, setPage] = useState(1);
-  const changePage = (_: any, pageIndex: number) => {
-    setPage(pageIndex);
-  };
-  const pageAmount = Math.ceil((results.length || 0) / pageSize);
-  return (
-    <>
-      <List>
-        {results
-          .slice(pageSize * (page - 1), pageSize * page)
-          .map(({ type, document }) => {
-            switch (type) {
-              case 'software-catalog':
-                return (
-                  <CatalogResultListItem
-                    key={document.location}
-                    result={document}
-                  />
-                );
-              case 'techdocs':
-                return (
-                  <DocsResultListItem
-                    key={document.location}
-                    result={document}
-                  />
-                );
-              default:
-                return (
-                  <DefaultResultListItem
-                    key={document.location}
-                    result={document}
-                  />
-                );
-            }
-          })}
-      </List>
-      {pageAmount > 1 && (
-        <Pagination
-          count={pageAmount}
-          page={page}
-          onChange={changePage}
-          showFirstButton
-          showLastButton
-        />
-      )}
-    </>
-  );
-};
-
 const SearchPage = () => {
   const classes = useStyles();
   return (
@@ -129,7 +74,35 @@ const SearchPage = () => {
           </Grid>
           <Grid item xs={9}>
             <SearchResult>
-              {({ results }) => <SearchResultList results={results} />}
+              {({ results }) => (
+                <List>
+                  {results.map(({ type, document }) => {
+                    switch (type) {
+                      case 'software-catalog':
+                        return (
+                          <CatalogResultListItem
+                            key={document.location}
+                            result={document}
+                          />
+                        );
+                      case 'techdocs':
+                        return (
+                          <DocsResultListItem
+                            key={document.location}
+                            result={document}
+                          />
+                        );
+                      default:
+                        return (
+                          <DefaultResultListItem
+                            key={document.location}
+                            result={document}
+                          />
+                        );
+                    }
+                  })}
+                </List>
+              )}
             </SearchResult>
           </Grid>
         </Grid>
diff --git a/plugins/search/src/apis.test.ts b/plugins/search/src/apis.test.ts
index cc59ca1a77..38f34bb91b 100644
--- a/plugins/search/src/apis.test.ts
+++ b/plugins/search/src/apis.test.ts
@@ -21,7 +21,7 @@ describe('apis', () => {
     term: '',
     filters: {},
     types: [],
-    pageCursor: '',
+    page: {},
   };
 
   const baseUrl = 'https://base-url.com/';
@@ -53,7 +53,7 @@ describe('apis', () => {
   it('Fetch is called with expected URL (including stringified Q params)', async () => {
     await client.query(query);
     expect(getBaseUrl).toHaveBeenLastCalledWith('search/query');
-    expect(fetch).toHaveBeenLastCalledWith(`${baseUrl}?term=&pageCursor=`, {
+    expect(fetch).toHaveBeenLastCalledWith(`${baseUrl}?term=`, {
       headers: {},
     });
   });
@@ -65,7 +65,7 @@ describe('apis', () => {
     });
     await authedClient.query(query);
     expect(getBaseUrl).toHaveBeenLastCalledWith('search/query');
-    expect(fetch).toHaveBeenLastCalledWith(`${baseUrl}?term=&pageCursor=`, {
+    expect(fetch).toHaveBeenLastCalledWith(`${baseUrl}?term=`, {
       headers: { Authorization: `Bearer ${token}` },
     });
   });
diff --git a/plugins/search/src/components/SearchBar/SearchBar.test.tsx b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
index b99b375252..acfeb2cb8b 100644
--- a/plugins/search/src/components/SearchBar/SearchBar.test.tsx
+++ b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
@@ -30,7 +30,7 @@ jest.mock('@backstage/core-plugin-api', () => ({
 describe('SearchBar', () => {
   const initialState = {
     term: '',
-    pageCursor: '',
+    page: {},
     filters: {},
     types: ['*'],
   };
diff --git a/plugins/search/src/components/SearchContext/SearchContext.test.tsx b/plugins/search/src/components/SearchContext/SearchContext.test.tsx
index 4de2a8f0a6..c1618be5ec 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.test.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.test.tsx
@@ -38,7 +38,7 @@ describe('SearchContext', () => {
 
   const initialState = {
     term: '',
-    pageCursor: '',
+    page: {},
     filters: {},
     types: ['*'],
   };
@@ -93,22 +93,26 @@ describe('SearchContext', () => {
       initialProps: {
         initialState: {
           ...initialState,
-          pageCursor: '1',
+          page: { offset: 0, limit: 25 },
         },
       },
     });
 
     await waitForNextUpdate();
 
-    expect(result.current.pageCursor).toBe('1');
+    expect(result.current.page).toEqual({ offset: 0, limit: 25 });
 
     act(() => {
       result.current.setTerm('first term');
     });
 
+    act(() => {
+      result.current.setPage({ offset: 75, limit: 25 });
+    });
+
     await waitForNextUpdate();
 
-    expect(result.current.pageCursor).toBe('1');
+    expect(result.current.page).toEqual({ offset: 75, limit: 25 });
 
     act(() => {
       result.current.setTerm('second term');
@@ -116,7 +120,7 @@ describe('SearchContext', () => {
 
     await waitForNextUpdate();
 
-    expect(result.current.pageCursor).toBe('');
+    expect(result.current.page).toEqual({ offset: 0, limit: 25 });
   });
 
   describe('Performs search (and sets results)', () => {
@@ -139,7 +143,10 @@ describe('SearchContext', () => {
       await waitForNextUpdate();
 
       expect(query).toHaveBeenLastCalledWith({
-        ...initialState,
+        filters: {},
+        types: ['*'],
+        limit: undefined,
+        offset: undefined,
         term,
       });
     });
@@ -163,12 +170,15 @@ describe('SearchContext', () => {
       await waitForNextUpdate();
 
       expect(query).toHaveBeenLastCalledWith({
-        ...initialState,
         filters,
+        types: ['*'],
+        limit: undefined,
+        offset: undefined,
+        term: '',
       });
     });
 
-    it('When pageCursor is set', async () => {
+    it('When page is set', async () => {
       const { result, waitForNextUpdate } = renderHook(() => useSearch(), {
         wrapper,
         initialProps: {
@@ -178,17 +188,20 @@ describe('SearchContext', () => {
 
       await waitForNextUpdate();
 
-      const pageCursor = 'pageCursor';
+      const page = { offset: 25, limit: 50 };
 
       act(() => {
-        result.current.setPageCursor(pageCursor);
+        result.current.setPage(page);
       });
 
       await waitForNextUpdate();
 
       expect(query).toHaveBeenLastCalledWith({
-        ...initialState,
-        pageCursor,
+        filters: {},
+        types: ['*'],
+        limit: 50,
+        offset: 25,
+        term: '',
       });
     });
 
@@ -211,8 +224,11 @@ describe('SearchContext', () => {
       await waitForNextUpdate();
 
       expect(query).toHaveBeenLastCalledWith({
-        ...initialState,
         types,
+        filters: {},
+        limit: undefined,
+        offset: undefined,
+        term: '',
       });
     });
   });
diff --git a/plugins/search/src/components/SearchContext/SearchContext.tsx b/plugins/search/src/components/SearchContext/SearchContext.tsx
index 45a74f5355..018496876b 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.tsx
@@ -14,19 +14,21 @@
  * limitations under the License.
  */
 
-import React, {
-  PropsWithChildren,
-  createContext,
-  useContext,
-  useState,
-  useEffect,
-} from 'react';
-import { useAsync, usePrevious } from 'react-use';
-import { SearchResultSet } from '@backstage/search-common';
-import { searchApiRef } from '../../apis';
-import { AsyncState } from 'react-use/lib/useAsync';
 import { JsonObject } from '@backstage/config';
 import { useApi } from '@backstage/core-plugin-api';
+import { SearchResultSet } from '@backstage/search-common';
+import React, {
+  createContext,
+  PropsWithChildren,
+  useContext,
+  useEffect,
+  useState,
+} from 'react';
+import { useAsync, usePrevious } from 'react-use';
+import { AsyncState } from 'react-use/lib/useAsync';
+import { searchApiRef } from '../../apis';
+
+type Page = { limit?: number; offset?: number };
 
 type SearchContextValue = {
   result: AsyncState<SearchResultSet>;
@@ -36,13 +38,13 @@ type SearchContextValue = {
   setTypes: React.Dispatch<React.SetStateAction<string[]>>;
   filters: JsonObject;
   setFilters: React.Dispatch<React.SetStateAction<JsonObject>>;
-  pageCursor: string;
-  setPageCursor: React.Dispatch<React.SetStateAction<string>>;
+  page: Page;
+  setPage: React.Dispatch<React.SetStateAction<Page>>;
 };
 
 type SettableSearchContext = Omit<
   SearchContextValue,
-  'result' | 'setTerm' | 'setTypes' | 'setFilters' | 'setPageCursor'
+  'result' | 'setTerm' | 'setTypes' | 'setFilters' | 'setPage'
 >;
 
 export const SearchContext = createContext<SearchContextValue | undefined>(
@@ -52,14 +54,14 @@ export const SearchContext = createContext<SearchContextValue | undefined>(
 export const SearchContextProvider = ({
   initialState = {
     term: '',
-    pageCursor: '',
+    page: {},
     filters: {},
     types: [],
   },
   children,
 }: PropsWithChildren<{ initialState?: SettableSearchContext }>) => {
   const searchApi = useApi(searchApiRef);
-  const [pageCursor, setPageCursor] = useState<string>(initialState.pageCursor);
+  const [page, setPage] = useState<Page>(initialState.page);
   const [filters, setFilters] = useState<JsonObject>(initialState.filters);
   const [term, setTerm] = useState<string>(initialState.term);
   const [types, setTypes] = useState<string[]>(initialState.types);
@@ -70,18 +72,19 @@ export const SearchContextProvider = ({
       searchApi.query({
         term,
         filters,
-        pageCursor,
+        offset: page?.offset,
+        limit: page?.limit,
         types,
       }),
-    [term, filters, types, pageCursor],
+    [term, filters, types, page],
   );
 
   useEffect(() => {
     // Any time a term is reset, we want to start from page 0.
     if (term && prevTerm && term !== prevTerm) {
-      setPageCursor('');
+      setPage(initialState.page);
     }
-  }, [term, prevTerm]);
+  }, [term, prevTerm, initialState.page]);
 
   const value: SearchContextValue = {
     result,
@@ -91,8 +94,8 @@ export const SearchContextProvider = ({
     setTerm,
     types,
     setTypes,
-    pageCursor,
-    setPageCursor,
+    page,
+    setPage,
   };
 
   return <SearchContext.Provider value={value} children={children} />;
diff --git a/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx b/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
index e8c2f048b9..b5dd56bfb6 100644
--- a/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
+++ b/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
@@ -32,7 +32,7 @@ describe('SearchFilter', () => {
     term: '',
     filters: {},
     types: [],
-    pageCursor: '',
+    page: {},
   };
 
   const name = 'field';
diff --git a/plugins/search/src/components/SearchPage/SearchPage.test.tsx b/plugins/search/src/components/SearchPage/SearchPage.test.tsx
index c387d57b60..91568cddbe 100644
--- a/plugins/search/src/components/SearchPage/SearchPage.test.tsx
+++ b/plugins/search/src/components/SearchPage/SearchPage.test.tsx
@@ -74,21 +74,25 @@ describe('SearchPage', () => {
     const expectedTerm = 'justin bieber';
     const expectedTypes = ['software-catalog'];
     const expectedFilters = { [expectedFilterField]: expectedFilterValue };
-    const expectedPageCursor = 'page2-or-something';
+    const expectedOffset = 25;
+    const expectedLimit = 50;
 
-    // e.g. ?query=petstore&pageCursor=1&filters[lifecycle][]=experimental&filters[kind]=Component
+    // e.g. ?query=petstore&offset=25&limit=50&filters[lifecycle][]=experimental&filters[kind]=Component
     (useLocation as jest.Mock).mockReturnValueOnce({
-      search: `?query=${expectedTerm}&types[]=${expectedTypes[0]}&filters[${expectedFilterField}]=${expectedFilterValue}&pageCursor=${expectedPageCursor}`,
+      search: `?query=${expectedTerm}&types[]=${expectedTypes[0]}&filters[${expectedFilterField}]=${expectedFilterValue}&offset=${expectedOffset}&limit=${expectedLimit}`,
     });
 
     // When we render the page...
     await renderInTestApp(<SearchPage />);
 
-    // Then search context should be set with these values...
-    expect(setTermMock).toHaveBeenCalledWith(expectedTerm);
-    expect(setTypesMock).toHaveBeenCalledWith(expectedTypes);
-    expect(setPageCursorMock).toHaveBeenCalledWith(expectedPageCursor);
-    expect(setFiltersMock).toHaveBeenCalledWith(expectedFilters);
+    // Then search context should be initialized with these values...
+    const calls = (SearchContextProvider as jest.Mock).mock.calls[0];
+    const actualInitialState = calls[0].initialState;
+    expect(actualInitialState.term).toEqual(expectedTerm);
+    expect(actualInitialState.types).toEqual(expectedTypes);
+    expect(actualInitialState.page.limit).toEqual(expectedLimit);
+    expect(actualInitialState.page.offset).toEqual(expectedOffset);
+    expect(actualInitialState.filters).toStrictEqual(expectedFilters);
   });
 
   it('renders provided router element', async () => {
@@ -108,7 +112,7 @@ describe('SearchPage', () => {
     (useSearch as jest.Mock).mockReturnValueOnce({
       term: 'bieber',
       types: ['software-catalog'],
-      pageCursor: 'page2-or-something',
+      page: { offset: 25, limit: 50 },
       filters: { anyKey: 'anyValue' },
       setTerm: setTermMock,
       setTypes: setTypesMock,
@@ -116,7 +120,7 @@ describe('SearchPage', () => {
       setPageCursor: setPageCursorMock,
     });
     const expectedLocation = encodeURI(
-      '?query=bieber&types[]=software-catalog&pageCursor=page2-or-something&filters[anyKey]=anyValue',
+      '?query=bieber&types[]=software-catalog&offset=25&limit=50&filters[anyKey]=anyValue',
     );
 
     await renderInTestApp(<SearchPage />);
diff --git a/plugins/search/src/components/SearchResult/SearchResult.test.tsx b/plugins/search/src/components/SearchResult/SearchResult.test.tsx
index bb8f393d67..d28bcc9136 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.test.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.test.tsx
@@ -24,6 +24,7 @@ jest.mock('../SearchContext', () => ({
   ...jest.requireActual('../SearchContext'),
   useSearch: jest.fn().mockReturnValue({
     result: {},
+    page: {},
   }),
 }));
 
@@ -93,16 +94,73 @@ describe('SearchResult', () => {
 
   it('Calls children with results set to result.value', async () => {
     (useSearch as jest.Mock).mockReturnValueOnce({
-      result: { loading: false, error: '', value: { results: [] } },
+      result: {
+        loading: false,
+        error: '',
+        value: {
+          totalCount: 1,
+          results: [
+            {
+              type: 'some-type',
+              document: {
+                title: 'some-title',
+                text: 'some-text',
+                location: 'some-location',
+              },
+            },
+          ],
+        },
+      },
+      page: {},
     });
 
-    await renderInTestApp(
+    const { getByText } = await renderInTestApp(
       <SearchResult>
         {({ results }) => {
-          expect(results).toEqual([]);
-          return <></>;
+          return <>Results {results.length}</>;
         }}
       </SearchResult>,
     );
+
+    expect(getByText('Results 1')).toBeInTheDocument();
+  });
+
+  it('Starts on initial page if no offset is set', async () => {
+    (useSearch as jest.Mock).mockReturnValueOnce({
+      page: {},
+      result: {
+        loading: false,
+        error: '',
+        value: { results: [{}], totalCount: 100 },
+      },
+    });
+
+    const { getByLabelText } = await renderInTestApp(
+      <SearchResult>{({}) => <></>}</SearchResult>,
+    );
+
+    expect(getByLabelText('page 1')).toHaveAttribute('aria-current', 'true');
+    expect(getByLabelText('Go to page 2')).toBeInTheDocument();
+    expect(getByLabelText('Go to page 3')).toBeInTheDocument();
+    expect(getByLabelText('Go to page 4')).toBeInTheDocument();
+  });
+
+  it('Shows the right page', async () => {
+    (useSearch as jest.Mock).mockReturnValueOnce({
+      page: { offset: 25 },
+      result: {
+        loading: false,
+        error: '',
+        value: { results: [{}], totalCount: 63 },
+      },
+    });
+
+    const { getByLabelText } = await renderInTestApp(
+      <SearchResult>{({}) => <></>}</SearchResult>,
+    );
+
+    expect(getByLabelText('Go to page 1')).toBeInTheDocument();
+    expect(getByLabelText('page 2')).toHaveAttribute('aria-current', 'true');
+    expect(getByLabelText('Go to page 3')).toBeInTheDocument();
   });
 });
diff --git a/plugins/search/src/components/SearchResult/SearchResult.tsx b/plugins/search/src/components/SearchResult/SearchResult.tsx
index 26a2484a86..5ac2c86a79 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.tsx
@@ -20,16 +20,20 @@ import {
   ResponseErrorPanel,
 } from '@backstage/core-components';
 import { SearchResult } from '@backstage/search-common';
+import { Pagination } from '@material-ui/lab';
 import React from 'react';
 import { useSearch } from '../SearchContext';
 
 type Props = {
   children: (results: { results: SearchResult[] }) => JSX.Element;
+  initialPageSize?: number;
 };
 
-const SearchResultComponent = ({ children }: Props) => {
+const SearchResultComponent = ({ children, initialPageSize = 25 }: Props) => {
   const {
     result: { loading, error, value },
+    page,
+    setPage,
   } = useSearch();
 
   if (loading) {
@@ -48,7 +52,25 @@ const SearchResultComponent = ({ children }: Props) => {
     return <EmptyState missing="data" title="Sorry, no results were found" />;
   }
 
-  return children({ results: value.results });
+  const pageSize = page.limit ?? initialPageSize;
+  const totalPages = Math.ceil(value.totalCount / pageSize);
+  const currentPage = page.offset ? Math.floor(page.offset / pageSize) + 1 : 1;
+
+  const handlePageChange = (_: React.ChangeEvent<unknown>, pageNum: number) => {
+    setPage({ offset: (pageNum - 1) * pageSize, limit: pageSize });
+    window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
+  };
+
+  return (
+    <>
+      {children({ results: value.results })}
+      <Pagination
+        count={totalPages}
+        page={currentPage}
+        onChange={handlePageChange}
+      />
+    </>
+  );
 };
 
 export { SearchResultComponent as SearchResult };
diff --git a/plugins/search/src/components/SearchType/SearchType.test.tsx b/plugins/search/src/components/SearchType/SearchType.test.tsx
index b8bf59d13e..f8171b0779 100644
--- a/plugins/search/src/components/SearchType/SearchType.test.tsx
+++ b/plugins/search/src/components/SearchType/SearchType.test.tsx
@@ -31,7 +31,7 @@ describe('SearchType', () => {
     term: '',
     filters: {},
     types: [],
-    pageCursor: '',
+    page: {},
   };
 
   const name = 'field';

From cd40f01ffd794013a306c9d921e6e8a8df49c143 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 11:22:16 +0200
Subject: [PATCH 71/83] Fix e2e test for search

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../app/cypress/integration/components/search/SearchPage.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/app/cypress/integration/components/search/SearchPage.js b/packages/app/cypress/integration/components/search/SearchPage.js
index 4db7acf4fd..6a18d16198 100644
--- a/packages/app/cypress/integration/components/search/SearchPage.js
+++ b/packages/app/cypress/integration/components/search/SearchPage.js
@@ -34,7 +34,7 @@ describe('SearchPage', () => {
       cy.visit('/search-next', {
         onBeforeLoad(win) {
           cy.stub(win, 'fetch')
-            .withArgs(`${API_ENDPOINT}?term=&pageCursor=`)
+            .withArgs(`${API_ENDPOINT}?term=`)
             .resolves({
               ok: true,
               json: () => ({ results }),
@@ -56,7 +56,7 @@ describe('SearchPage', () => {
           onBeforeLoad(win) {
             cy.stub(win, 'fetch')
               .withArgs(
-                `${API_ENDPOINT}?term=&filters%5Bkind%5D=Component&filters%5Blifecycle%5D%5B0%5D=experimental&pageCursor=`,
+                `${API_ENDPOINT}?term=&filters%5Bkind%5D=Component&filters%5Blifecycle%5D%5B0%5D=experimental`,
               )
               .resolves({
                 ok: true,
@@ -102,7 +102,7 @@ describe('SearchPage', () => {
       cy.visit('/search-next?query=backstage', {
         onBeforeLoad(win) {
           cy.stub(win, 'fetch')
-            .withArgs(`${API_ENDPOINT}?term=backstage&pageCursor=`)
+            .withArgs(`${API_ENDPOINT}?term=backstage`)
             .resolves({
               ok: true,
               json: () => ({ results: [] }),

From 56e79326291eeb75b7f8c0a9ca8478fd5af15abb Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 11:29:50 +0200
Subject: [PATCH 72/83] Update API reports

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 packages/search-common/api-report.md                   |  6 +++++-
 .../search-backend-module-elasticsearch/api-report.md  |  2 ++
 plugins/search-backend-module-pg/api-report.md         | 10 +++++++++-
 plugins/search/api-report.md                           |  4 +++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/search-common/api-report.md b/packages/search-common/api-report.md
index 055f2d152f..b4fcac22ca 100644
--- a/packages/search-common/api-report.md
+++ b/packages/search-common/api-report.md
@@ -53,7 +53,9 @@ export interface SearchQuery {
   // (undocumented)
   filters?: JsonObject;
   // (undocumented)
-  pageCursor: string;
+  limit?: number;
+  // (undocumented)
+  offset?: number;
   // (undocumented)
   term: string;
   // (undocumented)
@@ -76,6 +78,8 @@ export interface SearchResult {
 export interface SearchResultSet {
   // (undocumented)
   results: SearchResult[];
+  // (undocumented)
+  totalCount: number;
 }
 
 // (No @packageDocumentation comment for this package)
diff --git a/plugins/search-backend-module-elasticsearch/api-report.md b/plugins/search-backend-module-elasticsearch/api-report.md
index eac76a30b9..e538201bc0 100644
--- a/plugins/search-backend-module-elasticsearch/api-report.md
+++ b/plugins/search-backend-module-elasticsearch/api-report.md
@@ -45,6 +45,8 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     term,
     filters,
     types,
+    offset,
+    limit,
   }: SearchQuery): ConcreteElasticSearchQuery;
 }
 
diff --git a/plugins/search-backend-module-pg/api-report.md b/plugins/search-backend-module-pg/api-report.md
index 23a1f3ecbb..4879e64d06 100644
--- a/plugins/search-backend-module-pg/api-report.md
+++ b/plugins/search-backend-module-pg/api-report.md
@@ -18,6 +18,8 @@ export class DatabaseDocumentStore implements DatabaseStore {
   // (undocumented)
   completeInsert(tx: Knex.Transaction, type: string): Promise<void>;
   // (undocumented)
+  count(tx: Knex.Transaction, searchQuery: PgSearchQuery): Promise<number>;
+  // (undocumented)
   static create(knex: Knex): Promise<DatabaseDocumentStore>;
   // (undocumented)
   insertDocuments(
@@ -32,7 +34,7 @@ export class DatabaseDocumentStore implements DatabaseStore {
   // (undocumented)
   query(
     tx: Knex.Transaction,
-    { types, pgTerm, fields }: PgSearchQuery,
+    searchQuery: PgSearchQuery,
   ): Promise<DocumentResultRow[]>;
   // (undocumented)
   static supported(knex: Knex): Promise<boolean>;
@@ -47,6 +49,8 @@ export interface DatabaseStore {
   // (undocumented)
   completeInsert(tx: Knex.Transaction, type: string): Promise<void>;
   // (undocumented)
+  count(tx: Knex.Transaction, pgQuery: PgSearchQuery): Promise<number>;
+  // (undocumented)
   insertDocuments(
     tx: Knex.Transaction,
     type: string,
@@ -93,6 +97,10 @@ export interface PgSearchQuery {
   // (undocumented)
   fields?: Record<string, string | string[]>;
   // (undocumented)
+  limit: number;
+  // (undocumented)
+  offset: number;
+  // (undocumented)
   pgTerm?: string;
   // (undocumented)
   types?: string[];
diff --git a/plugins/search/api-report.md b/plugins/search/api-report.md
index e3075a448d..616c6f2cae 100644
--- a/plugins/search/api-report.md
+++ b/plugins/search/api-report.md
@@ -139,8 +139,10 @@ export { searchPlugin };
 // @public (undocumented)
 export const SearchResult: ({
   children,
+  initialPageSize,
 }: {
   children: (results: { results: SearchResult_2[] }) => JSX.Element;
+  initialPageSize?: number | undefined;
 }) => JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "SearchTypeProps" needs to be exported by the entry point index.d.ts
@@ -167,7 +169,7 @@ export const useSearch: () => SearchContextValue;
 
 // Warnings were encountered during analysis:
 //
-// src/components/SearchContext/SearchContext.d.ts:19:5 - (ae-forgotten-export) The symbol "SettableSearchContext" needs to be exported by the entry point index.d.ts
+// src/components/SearchContext/SearchContext.d.ts:23:5 - (ae-forgotten-export) The symbol "SettableSearchContext" needs to be exported by the entry point index.d.ts
 // src/components/SearchFilter/SearchFilter.d.ts:13:5 - (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
 // src/components/SearchFilter/SearchFilter.d.ts:14:5 - (ae-forgotten-export) The symbol "Component" needs to be exported by the entry point index.d.ts
 

From a13f21cdc99c539f1492e7281bfb101c39ffe0f5 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Mon, 16 Aug 2021 11:29:58 +0200
Subject: [PATCH 73/83] Update changeset

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .changeset/search-happy-owls-sneeze.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .changeset/search-happy-owls-sneeze.md

diff --git a/.changeset/search-happy-owls-sneeze.md b/.changeset/search-happy-owls-sneeze.md
new file mode 100644
index 0000000000..7c2959d020
--- /dev/null
+++ b/.changeset/search-happy-owls-sneeze.md
@@ -0,0 +1,10 @@
+---
+'@backstage/search-common': minor
+'@backstage/plugin-search': patch
+'@backstage/plugin-search-backend': patch
+'@backstage/plugin-search-backend-module-elasticsearch': patch
+'@backstage/plugin-search-backend-module-pg': minor
+'@backstage/plugin-search-backend-node': patch
+---
+
+Implement `offset` and `limit` based paging in search.

From 532b4cc6563621ec5cf76cdf573689ffb8a30146 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Thu, 19 Aug 2021 17:57:11 +0200
Subject: [PATCH 74/83] Rework search paging based on cursors

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .changeset/search-happy-owls-sneeze.md        |   2 +-
 packages/search-common/api-report.md          |  10 +-
 packages/search-common/src/types.ts           |   6 +-
 .../api-report.md                             |   3 +-
 .../engines/ElasticSearchSearchEngine.test.ts | 167 +++++++++++-----
 .../src/engines/ElasticSearchSearchEngine.ts  |  63 ++++--
 .../search-backend-module-pg/api-report.md    |  20 +-
 .../src/PgSearchEngine/PgSearchEngine.test.ts | 180 +++++++++++++-----
 .../src/PgSearchEngine/PgSearchEngine.ts      |  85 ++++++---
 .../src/PgSearchEngine/index.ts               |   1 +
 .../database/DatabaseDocumentStore.test.ts    |  31 ---
 .../src/database/DatabaseDocumentStore.ts     |  44 ++---
 .../src/database/types.ts                     |   1 -
 .../src/engines/LunrSearchEngine.test.ts      | 173 +++++++++++------
 .../src/engines/LunrSearchEngine.ts           |  43 ++++-
 plugins/search-backend/src/service/router.ts  |  14 +-
 plugins/search/api-report.md                  |   4 +-
 plugins/search/src/apis.test.ts               |   1 -
 .../components/SearchBar/SearchBar.test.tsx   |   1 -
 .../SearchContext/SearchContext.test.tsx      |  99 +++++++---
 .../SearchContext/SearchContext.tsx           |  55 ++++--
 .../SearchFilter/SearchFilter.test.tsx        |   1 -
 .../components/SearchPage/SearchPage.test.tsx |  27 ++-
 .../SearchResult/SearchResult.test.tsx        |  41 ----
 .../components/SearchResult/SearchResult.tsx  |  22 +--
 .../SearchResultPager.test.tsx                |  59 ++++++
 .../SearchResultPager/SearchResultPager.tsx   |  64 +++++++
 .../src/components/SearchResultPager/index.ts |  17 ++
 .../components/SearchType/SearchType.test.tsx |   1 -
 plugins/search/src/components/index.tsx       |   9 +-
 30 files changed, 826 insertions(+), 418 deletions(-)
 create mode 100644 plugins/search/src/components/SearchResultPager/SearchResultPager.test.tsx
 create mode 100644 plugins/search/src/components/SearchResultPager/SearchResultPager.tsx
 create mode 100644 plugins/search/src/components/SearchResultPager/index.ts

diff --git a/.changeset/search-happy-owls-sneeze.md b/.changeset/search-happy-owls-sneeze.md
index 7c2959d020..4740c767d2 100644
--- a/.changeset/search-happy-owls-sneeze.md
+++ b/.changeset/search-happy-owls-sneeze.md
@@ -7,4 +7,4 @@
 '@backstage/plugin-search-backend-node': patch
 ---
 
-Implement `offset` and `limit` based paging in search.
+Implement optional `pageCursor` based paging in search.
diff --git a/packages/search-common/api-report.md b/packages/search-common/api-report.md
index b4fcac22ca..f00beb6830 100644
--- a/packages/search-common/api-report.md
+++ b/packages/search-common/api-report.md
@@ -53,9 +53,7 @@ export interface SearchQuery {
   // (undocumented)
   filters?: JsonObject;
   // (undocumented)
-  limit?: number;
-  // (undocumented)
-  offset?: number;
+  pageCursor?: string;
   // (undocumented)
   term: string;
   // (undocumented)
@@ -77,9 +75,11 @@ export interface SearchResult {
 // @public (undocumented)
 export interface SearchResultSet {
   // (undocumented)
-  results: SearchResult[];
+  nextPageCursor?: string;
   // (undocumented)
-  totalCount: number;
+  previousPageCursor?: string;
+  // (undocumented)
+  results: SearchResult[];
 }
 
 // (No @packageDocumentation comment for this package)
diff --git a/packages/search-common/src/types.ts b/packages/search-common/src/types.ts
index 0bd12fbd42..063e0cb96c 100644
--- a/packages/search-common/src/types.ts
+++ b/packages/search-common/src/types.ts
@@ -19,8 +19,7 @@ export interface SearchQuery {
   term: string;
   filters?: JsonObject;
   types?: string[];
-  offset?: number;
-  limit?: number;
+  pageCursor?: string;
 }
 
 export interface SearchResult {
@@ -30,7 +29,8 @@ export interface SearchResult {
 
 export interface SearchResultSet {
   results: SearchResult[];
-  totalCount: number;
+  nextPageCursor?: string;
+  previousPageCursor?: string;
 }
 
 /**
diff --git a/plugins/search-backend-module-elasticsearch/api-report.md b/plugins/search-backend-module-elasticsearch/api-report.md
index e538201bc0..1644ce65ea 100644
--- a/plugins/search-backend-module-elasticsearch/api-report.md
+++ b/plugins/search-backend-module-elasticsearch/api-report.md
@@ -45,8 +45,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     term,
     filters,
     types,
-    offset,
-    limit,
+    pageCursor,
   }: SearchQuery): ConcreteElasticSearchQuery;
 }
 
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
index 18ee1314ce..36fb2e56c6 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
@@ -16,12 +16,14 @@
 
 import { getVoidLogger } from '@backstage/backend-common';
 import { SearchEngine } from '@backstage/search-common';
-import {
-  ConcreteElasticSearchQuery,
-  ElasticSearchSearchEngine,
-} from './ElasticSearchSearchEngine';
 import { Client } from '@elastic/elasticsearch';
 import Mock from '@elastic/elasticsearch-mock';
+import {
+  ConcreteElasticSearchQuery,
+  decodePageCursor,
+  ElasticSearchSearchEngine,
+  encodePageCursor,
+} from './ElasticSearchSearchEngine';
 
 class ElasticSearchSearchEngineForTranslatorTests extends ElasticSearchSearchEngine {
   getTranslator() {
@@ -134,14 +136,13 @@ describe('ElasticSearchSearchEngine', () => {
       });
     });
 
-    it('should pass offset and limit', async () => {
+    it('should pass page cursor', async () => {
       const translatorUnderTest = inspectableSearchEngine.getTranslator();
 
       const actualTranslatedQuery = translatorUnderTest({
         types: ['indexName'],
         term: 'testTerm',
-        offset: 25,
-        limit: 50,
+        pageCursor: 'MQ==',
       }) as ConcreteElasticSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
@@ -166,43 +167,7 @@ describe('ElasticSearchSearchEngine', () => {
           },
         },
         from: 25,
-        size: 50,
-      });
-    });
-
-    it('should have maximum limit of 100', async () => {
-      const translatorUnderTest = inspectableSearchEngine.getTranslator();
-
-      const actualTranslatedQuery = translatorUnderTest({
-        types: ['indexName'],
-        term: 'testTerm',
-        offset: 25,
-        limit: 500,
-      }) as ConcreteElasticSearchQuery;
-
-      expect(actualTranslatedQuery).toMatchObject({
-        documentTypes: ['indexName'],
-        elasticSearchQuery: expect.any(Object),
-      });
-
-      const queryBody = actualTranslatedQuery.elasticSearchQuery;
-
-      expect(queryBody).toEqual({
-        query: {
-          bool: {
-            filter: [],
-            must: {
-              multi_match: {
-                query: 'testTerm',
-                fields: ['*'],
-                fuzziness: 'auto',
-                minimum_should_match: 1,
-              },
-            },
-          },
-        },
-        from: 25,
-        size: 100,
+        size: 25,
       });
     });
 
@@ -387,7 +352,103 @@ describe('ElasticSearchSearchEngine', () => {
       });
 
       // Should return 0 results as nothing is indexed here
-      expect(mockedSearchResult).toMatchObject({ results: [], totalCount: 0 });
+      expect(mockedSearchResult).toMatchObject({
+        results: [],
+        nextPageCursor: undefined,
+      });
+    });
+
+    it('should perform search query with more results than one page', async () => {
+      mock.clear({
+        method: 'POST',
+        path: '/*__search/_search',
+      });
+      mock.add(
+        {
+          method: 'POST',
+          path: '/*__search/_search',
+        },
+        () => {
+          return {
+            hits: {
+              total: { value: 30, relation: 'eq' },
+              hits: Array(25)
+                .fill(null)
+                .map((_, i) => ({
+                  _index: 'mytype-index__',
+                  _source: {
+                    value: `${i}`,
+                  },
+                })),
+            },
+          };
+        },
+      );
+
+      const mockedSearchResult = await testSearchEngine.query({
+        term: 'testTerm',
+        filters: {},
+      });
+
+      expect(mockedSearchResult).toMatchObject({
+        results: expect.arrayContaining(
+          Array(25)
+            .fill(null)
+            .map((_, i) => ({
+              type: 'mytype',
+              document: { value: `${i}` },
+            })),
+        ),
+        nextPageCursor: 'MQ==',
+      });
+    });
+
+    it('should perform search query for second page', async () => {
+      mock.clear({
+        method: 'POST',
+        path: '/*__search/_search',
+      });
+      mock.add(
+        {
+          method: 'POST',
+          path: '/*__search/_search',
+        },
+        () => {
+          return {
+            hits: {
+              total: { value: 30, relation: 'eq' },
+              hits: Array(30)
+                .fill(null)
+                .map((_, i) => ({
+                  _index: 'mytype-index__',
+                  _source: {
+                    value: `${i}`,
+                  },
+                }))
+                .slice(25),
+            },
+          };
+        },
+      );
+
+      const mockedSearchResult = await testSearchEngine.query({
+        term: 'testTerm',
+        filters: {},
+        pageCursor: 'MQ==',
+      });
+
+      expect(mockedSearchResult).toMatchObject({
+        results: expect.arrayContaining(
+          Array(30)
+            .fill(null)
+            .map((_, i) => ({
+              type: 'mytype',
+              document: { value: `${i}` },
+            }))
+            .slice(25),
+        ),
+        previousPageCursor: 'MA==',
+      });
     });
 
     it('should handle index/search type filtering correctly', async () => {
@@ -498,3 +559,19 @@ describe('ElasticSearchSearchEngine', () => {
     });
   });
 });
+
+describe('decodePageCursor', () => {
+  test('should decode page', () => {
+    expect(decodePageCursor('MQ==')).toEqual({ page: 1 });
+  });
+
+  test('should fallback to first page if empty', () => {
+    expect(decodePageCursor()).toEqual({ page: 0 });
+  });
+});
+
+describe('encodePageCursor', () => {
+  test('should encode page', () => {
+    expect(encodePageCursor({ page: 1 })).toEqual('MQ==');
+  });
+});
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
index c1c959778b..a12daef282 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
@@ -15,24 +15,25 @@
  */
 
 import {
-  IndexableDocument,
-  SearchQuery,
-  SearchResultSet,
-  SearchEngine,
-} from '@backstage/search-common';
-import { Logger } from 'winston';
-import esb from 'elastic-builder';
-import { Client } from '@elastic/elasticsearch';
+  awsGetCredentials,
+  createAWSConnection,
+} from '@acuris/aws-es-connection';
 import { Config } from '@backstage/config';
 import {
-  createAWSConnection,
-  awsGetCredentials,
-} from '@acuris/aws-es-connection';
+  IndexableDocument,
+  SearchEngine,
+  SearchQuery,
+  SearchResultSet,
+} from '@backstage/search-common';
+import { Client } from '@elastic/elasticsearch';
+import esb from 'elastic-builder';
 import { isEmpty, isNaN as nan, isNumber } from 'lodash';
+import { Logger } from 'winston';
 
 export type ConcreteElasticSearchQuery = {
   documentTypes?: string[];
   elasticSearchQuery: Object;
+  pageSize: number;
 };
 
 type ElasticSearchQueryTranslator = (
@@ -140,8 +141,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     term,
     filters = {},
     types,
-    offset,
-    limit,
+    pageCursor,
   }: SearchQuery): ConcreteElasticSearchQuery {
     const filter = Object.entries(filters)
       .filter(([_, value]) => Boolean(value))
@@ -169,15 +169,18 @@ export class ElasticSearchSearchEngine implements SearchEngine {
           .multiMatchQuery(['*'], term)
           .fuzziness('auto')
           .minimumShouldMatch(1);
+    const pageSize = 25;
+    const { page } = decodePageCursor(pageCursor);
 
     return {
       elasticSearchQuery: esb
         .requestBodySearch()
         .query(esb.boolQuery().filter(filter).must([query]))
-        .from(offset ?? 0)
-        .size(Math.min(limit ?? 25, 100))
+        .from(page * pageSize)
+        .size(pageSize)
         .toJSON(),
       documentTypes: types,
+      pageSize,
     };
   }
 
@@ -249,7 +252,8 @@ export class ElasticSearchSearchEngine implements SearchEngine {
   }
 
   async query(query: SearchQuery): Promise<SearchResultSet> {
-    const { elasticSearchQuery, documentTypes } = this.translator(query);
+    const { elasticSearchQuery, documentTypes, pageSize } =
+      this.translator(query);
     const queryIndices = documentTypes
       ? documentTypes.map(it => this.constructSearchAlias(it))
       : this.constructSearchAlias('*');
@@ -258,12 +262,23 @@ export class ElasticSearchSearchEngine implements SearchEngine {
         index: queryIndices,
         body: elasticSearchQuery,
       });
+      const { page } = decodePageCursor(query.pageCursor);
+      const hasNextPage = result.body.hits.total.value > page * pageSize;
+      const hasPreviousPage = page > 0;
+      const nextPageCursor = hasNextPage
+        ? encodePageCursor({ page: page + 1 })
+        : undefined;
+      const previousPageCursor = hasPreviousPage
+        ? encodePageCursor({ page: page - 1 })
+        : undefined;
+
       return {
         results: result.body.hits.hits.map((d: ElasticSearchResult) => ({
           type: this.getTypeFromIndex(d._index),
           document: d._source,
         })),
-        totalCount: result.body.hits.total.value,
+        nextPageCursor,
+        previousPageCursor,
       };
     } catch (e) {
       this.logger.error(
@@ -291,3 +306,17 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     return `${this.indexPrefix}${type}${postFix}`;
   }
 }
+
+export function decodePageCursor(pageCursor?: string): { page: number } {
+  if (!pageCursor) {
+    return { page: 0 };
+  }
+
+  return {
+    page: Number(Buffer.from(pageCursor, 'base64').toString('utf-8')),
+  };
+}
+
+export function encodePageCursor({ page }: { page: number }): string {
+  return Buffer.from(`${page}`, 'utf-8').toString('base64');
+}
diff --git a/plugins/search-backend-module-pg/api-report.md b/plugins/search-backend-module-pg/api-report.md
index 4879e64d06..6a56daa8d7 100644
--- a/plugins/search-backend-module-pg/api-report.md
+++ b/plugins/search-backend-module-pg/api-report.md
@@ -10,6 +10,14 @@ import { SearchEngine } from '@backstage/plugin-search-backend-node';
 import { SearchQuery } from '@backstage/search-common';
 import { SearchResultSet } from '@backstage/search-common';
 
+// Warning: (ae-missing-release-tag) "ConcretePgSearchQuery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type ConcretePgSearchQuery = {
+  pgQuery: PgSearchQuery;
+  pageSize: number;
+};
+
 // Warning: (ae-missing-release-tag) "DatabaseDocumentStore" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -18,8 +26,6 @@ export class DatabaseDocumentStore implements DatabaseStore {
   // (undocumented)
   completeInsert(tx: Knex.Transaction, type: string): Promise<void>;
   // (undocumented)
-  count(tx: Knex.Transaction, searchQuery: PgSearchQuery): Promise<number>;
-  // (undocumented)
   static create(knex: Knex): Promise<DatabaseDocumentStore>;
   // (undocumented)
   insertDocuments(
@@ -34,7 +40,7 @@ export class DatabaseDocumentStore implements DatabaseStore {
   // (undocumented)
   query(
     tx: Knex.Transaction,
-    searchQuery: PgSearchQuery,
+    { types, pgTerm, fields, offset, limit }: PgSearchQuery,
   ): Promise<DocumentResultRow[]>;
   // (undocumented)
   static supported(knex: Knex): Promise<boolean>;
@@ -49,8 +55,6 @@ export interface DatabaseStore {
   // (undocumented)
   completeInsert(tx: Knex.Transaction, type: string): Promise<void>;
   // (undocumented)
-  count(tx: Knex.Transaction, pgQuery: PgSearchQuery): Promise<number>;
-  // (undocumented)
   insertDocuments(
     tx: Knex.Transaction,
     type: string,
@@ -83,11 +87,13 @@ export class PgSearchEngine implements SearchEngine {
   // (undocumented)
   query(query: SearchQuery): Promise<SearchResultSet>;
   // (undocumented)
-  setTranslator(translator: (query: SearchQuery) => PgSearchQuery): void;
+  setTranslator(
+    translator: (query: SearchQuery) => ConcretePgSearchQuery,
+  ): void;
   // (undocumented)
   static supported(database: PluginDatabaseManager): Promise<boolean>;
   // (undocumented)
-  translator(query: SearchQuery): PgSearchQuery;
+  translator(query: SearchQuery): ConcretePgSearchQuery;
 }
 
 // Warning: (ae-missing-release-tag) "PgSearchQuery" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts
index 0940e4d550..56a3a6e643 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.test.ts
@@ -14,8 +14,13 @@
  * limitations under the License.
  */
 import { range } from 'lodash';
-import { DatabaseStore, PgSearchQuery } from '../database';
-import { PgSearchEngine } from './PgSearchEngine';
+import { DatabaseStore } from '../database';
+import {
+  ConcretePgSearchQuery,
+  decodePageCursor,
+  encodePageCursor,
+  PgSearchEngine,
+} from './PgSearchEngine';
 
 describe('PgSearchEngine', () => {
   const tx: any = {} as any;
@@ -27,7 +32,6 @@ describe('PgSearchEngine', () => {
       transaction: jest.fn(),
       insertDocuments: jest.fn(),
       query: jest.fn(),
-      count: jest.fn(),
       completeInsert: jest.fn(),
       prepareInsert: jest.fn(),
     };
@@ -45,55 +49,42 @@ describe('PgSearchEngine', () => {
       await searchEngine.query({
         term: 'testTerm',
         filters: {},
-        offset: 25,
-        limit: 50,
       });
 
       expect(translatorSpy).toHaveBeenCalledWith({
         term: 'testTerm',
         filters: {},
-        offset: 25,
-        limit: 50,
       });
     });
 
-    it('should pass offset and limit', async () => {
+    it('should pass page cursor', async () => {
       const actualTranslatedQuery = searchEngine.translator({
         term: 'Hello',
-        offset: 25,
-        limit: 50,
-      }) as PgSearchQuery;
-
-      expect(actualTranslatedQuery).toMatchObject({
-        pgTerm: '("Hello" | "Hello":*)',
-        offset: 25,
-        limit: 50,
+        pageCursor: 'MQ==',
       });
-    });
-
-    it('should have maximum limit of 100', async () => {
-      const actualTranslatedQuery = searchEngine.translator({
-        term: 'Hello',
-        offset: 25,
-        limit: 1000,
-      }) as PgSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
-        pgTerm: '("Hello" | "Hello":*)',
-        offset: 25,
-        limit: 100,
+        pgQuery: {
+          pgTerm: '("Hello" | "Hello":*)',
+          offset: 25,
+          limit: 26,
+        },
+        pageSize: 25,
       });
     });
 
     it('should return translated query term', async () => {
       const actualTranslatedQuery = searchEngine.translator({
         term: 'Hello World',
-      }) as PgSearchQuery;
+      });
 
       expect(actualTranslatedQuery).toMatchObject({
-        pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
-        offset: 0,
-        limit: 25,
+        pgQuery: {
+          pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+          offset: 0,
+          limit: 26,
+        },
+        pageSize: 25,
       });
     });
 
@@ -101,10 +92,13 @@ describe('PgSearchEngine', () => {
       const actualTranslatedQuery = searchEngine.translator({
         term: 'H&e|l!l*o W\0o(r)l:d',
         pageCursor: '',
-      }) as PgSearchQuery;
+      }) as ConcretePgSearchQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
-        pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        pgQuery: {
+          pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        },
+        pageSize: 25,
       });
     });
 
@@ -113,14 +107,17 @@ describe('PgSearchEngine', () => {
         term: 'testTerm',
         filters: { kind: 'testKind' },
         types: ['my-filter'],
-      }) as PgSearchQuery;
+      });
 
       expect(actualTranslatedQuery).toMatchObject({
-        pgTerm: '("testTerm" | "testTerm":*)',
-        fields: { kind: 'testKind' },
-        types: ['my-filter'],
-        offset: 0,
-        limit: 25,
+        pgQuery: {
+          pgTerm: '("testTerm" | "testTerm":*)',
+          fields: { kind: 'testKind' },
+          types: ['my-filter'],
+          offset: 0,
+          limit: 26,
+        },
+        pageSize: 25,
       });
     });
   });
@@ -171,7 +168,6 @@ describe('PgSearchEngine', () => {
   describe('query', () => {
     it('should perform query', async () => {
       database.transaction.mockImplementation(fn => fn(tx));
-      database.count.mockResolvedValue(1337);
       database.query.mockResolvedValue([
         {
           document: {
@@ -198,19 +194,113 @@ describe('PgSearchEngine', () => {
             type: 'my-type',
           },
         ],
-        totalCount: 1337,
+        nextPageCursor: undefined,
       });
-      expect(database.transaction).toHaveBeenCalledTimes(2);
+      expect(database.transaction).toHaveBeenCalledTimes(1);
       expect(database.query).toHaveBeenCalledWith(tx, {
         pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
         offset: 0,
-        limit: 25,
+        limit: 26,
       });
-      expect(database.count).toHaveBeenCalledWith(tx, {
+    });
+
+    it('should include next page cursor if results exceed page size', async () => {
+      database.transaction.mockImplementation(fn => fn(tx));
+      database.query.mockResolvedValue(
+        Array(30)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'Hello World',
+              text: 'Lorem Ipsum',
+              location: `location-${i}`,
+            },
+            type: 'my-type',
+          })),
+      );
+
+      const results = await searchEngine.query({
+        term: 'Hello World',
+      });
+
+      expect(results).toEqual({
+        results: Array(25)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'Hello World',
+              text: 'Lorem Ipsum',
+              location: `location-${i}`,
+            },
+            type: 'my-type',
+          })),
+        nextPageCursor: 'MQ==',
+      });
+      expect(database.transaction).toHaveBeenCalledTimes(1);
+      expect(database.query).toHaveBeenCalledWith(tx, {
         pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
         offset: 0,
-        limit: 25,
+        limit: 26,
+      });
+    });
+
+    it('should include previous page cursor if on another page', async () => {
+      database.transaction.mockImplementation(fn => fn(tx));
+      database.query.mockResolvedValue(
+        Array(30)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'Hello World',
+              text: 'Lorem Ipsum',
+              location: `location-${i}`,
+            },
+            type: 'my-type',
+          }))
+          .slice(25),
+      );
+
+      const results = await searchEngine.query({
+        term: 'Hello World',
+        pageCursor: 'MQ==',
+      });
+
+      expect(results).toEqual({
+        results: Array(30)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'Hello World',
+              text: 'Lorem Ipsum',
+              location: `location-${i}`,
+            },
+            type: 'my-type',
+          }))
+          .slice(25),
+        previousPageCursor: 'MA==',
+      });
+      expect(database.transaction).toHaveBeenCalledTimes(1);
+      expect(database.query).toHaveBeenCalledWith(tx, {
+        pgTerm: '("Hello" | "Hello":*)&("World" | "World":*)',
+        offset: 25,
+        limit: 26,
       });
     });
   });
 });
+
+describe('decodePageCursor', () => {
+  test('should decode page', () => {
+    expect(decodePageCursor('MQ==')).toEqual({ page: 1 });
+  });
+
+  test('should fallback to first page if empty', () => {
+    expect(decodePageCursor()).toEqual({ page: 0 });
+  });
+});
+
+describe('encodePageCursor', () => {
+  test('should encode page', () => {
+    expect(encodePageCursor({ page: 1 })).toEqual('MQ==');
+  });
+});
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
index d5cf498cc1..a032dd783e 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngine.ts
@@ -27,7 +27,10 @@ import {
   PgSearchQuery,
 } from '../database';
 
-// TODO: Support paging using page cursor (return cursor and parse cursor)
+export type ConcretePgSearchQuery = {
+  pgQuery: PgSearchQuery;
+  pageSize: number;
+};
 
 export class PgSearchEngine implements SearchEngine {
   constructor(private readonly databaseStore: DatabaseStore) {}
@@ -46,22 +49,33 @@ export class PgSearchEngine implements SearchEngine {
     return await DatabaseDocumentStore.supported(await database.getClient());
   }
 
-  translator(query: SearchQuery): PgSearchQuery {
+  translator(query: SearchQuery): ConcretePgSearchQuery {
+    const pageSize = 25;
+    const { page } = decodePageCursor(query.pageCursor);
+    const offset = page * pageSize;
+    // We request more result to know whether there is another page
+    const limit = pageSize + 1;
+
     return {
-      pgTerm: query.term
-        .split(/\s/)
-        .map(p => p.replace(/[\0()|&:*!]/g, '').trim())
-        .filter(p => p !== '')
-        .map(p => `(${JSON.stringify(p)} | ${JSON.stringify(p)}:*)`)
-        .join('&'),
-      fields: query.filters as Record<string, string | string[]>,
-      types: query.types,
-      offset: query.offset ?? 0,
-      limit: Math.min(query.limit ?? 25, 100),
+      pgQuery: {
+        pgTerm: query.term
+          .split(/\s/)
+          .map(p => p.replace(/[\0()|&:*!]/g, '').trim())
+          .filter(p => p !== '')
+          .map(p => `(${JSON.stringify(p)} | ${JSON.stringify(p)}:*)`)
+          .join('&'),
+        fields: query.filters as Record<string, string | string[]>,
+        types: query.types,
+        offset,
+        limit,
+      },
+      pageSize,
     };
   }
 
-  setTranslator(translator: (query: SearchQuery) => PgSearchQuery): void {
+  setTranslator(
+    translator: (query: SearchQuery) => ConcretePgSearchQuery,
+  ): void {
     this.translator = translator;
   }
 
@@ -79,21 +93,44 @@ export class PgSearchEngine implements SearchEngine {
   }
 
   async query(query: SearchQuery): Promise<SearchResultSet> {
-    const pgQuery = this.translator(query);
+    const { pgQuery, pageSize } = this.translator(query);
 
-    const [rows, totalCount] = await Promise.all([
-      this.databaseStore.transaction(async tx =>
-        this.databaseStore.query(tx, pgQuery),
-      ),
-      this.databaseStore.transaction(async tx =>
-        this.databaseStore.count(tx, pgQuery),
-      ),
-    ]);
-    const results = rows.map(({ type, document }) => ({
+    const rows = await this.databaseStore.transaction(async tx =>
+      this.databaseStore.query(tx, pgQuery),
+    );
+
+    // We requested one result more than the page size to know whether there is
+    // another page.
+    const { page } = decodePageCursor(query.pageCursor);
+    const hasNextPage = rows.length > pageSize;
+    const hasPreviousPage = page > 0;
+    const pageRows = rows.slice(0, pageSize);
+    const nextPageCursor = hasNextPage
+      ? encodePageCursor({ page: page + 1 })
+      : undefined;
+    const previousPageCursor = hasPreviousPage
+      ? encodePageCursor({ page: page - 1 })
+      : undefined;
+
+    const results = pageRows.map(({ type, document }) => ({
       type,
       document,
     }));
 
-    return { results, totalCount };
+    return { results, nextPageCursor, previousPageCursor };
   }
 }
+
+export function decodePageCursor(pageCursor?: string): { page: number } {
+  if (!pageCursor) {
+    return { page: 0 };
+  }
+
+  return {
+    page: Number(Buffer.from(pageCursor, 'base64').toString('utf-8')),
+  };
+}
+
+export function encodePageCursor({ page }: { page: number }): string {
+  return Buffer.from(`${page}`, 'utf-8').toString('base64');
+}
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/index.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/index.ts
index b28e03ee5c..7994998baf 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/index.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/index.ts
@@ -14,3 +14,4 @@
  * limitations under the License.
  */
 export { PgSearchEngine } from './PgSearchEngine';
+export type { ConcretePgSearchQuery } from './PgSearchEngine';
diff --git a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
index a456d0caf5..71c012ec00 100644
--- a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
+++ b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.test.ts
@@ -238,37 +238,6 @@ describe('DatabaseDocumentStore', () => {
       60_000,
     );
 
-    it.each(databases.eachSupportedId())(
-      'count by term, %p',
-      async databaseId => {
-        const { store } = await createStore(databaseId);
-
-        await store.transaction(async tx => {
-          await store.prepareInsert(tx);
-          await store.insertDocuments(tx, 'test', [
-            {
-              title: 'Lorem Ipsum',
-              text: 'Hello World',
-              location: 'LOCATION-1',
-            },
-            {
-              title: 'Hello World',
-              text: 'Around the world',
-              location: 'LOCATION-1',
-            },
-          ]);
-          await store.completeInsert(tx, 'test');
-        });
-
-        const totalCount = await store.transaction(tx =>
-          store.count(tx, { pgTerm: 'Hello & World', offset: 0, limit: 25 }),
-        );
-
-        expect(totalCount).toEqual(2);
-      },
-      60_000,
-    );
-
     it.each(databases.eachSupportedId())(
       'query by term, %p',
       async databaseId => {
diff --git a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts
index 80398ec707..8c180ea019 100644
--- a/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts
+++ b/plugins/search-backend-module-pg/src/database/DatabaseDocumentStore.ts
@@ -128,7 +128,7 @@ export class DatabaseDocumentStore implements DatabaseStore {
 
   async query(
     tx: Knex.Transaction,
-    searchQuery: PgSearchQuery,
+    { types, pgTerm, fields, offset, limit }: PgSearchQuery,
   ): Promise<DocumentResultRow[]> {
     // Builds a query like:
     // SELECT ts_rank_cd(body, query) AS rank,  type, document
@@ -136,36 +136,6 @@ export class DatabaseDocumentStore implements DatabaseStore {
     // WHERE query @@ body AND (document @> '{"kind": "API"}')
     // ORDER BY rank DESC
     // LIMIT 10;
-    const query = this.buildQuery(tx, searchQuery);
-
-    query.select('type', 'document');
-
-    const { pgTerm, limit, offset } = searchQuery;
-
-    if (pgTerm) {
-      query
-        .select(tx.raw('ts_rank_cd(body, query) AS "rank"'))
-        .orderBy('rank', 'desc');
-    } else {
-      query.select(tx.raw('1 as rank'));
-    }
-
-    return await query.offset(offset).limit(limit);
-  }
-
-  async count(
-    tx: Knex.Transaction,
-    searchQuery: PgSearchQuery,
-  ): Promise<number> {
-    const query = this.buildQuery(tx, searchQuery);
-    const [row] = await query.count();
-    return Number(row.count);
-  }
-
-  private buildQuery(
-    tx: Knex.Transaction,
-    { types, pgTerm, fields }: PgSearchQuery,
-  ) {
     const query = tx<DocumentResultRow>('documents');
 
     if (pgTerm) {
@@ -194,6 +164,16 @@ export class DatabaseDocumentStore implements DatabaseStore {
       });
     }
 
-    return query;
+    query.select('type', 'document');
+
+    if (pgTerm) {
+      query
+        .select(tx.raw('ts_rank_cd(body, query) AS "rank"'))
+        .orderBy('rank', 'desc');
+    } else {
+      query.select(tx.raw('1 as rank'));
+    }
+
+    return await query.offset(offset).limit(limit);
   }
 }
diff --git a/plugins/search-backend-module-pg/src/database/types.ts b/plugins/search-backend-module-pg/src/database/types.ts
index f8425c41b6..0c0596160e 100644
--- a/plugins/search-backend-module-pg/src/database/types.ts
+++ b/plugins/search-backend-module-pg/src/database/types.ts
@@ -37,7 +37,6 @@ export interface DatabaseStore {
     tx: Knex.Transaction,
     pgQuery: PgSearchQuery,
   ): Promise<DocumentResultRow[]>;
-  count(tx: Knex.Transaction, pgQuery: PgSearchQuery): Promise<number>;
 }
 
 export interface RawDocumentRow {
diff --git a/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts b/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
index 71c2b95a29..a2cbb4ecc3 100644
--- a/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
+++ b/plugins/search-backend-node/src/engines/LunrSearchEngine.test.ts
@@ -17,7 +17,12 @@
 import { getVoidLogger } from '@backstage/backend-common';
 import lunr from 'lunr';
 import { SearchEngine } from '@backstage/search-common';
-import { ConcreteLunrQuery, LunrSearchEngine } from './LunrSearchEngine';
+import {
+  ConcreteLunrQuery,
+  LunrSearchEngine,
+  decodePageCursor,
+  encodePageCursor,
+} from './LunrSearchEngine';
 
 /**
  * Just used to test the default translator shipped with LunrSearchEngine.
@@ -48,12 +53,14 @@ describe('LunrSearchEngine', () => {
       await testLunrSearchEngine.query({
         term: 'testTerm',
         filters: {},
+        pageCursor: 'MQ==',
       });
 
       // Then: the translator is invoked with expected args.
       expect(translatorSpy).toHaveBeenCalledWith({
         term: 'testTerm',
         filters: {},
+        pageCursor: 'MQ==',
       });
     });
 
@@ -66,15 +73,12 @@ describe('LunrSearchEngine', () => {
       const actualTranslatedQuery = translatorUnderTest({
         term: 'testTerm',
         filters: {},
-        offset: 0,
-        limit: 50,
       }) as ConcreteLunrQuery;
 
       expect(actualTranslatedQuery).toMatchObject({
         documentTypes: undefined,
         lunrQueryBuilder: expect.any(Function),
-        offset: 0,
-        limit: 50,
+        pageSize: 25,
       });
 
       const query: jest.Mocked<lunr.Query> = {
@@ -115,52 +119,7 @@ describe('LunrSearchEngine', () => {
       expect(actualTranslatedQuery).toMatchObject({
         documentTypes: undefined,
         lunrQueryBuilder: expect.any(Function),
-        offset: 0,
-        limit: 25,
-      });
-
-      const query: jest.Mocked<lunr.Query> = {
-        allFields: [],
-        clauses: [],
-        term: jest.fn(),
-        clause: jest.fn(),
-      };
-
-      actualTranslatedQuery.lunrQueryBuilder.bind(query)(query);
-
-      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
-        boost: 100,
-        usePipeline: true,
-      });
-      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
-        boost: 10,
-        usePipeline: false,
-        wildcard: lunr.Query.wildcard.TRAILING,
-      });
-      expect(query.term).toBeCalledWith(lunr.tokenizer('testTerm'), {
-        boost: 1,
-        usePipeline: false,
-        editDistance: 2,
-      });
-    });
-
-    it('should have maximum limit', async () => {
-      const inspectableSearchEngine = new LunrSearchEngineForTranslatorTests({
-        logger: getVoidLogger(),
-      });
-      const translatorUnderTest = inspectableSearchEngine.getTranslator();
-
-      const actualTranslatedQuery = translatorUnderTest({
-        term: 'testTerm',
-        offset: 0,
-        limit: 1000,
-      }) as ConcreteLunrQuery;
-
-      expect(actualTranslatedQuery).toMatchObject({
-        documentTypes: undefined,
-        lunrQueryBuilder: expect.any(Function),
-        offset: 0,
-        limit: 100,
+        pageSize: 25,
       });
 
       const query: jest.Mocked<lunr.Query> = {
@@ -328,7 +287,10 @@ describe('LunrSearchEngine', () => {
       });
 
       // Should return 0 results as nothing is indexed here
-      expect(mockedSearchResult).toMatchObject({ results: [], totalCount: 0 });
+      expect(mockedSearchResult).toMatchObject({
+        results: [],
+        nextPageCursor: undefined,
+      });
     });
 
     it('should perform search query and return 0 results on no match', async () => {
@@ -350,7 +312,10 @@ describe('LunrSearchEngine', () => {
       });
 
       // Should return 0 results as we are mocking the indexing of 1 document but with no match on the fields
-      expect(mockedSearchResult).toMatchObject({ results: [], totalCount: 0 });
+      expect(mockedSearchResult).toMatchObject({
+        results: [],
+        nextPageCursor: undefined,
+      });
     });
 
     it('should perform search query and return all results on empty term', async () => {
@@ -382,7 +347,7 @@ describe('LunrSearchEngine', () => {
             type: 'test-index',
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -414,7 +379,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -446,7 +411,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -479,7 +444,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -512,7 +477,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -545,7 +510,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -585,7 +550,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -627,7 +592,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -667,7 +632,7 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 1,
+        nextPageCursor: undefined,
       });
     });
 
@@ -725,9 +690,75 @@ describe('LunrSearchEngine', () => {
             },
           },
         ],
-        totalCount: 2,
+        nextPageCursor: undefined,
       });
     });
+
+    it('should return next page cursor if results exceed page size', async () => {
+      const mockDocuments = Array(30)
+        .fill(0)
+        .map((_, i) => ({
+          title: 'testTitle',
+          text: 'testText',
+          location: `test/location/${i}`,
+        }));
+
+      await testLunrSearchEngine.index('test-index', mockDocuments);
+
+      const mockedSearchResult = await testLunrSearchEngine.query({
+        term: 'testTitle',
+        types: ['test-index'],
+      });
+
+      expect(mockedSearchResult).toMatchObject({
+        results: Array(25)
+          .fill(0)
+          .map((_, i) => ({
+            document: {
+              title: 'testTitle',
+              text: 'testText',
+              location: `test/location/${i}`,
+            },
+            type: 'test-index',
+          })),
+        nextPageCursor: 'MQ==',
+        previousPageCursor: undefined,
+      });
+    });
+  });
+
+  it('should return previous page cursor if on another page', async () => {
+    const mockDocuments = Array(30)
+      .fill(0)
+      .map((_, i) => ({
+        title: 'testTitle',
+        text: 'testText',
+        location: `test/location/${i}`,
+      }));
+
+    await testLunrSearchEngine.index('test-index', mockDocuments);
+
+    const mockedSearchResult = await testLunrSearchEngine.query({
+      term: 'testTitle',
+      types: ['test-index'],
+      pageCursor: 'MQ==',
+    });
+
+    expect(mockedSearchResult).toMatchObject({
+      results: Array(30)
+        .fill(0)
+        .map((_, i) => ({
+          document: {
+            title: 'testTitle',
+            text: 'testText',
+            location: `test/location/${i}`,
+          },
+          type: 'test-index',
+        }))
+        .slice(25),
+      nextPageCursor: undefined,
+      previousPageCursor: 'MA==',
+    });
   });
 
   describe('index', () => {
@@ -750,3 +781,19 @@ describe('LunrSearchEngine', () => {
     });
   });
 });
+
+describe('decodePageCursor', () => {
+  test('should decode page', () => {
+    expect(decodePageCursor('MQ==')).toEqual({ page: 1 });
+  });
+
+  test('should fallback to first page if empty', () => {
+    expect(decodePageCursor()).toEqual({ page: 0 });
+  });
+});
+
+describe('encodePageCursor', () => {
+  test('should encode page', () => {
+    expect(encodePageCursor({ page: 1 })).toEqual('MQ==');
+  });
+});
diff --git a/plugins/search-backend-node/src/engines/LunrSearchEngine.ts b/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
index 75e5fdc625..f22762cb9f 100644
--- a/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
+++ b/plugins/search-backend-node/src/engines/LunrSearchEngine.ts
@@ -27,8 +27,7 @@ import { Logger } from 'winston';
 export type ConcreteLunrQuery = {
   lunrQueryBuilder: lunr.Index.QueryBuilder;
   documentTypes?: string[];
-  offset: number;
-  limit: number;
+  pageSize: number;
 };
 
 type LunrResultEnvelope = {
@@ -52,9 +51,9 @@ export class LunrSearchEngine implements SearchEngine {
     term,
     filters,
     types,
-    offset,
-    limit,
   }: SearchQuery): ConcreteLunrQuery => {
+    const pageSize = 25;
+
     return {
       lunrQueryBuilder: q => {
         const termToken = lunr.tokenizer(term);
@@ -111,8 +110,7 @@ export class LunrSearchEngine implements SearchEngine {
         }
       },
       documentTypes: types,
-      offset: offset ?? 0,
-      limit: Math.min(limit ?? 25, 100),
+      pageSize,
     };
   };
 
@@ -147,7 +145,7 @@ export class LunrSearchEngine implements SearchEngine {
   }
 
   async query(query: SearchQuery): Promise<SearchResultSet> {
-    const { lunrQueryBuilder, documentTypes, offset, limit } = this.translator(
+    const { lunrQueryBuilder, documentTypes, pageSize } = this.translator(
       query,
     ) as ConcreteLunrQuery;
 
@@ -183,14 +181,41 @@ export class LunrSearchEngine implements SearchEngine {
       return doc2.result.score - doc1.result.score;
     });
 
+    // Perform paging
+    const { page } = decodePageCursor(query.pageCursor);
+    const offset = page * pageSize;
+    const hasPreviousPage = page > 0;
+    const hasNextPage = results.length > offset + pageSize;
+    const nextPageCursor = hasNextPage
+      ? encodePageCursor({ page: page + 1 })
+      : undefined;
+    const previousPageCursor = hasPreviousPage
+      ? encodePageCursor({ page: page - 1 })
+      : undefined;
+
     // Translate results into SearchResultSet
     const realResultSet: SearchResultSet = {
-      results: results.slice(offset, offset + limit).map(d => {
+      results: results.slice(offset, offset + pageSize).map(d => {
         return { type: d.type, document: this.docStore[d.result.ref] };
       }),
-      totalCount: results.length,
+      nextPageCursor,
+      previousPageCursor,
     };
 
     return realResultSet;
   }
 }
+
+export function decodePageCursor(pageCursor?: string): { page: number } {
+  if (!pageCursor) {
+    return { page: 0 };
+  }
+
+  return {
+    page: Number(Buffer.from(pageCursor, 'base64').toString('utf-8')),
+  };
+}
+
+export function encodePageCursor({ page }: { page: number }): string {
+  return Buffer.from(`${page}`, 'utf-8').toString('base64');
+}
diff --git a/plugins/search-backend/src/service/router.ts b/plugins/search-backend/src/service/router.ts
index 5a87fb1734..6df39ca1eb 100644
--- a/plugins/search-backend/src/service/router.ts
+++ b/plugins/search-backend/src/service/router.ts
@@ -36,21 +36,17 @@ export async function createRouter({
       req: express.Request<any, unknown, unknown, SearchQuery>,
       res: express.Response<SearchResultSet>,
     ) => {
-      const { term, filters = {}, types, offset, limit } = req.query;
+      const { term, filters = {}, types, pageCursor } = req.query;
       logger.info(
         `Search request received: term="${term}", filters=${JSON.stringify(
           filters,
-        )}, offset=${offset ?? ''}, limit=${limit ?? ''}`,
+        )}, types=${types ? types.join(',') : ''}, pageCursor=${
+          pageCursor ?? ''
+        }`,
       );
 
       try {
-        const results = await engine?.query({
-          term,
-          types,
-          filters,
-          offset: offset ? Number(offset) : undefined,
-          limit: limit ? Number(limit) : undefined,
-        });
+        const results = await engine?.query(req.query);
         res.send(results);
       } catch (err) {
         throw new Error(
diff --git a/plugins/search/api-report.md b/plugins/search/api-report.md
index 616c6f2cae..2cdac79cad 100644
--- a/plugins/search/api-report.md
+++ b/plugins/search/api-report.md
@@ -139,10 +139,8 @@ export { searchPlugin };
 // @public (undocumented)
 export const SearchResult: ({
   children,
-  initialPageSize,
 }: {
   children: (results: { results: SearchResult_2[] }) => JSX.Element;
-  initialPageSize?: number | undefined;
 }) => JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "SearchTypeProps" needs to be exported by the entry point index.d.ts
@@ -169,7 +167,7 @@ export const useSearch: () => SearchContextValue;
 
 // Warnings were encountered during analysis:
 //
-// src/components/SearchContext/SearchContext.d.ts:23:5 - (ae-forgotten-export) The symbol "SettableSearchContext" needs to be exported by the entry point index.d.ts
+// src/components/SearchContext/SearchContext.d.ts:21:5 - (ae-forgotten-export) The symbol "SettableSearchContext" needs to be exported by the entry point index.d.ts
 // src/components/SearchFilter/SearchFilter.d.ts:13:5 - (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
 // src/components/SearchFilter/SearchFilter.d.ts:14:5 - (ae-forgotten-export) The symbol "Component" needs to be exported by the entry point index.d.ts
 
diff --git a/plugins/search/src/apis.test.ts b/plugins/search/src/apis.test.ts
index 38f34bb91b..91395d1f0b 100644
--- a/plugins/search/src/apis.test.ts
+++ b/plugins/search/src/apis.test.ts
@@ -21,7 +21,6 @@ describe('apis', () => {
     term: '',
     filters: {},
     types: [],
-    page: {},
   };
 
   const baseUrl = 'https://base-url.com/';
diff --git a/plugins/search/src/components/SearchBar/SearchBar.test.tsx b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
index acfeb2cb8b..188ffb279b 100644
--- a/plugins/search/src/components/SearchBar/SearchBar.test.tsx
+++ b/plugins/search/src/components/SearchBar/SearchBar.test.tsx
@@ -30,7 +30,6 @@ jest.mock('@backstage/core-plugin-api', () => ({
 describe('SearchBar', () => {
   const initialState = {
     term: '',
-    page: {},
     filters: {},
     types: ['*'],
   };
diff --git a/plugins/search/src/components/SearchContext/SearchContext.test.tsx b/plugins/search/src/components/SearchContext/SearchContext.test.tsx
index c1618be5ec..d4153e8e4b 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.test.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.test.tsx
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-import React from 'react';
-import { render, screen, waitFor } from '@testing-library/react';
-import { renderHook, act } from '@testing-library/react-hooks';
-
-import { useSearch, SearchContextProvider } from './SearchContext';
-
 import { useApi } from '@backstage/core-plugin-api';
+import { render, screen, waitFor } from '@testing-library/react';
+import { act, renderHook } from '@testing-library/react-hooks';
+import React from 'react';
+import { SearchContextProvider, useSearch } from './SearchContext';
 
 jest.mock('@backstage/core-plugin-api', () => ({
   ...jest.requireActual('@backstage/core-plugin-api'),
@@ -38,7 +36,6 @@ describe('SearchContext', () => {
 
   const initialState = {
     term: '',
-    page: {},
     filters: {},
     types: ['*'],
   };
@@ -46,6 +43,7 @@ describe('SearchContext', () => {
   beforeEach(() => {
     query.mockResolvedValue({});
     (useApi as jest.Mock).mockReturnValue({ query: query });
+    window.scrollTo = jest.fn();
   });
 
   afterAll(() => {
@@ -93,26 +91,26 @@ describe('SearchContext', () => {
       initialProps: {
         initialState: {
           ...initialState,
-          page: { offset: 0, limit: 25 },
+          pageCursor: 'SOMEPAGE',
         },
       },
     });
 
     await waitForNextUpdate();
 
-    expect(result.current.page).toEqual({ offset: 0, limit: 25 });
+    expect(result.current.pageCursor).toEqual('SOMEPAGE');
 
     act(() => {
       result.current.setTerm('first term');
     });
 
     act(() => {
-      result.current.setPage({ offset: 75, limit: 25 });
+      result.current.setPageCursor('OTHERPAGE');
     });
 
     await waitForNextUpdate();
 
-    expect(result.current.page).toEqual({ offset: 75, limit: 25 });
+    expect(result.current.pageCursor).toEqual('OTHERPAGE');
 
     act(() => {
       result.current.setTerm('second term');
@@ -120,7 +118,7 @@ describe('SearchContext', () => {
 
     await waitForNextUpdate();
 
-    expect(result.current.page).toEqual({ offset: 0, limit: 25 });
+    expect(result.current.pageCursor).toEqual(undefined);
   });
 
   describe('Performs search (and sets results)', () => {
@@ -145,8 +143,6 @@ describe('SearchContext', () => {
       expect(query).toHaveBeenLastCalledWith({
         filters: {},
         types: ['*'],
-        limit: undefined,
-        offset: undefined,
         term,
       });
     });
@@ -172,8 +168,6 @@ describe('SearchContext', () => {
       expect(query).toHaveBeenLastCalledWith({
         filters,
         types: ['*'],
-        limit: undefined,
-        offset: undefined,
         term: '',
       });
     });
@@ -188,10 +182,8 @@ describe('SearchContext', () => {
 
       await waitForNextUpdate();
 
-      const page = { offset: 25, limit: 50 };
-
       act(() => {
-        result.current.setPage(page);
+        result.current.setPageCursor('SOMEPAGE');
       });
 
       await waitForNextUpdate();
@@ -199,8 +191,7 @@ describe('SearchContext', () => {
       expect(query).toHaveBeenLastCalledWith({
         filters: {},
         types: ['*'],
-        limit: 50,
-        offset: 25,
+        pageCursor: 'SOMEPAGE',
         term: '',
       });
     });
@@ -226,10 +217,72 @@ describe('SearchContext', () => {
       expect(query).toHaveBeenLastCalledWith({
         types,
         filters: {},
-        limit: undefined,
-        offset: undefined,
         term: '',
       });
     });
+
+    it('provides function for fetch the next page', async () => {
+      query.mockResolvedValue({
+        results: [],
+        nextPageCursor: 'NEXT',
+      });
+
+      const { result, waitForNextUpdate } = renderHook(() => useSearch(), {
+        wrapper,
+        initialProps: {
+          initialState,
+        },
+      });
+
+      await waitForNextUpdate();
+
+      expect(result.current.fetchNextPage).toBeDefined();
+      expect(result.current.fetchPreviousPage).toBeUndefined();
+
+      act(() => {
+        result.current.fetchNextPage!();
+      });
+
+      await waitForNextUpdate();
+
+      expect(query).toHaveBeenLastCalledWith({
+        types: ['*'],
+        filters: {},
+        term: '',
+        pageCursor: 'NEXT',
+      });
+    });
+
+    it('provides function for fetch the previous page', async () => {
+      query.mockResolvedValue({
+        results: [],
+        previousPageCursor: 'PREVIOUS',
+      });
+
+      const { result, waitForNextUpdate } = renderHook(() => useSearch(), {
+        wrapper,
+        initialProps: {
+          initialState,
+        },
+      });
+
+      await waitForNextUpdate();
+
+      expect(result.current.fetchNextPage).toBeUndefined();
+      expect(result.current.fetchPreviousPage).toBeDefined();
+
+      act(() => {
+        result.current.fetchPreviousPage!();
+      });
+
+      await waitForNextUpdate();
+
+      expect(query).toHaveBeenLastCalledWith({
+        types: ['*'],
+        filters: {},
+        term: '',
+        pageCursor: 'PREVIOUS',
+      });
+    });
   });
 });
diff --git a/plugins/search/src/components/SearchContext/SearchContext.tsx b/plugins/search/src/components/SearchContext/SearchContext.tsx
index 018496876b..0badc7fd20 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.tsx
@@ -20,6 +20,7 @@ import { SearchResultSet } from '@backstage/search-common';
 import React, {
   createContext,
   PropsWithChildren,
+  useCallback,
   useContext,
   useEffect,
   useState,
@@ -28,8 +29,6 @@ import { useAsync, usePrevious } from 'react-use';
 import { AsyncState } from 'react-use/lib/useAsync';
 import { searchApiRef } from '../../apis';
 
-type Page = { limit?: number; offset?: number };
-
 type SearchContextValue = {
   result: AsyncState<SearchResultSet>;
   term: string;
@@ -38,13 +37,21 @@ type SearchContextValue = {
   setTypes: React.Dispatch<React.SetStateAction<string[]>>;
   filters: JsonObject;
   setFilters: React.Dispatch<React.SetStateAction<JsonObject>>;
-  page: Page;
-  setPage: React.Dispatch<React.SetStateAction<Page>>;
+  pageCursor?: string;
+  setPageCursor: React.Dispatch<React.SetStateAction<string | undefined>>;
+  fetchNextPage?: React.DispatchWithoutAction;
+  fetchPreviousPage?: React.DispatchWithoutAction;
 };
 
 type SettableSearchContext = Omit<
   SearchContextValue,
-  'result' | 'setTerm' | 'setTypes' | 'setFilters' | 'setPage'
+  | 'result'
+  | 'setTerm'
+  | 'setTypes'
+  | 'setFilters'
+  | 'setPageCursor'
+  | 'fetchNextPage'
+  | 'fetchPreviousPage'
 >;
 
 export const SearchContext = createContext<SearchContextValue | undefined>(
@@ -54,14 +61,16 @@ export const SearchContext = createContext<SearchContextValue | undefined>(
 export const SearchContextProvider = ({
   initialState = {
     term: '',
-    page: {},
+    pageCursor: undefined,
     filters: {},
     types: [],
   },
   children,
 }: PropsWithChildren<{ initialState?: SettableSearchContext }>) => {
   const searchApi = useApi(searchApiRef);
-  const [page, setPage] = useState<Page>(initialState.page);
+  const [pageCursor, setPageCursor] = useState<string | undefined>(
+    initialState.pageCursor,
+  );
   const [filters, setFilters] = useState<JsonObject>(initialState.filters);
   const [term, setTerm] = useState<string>(initialState.term);
   const [types, setTypes] = useState<string[]>(initialState.types);
@@ -72,19 +81,31 @@ export const SearchContextProvider = ({
       searchApi.query({
         term,
         filters,
-        offset: page?.offset,
-        limit: page?.limit,
+        pageCursor: pageCursor,
         types,
       }),
-    [term, filters, types, page],
+    [term, filters, types, pageCursor],
   );
 
+  const hasNextPage =
+    !result.loading && !result.error && result.value?.nextPageCursor;
+  const hasPreviousPage =
+    !result.loading && !result.error && result.value?.previousPageCursor;
+  const fetchNextPage = useCallback(() => {
+    setPageCursor(result.value?.nextPageCursor);
+    resetScrollPosition();
+  }, [result.value?.nextPageCursor]);
+  const fetchPreviousPage = useCallback(() => {
+    setPageCursor(result.value?.previousPageCursor);
+    resetScrollPosition();
+  }, [result.value?.previousPageCursor]);
+
   useEffect(() => {
     // Any time a term is reset, we want to start from page 0.
     if (term && prevTerm && term !== prevTerm) {
-      setPage(initialState.page);
+      setPageCursor(undefined);
     }
-  }, [term, prevTerm, initialState.page]);
+  }, [term, prevTerm, initialState.pageCursor]);
 
   const value: SearchContextValue = {
     result,
@@ -94,8 +115,10 @@ export const SearchContextProvider = ({
     setTerm,
     types,
     setTypes,
-    page,
-    setPage,
+    pageCursor,
+    setPageCursor,
+    fetchNextPage: hasNextPage ? fetchNextPage : undefined,
+    fetchPreviousPage: hasPreviousPage ? fetchPreviousPage : undefined,
   };
 
   return <SearchContext.Provider value={value} children={children} />;
@@ -108,3 +131,7 @@ export const useSearch = () => {
   }
   return context;
 };
+
+function resetScrollPosition() {
+  window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
+}
diff --git a/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx b/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
index b5dd56bfb6..8f716caf4b 100644
--- a/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
+++ b/plugins/search/src/components/SearchFilter/SearchFilter.test.tsx
@@ -32,7 +32,6 @@ describe('SearchFilter', () => {
     term: '',
     filters: {},
     types: [],
-    page: {},
   };
 
   const name = 'field';
diff --git a/plugins/search/src/components/SearchPage/SearchPage.test.tsx b/plugins/search/src/components/SearchPage/SearchPage.test.tsx
index 91568cddbe..5ff61a3dbe 100644
--- a/plugins/search/src/components/SearchPage/SearchPage.test.tsx
+++ b/plugins/search/src/components/SearchPage/SearchPage.test.tsx
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-import React from 'react';
 import { renderInTestApp } from '@backstage/test-utils';
+import React from 'react';
 import { useLocation, useOutlet } from 'react-router';
-
 import { useSearch } from '../SearchContext';
 import { SearchPage } from './';
 
@@ -74,25 +73,21 @@ describe('SearchPage', () => {
     const expectedTerm = 'justin bieber';
     const expectedTypes = ['software-catalog'];
     const expectedFilters = { [expectedFilterField]: expectedFilterValue };
-    const expectedOffset = 25;
-    const expectedLimit = 50;
+    const expectedPageCursor = 'SOMEPAGE';
 
-    // e.g. ?query=petstore&offset=25&limit=50&filters[lifecycle][]=experimental&filters[kind]=Component
+    // e.g. ?query=petstore&pageCursor=SOMEPAGE&filters[lifecycle][]=experimental&filters[kind]=Component
     (useLocation as jest.Mock).mockReturnValueOnce({
-      search: `?query=${expectedTerm}&types[]=${expectedTypes[0]}&filters[${expectedFilterField}]=${expectedFilterValue}&offset=${expectedOffset}&limit=${expectedLimit}`,
+      search: `?query=${expectedTerm}&types[]=${expectedTypes[0]}&filters[${expectedFilterField}]=${expectedFilterValue}&pageCursor=${expectedPageCursor}`,
     });
 
     // When we render the page...
     await renderInTestApp(<SearchPage />);
 
-    // Then search context should be initialized with these values...
-    const calls = (SearchContextProvider as jest.Mock).mock.calls[0];
-    const actualInitialState = calls[0].initialState;
-    expect(actualInitialState.term).toEqual(expectedTerm);
-    expect(actualInitialState.types).toEqual(expectedTypes);
-    expect(actualInitialState.page.limit).toEqual(expectedLimit);
-    expect(actualInitialState.page.offset).toEqual(expectedOffset);
-    expect(actualInitialState.filters).toStrictEqual(expectedFilters);
+    // Then search context should be set with these values...
+    expect(setTermMock).toHaveBeenCalledWith(expectedTerm);
+    expect(setTypesMock).toHaveBeenCalledWith(expectedTypes);
+    expect(setPageCursorMock).toHaveBeenCalledWith(expectedPageCursor);
+    expect(setFiltersMock).toHaveBeenCalledWith(expectedFilters);
   });
 
   it('renders provided router element', async () => {
@@ -112,7 +107,7 @@ describe('SearchPage', () => {
     (useSearch as jest.Mock).mockReturnValueOnce({
       term: 'bieber',
       types: ['software-catalog'],
-      page: { offset: 25, limit: 50 },
+      pageCursor: 'SOMEPAGE',
       filters: { anyKey: 'anyValue' },
       setTerm: setTermMock,
       setTypes: setTypesMock,
@@ -120,7 +115,7 @@ describe('SearchPage', () => {
       setPageCursor: setPageCursorMock,
     });
     const expectedLocation = encodeURI(
-      '?query=bieber&types[]=software-catalog&offset=25&limit=50&filters[anyKey]=anyValue',
+      '?query=bieber&types[]=software-catalog&pageCursor=SOMEPAGE&filters[anyKey]=anyValue',
     );
 
     await renderInTestApp(<SearchPage />);
diff --git a/plugins/search/src/components/SearchResult/SearchResult.test.tsx b/plugins/search/src/components/SearchResult/SearchResult.test.tsx
index d28bcc9136..43a9cdb022 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.test.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.test.tsx
@@ -24,7 +24,6 @@ jest.mock('../SearchContext', () => ({
   ...jest.requireActual('../SearchContext'),
   useSearch: jest.fn().mockReturnValue({
     result: {},
-    page: {},
   }),
 }));
 
@@ -111,7 +110,6 @@ describe('SearchResult', () => {
           ],
         },
       },
-      page: {},
     });
 
     const { getByText } = await renderInTestApp(
@@ -124,43 +122,4 @@ describe('SearchResult', () => {
 
     expect(getByText('Results 1')).toBeInTheDocument();
   });
-
-  it('Starts on initial page if no offset is set', async () => {
-    (useSearch as jest.Mock).mockReturnValueOnce({
-      page: {},
-      result: {
-        loading: false,
-        error: '',
-        value: { results: [{}], totalCount: 100 },
-      },
-    });
-
-    const { getByLabelText } = await renderInTestApp(
-      <SearchResult>{({}) => <></>}</SearchResult>,
-    );
-
-    expect(getByLabelText('page 1')).toHaveAttribute('aria-current', 'true');
-    expect(getByLabelText('Go to page 2')).toBeInTheDocument();
-    expect(getByLabelText('Go to page 3')).toBeInTheDocument();
-    expect(getByLabelText('Go to page 4')).toBeInTheDocument();
-  });
-
-  it('Shows the right page', async () => {
-    (useSearch as jest.Mock).mockReturnValueOnce({
-      page: { offset: 25 },
-      result: {
-        loading: false,
-        error: '',
-        value: { results: [{}], totalCount: 63 },
-      },
-    });
-
-    const { getByLabelText } = await renderInTestApp(
-      <SearchResult>{({}) => <></>}</SearchResult>,
-    );
-
-    expect(getByLabelText('Go to page 1')).toBeInTheDocument();
-    expect(getByLabelText('page 2')).toHaveAttribute('aria-current', 'true');
-    expect(getByLabelText('Go to page 3')).toBeInTheDocument();
-  });
 });
diff --git a/plugins/search/src/components/SearchResult/SearchResult.tsx b/plugins/search/src/components/SearchResult/SearchResult.tsx
index 5ac2c86a79..ff01e96e74 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.tsx
@@ -20,20 +20,17 @@ import {
   ResponseErrorPanel,
 } from '@backstage/core-components';
 import { SearchResult } from '@backstage/search-common';
-import { Pagination } from '@material-ui/lab';
 import React from 'react';
 import { useSearch } from '../SearchContext';
+import { SearchResultPager } from '../SearchResultPager';
 
 type Props = {
   children: (results: { results: SearchResult[] }) => JSX.Element;
-  initialPageSize?: number;
 };
 
-const SearchResultComponent = ({ children, initialPageSize = 25 }: Props) => {
+export const SearchResultComponent = ({ children }: Props) => {
   const {
     result: { loading, error, value },
-    page,
-    setPage,
   } = useSearch();
 
   if (loading) {
@@ -52,23 +49,10 @@ const SearchResultComponent = ({ children, initialPageSize = 25 }: Props) => {
     return <EmptyState missing="data" title="Sorry, no results were found" />;
   }
 
-  const pageSize = page.limit ?? initialPageSize;
-  const totalPages = Math.ceil(value.totalCount / pageSize);
-  const currentPage = page.offset ? Math.floor(page.offset / pageSize) + 1 : 1;
-
-  const handlePageChange = (_: React.ChangeEvent<unknown>, pageNum: number) => {
-    setPage({ offset: (pageNum - 1) * pageSize, limit: pageSize });
-    window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
-  };
-
   return (
     <>
       {children({ results: value.results })}
-      <Pagination
-        count={totalPages}
-        page={currentPage}
-        onChange={handlePageChange}
-      />
+      <SearchResultPager />
     </>
   );
 };
diff --git a/plugins/search/src/components/SearchResultPager/SearchResultPager.test.tsx b/plugins/search/src/components/SearchResultPager/SearchResultPager.test.tsx
new file mode 100644
index 0000000000..ab46d77938
--- /dev/null
+++ b/plugins/search/src/components/SearchResultPager/SearchResultPager.test.tsx
@@ -0,0 +1,59 @@
+/*
+ * 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 { renderInTestApp } from '@backstage/test-utils';
+import { waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { useSearch } from '../SearchContext';
+import { SearchResultPager } from './SearchResultPager';
+
+jest.mock('../SearchContext', () => ({
+  ...jest.requireActual('../SearchContext'),
+  useSearch: jest.fn().mockReturnValue({
+    result: {},
+  }),
+}));
+
+describe('SearchResultPager', () => {
+  it('renders pager buttons', async () => {
+    const fetchNextPage = jest.fn();
+    const fetchPreviousPage = jest.fn();
+    (useSearch as jest.Mock).mockReturnValueOnce({
+      result: { loading: false, value: [] },
+      fetchNextPage,
+      fetchPreviousPage,
+    });
+
+    const { getByLabelText } = await renderInTestApp(<SearchResultPager />);
+
+    await waitFor(() => {
+      expect(getByLabelText('previous page')).toBeInTheDocument();
+
+      userEvent.click(getByLabelText('previous page'));
+    });
+
+    expect(fetchPreviousPage).toBeCalled();
+
+    await waitFor(() => {
+      expect(getByLabelText('next page')).toBeInTheDocument();
+
+      userEvent.click(getByLabelText('next page'));
+    });
+
+    expect(fetchNextPage).toBeCalled();
+  });
+});
diff --git a/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx b/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx
new file mode 100644
index 0000000000..97fa0048e3
--- /dev/null
+++ b/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx
@@ -0,0 +1,64 @@
+/*
+ * 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 { Button, makeStyles } from '@material-ui/core';
+import ArrowBackIosIcon from '@material-ui/icons/ArrowBackIos';
+import ArrowForwardIosIcon from '@material-ui/icons/ArrowForwardIos';
+import React from 'react';
+import { useSearch } from '../SearchContext';
+
+const useStyles = makeStyles(theme => ({
+  root: {
+    display: 'flex',
+    justifyContent: 'center',
+    gap: theme.spacing(2),
+    marginTop: theme.spacing(1),
+    marginBottom: theme.spacing(1),
+  },
+}));
+
+export const SearchResultPager = () => {
+  const { fetchNextPage, fetchPreviousPage } = useSearch();
+  const classes = useStyles();
+
+  if (!fetchNextPage && !fetchPreviousPage) {
+    return <></>;
+  }
+
+  return (
+    <nav arial-label="pagination navigation" className={classes.root}>
+      <Button
+        aria-label="previous page"
+        disabled={!fetchPreviousPage}
+        onClick={fetchPreviousPage}
+        startIcon={<ArrowBackIosIcon />}
+        size="small"
+      >
+        Back
+      </Button>
+
+      <Button
+        aria-label="next page"
+        disabled={!fetchNextPage}
+        onClick={fetchNextPage}
+        endIcon={<ArrowForwardIosIcon />}
+        size="small"
+      >
+        Next
+      </Button>
+    </nav>
+  );
+};
diff --git a/plugins/search/src/components/SearchResultPager/index.ts b/plugins/search/src/components/SearchResultPager/index.ts
new file mode 100644
index 0000000000..39b72ec71f
--- /dev/null
+++ b/plugins/search/src/components/SearchResultPager/index.ts
@@ -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 { SearchResultPager } from './SearchResultPager';
diff --git a/plugins/search/src/components/SearchType/SearchType.test.tsx b/plugins/search/src/components/SearchType/SearchType.test.tsx
index f8171b0779..d3792bb9f4 100644
--- a/plugins/search/src/components/SearchType/SearchType.test.tsx
+++ b/plugins/search/src/components/SearchType/SearchType.test.tsx
@@ -31,7 +31,6 @@ describe('SearchType', () => {
     term: '',
     filters: {},
     types: [],
-    page: {},
   };
 
   const name = 'field';
diff --git a/plugins/search/src/components/index.tsx b/plugins/search/src/components/index.tsx
index 889eb36334..8b6493ae9b 100644
--- a/plugins/search/src/components/index.tsx
+++ b/plugins/search/src/components/index.tsx
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
+export * from './DefaultResultListItem';
 export * from './Filters';
-export * from './SearchFilter';
-export * from './SearchType';
 export * from './SearchBar';
+export * from './SearchContext';
+export * from './SearchFilter';
 export * from './SearchPage';
 export * from './SearchResult';
-export * from './DefaultResultListItem';
+export * from './SearchResultPager';
+export * from './SearchType';
 export * from './SidebarSearch';
-export * from './SearchContext';

From 66be8145796626e19b28f580190a6ccfb80f9cb4 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Thu, 2 Sep 2021 10:17:22 +0200
Subject: [PATCH 75/83] Remove scrolling behavior

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .../src/components/SearchContext/SearchContext.test.tsx     | 1 -
 .../search/src/components/SearchContext/SearchContext.tsx   | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/plugins/search/src/components/SearchContext/SearchContext.test.tsx b/plugins/search/src/components/SearchContext/SearchContext.test.tsx
index d4153e8e4b..6513dc21bb 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.test.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.test.tsx
@@ -43,7 +43,6 @@ describe('SearchContext', () => {
   beforeEach(() => {
     query.mockResolvedValue({});
     (useApi as jest.Mock).mockReturnValue({ query: query });
-    window.scrollTo = jest.fn();
   });
 
   afterAll(() => {
diff --git a/plugins/search/src/components/SearchContext/SearchContext.tsx b/plugins/search/src/components/SearchContext/SearchContext.tsx
index 0badc7fd20..16d1371964 100644
--- a/plugins/search/src/components/SearchContext/SearchContext.tsx
+++ b/plugins/search/src/components/SearchContext/SearchContext.tsx
@@ -93,11 +93,9 @@ export const SearchContextProvider = ({
     !result.loading && !result.error && result.value?.previousPageCursor;
   const fetchNextPage = useCallback(() => {
     setPageCursor(result.value?.nextPageCursor);
-    resetScrollPosition();
   }, [result.value?.nextPageCursor]);
   const fetchPreviousPage = useCallback(() => {
     setPageCursor(result.value?.previousPageCursor);
-    resetScrollPosition();
   }, [result.value?.previousPageCursor]);
 
   useEffect(() => {
@@ -131,7 +129,3 @@ export const useSearch = () => {
   }
   return context;
 };
-
-function resetScrollPosition() {
-  window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
-}

From f8546dadbffa9de509426e5d2045d60fca78599f Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Thu, 2 Sep 2021 10:19:08 +0200
Subject: [PATCH 76/83] Force adopters to include the search result pager on
 their own

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 .changeset/search-happy-owls-sneeze.md        |  3 +++
 .../app/src/components/search/SearchPage.tsx  |  2 ++
 .../components/SearchResult/SearchResult.tsx  |  8 +-----
 .../SearchResultPager/SearchResultPager.tsx   |  5 ++--
 plugins/search/src/index.ts                   | 25 ++++++++++---------
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/.changeset/search-happy-owls-sneeze.md b/.changeset/search-happy-owls-sneeze.md
index 4740c767d2..1f3cfd5dd1 100644
--- a/.changeset/search-happy-owls-sneeze.md
+++ b/.changeset/search-happy-owls-sneeze.md
@@ -8,3 +8,6 @@
 ---
 
 Implement optional `pageCursor` based paging in search.
+
+To use paging in your app, add a `<SearchResultPager />` to your
+`SearchPage.tsx`.
diff --git a/packages/app/src/components/search/SearchPage.tsx b/packages/app/src/components/search/SearchPage.tsx
index 1c8d750e08..54f59d1a6e 100644
--- a/packages/app/src/components/search/SearchPage.tsx
+++ b/packages/app/src/components/search/SearchPage.tsx
@@ -21,6 +21,7 @@ import {
   SearchBar,
   SearchFilter,
   SearchResult,
+  SearchResultPager,
   SearchType,
 } from '@backstage/plugin-search';
 import { DocsResultListItem } from '@backstage/plugin-techdocs';
@@ -104,6 +105,7 @@ const SearchPage = () => {
                 </List>
               )}
             </SearchResult>
+            <SearchResultPager />
           </Grid>
         </Grid>
       </Content>
diff --git a/plugins/search/src/components/SearchResult/SearchResult.tsx b/plugins/search/src/components/SearchResult/SearchResult.tsx
index ff01e96e74..34b6840f21 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.tsx
@@ -22,7 +22,6 @@ import {
 import { SearchResult } from '@backstage/search-common';
 import React from 'react';
 import { useSearch } from '../SearchContext';
-import { SearchResultPager } from '../SearchResultPager';
 
 type Props = {
   children: (results: { results: SearchResult[] }) => JSX.Element;
@@ -49,12 +48,7 @@ export const SearchResultComponent = ({ children }: Props) => {
     return <EmptyState missing="data" title="Sorry, no results were found" />;
   }
 
-  return (
-    <>
-      {children({ results: value.results })}
-      <SearchResultPager />
-    </>
-  );
+  return <>{children({ results: value.results })}</>;
 };
 
 export { SearchResultComponent as SearchResult };
diff --git a/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx b/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx
index 97fa0048e3..f1850772bb 100644
--- a/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx
+++ b/plugins/search/src/components/SearchResultPager/SearchResultPager.tsx
@@ -23,10 +23,9 @@ import { useSearch } from '../SearchContext';
 const useStyles = makeStyles(theme => ({
   root: {
     display: 'flex',
-    justifyContent: 'center',
+    justifyContent: 'space-between',
     gap: theme.spacing(2),
-    marginTop: theme.spacing(1),
-    marginBottom: theme.spacing(1),
+    margin: theme.spacing(4),
   },
 }));
 
diff --git a/plugins/search/src/index.ts b/plugins/search/src/index.ts
index f09ba739bd..d178329ab4 100644
--- a/plugins/search/src/index.ts
+++ b/plugins/search/src/index.ts
@@ -15,25 +15,26 @@
  */
 
 export { searchApiRef } from './apis';
-export {
-  searchPlugin,
-  searchPlugin as plugin,
-  SearchPage,
-  SearchPageNext,
-  SearchBarNext,
-  SearchResult,
-  DefaultResultListItem,
-} from './plugin';
 export {
   Filters,
   FiltersButton,
   SearchBar,
   SearchContextProvider,
-  useSearch,
-  SearchPage as Router,
   SearchFilter,
-  SearchType,
   SearchFilterNext,
+  SearchPage as Router,
+  SearchResultPager,
+  SearchType,
   SidebarSearch,
+  useSearch,
 } from './components';
 export type { FiltersState } from './components';
+export {
+  DefaultResultListItem,
+  SearchBarNext,
+  SearchPage,
+  SearchPageNext,
+  searchPlugin as plugin,
+  searchPlugin,
+  SearchResult,
+} from './plugin';

From dba58584c381bab05aa6dd9c6985f06e591c7466 Mon Sep 17 00:00:00 2001
From: Oliver Sand <oliver.sand@sda-se.com>
Date: Thu, 2 Sep 2021 10:50:39 +0200
Subject: [PATCH 77/83] Update api report

Signed-off-by: Oliver Sand <oliver.sand@sda-se.com>
---
 plugins/search/api-report.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/search/api-report.md b/plugins/search/api-report.md
index 2cdac79cad..03c24609e2 100644
--- a/plugins/search/api-report.md
+++ b/plugins/search/api-report.md
@@ -143,6 +143,11 @@ export const SearchResult: ({
   children: (results: { results: SearchResult_2[] }) => JSX.Element;
 }) => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "SearchResultPager" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const SearchResultPager: () => JSX.Element;
+
 // Warning: (ae-forgotten-export) The symbol "SearchTypeProps" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "SearchType" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //

From 5783b0dc27038bf771c6e3b90c1dc63bbbf5b208 Mon Sep 17 00:00:00 2001
From: "@pawelmitka" <pawel.mitka@brainly.com>
Date: Thu, 2 Sep 2021 11:06:06 +0200
Subject: [PATCH 78/83] refactor: rename webhookSecretDefault to
 defaultWebhookSecret

Signed-off-by: @pawelmitka <pawel.mitka@brainly.com>
---
 plugins/scaffolder-backend/api-report.md         |  2 +-
 .../actions/builtin/github/githubWebhook.test.ts | 16 ++++++++--------
 .../actions/builtin/github/githubWebhook.ts      |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index 8a6598da33..b43adc189a 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -120,7 +120,7 @@ export function createGithubActionsDispatchAction(options: {
 // @public (undocumented)
 export function createGithubWebhookAction(options: {
   integrations: ScmIntegrationRegistry;
-  webhookSecretDefault?: string;
+  defaultWebhookSecret?: string;
 }): TemplateAction<any>;
 
 // Warning: (ae-missing-release-tag) "createPublishAzureAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
index 6a49156d22..7d5da3e7b8 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
@@ -33,10 +33,10 @@ describe('github:repository:webhook:create', () => {
   });
 
   const integrations = ScmIntegrations.fromConfig(config);
-  const webhookSecretDefault = 'aafdfdivierernfdk23f';
+  const defaultWebhookSecret = 'aafdfdivierernfdk23f';
   const action = createGithubWebhookAction({
     integrations,
-    webhookSecretDefault,
+    defaultWebhookSecret,
   });
 
   const mockContext = {
@@ -73,7 +73,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecretDefault,
+        secret: defaultWebhookSecret,
         insecure_ssl: '0',
       },
     });
@@ -116,7 +116,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecretDefault,
+        secret: defaultWebhookSecret,
         insecure_ssl: '0',
       },
     });
@@ -137,7 +137,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'json',
-        secret: webhookSecretDefault,
+        secret: defaultWebhookSecret,
         insecure_ssl: '0',
       },
     });
@@ -158,7 +158,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecretDefault,
+        secret: defaultWebhookSecret,
         insecure_ssl: '1',
       },
     });
@@ -179,7 +179,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecretDefault,
+        secret: defaultWebhookSecret,
         insecure_ssl: '1',
       },
     });
@@ -200,7 +200,7 @@ describe('github:repository:webhook:create', () => {
       config: {
         url: webhookUrl,
         content_type: 'form',
-        secret: webhookSecretDefault,
+        secret: defaultWebhookSecret,
         insecure_ssl: '0',
       },
     });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
index f0690cee95..9aefc37034 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
@@ -21,9 +21,9 @@ type ContentType = 'form' | 'json';
 
 export function createGithubWebhookAction(options: {
   integrations: ScmIntegrationRegistry;
-  webhookSecretDefault?: string;
+  defaultWebhookSecret?: string;
 }) {
-  const { integrations, webhookSecretDefault } = options;
+  const { integrations, defaultWebhookSecret } = options;
   const octokitProvider = new OctokitProvider(integrations);
 
   return createTemplateAction<{
@@ -90,7 +90,7 @@ export function createGithubWebhookAction(options: {
       const {
         repoUrl,
         webhookUrl,
-        webhookSecret = webhookSecretDefault,
+        webhookSecret = defaultWebhookSecret,
         events = ['push'],
         active = true,
         contentType = 'form',

From 45a681aa6a016f49890531a0905d66d257fa9e33 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 2 Sep 2021 10:41:57 +0000
Subject: [PATCH 79/83] Version Packages

---
 .changeset/beige-glasses-dream.md             |  5 --
 .changeset/big-eyes-dance.md                  |  5 --
 .changeset/cuddly-cooks-fry.md                |  6 --
 .changeset/cuddly-impalas-wave.md             |  5 --
 .changeset/fair-files-rest.md                 |  5 --
 .changeset/forty-terms-join.md                |  9 ---
 .changeset/four-bobcats-confess.md            |  5 --
 .changeset/friendly-tables-heal.md            |  7 --
 .changeset/fuzzy-pigs-wash.md                 |  5 --
 .changeset/good-papayas-fetch.md              |  5 --
 .changeset/hip-beers-attend.md                |  7 --
 .changeset/honest-suits-approve.md            |  5 --
 .changeset/lovely-guests-smell.md             |  5 --
 .changeset/nasty-ads-nail.md                  | 10 ---
 .changeset/nasty-jokes-camp.md                |  5 --
 .changeset/pretty-cameras-give.md             |  7 --
 .changeset/real-pugs-rhyme.md                 |  5 --
 .changeset/search-happy-owls-sneeze.md        | 13 ----
 .changeset/serious-maps-try.md                |  5 --
 .changeset/serious-pumpkins-hug.md            |  5 --
 .changeset/shiny-guests-explain.md            |  6 --
 .changeset/short-years-smile.md               |  5 --
 .changeset/sixty-cougars-study.md             |  5 --
 .changeset/strange-zoos-grab.md               | 11 ---
 .changeset/strong-beers-ring.md               |  5 --
 .changeset/strong-ravens-smoke.md             |  5 --
 .changeset/stupid-ants-call.md                |  5 --
 .changeset/sweet-jars-travel.md               |  5 --
 .changeset/techdocs-search-log-fatigue.md     |  6 --
 .changeset/techdocs-the-beta-local.md         |  6 --
 .changeset/techdocs-three-icons-collect.md    |  7 --
 .changeset/techdocs-trains-beg.md             |  5 --
 .changeset/techdocs-warm-walls-smile.md       | 17 -----
 .changeset/thick-trees-pay.md                 |  5 --
 .changeset/tiny-crews-notice.md               |  5 --
 .changeset/two-hats-judge.md                  |  5 --
 .changeset/wicked-singers-push.md             |  5 --
 .changeset/yellow-windows-fix.md              |  5 --
 packages/app/CHANGELOG.md                     | 42 +++++++++++
 packages/app/package.json                     | 74 +++++++++----------
 packages/backend-common/CHANGELOG.md          |  8 ++
 packages/backend-common/package.json          |  6 +-
 packages/backend/CHANGELOG.md                 | 18 +++++
 packages/backend/package.json                 | 28 +++----
 packages/catalog-model/CHANGELOG.md           | 12 +++
 packages/catalog-model/package.json           |  4 +-
 packages/cli/CHANGELOG.md                     |  7 ++
 packages/cli/package.json                     | 10 +--
 packages/codemods/CHANGELOG.md                |  8 ++
 packages/codemods/package.json                |  2 +-
 packages/core-app-api/CHANGELOG.md            |  7 ++
 packages/core-app-api/package.json            |  6 +-
 packages/core-components/CHANGELOG.md         | 15 ++++
 packages/core-components/package.json         |  6 +-
 packages/create-app/CHANGELOG.md              |  6 ++
 packages/create-app/package.json              |  2 +-
 packages/dev-utils/CHANGELOG.md               | 11 +++
 packages/dev-utils/package.json               | 14 ++--
 packages/integration-react/CHANGELOG.md       |  8 ++
 packages/integration-react/package.json       | 10 +--
 packages/integration/CHANGELOG.md             |  6 ++
 packages/integration/package.json             |  4 +-
 packages/search-common/CHANGELOG.md           |  9 +++
 packages/search-common/package.json           |  4 +-
 packages/techdocs-common/CHANGELOG.md         | 37 ++++++++++
 packages/techdocs-common/package.json         | 12 +--
 plugins/allure/CHANGELOG.md                   | 10 +++
 plugins/allure/package.json                   | 14 ++--
 plugins/api-docs/CHANGELOG.md                 | 10 +++
 plugins/api-docs/package.json                 | 16 ++--
 plugins/auth-backend/CHANGELOG.md             | 15 ++++
 plugins/auth-backend/package.json             |  8 +-
 plugins/badges/CHANGELOG.md                   |  9 +++
 plugins/badges/package.json                   | 14 ++--
 plugins/bitrise/CHANGELOG.md                  |  9 +++
 plugins/bitrise/package.json                  | 14 ++--
 plugins/catalog-backend/CHANGELOG.md          | 13 ++++
 plugins/catalog-backend/package.json          | 14 ++--
 plugins/catalog-import/CHANGELOG.md           | 12 +++
 plugins/catalog-import/package.json           | 18 ++---
 plugins/catalog-react/CHANGELOG.md            | 12 +++
 plugins/catalog-react/package.json            | 14 ++--
 plugins/catalog/CHANGELOG.md                  | 18 +++++
 plugins/catalog/package.json                  | 18 ++---
 plugins/circleci/CHANGELOG.md                 |  9 +++
 plugins/circleci/package.json                 | 14 ++--
 plugins/cloudbuild/CHANGELOG.md               |  9 +++
 plugins/cloudbuild/package.json               | 14 ++--
 plugins/code-coverage/CHANGELOG.md            |  9 +++
 plugins/code-coverage/package.json            | 14 ++--
 plugins/config-schema/CHANGELOG.md            |  7 ++
 plugins/config-schema/package.json            | 10 +--
 plugins/cost-insights/CHANGELOG.md            |  7 ++
 plugins/cost-insights/package.json            | 10 +--
 plugins/explore/CHANGELOG.md                  |  9 +++
 plugins/explore/package.json                  | 14 ++--
 plugins/firehydrant/CHANGELOG.md              |  9 +++
 plugins/firehydrant/package.json              | 12 +--
 plugins/fossa/CHANGELOG.md                    |  9 +++
 plugins/fossa/package.json                    | 14 ++--
 plugins/gcp-projects/CHANGELOG.md             |  7 ++
 plugins/gcp-projects/package.json             | 10 +--
 plugins/git-release-manager/CHANGELOG.md      |  9 +++
 plugins/git-release-manager/package.json      | 12 +--
 plugins/github-actions/CHANGELOG.md           | 10 +++
 plugins/github-actions/package.json           | 16 ++--
 plugins/github-deployments/CHANGELOG.md       | 11 +++
 plugins/github-deployments/package.json       | 18 ++---
 plugins/gitops-profiles/CHANGELOG.md          |  7 ++
 plugins/gitops-profiles/package.json          | 10 +--
 plugins/graphiql/CHANGELOG.md                 |  7 ++
 plugins/graphiql/package.json                 | 10 +--
 plugins/home/CHANGELOG.md                     |  7 ++
 plugins/home/package.json                     | 10 +--
 plugins/ilert/CHANGELOG.md                    |  9 +++
 plugins/ilert/package.json                    | 14 ++--
 plugins/jenkins/CHANGELOG.md                  |  9 +++
 plugins/jenkins/package.json                  | 14 ++--
 plugins/kafka/CHANGELOG.md                    |  9 +++
 plugins/kafka/package.json                    | 14 ++--
 plugins/kubernetes/CHANGELOG.md               |  9 +++
 plugins/kubernetes/package.json               | 14 ++--
 plugins/lighthouse/CHANGELOG.md               |  9 +++
 plugins/lighthouse/package.json               | 14 ++--
 plugins/newrelic/CHANGELOG.md                 |  7 ++
 plugins/newrelic/package.json                 | 10 +--
 plugins/org/CHANGELOG.md                      | 12 +++
 plugins/org/package.json                      | 14 ++--
 plugins/pagerduty/CHANGELOG.md                |  9 +++
 plugins/pagerduty/package.json                | 14 ++--
 plugins/rollbar/CHANGELOG.md                  |  9 +++
 plugins/rollbar/package.json                  | 14 ++--
 plugins/scaffolder-backend/CHANGELOG.md       | 13 ++++
 plugins/scaffolder-backend/package.json       | 10 +--
 plugins/scaffolder/CHANGELOG.md               | 13 ++++
 plugins/scaffolder/package.json               | 18 ++---
 .../CHANGELOG.md                              | 12 +++
 .../package.json                              |  8 +-
 plugins/search-backend-module-pg/CHANGELOG.md | 16 ++++
 plugins/search-backend-module-pg/package.json | 10 +--
 plugins/search-backend-node/CHANGELOG.md      | 12 +++
 plugins/search-backend-node/package.json      |  8 +-
 plugins/search-backend/CHANGELOG.md           | 14 ++++
 plugins/search-backend/package.json           | 10 +--
 plugins/search/CHANGELOG.md                   | 15 ++++
 plugins/search/package.json                   | 16 ++--
 plugins/sentry/CHANGELOG.md                   |  9 +++
 plugins/sentry/package.json                   | 14 ++--
 plugins/shortcuts/CHANGELOG.md                |  9 +++
 plugins/shortcuts/package.json                | 10 +--
 plugins/sonarqube/CHANGELOG.md                | 10 +++
 plugins/sonarqube/package.json                | 14 ++--
 plugins/splunk-on-call/CHANGELOG.md           |  9 +++
 plugins/splunk-on-call/package.json           | 14 ++--
 plugins/tech-radar/CHANGELOG.md               |  7 ++
 plugins/tech-radar/package.json               | 10 +--
 plugins/techdocs-backend/CHANGELOG.md         | 17 +++++
 plugins/techdocs-backend/package.json         | 14 ++--
 plugins/techdocs/CHANGELOG.md                 | 18 +++++
 plugins/techdocs/package.json                 | 22 +++---
 plugins/todo/CHANGELOG.md                     |  9 +++
 plugins/todo/package.json                     | 14 ++--
 plugins/user-settings/CHANGELOG.md            |  7 ++
 plugins/user-settings/package.json            | 10 +--
 plugins/welcome/CHANGELOG.md                  |  7 ++
 plugins/welcome/package.json                  | 10 +--
 plugins/xcmetrics/CHANGELOG.md                |  7 ++
 plugins/xcmetrics/package.json                | 10 +--
 yarn.lock                                     | 45 +++++++++++
 169 files changed, 1181 insertions(+), 659 deletions(-)
 delete mode 100644 .changeset/beige-glasses-dream.md
 delete mode 100644 .changeset/big-eyes-dance.md
 delete mode 100644 .changeset/cuddly-cooks-fry.md
 delete mode 100644 .changeset/cuddly-impalas-wave.md
 delete mode 100644 .changeset/fair-files-rest.md
 delete mode 100644 .changeset/forty-terms-join.md
 delete mode 100644 .changeset/four-bobcats-confess.md
 delete mode 100644 .changeset/friendly-tables-heal.md
 delete mode 100644 .changeset/fuzzy-pigs-wash.md
 delete mode 100644 .changeset/good-papayas-fetch.md
 delete mode 100644 .changeset/hip-beers-attend.md
 delete mode 100644 .changeset/honest-suits-approve.md
 delete mode 100644 .changeset/lovely-guests-smell.md
 delete mode 100644 .changeset/nasty-ads-nail.md
 delete mode 100644 .changeset/nasty-jokes-camp.md
 delete mode 100644 .changeset/pretty-cameras-give.md
 delete mode 100644 .changeset/real-pugs-rhyme.md
 delete mode 100644 .changeset/search-happy-owls-sneeze.md
 delete mode 100644 .changeset/serious-maps-try.md
 delete mode 100644 .changeset/serious-pumpkins-hug.md
 delete mode 100644 .changeset/shiny-guests-explain.md
 delete mode 100644 .changeset/short-years-smile.md
 delete mode 100644 .changeset/sixty-cougars-study.md
 delete mode 100644 .changeset/strange-zoos-grab.md
 delete mode 100644 .changeset/strong-beers-ring.md
 delete mode 100644 .changeset/strong-ravens-smoke.md
 delete mode 100644 .changeset/stupid-ants-call.md
 delete mode 100644 .changeset/sweet-jars-travel.md
 delete mode 100644 .changeset/techdocs-search-log-fatigue.md
 delete mode 100644 .changeset/techdocs-the-beta-local.md
 delete mode 100644 .changeset/techdocs-three-icons-collect.md
 delete mode 100644 .changeset/techdocs-trains-beg.md
 delete mode 100644 .changeset/techdocs-warm-walls-smile.md
 delete mode 100644 .changeset/thick-trees-pay.md
 delete mode 100644 .changeset/tiny-crews-notice.md
 delete mode 100644 .changeset/two-hats-judge.md
 delete mode 100644 .changeset/wicked-singers-push.md
 delete mode 100644 .changeset/yellow-windows-fix.md
 create mode 100644 plugins/allure/CHANGELOG.md
 create mode 100644 plugins/firehydrant/CHANGELOG.md

diff --git a/.changeset/beige-glasses-dream.md b/.changeset/beige-glasses-dream.md
deleted file mode 100644
index c1a9ad1857..0000000000
--- a/.changeset/beige-glasses-dream.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder': patch
----
-
-Allow to pass custom TemplateCard to ScaffolderPage
diff --git a/.changeset/big-eyes-dance.md b/.changeset/big-eyes-dance.md
deleted file mode 100644
index ab14979619..0000000000
--- a/.changeset/big-eyes-dance.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Added support for importing font files. Imports in CSS via `url()` are supported for the final frontend bundle, but not for packages that are built for publishing. Module imports of fonts files from TypeScript are supported everywhere.
diff --git a/.changeset/cuddly-cooks-fry.md b/.changeset/cuddly-cooks-fry.md
deleted file mode 100644
index 028b0291bd..0000000000
--- a/.changeset/cuddly-cooks-fry.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-catalog-react': patch
----
-
-Added a `useEntityKinds` hook to load a unique list of entity kinds from the catalog.
-Fixed a bug in `EntityTypePicker` where the component did not hide when no types were available in returned entities.
diff --git a/.changeset/cuddly-impalas-wave.md b/.changeset/cuddly-impalas-wave.md
deleted file mode 100644
index 1199ef1482..0000000000
--- a/.changeset/cuddly-impalas-wave.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend': patch
----
-
-GitHub discovery processor passes over repositories that do not have a default branch
diff --git a/.changeset/fair-files-rest.md b/.changeset/fair-files-rest.md
deleted file mode 100644
index 68d3246aa4..0000000000
--- a/.changeset/fair-files-rest.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-GitHub create repository webhook action: `github:webhook` for Backstage plugin Scaffolder has been added.
diff --git a/.changeset/forty-terms-join.md b/.changeset/forty-terms-join.md
deleted file mode 100644
index 1476ebff9c..0000000000
--- a/.changeset/forty-terms-join.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-'@backstage/plugin-techdocs': patch
-'@backstage/plugin-techdocs-backend': patch
-'@backstage/techdocs-common': patch
----
-
-Adding in-context search to TechDocs Reader component. Using existing search-backend to query for indexed search results scoped into a specific entity's techdocs. Needs TechDocsCollator enabled on the backend to work.
-
-Adding extra information to indexed tech docs documents for search.
diff --git a/.changeset/four-bobcats-confess.md b/.changeset/four-bobcats-confess.md
deleted file mode 100644
index 2126329e3e..0000000000
--- a/.changeset/four-bobcats-confess.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-GitHubWebhook Action can be created with a default webhook secret. This allows getting secret from environment variable as an alternative to get it from context.
diff --git a/.changeset/friendly-tables-heal.md b/.changeset/friendly-tables-heal.md
deleted file mode 100644
index 8aa987d409..0000000000
--- a/.changeset/friendly-tables-heal.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/plugin-auth-backend': patch
----
-
-Add a warning log message that `passport-saml` will require a `cert` config parameter imminently.
-
-We intend to upgrade this package soon, past the point where we will start to strictly require the `auth.saml.cert` configuration parameter to be present. To avoid issues starting your auth backend, please
diff --git a/.changeset/fuzzy-pigs-wash.md b/.changeset/fuzzy-pigs-wash.md
deleted file mode 100644
index d4a0ce4602..0000000000
--- a/.changeset/fuzzy-pigs-wash.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/integration': patch
----
-
-Update to properly handle Azure DevOps Server download URL
diff --git a/.changeset/good-papayas-fetch.md b/.changeset/good-papayas-fetch.md
deleted file mode 100644
index 6cd74ce064..0000000000
--- a/.changeset/good-papayas-fetch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend': patch
----
-
-Adds optional namespacing for users in the GitHub Multi Org Plugin
diff --git a/.changeset/hip-beers-attend.md b/.changeset/hip-beers-attend.md
deleted file mode 100644
index 802bfe7397..0000000000
--- a/.changeset/hip-beers-attend.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/core-components': patch
-'@backstage/plugin-catalog-import': patch
-'@backstage/plugin-shortcuts': patch
----
-
-Bumped `react-hook-form` to `^7.12.2`
diff --git a/.changeset/honest-suits-approve.md b/.changeset/honest-suits-approve.md
deleted file mode 100644
index 59cdb09762..0000000000
--- a/.changeset/honest-suits-approve.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-git-release-manager': patch
----
-
-Wrap each feature in custom feature arrays with an element containing a 'key' to avoid missing-key-warnings
diff --git a/.changeset/lovely-guests-smell.md b/.changeset/lovely-guests-smell.md
deleted file mode 100644
index ef6bb8c8f4..0000000000
--- a/.changeset/lovely-guests-smell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder': patch
----
-
-Use themeId in TemplateCard from theme object
diff --git a/.changeset/nasty-ads-nail.md b/.changeset/nasty-ads-nail.md
deleted file mode 100644
index 0518b1e569..0000000000
--- a/.changeset/nasty-ads-nail.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-'@backstage/core-components': minor
----
-
-Changed the `titleComponent` prop on `ContentHeader` to accept `ReactNode` instead of a React `ComponentType`. Usages of this prop should be converted from passing a component to passing in the rendered element:
-
-```diff
--<ContentHeader titleComponent={MyComponent}>
-+<ContentHeader titleComponent={<MyComponent />}>
-```
diff --git a/.changeset/nasty-jokes-camp.md b/.changeset/nasty-jokes-camp.md
deleted file mode 100644
index e30ff75911..0000000000
--- a/.changeset/nasty-jokes-camp.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-org': patch
----
-
-Don't open a new tab when clicking on the ownership card.
diff --git a/.changeset/pretty-cameras-give.md b/.changeset/pretty-cameras-give.md
deleted file mode 100644
index 8f9f4a83fa..0000000000
--- a/.changeset/pretty-cameras-give.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/plugin-catalog': patch
----
-
-Update the `AboutCard` to properly support non-standard entity types and rework the defaults for the build-in kinds.
-
-This change also uses `useElementFilter(...)` instead of `React.children.count(...)` in `AboutField` to properly recognize whether children are available.
diff --git a/.changeset/real-pugs-rhyme.md b/.changeset/real-pugs-rhyme.md
deleted file mode 100644
index 94cec27487..0000000000
--- a/.changeset/real-pugs-rhyme.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-Updated dependencies
diff --git a/.changeset/search-happy-owls-sneeze.md b/.changeset/search-happy-owls-sneeze.md
deleted file mode 100644
index 1f3cfd5dd1..0000000000
--- a/.changeset/search-happy-owls-sneeze.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-'@backstage/search-common': minor
-'@backstage/plugin-search': patch
-'@backstage/plugin-search-backend': patch
-'@backstage/plugin-search-backend-module-elasticsearch': patch
-'@backstage/plugin-search-backend-module-pg': minor
-'@backstage/plugin-search-backend-node': patch
----
-
-Implement optional `pageCursor` based paging in search.
-
-To use paging in your app, add a `<SearchResultPager />` to your
-`SearchPage.tsx`.
diff --git a/.changeset/serious-maps-try.md b/.changeset/serious-maps-try.md
deleted file mode 100644
index 78e953dfd6..0000000000
--- a/.changeset/serious-maps-try.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-auth-backend': patch
----
-
-typo fix `tenentId` in Azure auth provider docs
diff --git a/.changeset/serious-pumpkins-hug.md b/.changeset/serious-pumpkins-hug.md
deleted file mode 100644
index 9441f3aeb7..0000000000
--- a/.changeset/serious-pumpkins-hug.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Updated dependencies
diff --git a/.changeset/shiny-guests-explain.md b/.changeset/shiny-guests-explain.md
deleted file mode 100644
index 6bd99e4aa6..0000000000
--- a/.changeset/shiny-guests-explain.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-catalog': patch
-'@backstage/plugin-org': patch
----
-
-This change hides pagination counter of search tables and group members list when results fit in one page
diff --git a/.changeset/short-years-smile.md b/.changeset/short-years-smile.md
deleted file mode 100644
index 6e7b882c1e..0000000000
--- a/.changeset/short-years-smile.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog': patch
----
-
-Added the ability to switch entity kind on the catalog index page. This is a non-breaking change, but if you created a custom `CatalogPage` and wish to use this feature, make the modifications shown on [#6895](https://github.com/backstage/backstage/pull/6895).
diff --git a/.changeset/sixty-cougars-study.md b/.changeset/sixty-cougars-study.md
deleted file mode 100644
index 80db2913d0..0000000000
--- a/.changeset/sixty-cougars-study.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-shortcuts': patch
----
-
-Fix material-ui warning about deprecated `onExit` prop
diff --git a/.changeset/strange-zoos-grab.md b/.changeset/strange-zoos-grab.md
deleted file mode 100644
index 78a6c6eeee..0000000000
--- a/.changeset/strange-zoos-grab.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-'@backstage/catalog-model': patch
----
-
-Add an optional `metadata.title` field to all entity kinds.
-
-This used to be available on only the `Template` kind, and we have decided that the metadata block should be the same for all kinds. A title can be useful especially in large and complex catalogs where users have a tough time navigating or discerning among the entities.
-
-It also carries some risk. You do not want to end up giving a title that collides with an actual name, which at best leads to confusion and at worst could be a liability. We do not perform any collision detection in the catalog. If you want to disallow this facility you may want to add a small processor that makes sure it's not set.
-
-At the time of writing this message, only the scaffolder actually makes use of this field for display purposes.
diff --git a/.changeset/strong-beers-ring.md b/.changeset/strong-beers-ring.md
deleted file mode 100644
index 17a6d89fcc..0000000000
--- a/.changeset/strong-beers-ring.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/create-app': patch
----
-
-Minor tweaks to the create-app template to match earlier documented changes
diff --git a/.changeset/strong-ravens-smoke.md b/.changeset/strong-ravens-smoke.md
deleted file mode 100644
index 478eb1c4c2..0000000000
--- a/.changeset/strong-ravens-smoke.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-auth-backend': patch
----
-
-Added signIn and authHandler resolver for oAuth2 provider
diff --git a/.changeset/stupid-ants-call.md b/.changeset/stupid-ants-call.md
deleted file mode 100644
index b2dc16d0e2..0000000000
--- a/.changeset/stupid-ants-call.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-common': patch
----
-
-Export type that are needed to implement a new `UrlReader`
diff --git a/.changeset/sweet-jars-travel.md b/.changeset/sweet-jars-travel.md
deleted file mode 100644
index 83fcd13623..0000000000
--- a/.changeset/sweet-jars-travel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-sonarqube': patch
----
-
-Update README to show a simpler proxy configuration.
diff --git a/.changeset/techdocs-search-log-fatigue.md b/.changeset/techdocs-search-log-fatigue.md
deleted file mode 100644
index dc81563d8c..0000000000
--- a/.changeset/techdocs-search-log-fatigue.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-techdocs-backend': patch
----
-
-Errors encountered while attempting to load TechDocs search indices at
-collation-time are now logged at `DEBUG` instead of `WARN` level.
diff --git a/.changeset/techdocs-the-beta-local.md b/.changeset/techdocs-the-beta-local.md
deleted file mode 100644
index 9f94627a60..0000000000
--- a/.changeset/techdocs-the-beta-local.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/techdocs-common': patch
----
-
-"Local" (out-of-the-box) publisher explicitly follows lower-case entity triplet
-logic.
diff --git a/.changeset/techdocs-three-icons-collect.md b/.changeset/techdocs-three-icons-collect.md
deleted file mode 100644
index a3c005f82d..0000000000
--- a/.changeset/techdocs-three-icons-collect.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/techdocs-common': patch
----
-
-Only write the updated `mkdocs.yml` file if the content was updated.
-
-This keeps local files unchanged if the `dir` annotation is used in combination with the `file` location.
diff --git a/.changeset/techdocs-trains-beg.md b/.changeset/techdocs-trains-beg.md
deleted file mode 100644
index 05161b7093..0000000000
--- a/.changeset/techdocs-trains-beg.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/techdocs-common': patch
----
-
-Force using `posix` path for cloud storage
diff --git a/.changeset/techdocs-warm-walls-smile.md b/.changeset/techdocs-warm-walls-smile.md
deleted file mode 100644
index ab7469ec65..0000000000
--- a/.changeset/techdocs-warm-walls-smile.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-'@backstage/techdocs-common': minor
----
-
-Set the correct `edit_uri` or `repo_url` for documentation pages that are hosted on GitHub and GitLab.
-
-The constructor of the `TechDocsGenerator` changed.
-Prefer the use of `TechdocsGenerator.fromConfig(…)` instead:
-
-```diff
-- const techdocsGenerator = new TechdocsGenerator({
-+ const techdocsGenerator = TechdocsGenerator.fromConfig(config, {
-    logger,
-    containerRunner,
--   config,
-  });
-```
diff --git a/.changeset/thick-trees-pay.md b/.changeset/thick-trees-pay.md
deleted file mode 100644
index 6ee7b514ca..0000000000
--- a/.changeset/thick-trees-pay.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog': patch
----
-
-Use a `Link` for the edit button on the `AboutCard` instead of doing `window.open(...)`
diff --git a/.changeset/tiny-crews-notice.md b/.changeset/tiny-crews-notice.md
deleted file mode 100644
index 3d61ca44eb..0000000000
--- a/.changeset/tiny-crews-notice.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-auth-backend': patch
----
-
-Export GitHub to allow use with Identity resolver
diff --git a/.changeset/two-hats-judge.md b/.changeset/two-hats-judge.md
deleted file mode 100644
index 27768aba8b..0000000000
--- a/.changeset/two-hats-judge.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-techdocs': patch
----
-
-Display [metadata.title](https://backstage.io/docs/features/software-catalog/descriptor-format#title-optional) for components on the TechDocs homepage, if defined; otherwise fall back to `metadata.name` as displayed before.
diff --git a/.changeset/wicked-singers-push.md b/.changeset/wicked-singers-push.md
deleted file mode 100644
index 3c34a959ed..0000000000
--- a/.changeset/wicked-singers-push.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-org': patch
----
-
-Fix OwnershipCard links to support namespaced owners
diff --git a/.changeset/yellow-windows-fix.md b/.changeset/yellow-windows-fix.md
deleted file mode 100644
index 7572fdce88..0000000000
--- a/.changeset/yellow-windows-fix.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': patch
----
-
-refactor: extract common Octokit related code and use it in actions: `publish:github`, `github:actions:dispatch`, `github:webhook`.
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
index a3af287fc8..7de19802e3 100644
--- a/packages/app/CHANGELOG.md
+++ b/packages/app/CHANGELOG.md
@@ -1,5 +1,47 @@
 # example-app
 
+## 0.2.44
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder@0.11.2
+  - @backstage/cli@0.7.10
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/plugin-techdocs@0.11.1
+  - @backstage/core-components@0.4.0
+  - @backstage/plugin-catalog-import@0.5.20
+  - @backstage/plugin-shortcuts@0.1.7
+  - @backstage/plugin-org@0.3.21
+  - @backstage/plugin-catalog@0.6.14
+  - @backstage/search-common@0.2.0
+  - @backstage/plugin-search@0.4.9
+  - @backstage/catalog-model@0.9.1
+  - @backstage/core-app-api@0.1.11
+  - @backstage/integration-react@0.1.8
+  - @backstage/plugin-api-docs@0.6.7
+  - @backstage/plugin-badges@0.2.8
+  - @backstage/plugin-circleci@0.2.22
+  - @backstage/plugin-cloudbuild@0.2.22
+  - @backstage/plugin-code-coverage@0.1.10
+  - @backstage/plugin-cost-insights@0.11.5
+  - @backstage/plugin-explore@0.3.15
+  - @backstage/plugin-gcp-projects@0.3.3
+  - @backstage/plugin-github-actions@0.4.17
+  - @backstage/plugin-graphiql@0.2.15
+  - @backstage/plugin-home@0.2.1
+  - @backstage/plugin-jenkins@0.5.5
+  - @backstage/plugin-kafka@0.2.14
+  - @backstage/plugin-kubernetes@0.4.12
+  - @backstage/plugin-lighthouse@0.2.24
+  - @backstage/plugin-newrelic@0.3.3
+  - @backstage/plugin-pagerduty@0.3.12
+  - @backstage/plugin-rollbar@0.3.13
+  - @backstage/plugin-sentry@0.3.20
+  - @backstage/plugin-tech-radar@0.4.6
+  - @backstage/plugin-todo@0.1.8
+  - @backstage/plugin-user-settings@0.3.4
+
 ## 0.2.43
 
 ### Patch Changes
diff --git a/packages/app/package.json b/packages/app/package.json
index 162474fd0e..011fcb59af 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,46 +1,46 @@
 {
   "name": "example-app",
-  "version": "0.2.43",
+  "version": "0.2.44",
   "private": true,
   "bundled": true,
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-api-docs": "^0.6.6",
-    "@backstage/plugin-badges": "^0.2.7",
-    "@backstage/plugin-catalog": "^0.6.13",
-    "@backstage/plugin-catalog-import": "^0.5.19",
-    "@backstage/plugin-catalog-react": "^0.4.4",
-    "@backstage/plugin-circleci": "^0.2.21",
-    "@backstage/plugin-cloudbuild": "^0.2.21",
-    "@backstage/plugin-code-coverage": "^0.1.9",
-    "@backstage/plugin-cost-insights": "^0.11.4",
-    "@backstage/plugin-explore": "^0.3.14",
-    "@backstage/plugin-gcp-projects": "^0.3.2",
-    "@backstage/plugin-github-actions": "^0.4.16",
-    "@backstage/plugin-graphiql": "^0.2.14",
-    "@backstage/plugin-home": "^0.2.0",
-    "@backstage/plugin-jenkins": "^0.5.4",
-    "@backstage/plugin-kafka": "^0.2.13",
-    "@backstage/plugin-kubernetes": "^0.4.11",
-    "@backstage/plugin-lighthouse": "^0.2.23",
-    "@backstage/plugin-newrelic": "^0.3.2",
-    "@backstage/plugin-org": "^0.3.20",
-    "@backstage/plugin-pagerduty": "0.3.11",
-    "@backstage/plugin-rollbar": "^0.3.12",
-    "@backstage/plugin-scaffolder": "^0.11.1",
-    "@backstage/plugin-search": "^0.4.8",
-    "@backstage/plugin-sentry": "^0.3.19",
-    "@backstage/plugin-shortcuts": "^0.1.6",
-    "@backstage/plugin-tech-radar": "^0.4.5",
-    "@backstage/plugin-techdocs": "^0.11.0",
-    "@backstage/plugin-todo": "^0.1.7",
-    "@backstage/plugin-user-settings": "^0.3.3",
-    "@backstage/search-common": "^0.1.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-api-docs": "^0.6.7",
+    "@backstage/plugin-badges": "^0.2.8",
+    "@backstage/plugin-catalog": "^0.6.14",
+    "@backstage/plugin-catalog-import": "^0.5.20",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/plugin-circleci": "^0.2.22",
+    "@backstage/plugin-cloudbuild": "^0.2.22",
+    "@backstage/plugin-code-coverage": "^0.1.10",
+    "@backstage/plugin-cost-insights": "^0.11.5",
+    "@backstage/plugin-explore": "^0.3.15",
+    "@backstage/plugin-gcp-projects": "^0.3.3",
+    "@backstage/plugin-github-actions": "^0.4.17",
+    "@backstage/plugin-graphiql": "^0.2.15",
+    "@backstage/plugin-home": "^0.2.1",
+    "@backstage/plugin-jenkins": "^0.5.5",
+    "@backstage/plugin-kafka": "^0.2.14",
+    "@backstage/plugin-kubernetes": "^0.4.12",
+    "@backstage/plugin-lighthouse": "^0.2.24",
+    "@backstage/plugin-newrelic": "^0.3.3",
+    "@backstage/plugin-org": "^0.3.21",
+    "@backstage/plugin-pagerduty": "0.3.12",
+    "@backstage/plugin-rollbar": "^0.3.13",
+    "@backstage/plugin-scaffolder": "^0.11.2",
+    "@backstage/plugin-search": "^0.4.9",
+    "@backstage/plugin-sentry": "^0.3.20",
+    "@backstage/plugin-shortcuts": "^0.1.7",
+    "@backstage/plugin-tech-radar": "^0.4.6",
+    "@backstage/plugin-techdocs": "^0.11.1",
+    "@backstage/plugin-todo": "^0.1.8",
+    "@backstage/plugin-user-settings": "^0.3.4",
+    "@backstage/search-common": "^0.2.0",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
diff --git a/packages/backend-common/CHANGELOG.md b/packages/backend-common/CHANGELOG.md
index f3fcd5a855..dc83e3aa3c 100644
--- a/packages/backend-common/CHANGELOG.md
+++ b/packages/backend-common/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/backend-common
 
+## 0.9.1
+
+### Patch Changes
+
+- 714a2a918: Export type that are needed to implement a new `UrlReader`
+- Updated dependencies
+  - @backstage/integration@0.6.3
+
 ## 0.9.0
 
 ### Minor Changes
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 15a559f960..87d1053165 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-common",
   "description": "Common functionality library for Backstage backends",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -33,7 +33,7 @@
     "@backstage/config": "^0.1.8",
     "@backstage/config-loader": "^0.6.7",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.6.2",
+    "@backstage/integration": "^0.6.3",
     "@google-cloud/storage": "^5.8.0",
     "@octokit/rest": "^18.5.3",
     "@types/cors": "^2.8.6",
@@ -77,7 +77,7 @@
     }
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
+    "@backstage/cli": "^0.7.10",
     "@backstage/test-utils": "^0.1.17",
     "@types/archiver": "^5.1.0",
     "@types/compression": "^1.7.0",
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index b27dbd07e7..9ca401a105 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/CHANGELOG.md
@@ -1,5 +1,23 @@
 # example-backend
 
+## 0.2.44
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@0.13.6
+  - @backstage/plugin-scaffolder-backend@0.15.3
+  - @backstage/plugin-techdocs-backend@0.10.1
+  - @backstage/plugin-auth-backend@0.3.24
+  - @backstage/integration@0.6.3
+  - @backstage/plugin-search-backend@0.2.6
+  - @backstage/plugin-search-backend-module-elasticsearch@0.0.3
+  - @backstage/plugin-search-backend-module-pg@0.2.0
+  - @backstage/plugin-search-backend-node@0.4.2
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+  - example-app@0.2.44
+
 ## 0.2.43
 
 ### Patch Changes
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 3dccb32b82..56b73e0591 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.2.43",
+  "version": "0.2.44",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -27,15 +27,15 @@
     "migrate:create": "knex migrate:make -x ts"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
+    "@backstage/backend-common": "^0.9.1",
     "@backstage/catalog-client": "^0.3.17",
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
-    "@backstage/integration": "^0.6.2",
+    "@backstage/integration": "^0.6.3",
     "@backstage/plugin-app-backend": "^0.3.16",
-    "@backstage/plugin-auth-backend": "^0.3.23",
+    "@backstage/plugin-auth-backend": "^0.3.24",
     "@backstage/plugin-badges-backend": "^0.1.9",
-    "@backstage/plugin-catalog-backend": "^0.13.5",
+    "@backstage/plugin-catalog-backend": "^0.13.6",
     "@backstage/plugin-code-coverage-backend": "^0.1.10",
     "@backstage/plugin-graphql-backend": "^0.1.9",
     "@backstage/plugin-jenkins-backend": "^0.1.4",
@@ -43,19 +43,19 @@
     "@backstage/plugin-kafka-backend": "^0.2.9",
     "@backstage/plugin-proxy-backend": "^0.2.12",
     "@backstage/plugin-rollbar-backend": "^0.1.14",
-    "@backstage/plugin-scaffolder-backend": "^0.15.2",
+    "@backstage/plugin-scaffolder-backend": "^0.15.3",
     "@backstage/plugin-scaffolder-backend-module-rails": "^0.1.5",
-    "@backstage/plugin-search-backend": "^0.2.5",
-    "@backstage/plugin-search-backend-node": "^0.4.0",
-    "@backstage/plugin-search-backend-module-elasticsearch": "^0.0.2",
-    "@backstage/plugin-search-backend-module-pg": "^0.1.3",
-    "@backstage/plugin-techdocs-backend": "^0.10.0",
+    "@backstage/plugin-search-backend": "^0.2.6",
+    "@backstage/plugin-search-backend-node": "^0.4.2",
+    "@backstage/plugin-search-backend-module-elasticsearch": "^0.0.3",
+    "@backstage/plugin-search-backend-module-pg": "^0.2.0",
+    "@backstage/plugin-techdocs-backend": "^0.10.1",
     "@backstage/plugin-todo-backend": "^0.1.11",
     "@gitbeaker/node": "^30.2.0",
     "@octokit/rest": "^18.5.3",
     "azure-devops-node-api": "^11.0.1",
     "dockerode": "^3.2.1",
-    "example-app": "^0.2.43",
+    "example-app": "^0.2.44",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
     "express-prom-bundle": "^6.3.6",
@@ -67,7 +67,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.8",
+    "@backstage/cli": "^0.7.10",
     "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5"
diff --git a/packages/catalog-model/CHANGELOG.md b/packages/catalog-model/CHANGELOG.md
index 5dbbfd241f..3559c661ef 100644
--- a/packages/catalog-model/CHANGELOG.md
+++ b/packages/catalog-model/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/catalog-model
 
+## 0.9.1
+
+### Patch Changes
+
+- 13dc3735c: Add an optional `metadata.title` field to all entity kinds.
+
+  This used to be available on only the `Template` kind, and we have decided that the metadata block should be the same for all kinds. A title can be useful especially in large and complex catalogs where users have a tough time navigating or discerning among the entities.
+
+  It also carries some risk. You do not want to end up giving a title that collides with an actual name, which at best leads to confusion and at worst could be a liability. We do not perform any collision detection in the catalog. If you want to disallow this facility you may want to add a small processor that makes sure it's not set.
+
+  At the time of writing this message, only the scaffolder actually makes use of this field for display purposes.
+
 ## 0.9.0
 
 ### Minor Changes
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 13c3214252..5a16a1d310 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/catalog-model",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -40,7 +40,7 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.2",
+    "@backstage/cli": "^0.7.10",
     "@types/express": "^4.17.6",
     "@types/jest": "^26.0.7",
     "@types/lodash": "^4.14.151",
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 064438d17e..47f4545ea2 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/cli
 
+## 0.7.10
+
+### Patch Changes
+
+- 5e803edb8: Added support for importing font files. Imports in CSS via `url()` are supported for the final frontend bundle, but not for packages that are built for publishing. Module imports of fonts files from TypeScript are supported everywhere.
+- b5118ff76: Updated dependencies
+
 ## 0.7.9
 
 ### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 09054cd351..831a4af0c3 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli",
   "description": "CLI for developing Backstage plugins and apps",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -120,12 +120,12 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.9.0",
+    "@backstage/backend-common": "^0.9.1",
     "@backstage/config": "^0.1.8",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@backstage/theme": "^0.2.10",
     "@types/diff": "^5.0.0",
diff --git a/packages/codemods/CHANGELOG.md b/packages/codemods/CHANGELOG.md
index 74a3022bf5..e0b3bfb693 100644
--- a/packages/codemods/CHANGELOG.md
+++ b/packages/codemods/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/codemods
 
+## 0.1.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+  - @backstage/core-app-api@0.1.11
+
 ## 0.1.11
 
 ### Patch Changes
diff --git a/packages/codemods/package.json b/packages/codemods/package.json
index 04bf0ac014..b14d3e880e 100644
--- a/packages/codemods/package.json
+++ b/packages/codemods/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/codemods",
   "description": "A collection of codemods for Backstage projects",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "private": false,
   "publishConfig": {
     "access": "public",
diff --git a/packages/core-app-api/CHANGELOG.md b/packages/core-app-api/CHANGELOG.md
index db5158a697..55b20aac8b 100644
--- a/packages/core-app-api/CHANGELOG.md
+++ b/packages/core-app-api/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/core-app-api
 
+## 0.1.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.1.10
 
 ### Patch Changes
diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index 90c962be3e..e0801b45db 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-app-api",
   "description": "Core app API used by Backstage apps",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,7 +29,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/config": "^0.1.8",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
@@ -44,7 +44,7 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
+    "@backstage/cli": "^0.7.10",
     "@backstage/test-utils": "^0.1.17",
     "@backstage/test-utils-core": "^0.1.2",
     "@testing-library/jest-dom": "^5.10.1",
diff --git a/packages/core-components/CHANGELOG.md b/packages/core-components/CHANGELOG.md
index 1b56b033b5..0f89c26682 100644
--- a/packages/core-components/CHANGELOG.md
+++ b/packages/core-components/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/core-components
 
+## 0.4.0
+
+### Minor Changes
+
+- 3ed78fca3: Changed the `titleComponent` prop on `ContentHeader` to accept `ReactNode` instead of a React `ComponentType`. Usages of this prop should be converted from passing a component to passing in the rendered element:
+
+  ```diff
+  -<ContentHeader titleComponent={MyComponent}>
+  +<ContentHeader titleComponent={<MyComponent />}>
+  ```
+
+### Patch Changes
+
+- e0a6aea82: Bumped `react-hook-form` to `^7.12.2`
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index ae6daece4d..720482f46b 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-components",
   "description": "Core components used by Backstage plugins and apps",
-  "version": "0.3.3",
+  "version": "0.4.0",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -70,8 +70,8 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/cli": "^0.7.9",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/cli": "^0.7.10",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index 9ad697b74d..670613dac9 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/create-app
 
+## 0.3.39
+
+### Patch Changes
+
+- 25924638b: Minor tweaks to the create-app template to match earlier documented changes
+
 ## 0.3.38
 
 ### Patch Changes
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index 31ac1ba271..f0939c213e 100644
--- a/packages/create-app/package.json
+++ b/packages/create-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/create-app",
   "description": "Create app package for Backstage",
-  "version": "0.3.38",
+  "version": "0.3.39",
   "private": false,
   "publishConfig": {
     "access": "public"
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index a05e39a69b..f0c4c062b4 100644
--- a/packages/dev-utils/CHANGELOG.md
+++ b/packages/dev-utils/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/dev-utils
 
+## 0.2.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/core-app-api@0.1.11
+  - @backstage/integration-react@0.1.8
+
 ## 0.2.7
 
 ### Patch Changes
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 3990296f4c..9317c0a107 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/dev-utils",
   "description": "Utilities for developing Backstage plugins.",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -29,12 +29,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-app-api": "^0.1.9",
-    "@backstage/core-components": "^0.3.2",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-catalog-react": "^0.4.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/test-utils": "^0.1.17",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -50,7 +50,7 @@
     "react-router-dom": "6.0.0-beta.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
+    "@backstage/cli": "^0.7.10",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.14.32"
   },
diff --git a/packages/integration-react/CHANGELOG.md b/packages/integration-react/CHANGELOG.md
index 281fed0211..a9944238ce 100644
--- a/packages/integration-react/CHANGELOG.md
+++ b/packages/integration-react/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/integration-react
 
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+
 ## 0.1.7
 
 ### Patch Changes
diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json
index 3217881046..90acb9acd3 100644
--- a/packages/integration-react/package.json
+++ b/packages/integration-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration-react",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,9 +21,9 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.3.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/integration": "^0.6.0",
+    "@backstage/integration": "^0.6.3",
     "@backstage/theme": "^0.2.9",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -33,8 +33,8 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.8",
-    "@backstage/dev-utils": "^0.2.6",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/packages/integration/CHANGELOG.md b/packages/integration/CHANGELOG.md
index dfc9a5722a..1befa4f6cc 100644
--- a/packages/integration/CHANGELOG.md
+++ b/packages/integration/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/integration
 
+## 0.6.3
+
+### Patch Changes
+
+- 5dca42b17: Update to properly handle Azure DevOps Server download URL
+
 ## 0.6.2
 
 ### Patch Changes
diff --git a/packages/integration/package.json b/packages/integration/package.json
index ffe4e5776f..5ae86ea163 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -37,7 +37,7 @@
     "luxon": "^2.0.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
+    "@backstage/cli": "^0.7.10",
     "@backstage/config-loader": "^0.6.7",
     "@backstage/test-utils": "^0.1.17",
     "@types/jest": "^26.0.7",
diff --git a/packages/search-common/CHANGELOG.md b/packages/search-common/CHANGELOG.md
index f7d12eb006..34f956586e 100644
--- a/packages/search-common/CHANGELOG.md
+++ b/packages/search-common/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/search-common
 
+## 0.2.0
+
+### Minor Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/packages/search-common/package.json b/packages/search-common/package.json
index ede7baeae2..be1aad16b0 100644
--- a/packages/search-common/package.json
+++ b/packages/search-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/search-common",
   "description": "Common functionalities for Search, to be shared between various search-enabled plugins",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -39,7 +39,7 @@
     "@backstage/config": "^0.1.6"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.7"
+    "@backstage/cli": "^0.7.10"
   },
   "jest": {
     "roots": [
diff --git a/packages/techdocs-common/CHANGELOG.md b/packages/techdocs-common/CHANGELOG.md
index 342bb76c21..360bebded0 100644
--- a/packages/techdocs-common/CHANGELOG.md
+++ b/packages/techdocs-common/CHANGELOG.md
@@ -1,5 +1,42 @@
 # @backstage/techdocs-common
 
+## 0.10.0
+
+### Minor Changes
+
+- 8b0f6f860: Set the correct `edit_uri` or `repo_url` for documentation pages that are hosted on GitHub and GitLab.
+
+  The constructor of the `TechDocsGenerator` changed.
+  Prefer the use of `TechdocsGenerator.fromConfig(…)` instead:
+
+  ```diff
+  - const techdocsGenerator = new TechdocsGenerator({
+  + const techdocsGenerator = TechdocsGenerator.fromConfig(config, {
+      logger,
+      containerRunner,
+  -   config,
+    });
+  ```
+
+### Patch Changes
+
+- 30ed662a3: Adding in-context search to TechDocs Reader component. Using existing search-backend to query for indexed search results scoped into a specific entity's techdocs. Needs TechDocsCollator enabled on the backend to work.
+
+  Adding extra information to indexed tech docs documents for search.
+
+- 3624616e7: "Local" (out-of-the-box) publisher explicitly follows lower-case entity triplet
+  logic.
+- 67ba7e088: Only write the updated `mkdocs.yml` file if the content was updated.
+
+  This keeps local files unchanged if the `dir` annotation is used in combination with the `file` location.
+
+- 8eab6be6a: Force using `posix` path for cloud storage
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/search-common@0.2.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
 ## 0.9.0
 
 ### Minor Changes
diff --git a/packages/techdocs-common/package.json b/packages/techdocs-common/package.json
index fb2ec97ae5..a914830fd5 100644
--- a/packages/techdocs-common/package.json
+++ b/packages/techdocs-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/techdocs-common",
   "description": "Common functionalities for TechDocs, to be shared between techdocs-backend plugin and techdocs-cli",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -38,12 +38,12 @@
   "dependencies": {
     "@azure/identity": "^1.5.0",
     "@azure/storage-blob": "^12.5.0",
-    "@backstage/backend-common": "^0.9.0",
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
-    "@backstage/search-common": "^0.1.3",
-    "@backstage/integration": "^0.6.2",
+    "@backstage/search-common": "^0.2.0",
+    "@backstage/integration": "^0.6.3",
     "@google-cloud/storage": "^5.6.0",
     "@trendyol-js/openstack-swift-sdk": "^0.0.4",
     "@types/express": "^4.17.6",
@@ -60,7 +60,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.8",
+    "@backstage/cli": "^0.7.10",
     "@types/fs-extra": "^9.0.5",
     "@types/js-yaml": "^4.0.0",
     "@types/mime-types": "^2.1.0",
diff --git a/plugins/allure/CHANGELOG.md b/plugins/allure/CHANGELOG.md
new file mode 100644
index 0000000000..d62b95ea66
--- /dev/null
+++ b/plugins/allure/CHANGELOG.md
@@ -0,0 +1,10 @@
+# @backstage/plugin-allure
+
+## 0.1.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
diff --git a/plugins/allure/package.json b/plugins/allure/package.json
index 8066877650..bc56349a1c 100644
--- a/plugins/allure/package.json
+++ b/plugins/allure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-allure",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,10 +21,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.3",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -35,9 +35,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/api-docs/CHANGELOG.md b/plugins/api-docs/CHANGELOG.md
index 728667dabd..103c57823f 100644
--- a/plugins/api-docs/CHANGELOG.md
+++ b/plugins/api-docs/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-api-docs
 
+## 0.6.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/plugin-catalog@0.6.14
+  - @backstage/catalog-model@0.9.1
+
 ## 0.6.6
 
 ### Patch Changes
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index 192098cdba..083464ed9b 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-api-docs",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,11 +30,11 @@
   },
   "dependencies": {
     "@asyncapi/react-component": "^0.23.0",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog": "^0.6.11",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog": "^0.6.14",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-icons/font": "^1.0.2",
     "@material-ui/core": "^4.12.2",
@@ -52,9 +52,9 @@
     "swagger-ui-react": "^3.37.2"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/auth-backend/CHANGELOG.md b/plugins/auth-backend/CHANGELOG.md
index a6c5f002d4..4150d7f0e0 100644
--- a/plugins/auth-backend/CHANGELOG.md
+++ b/plugins/auth-backend/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-auth-backend
 
+## 0.3.24
+
+### Patch Changes
+
+- 2a105f451: Add a warning log message that `passport-saml` will require a `cert` config parameter imminently.
+
+  We intend to upgrade this package soon, past the point where we will start to strictly require the `auth.saml.cert` configuration parameter to be present. To avoid issues starting your auth backend, please
+
+- 31892ee25: typo fix `tenentId` in Azure auth provider docs
+- e9b1e2a9f: Added signIn and authHandler resolver for oAuth2 provider
+- ca45b169d: Export GitHub to allow use with Identity resolver
+- Updated dependencies
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
 ## 0.3.23
 
 ### Patch Changes
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index badaafb61c..3ef3f6155e 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,9 +29,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
+    "@backstage/backend-common": "^0.9.1",
     "@backstage/catalog-client": "^0.3.18",
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
     "@backstage/test-utils": "^0.1.17",
@@ -70,7 +70,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
+    "@backstage/cli": "^0.7.10",
     "@types/body-parser": "^1.19.0",
     "@types/cookie-parser": "^1.4.2",
     "@types/express-session": "^1.17.2",
diff --git a/plugins/badges/CHANGELOG.md b/plugins/badges/CHANGELOG.md
index 15f6c75dbd..4809905dc7 100644
--- a/plugins/badges/CHANGELOG.md
+++ b/plugins/badges/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-badges
 
+## 0.2.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.2.7
 
 ### Patch Changes
diff --git a/plugins/badges/package.json b/plugins/badges/package.json
index ec64b02d53..7a8bf9079f 100644
--- a/plugins/badges/package.json
+++ b/plugins/badges/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-badges",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,11 +20,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.4.1",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -35,9 +35,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/bitrise/CHANGELOG.md b/plugins/bitrise/CHANGELOG.md
index 45050ae0e3..c082e6e3d8 100644
--- a/plugins/bitrise/CHANGELOG.md
+++ b/plugins/bitrise/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-bitrise
 
+## 0.1.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.1.10
 
 ### Patch Changes
diff --git a/plugins/bitrise/package.json b/plugins/bitrise/package.json
index e50d69de1f..d0b9a012f5 100644
--- a/plugins/bitrise/package.json
+++ b/plugins/bitrise/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-bitrise",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "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.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -38,9 +38,9 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md
index bff73ba066..67b71f3fe8 100644
--- a/plugins/catalog-backend/CHANGELOG.md
+++ b/plugins/catalog-backend/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-catalog-backend
 
+## 0.13.6
+
+### Patch Changes
+
+- 4d62dc15b: GitHub discovery processor passes over repositories that do not have a default branch
+- 977b1dfbe: Adds optional namespacing for users in the GitHub Multi Org Plugin
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/search-common@0.2.0
+  - @backstage/plugin-search-backend-node@0.4.2
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
 ## 0.13.5
 
 ### Patch Changes
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 7f5ec0b2d6..9c4ddef0b8 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "0.13.5",
+  "version": "0.13.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,14 +29,14 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
+    "@backstage/backend-common": "^0.9.1",
     "@backstage/catalog-client": "^0.3.18",
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.6.2",
-    "@backstage/plugin-search-backend-node": "^0.4.0",
-    "@backstage/search-common": "^0.1.2",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/plugin-search-backend-node": "^0.4.2",
+    "@backstage/search-common": "^0.2.0",
     "@octokit/graphql": "^4.5.8",
     "@types/express": "^4.17.6",
     "aws-sdk": "^2.840.0",
@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "^0.1.6",
-    "@backstage/cli": "^0.7.9",
+    "@backstage/cli": "^0.7.10",
     "@backstage/test-utils": "^0.1.17",
     "@types/core-js": "^2.5.4",
     "@types/git-url-parse": "^9.0.0",
diff --git a/plugins/catalog-import/CHANGELOG.md b/plugins/catalog-import/CHANGELOG.md
index f6feb4fba0..3b5b0fa8fd 100644
--- a/plugins/catalog-import/CHANGELOG.md
+++ b/plugins/catalog-import/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-catalog-import
 
+## 0.5.20
+
+### Patch Changes
+
+- e0a6aea82: Bumped `react-hook-form` to `^7.12.2`
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
 ## 0.5.19
 
 ### Patch Changes
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index 2605951a97..570658f712 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-import",
-  "version": "0.5.19",
+  "version": "0.5.20",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,12 +31,12 @@
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.3.18",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/integration": "^0.6.2",
-    "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-catalog-react": "^0.4.4",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -54,9 +54,9 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/catalog-react/CHANGELOG.md b/plugins/catalog-react/CHANGELOG.md
index 1033bdd327..be858aac38 100644
--- a/plugins/catalog-react/CHANGELOG.md
+++ b/plugins/catalog-react/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-catalog-react
 
+## 0.4.5
+
+### Patch Changes
+
+- 3ed78fca3: Added a `useEntityKinds` hook to load a unique list of entity kinds from the catalog.
+  Fixed a bug in `EntityTypePicker` where the component did not hide when no types were available in returned entities.
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/core-app-api@0.1.11
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index 0737e6458f..3d9aed01c5 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-react",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,11 +29,11 @@
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.3.18",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/integration": "^0.6.2",
+    "@backstage/integration": "^0.6.3",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -47,8 +47,8 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/catalog/CHANGELOG.md b/plugins/catalog/CHANGELOG.md
index 9b81327206..c2d3f7191c 100644
--- a/plugins/catalog/CHANGELOG.md
+++ b/plugins/catalog/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-catalog
 
+## 0.6.14
+
+### Patch Changes
+
+- 10db3ce09: Update the `AboutCard` to properly support non-standard entity types and rework the defaults for the build-in kinds.
+
+  This change also uses `useElementFilter(...)` instead of `React.children.count(...)` in `AboutField` to properly recognize whether children are available.
+
+- 7e5f14dda: This change hides pagination counter of search tables and group members list when results fit in one page
+- 3ed78fca3: Added the ability to switch entity kind on the catalog index page. This is a non-breaking change, but if you created a custom `CatalogPage` and wish to use this feature, make the modifications shown on [#6895](https://github.com/backstage/backstage/pull/6895).
+- aaa1dd17b: Use a `Link` for the edit button on the `AboutCard` instead of doing `window.open(...)`
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
 ## 0.6.13
 
 ### Patch Changes
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index 617b7afbf3..89a0ca20cb 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog",
-  "version": "0.6.13",
+  "version": "0.6.14",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,13 +31,13 @@
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.3.18",
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.6.2",
-    "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-catalog-react": "^0.4.4",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -54,9 +54,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/circleci/CHANGELOG.md b/plugins/circleci/CHANGELOG.md
index eed3173b94..4f070e8025 100644
--- a/plugins/circleci/CHANGELOG.md
+++ b/plugins/circleci/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-circleci
 
+## 0.2.22
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.2.21
 
 ### Patch Changes
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index f10e559b46..a828a26ba0 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-circleci",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,10 +31,10 @@
     "postpack": "backstage-cli postpack"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.1",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -50,9 +50,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/cloudbuild/CHANGELOG.md b/plugins/cloudbuild/CHANGELOG.md
index ecb710f393..646bd28c65 100644
--- a/plugins/cloudbuild/CHANGELOG.md
+++ b/plugins/cloudbuild/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-cloudbuild
 
+## 0.2.22
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.2.21
 
 ### Patch Changes
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index 633b5d6e20..f28a42bac6 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-cloudbuild",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,10 +30,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.1",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/code-coverage/CHANGELOG.md b/plugins/code-coverage/CHANGELOG.md
index b3e3ed6940..2866f8cbcc 100644
--- a/plugins/code-coverage/CHANGELOG.md
+++ b/plugins/code-coverage/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-code-coverage
 
+## 0.1.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.1.9
 
 ### Patch Changes
diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json
index 51677e72d3..d69ce9c910 100644
--- a/plugins/code-coverage/package.json
+++ b/plugins/code-coverage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-code-coverage",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,12 +20,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.4.1",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -40,9 +40,9 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/config-schema/CHANGELOG.md b/plugins/config-schema/CHANGELOG.md
index 4a2d4fdcee..52c29bcbc3 100644
--- a/plugins/config-schema/CHANGELOG.md
+++ b/plugins/config-schema/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-config-schema
 
+## 0.1.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index 42b5b2e266..8001f6b055 100644
--- a/plugins/config-schema/package.json
+++ b/plugins/config-schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-config-schema",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
     "@backstage/theme": "^0.2.10",
@@ -35,9 +35,9 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/cost-insights/CHANGELOG.md b/plugins/cost-insights/CHANGELOG.md
index 7f4ccf2db8..f7dd9d27f9 100644
--- a/plugins/cost-insights/CHANGELOG.md
+++ b/plugins/cost-insights/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-cost-insights
 
+## 0.11.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.11.4
 
 ### Patch Changes
diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index 1bbf130a06..b48888025d 100644
--- a/plugins/cost-insights/package.json
+++ b/plugins/cost-insights/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-cost-insights",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -54,9 +54,9 @@
     "yup": "^0.29.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/explore/CHANGELOG.md b/plugins/explore/CHANGELOG.md
index 456f4c66fc..2e199b02dd 100644
--- a/plugins/explore/CHANGELOG.md
+++ b/plugins/explore/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-explore
 
+## 0.3.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.3.14
 
 ### Patch Changes
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index 3ee4898422..204fa7f1ae 100644
--- a/plugins/explore/package.json
+++ b/plugins/explore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-explore",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,10 +30,10 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.4",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/plugin-explore-react": "^0.0.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/firehydrant/CHANGELOG.md b/plugins/firehydrant/CHANGELOG.md
new file mode 100644
index 0000000000..2fd79e0179
--- /dev/null
+++ b/plugins/firehydrant/CHANGELOG.md
@@ -0,0 +1,9 @@
+# @backstage/plugin-firehydrant
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
diff --git a/plugins/firehydrant/package.json b/plugins/firehydrant/package.json
index 30ffb007b9..be6abb11ff 100644
--- a/plugins/firehydrant/package.json
+++ b/plugins/firehydrant/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-firehydrant",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,9 +21,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.1",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -34,9 +34,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/fossa/CHANGELOG.md b/plugins/fossa/CHANGELOG.md
index 62d5b2c5d8..f99c0d2943 100644
--- a/plugins/fossa/CHANGELOG.md
+++ b/plugins/fossa/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-fossa
 
+## 0.2.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.2.14
 
 ### Patch Changes
diff --git a/plugins/fossa/package.json b/plugins/fossa/package.json
index f1684c515b..1fbcdb1a90 100644
--- a/plugins/fossa/package.json
+++ b/plugins/fossa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-fossa",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,11 +31,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/gcp-projects/CHANGELOG.md b/plugins/gcp-projects/CHANGELOG.md
index 293f8afd62..6a7c312294 100644
--- a/plugins/gcp-projects/CHANGELOG.md
+++ b/plugins/gcp-projects/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-gcp-projects
 
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index 7fc15302ad..9c81c58f3c 100644
--- a/plugins/gcp-projects/package.json
+++ b/plugins/gcp-projects/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-gcp-projects",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,7 +30,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -42,9 +42,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/git-release-manager/CHANGELOG.md b/plugins/git-release-manager/CHANGELOG.md
index fef94b1b3a..ee73a71b9f 100644
--- a/plugins/git-release-manager/CHANGELOG.md
+++ b/plugins/git-release-manager/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-git-release-manager
 
+## 0.2.5
+
+### Patch Changes
+
+- 27ef7b645: Wrap each feature in custom feature arrays with an element containing a 'key' to avoid missing-key-warnings
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+
 ## 0.2.4
 
 ### Patch Changes
diff --git a/plugins/git-release-manager/package.json b/plugins/git-release-manager/package.json
index d97986dff7..0427f4d7fd 100644
--- a/plugins/git-release-manager/package.json
+++ b/plugins/git-release-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-git-release-manager",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,9 +20,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/integration": "^0.6.2",
+    "@backstage/integration": "^0.6.3",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -38,9 +38,9 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/github-actions/CHANGELOG.md b/plugins/github-actions/CHANGELOG.md
index 0ea9cd57dd..9ab64f6344 100644
--- a/plugins/github-actions/CHANGELOG.md
+++ b/plugins/github-actions/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-github-actions
 
+## 0.4.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.4.16
 
 ### Patch Changes
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index f94eec4394..0d2aba6af4 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-github-actions",
-  "version": "0.4.16",
+  "version": "0.4.17",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -32,11 +32,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/integration": "^0.6.0",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -51,9 +51,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/github-deployments/CHANGELOG.md b/plugins/github-deployments/CHANGELOG.md
index a31d0c0b6a..a7a47fb396 100644
--- a/plugins/github-deployments/CHANGELOG.md
+++ b/plugins/github-deployments/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-github-deployments
 
+## 0.1.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
 ## 0.1.14
 
 ### Patch Changes
diff --git a/plugins/github-deployments/package.json b/plugins/github-deployments/package.json
index 1da26f370e..420a948ec3 100644
--- a/plugins/github-deployments/package.json
+++ b/plugins/github-deployments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-github-deployments",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,13 +20,13 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.6.0",
-    "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -38,9 +38,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/gitops-profiles/CHANGELOG.md b/plugins/gitops-profiles/CHANGELOG.md
index ff6750c3eb..d49360ccba 100644
--- a/plugins/gitops-profiles/CHANGELOG.md
+++ b/plugins/gitops-profiles/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-gitops-profiles
 
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index 9d510b5185..95300a86af 100644
--- a/plugins/gitops-profiles/package.json
+++ b/plugins/gitops-profiles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-gitops-profiles",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,7 +31,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -43,9 +43,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/graphiql/CHANGELOG.md b/plugins/graphiql/CHANGELOG.md
index 5324eb6fa2..edc39a63eb 100644
--- a/plugins/graphiql/CHANGELOG.md
+++ b/plugins/graphiql/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-graphiql
 
+## 0.2.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.2.14
 
 ### Patch Changes
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index e7758e492a..ec74cedd37 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-graphiql",
   "description": "Backstage plugin for browsing GraphQL APIs",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -31,7 +31,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -44,9 +44,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/home/CHANGELOG.md b/plugins/home/CHANGELOG.md
index c419cbbea5..c573ebb32b 100644
--- a/plugins/home/CHANGELOG.md
+++ b/plugins/home/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-home
 
+## 0.2.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/plugins/home/package.json b/plugins/home/package.json
index 9056d0c36f..8ae92e8ace 100644
--- a/plugins/home/package.json
+++ b/plugins/home/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-home",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -33,9 +33,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/ilert/CHANGELOG.md b/plugins/ilert/CHANGELOG.md
index cad51a3f69..b04017849b 100644
--- a/plugins/ilert/CHANGELOG.md
+++ b/plugins/ilert/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-ilert
 
+## 0.1.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.1.9
 
 ### Patch Changes
diff --git a/plugins/ilert/package.json b/plugins/ilert/package.json
index 12dbc44972..b3591fb903 100644
--- a/plugins/ilert/package.json
+++ b/plugins/ilert/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-ilert",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,11 +20,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@date-io/luxon": "2.x",
     "@material-ui/core": "^4.12.2",
@@ -38,9 +38,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/jenkins/CHANGELOG.md b/plugins/jenkins/CHANGELOG.md
index aa363a5759..ca5e4c3ed8 100644
--- a/plugins/jenkins/CHANGELOG.md
+++ b/plugins/jenkins/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-jenkins
 
+## 0.5.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.5.4
 
 ### Patch Changes
diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json
index 3eb47fc0e6..c9e0b5a36d 100644
--- a/plugins/jenkins/package.json
+++ b/plugins/jenkins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-jenkins",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,10 +31,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.3",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -47,9 +47,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/kafka/CHANGELOG.md b/plugins/kafka/CHANGELOG.md
index 35fd3cdfed..6bee3e5e6a 100644
--- a/plugins/kafka/CHANGELOG.md
+++ b/plugins/kafka/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-kafka
 
+## 0.2.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.2.13
 
 ### Patch Changes
diff --git a/plugins/kafka/package.json b/plugins/kafka/package.json
index c012d90df8..3024d88311 100644
--- a/plugins/kafka/package.json
+++ b/plugins/kafka/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kafka",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "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.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.1",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -34,9 +34,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/kubernetes/CHANGELOG.md b/plugins/kubernetes/CHANGELOG.md
index c3f3b292a9..2e389256ef 100644
--- a/plugins/kubernetes/CHANGELOG.md
+++ b/plugins/kubernetes/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-kubernetes
 
+## 0.4.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.4.11
 
 ### Patch Changes
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 742bce249a..7d64315e0c 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,11 +30,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/plugin-kubernetes-common": "^0.1.3",
     "@backstage/theme": "^0.2.10",
     "@kubernetes/client-node": "^0.15.0",
@@ -50,9 +50,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/lighthouse/CHANGELOG.md b/plugins/lighthouse/CHANGELOG.md
index d2ad6ce91e..b43c9c9fb7 100644
--- a/plugins/lighthouse/CHANGELOG.md
+++ b/plugins/lighthouse/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-lighthouse
 
+## 0.2.24
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.2.23
 
 ### Patch Changes
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index fcc8061a10..256767ede6 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-lighthouse",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,11 +31,11 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.6",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -47,9 +47,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/newrelic/CHANGELOG.md b/plugins/newrelic/CHANGELOG.md
index 444c615867..f43f625238 100644
--- a/plugins/newrelic/CHANGELOG.md
+++ b/plugins/newrelic/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-newrelic
 
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json
index caaa86fd38..dfb245b65f 100644
--- a/plugins/newrelic/package.json
+++ b/plugins/newrelic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-newrelic",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,7 +31,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -42,9 +42,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/org/CHANGELOG.md b/plugins/org/CHANGELOG.md
index 586cbf2fcb..b6b94201ce 100644
--- a/plugins/org/CHANGELOG.md
+++ b/plugins/org/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-org
 
+## 0.3.21
+
+### Patch Changes
+
+- c9927b1c7: Don't open a new tab when clicking on the ownership card.
+- 7e5f14dda: This change hides pagination counter of search tables and group members list when results fit in one page
+- ff304cfc3: Fix OwnershipCard links to support namespaced owners
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.3.20
 
 ### Patch Changes
diff --git a/plugins/org/package.json b/plugins/org/package.json
index b416e5a3d6..22df2e6606 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-org",
-  "version": "0.3.20",
+  "version": "0.3.21",
   "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.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.4",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -36,9 +36,9 @@
     "qs": "^6.10.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/pagerduty/CHANGELOG.md b/plugins/pagerduty/CHANGELOG.md
index b07d102131..cd838eb5b7 100644
--- a/plugins/pagerduty/CHANGELOG.md
+++ b/plugins/pagerduty/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-pagerduty
 
+## 0.3.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.3.11
 
 ### Patch Changes
diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json
index e0ad4ea80b..b8066e9080 100644
--- a/plugins/pagerduty/package.json
+++ b/plugins/pagerduty/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-pagerduty",
-  "version": "0.3.11",
+  "version": "0.3.12",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,10 +30,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -47,9 +47,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/rollbar/CHANGELOG.md b/plugins/rollbar/CHANGELOG.md
index da263c3a2b..62b50ffa41 100644
--- a/plugins/rollbar/CHANGELOG.md
+++ b/plugins/rollbar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-rollbar
 
+## 0.3.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.3.12
 
 ### Patch Changes
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index 09999bc111..79cfab6f43 100644
--- a/plugins/rollbar/package.json
+++ b/plugins/rollbar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-rollbar",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,10 +31,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md
index ceca597780..5827b82466 100644
--- a/plugins/scaffolder-backend/CHANGELOG.md
+++ b/plugins/scaffolder-backend/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-scaffolder-backend
 
+## 0.15.3
+
+### Patch Changes
+
+- 3f9dd1759: GitHub create repository webhook action: `github:webhook` for Backstage plugin Scaffolder has been added.
+- 774b08a5c: GitHubWebhook Action can be created with a default webhook secret. This allows getting secret from environment variable as an alternative to get it from context.
+- 536f4d844: Updated dependencies
+- 0b92a1e74: refactor: extract common Octokit related code and use it in actions: `publish:github`, `github:actions:dispatch`, `github:webhook`.
+- Updated dependencies
+  - @backstage/integration@0.6.3
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
 ## 0.15.2
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 5ed50f1964..93cee90937 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,12 +29,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
+    "@backstage/backend-common": "^0.9.1",
     "@backstage/catalog-client": "^0.3.17",
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.6.2",
+    "@backstage/integration": "^0.6.3",
     "@backstage/plugin-scaffolder-backend-module-cookiecutter": "^0.1.2",
     "@gitbeaker/core": "^30.2.0",
     "@gitbeaker/node": "^30.2.0",
@@ -66,7 +66,7 @@
     "yaml": "^1.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.8",
+    "@backstage/cli": "^0.7.10",
     "@backstage/test-utils": "^0.1.17",
     "@types/command-exists": "^1.2.0",
     "@types/fs-extra": "^9.0.1",
diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md
index 88da5445ab..f180e67011 100644
--- a/plugins/scaffolder/CHANGELOG.md
+++ b/plugins/scaffolder/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-scaffolder
 
+## 0.11.2
+
+### Patch Changes
+
+- 34e14fdf7: Allow to pass custom TemplateCard to ScaffolderPage
+- 957ae8059: Use themeId in TemplateCard from theme object
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
 ## 0.11.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 042eab076e..c457da8b15 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,14 +31,14 @@
   },
   "dependencies": {
     "@backstage/catalog-client": "^0.3.18",
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.7",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.6.1",
-    "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-catalog-react": "^0.4.3",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -63,9 +63,9 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/search-backend-module-elasticsearch/CHANGELOG.md b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
index 6dd34513f0..af7b9c23f5 100644
--- a/plugins/search-backend-module-elasticsearch/CHANGELOG.md
+++ b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-search-backend-module-elasticsearch
 
+## 0.0.3
+
+### Patch Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+- Updated dependencies
+  - @backstage/search-common@0.2.0
+
 ## 0.0.2
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-elasticsearch/package.json b/plugins/search-backend-module-elasticsearch/package.json
index b68f401888..9cfd2422d7 100644
--- a/plugins/search-backend-module-elasticsearch/package.json
+++ b/plugins/search-backend-module-elasticsearch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-elasticsearch",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@backstage/config": "^0.1.8",
-    "@backstage/search-common": "^0.1.2",
+    "@backstage/search-common": "^0.2.0",
     "@elastic/elasticsearch": "^7.13.0",
     "@acuris/aws-es-connection": "^2.2.0",
     "aws-sdk": "^2.948.0",
@@ -29,8 +29,8 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.9.0",
-    "@backstage/cli": "^0.7.8",
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/cli": "^0.7.10",
     "@elastic/elasticsearch-mock": "^0.3.0"
   },
   "files": [
diff --git a/plugins/search-backend-module-pg/CHANGELOG.md b/plugins/search-backend-module-pg/CHANGELOG.md
index 6199643da6..ee9953942a 100644
--- a/plugins/search-backend-module-pg/CHANGELOG.md
+++ b/plugins/search-backend-module-pg/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-search-backend-module-pg
 
+## 0.2.0
+
+### Minor Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/search-common@0.2.0
+  - @backstage/plugin-search-backend-node@0.4.2
+  - @backstage/backend-common@0.9.1
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-pg/package.json b/plugins/search-backend-module-pg/package.json
index d799d53dc8..08ecd93967 100644
--- a/plugins/search-backend-module-pg/package.json
+++ b/plugins/search-backend-module-pg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-pg",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,15 +19,15 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
-    "@backstage/search-common": "^0.1.2",
-    "@backstage/plugin-search-backend-node": "^0.4.0",
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/search-common": "^0.2.0",
+    "@backstage/plugin-search-backend-node": "^0.4.2",
     "lodash": "^4.17.15",
     "knex": "^0.95.1"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "^0.1.6",
-    "@backstage/cli": "^0.7.9"
+    "@backstage/cli": "^0.7.10"
   },
   "files": [
     "dist",
diff --git a/plugins/search-backend-node/CHANGELOG.md b/plugins/search-backend-node/CHANGELOG.md
index 258a6c0d44..95ed3ad2d4 100644
--- a/plugins/search-backend-node/CHANGELOG.md
+++ b/plugins/search-backend-node/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-search-backend-node
 
+## 0.4.2
+
+### Patch Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+- Updated dependencies
+  - @backstage/search-common@0.2.0
+
 ## 0.4.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-node/package.json b/plugins/search-backend-node/package.json
index 57559be9ed..f57ad81e18 100644
--- a/plugins/search-backend-node/package.json
+++ b/plugins/search-backend-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-node",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,14 +19,14 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/search-common": "^0.1.3",
+    "@backstage/search-common": "^0.2.0",
     "winston": "^3.2.1",
     "lunr": "^2.3.9",
     "@types/lunr": "^2.3.3"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.9.0",
-    "@backstage/cli": "^0.7.7"
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/cli": "^0.7.10"
   },
   "files": [
     "dist"
diff --git a/plugins/search-backend/CHANGELOG.md b/plugins/search-backend/CHANGELOG.md
index c8192ef941..af8fcfa79a 100644
--- a/plugins/search-backend/CHANGELOG.md
+++ b/plugins/search-backend/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-search-backend
 
+## 0.2.6
+
+### Patch Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+- Updated dependencies
+  - @backstage/search-common@0.2.0
+  - @backstage/plugin-search-backend-node@0.4.2
+  - @backstage/backend-common@0.9.1
+
 ## 0.2.5
 
 ### Patch Changes
diff --git a/plugins/search-backend/package.json b/plugins/search-backend/package.json
index 74ed840f3c..300ff80ba1 100644
--- a/plugins/search-backend/package.json
+++ b/plugins/search-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -19,9 +19,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
-    "@backstage/search-common": "^0.1.2",
-    "@backstage/plugin-search-backend-node": "^0.4.0",
+    "@backstage/backend-common": "^0.9.1",
+    "@backstage/search-common": "^0.2.0",
+    "@backstage/plugin-search-backend-node": "^0.4.2",
     "@types/express": "^4.17.6",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
@@ -29,7 +29,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
+    "@backstage/cli": "^0.7.10",
     "@types/supertest": "^2.0.8",
     "supertest": "^6.1.3"
   },
diff --git a/plugins/search/CHANGELOG.md b/plugins/search/CHANGELOG.md
index 4d6c7eacbb..de2af423dd 100644
--- a/plugins/search/CHANGELOG.md
+++ b/plugins/search/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-search
 
+## 0.4.9
+
+### Patch Changes
+
+- a13f21cdc: Implement optional `pageCursor` based paging in search.
+
+  To use paging in your app, add a `<SearchResultPager />` to your
+  `SearchPage.tsx`.
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/search-common@0.2.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.4.8
 
 ### Patch Changes
diff --git a/plugins/search/package.json b/plugins/search/package.json
index de48cc7f96..900ea3c11d 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -29,13 +29,13 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.4.4",
-    "@backstage/search-common": "^0.1.3",
+    "@backstage/plugin-catalog-react": "^0.4.5",
+    "@backstage/search-common": "^0.2.0",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -49,9 +49,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/sentry/CHANGELOG.md b/plugins/sentry/CHANGELOG.md
index 51e4080fc8..4092a460f1 100644
--- a/plugins/sentry/CHANGELOG.md
+++ b/plugins/sentry/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-sentry
 
+## 0.3.20
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.3.19
 
 ### Patch Changes
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index 13fa91eb83..5b7f174583 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sentry",
-  "version": "0.3.19",
+  "version": "0.3.20",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,10 +31,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.3",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -47,9 +47,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/shortcuts/CHANGELOG.md b/plugins/shortcuts/CHANGELOG.md
index 33f208531b..b06b2abbfa 100644
--- a/plugins/shortcuts/CHANGELOG.md
+++ b/plugins/shortcuts/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-shortcuts
 
+## 0.1.7
+
+### Patch Changes
+
+- e0a6aea82: Bumped `react-hook-form` to `^7.12.2`
+- b8e8a3424: Fix material-ui warning about deprecated `onExit` prop
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/plugins/shortcuts/package.json b/plugins/shortcuts/package.json
index 45d2487070..1df0981b18 100644
--- a/plugins/shortcuts/package.json
+++ b/plugins/shortcuts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-shortcuts",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -36,9 +36,9 @@
     "zen-observable": "^0.8.15"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/sonarqube/CHANGELOG.md b/plugins/sonarqube/CHANGELOG.md
index a29ee6365d..04b6d2ed40 100644
--- a/plugins/sonarqube/CHANGELOG.md
+++ b/plugins/sonarqube/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-sonarqube
 
+## 0.2.1
+
+### Patch Changes
+
+- 38fd73fb5: Update README to show a simpler proxy configuration.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json
index 5d08a1f15c..3fce16b5fe 100644
--- a/plugins/sonarqube/package.json
+++ b/plugins/sonarqube/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sonarqube",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -32,10 +32,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -48,9 +48,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/splunk-on-call/CHANGELOG.md b/plugins/splunk-on-call/CHANGELOG.md
index 73ba4ee6bd..e396bc8f9e 100644
--- a/plugins/splunk-on-call/CHANGELOG.md
+++ b/plugins/splunk-on-call/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-splunk-on-call
 
+## 0.3.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.3.8
 
 ### Patch Changes
diff --git a/plugins/splunk-on-call/package.json b/plugins/splunk-on-call/package.json
index 75c249499e..5d821dd44b 100644
--- a/plugins/splunk-on-call/package.json
+++ b/plugins/splunk-on-call/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-splunk-on-call",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,10 +30,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
-    "@backstage/plugin-catalog-react": "^0.4.2",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -46,9 +46,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/tech-radar/CHANGELOG.md b/plugins/tech-radar/CHANGELOG.md
index 7b4daca110..139e44ea58 100644
--- a/plugins/tech-radar/CHANGELOG.md
+++ b/plugins/tech-radar/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-tech-radar
 
+## 0.4.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.4.5
 
 ### Patch Changes
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index e1ae17f98c..cede08d9f4 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-tech-radar",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,7 +30,7 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -44,9 +44,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/techdocs-backend/CHANGELOG.md b/plugins/techdocs-backend/CHANGELOG.md
index 4301c0f0bf..8b8b059b02 100644
--- a/plugins/techdocs-backend/CHANGELOG.md
+++ b/plugins/techdocs-backend/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-techdocs-backend
 
+## 0.10.1
+
+### Patch Changes
+
+- 30ed662a3: Adding in-context search to TechDocs Reader component. Using existing search-backend to query for indexed search results scoped into a specific entity's techdocs. Needs TechDocsCollator enabled on the backend to work.
+
+  Adding extra information to indexed tech docs documents for search.
+
+- a42a142c2: Errors encountered while attempting to load TechDocs search indices at
+  collation-time are now logged at `DEBUG` instead of `WARN` level.
+- Updated dependencies
+  - @backstage/techdocs-common@0.10.0
+  - @backstage/integration@0.6.3
+  - @backstage/search-common@0.2.0
+  - @backstage/catalog-model@0.9.1
+  - @backstage/backend-common@0.9.1
+
 ## 0.10.0
 
 ### Minor Changes
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index 170667df2a..24317a0146 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-backend",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,14 +30,14 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.0",
+    "@backstage/backend-common": "^0.9.1",
     "@backstage/catalog-client": "^0.3.17",
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.6.2",
-    "@backstage/search-common": "^0.1.3",
-    "@backstage/techdocs-common": "^0.9.0",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/search-common": "^0.2.0",
+    "@backstage/techdocs-common": "^0.10.0",
     "@types/express": "^4.17.6",
     "cross-fetch": "^3.0.6",
     "dockerode": "^3.2.1",
@@ -50,7 +50,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.8",
+    "@backstage/cli": "^0.7.10",
     "@backstage/test-utils": "^0.1.17",
     "@types/dockerode": "^3.2.1",
     "msw": "^0.29.0",
diff --git a/plugins/techdocs/CHANGELOG.md b/plugins/techdocs/CHANGELOG.md
index 28095fb8ba..f920a0dd17 100644
--- a/plugins/techdocs/CHANGELOG.md
+++ b/plugins/techdocs/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-techdocs
 
+## 0.11.1
+
+### Patch Changes
+
+- 30ed662a3: Adding in-context search to TechDocs Reader component. Using existing search-backend to query for indexed search results scoped into a specific entity's techdocs. Needs TechDocsCollator enabled on the backend to work.
+
+  Adding extra information to indexed tech docs documents for search.
+
+- 434dfc5d4: Display [metadata.title](https://backstage.io/docs/features/software-catalog/descriptor-format#title-optional) for components on the TechDocs homepage, if defined; otherwise fall back to `metadata.name` as displayed before.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/integration@0.6.3
+  - @backstage/core-components@0.4.0
+  - @backstage/plugin-catalog@0.6.14
+  - @backstage/plugin-search@0.4.9
+  - @backstage/catalog-model@0.9.1
+  - @backstage/integration-react@0.1.8
+
 ## 0.11.0
 
 ### Minor Changes
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 20b23fbfa2..a8ca36e2dd 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,16 +31,16 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
+    "@backstage/catalog-model": "^0.9.1",
     "@backstage/config": "^0.1.8",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-search": "^0.4.5",
-    "@backstage/integration": "^0.6.2",
-    "@backstage/integration-react": "^0.1.7",
-    "@backstage/plugin-catalog": "^0.6.13",
-    "@backstage/plugin-catalog-react": "^0.4.4",
+    "@backstage/plugin-search": "^0.4.9",
+    "@backstage/integration": "^0.6.3",
+    "@backstage/integration-react": "^0.1.8",
+    "@backstage/plugin-catalog": "^0.6.14",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -60,9 +60,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/todo/CHANGELOG.md b/plugins/todo/CHANGELOG.md
index 065fb16b0c..d867c6fe77 100644
--- a/plugins/todo/CHANGELOG.md
+++ b/plugins/todo/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-todo
 
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@0.4.5
+  - @backstage/core-components@0.4.0
+  - @backstage/catalog-model@0.9.1
+
 ## 0.1.7
 
 ### Patch Changes
diff --git a/plugins/todo/package.json b/plugins/todo/package.json
index 05776d2204..eb02b12a20 100644
--- a/plugins/todo/package.json
+++ b/plugins/todo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-todo",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -26,11 +26,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.9.0",
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/catalog-model": "^0.9.1",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
-    "@backstage/plugin-catalog-react": "^0.4.1",
+    "@backstage/plugin-catalog-react": "^0.4.5",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -40,9 +40,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/user-settings/CHANGELOG.md b/plugins/user-settings/CHANGELOG.md
index 0ef1329ab9..24a6c967a0 100644
--- a/plugins/user-settings/CHANGELOG.md
+++ b/plugins/user-settings/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-user-settings
 
+## 0.3.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index 500270f9d6..cef50d1f2b 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-user-settings",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,7 +30,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -42,10 +42,10 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
     "@backstage/core-plugin-api": "^0.1.5",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/welcome/CHANGELOG.md b/plugins/welcome/CHANGELOG.md
index 5f0871e2bb..cb518b83e5 100644
--- a/plugins/welcome/CHANGELOG.md
+++ b/plugins/welcome/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-welcome
 
+## 0.3.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index 922ee554ed..9dbf2a3a04 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-welcome",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "private": false,
@@ -30,7 +30,7 @@
     "start": "backstage-cli plugin:serve"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/theme": "^0.2.10",
     "@material-ui/core": "^4.12.2",
@@ -42,9 +42,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/plugins/xcmetrics/CHANGELOG.md b/plugins/xcmetrics/CHANGELOG.md
index 75ebf9954a..c512bae367 100644
--- a/plugins/xcmetrics/CHANGELOG.md
+++ b/plugins/xcmetrics/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-xcmetrics
 
+## 0.2.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.4.0
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/xcmetrics/package.json b/plugins/xcmetrics/package.json
index 4498d79ff0..dc72855765 100644
--- a/plugins/xcmetrics/package.json
+++ b/plugins/xcmetrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-xcmetrics",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.3.3",
+    "@backstage/core-components": "^0.4.0",
     "@backstage/core-plugin-api": "^0.1.6",
     "@backstage/errors": "^0.1.1",
     "@backstage/theme": "^0.2.10",
@@ -34,9 +34,9 @@
     "recharts": "^1.8.5"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.9",
-    "@backstage/core-app-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.7",
+    "@backstage/cli": "^0.7.10",
+    "@backstage/core-app-api": "^0.1.11",
+    "@backstage/dev-utils": "^0.2.8",
     "@backstage/test-utils": "^0.1.17",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
diff --git a/yarn.lock b/yarn.lock
index 333776fb5d..c7c2685352 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2312,6 +2312,51 @@
     react-use "^17.2.4"
     zen-observable "^0.8.15"
 
+"@backstage/core-components@^0.3.0":
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/@backstage/core-components/-/core-components-0.3.3.tgz#ec63eac6d789303f90219857849fa1cefe4e0dde"
+  integrity sha512-u75+YiXu33NHSFT5MqTgY+uqtxyye4Tmy3I7D21wLUgeW6aFhmS1IUBGckCqv8UG1nqZS7gBmJLccm88tDsJaA==
+  dependencies:
+    "@backstage/config" "^0.1.8"
+    "@backstage/core-plugin-api" "^0.1.6"
+    "@backstage/errors" "^0.1.1"
+    "@backstage/theme" "^0.2.10"
+    "@material-table/core" "^3.1.0"
+    "@material-ui/core" "^4.12.2"
+    "@material-ui/icons" "^4.9.1"
+    "@material-ui/lab" "4.0.0-alpha.45"
+    "@testing-library/react-hooks" "^3.4.2"
+    "@types/dagre" "^0.7.44"
+    "@types/prop-types" "^15.7.3"
+    "@types/react" "*"
+    "@types/react-sparklines" "^1.7.0"
+    "@types/react-text-truncate" "^0.14.0"
+    classnames "^2.2.6"
+    clsx "^1.1.0"
+    d3-selection "^2.0.0"
+    d3-shape "^2.0.0"
+    d3-zoom "^2.0.0"
+    dagre "^0.8.5"
+    immer "^9.0.1"
+    lodash "^4.17.15"
+    pluralize "^8.0.0"
+    prop-types "^15.7.2"
+    qs "^6.9.4"
+    rc-progress "^3.0.0"
+    react "^16.12.0"
+    react-dom "^16.12.0"
+    react-helmet "6.1.0"
+    react-hook-form "^6.15.4"
+    react-markdown "^5.0.2"
+    react-router "6.0.0-beta.0"
+    react-router-dom "6.0.0-beta.0"
+    react-sparklines "^1.7.0"
+    react-syntax-highlighter "^15.4.3"
+    react-text-truncate "^0.16.0"
+    react-use "^17.2.4"
+    remark-gfm "^1.0.0"
+    zen-observable "^0.8.15"
+
 "@backstage/core@*":
   version "0.7.14"
   resolved "https://registry.npmjs.org/@backstage/core/-/core-0.7.14.tgz#863844fe40bb6a29bcc2d297e42055633b0e886f"

From 7bd63fe56f1537454ba7e2e3060bcbb224b36c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 2 Sep 2021 13:08:59 +0200
Subject: [PATCH 80/83] fix the link to allure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 microsite/data/plugins/allure.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsite/data/plugins/allure.yaml b/microsite/data/plugins/allure.yaml
index b24a4157f9..defa7158c0 100644
--- a/microsite/data/plugins/allure.yaml
+++ b/microsite/data/plugins/allure.yaml
@@ -4,6 +4,6 @@ author: Deepak Bhardwaj
 authorUrl: https://github.com/deepak-bhardwaj-ps
 category: Reporting
 description: View Allure reports for your components in Backstage.
-documentation: https://github.com/backstage/backstage/blob/plugin-allure/plugins/allure/README.md
+documentation: https://github.com/backstage/backstage/tree/master/plugins/allure
 iconUrl: https://avatars.githubusercontent.com/u/5879127
 npmPackageName: '@backstage/plugin-allure'

From e537f33f3c2533d7d6db429c75d1bcfd9a26db2e Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 2 Sep 2021 13:41:39 +0200
Subject: [PATCH 81/83] chore: updating core library too as they need bumping
 at the same time

Signed-off-by: blam <ben@blam.sh>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 59deeb3b96..83741da8a6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5038,9 +5038,9 @@
     react-lifecycles-compat "^3.0.4"
 
 "@rjsf/core@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@rjsf/core/-/core-3.0.0.tgz#7f79b0635c969e3fbfe0aaa4773d844fbee68a63"
-  integrity sha512-QSvyVMDiwd7neVnIMOte4tZUvtDWgLDYKOsq1tgCsIFh+RXskd3AEBf6IsK8w6Wg36Om7YalDqqrtXbk9z+rLw==
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/@rjsf/core/-/core-3.1.0.tgz#7667364a4532e25c164abbc2adabe39157ffec4c"
+  integrity sha512-EwM2juiQxEdXzFy9rIIsDr6/e+FYeR1cKx0/no8ASEuXZ1p+/nf/CxKGobzD6UhpRip7JK9PhhuHFEFBIjHFJA==
   dependencies:
     "@types/json-schema" "^7.0.7"
     ajv "^6.7.0"

From 800a95bace135d7612aa84eb0ef6e3e556b49c25 Mon Sep 17 00:00:00 2001
From: Roy Jacobs <roy.jacobs@gmail.com>
Date: Thu, 2 Sep 2021 15:02:24 +0200
Subject: [PATCH 82/83] Use the CatalogClient to perform the request to the
 catalog backend

Signed-off-by: Roy Jacobs <roy.jacobs@gmail.com>
---
 plugins/catalog-backend/api-report.md         |  7 +++-
 .../src/search/DefaultCatalogCollator.test.ts | 26 +------------
 .../src/search/DefaultCatalogCollator.ts      | 39 ++++++++-----------
 3 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md
index f6e864221c..01a824d049 100644
--- a/plugins/catalog-backend/api-report.md
+++ b/plugins/catalog-backend/api-report.md
@@ -7,6 +7,7 @@
 
 import { Account } from 'aws-sdk/clients/organizations';
 import { BitbucketIntegration } from '@backstage/integration';
+import { CatalogApi } from '@backstage/catalog-client';
 import { CatalogEntitiesRequest } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { DocumentCollator } from '@backstage/search-common';
@@ -567,10 +568,12 @@ export class DefaultCatalogCollator implements DocumentCollator {
     discovery,
     locationTemplate,
     filter,
+    catalogClient,
   }: {
     discovery: PluginEndpointDiscovery;
     locationTemplate?: string;
     filter?: CatalogEntitiesRequest['filter'];
+    catalogClient?: CatalogApi;
   });
   // (undocumented)
   protected applyArgsToFormat(
@@ -578,13 +581,15 @@ export class DefaultCatalogCollator implements DocumentCollator {
     args: Record<string, string>,
   ): string;
   // (undocumented)
+  protected readonly catalogClient: CatalogApi;
+  // (undocumented)
   protected discovery: PluginEndpointDiscovery;
   // Warning: (ae-forgotten-export) The symbol "CatalogEntityDocument" needs to be exported by the entry point index.d.ts
   //
   // (undocumented)
   execute(): Promise<CatalogEntityDocument[]>;
   // (undocumented)
-  protected filterUrl?: string;
+  protected filter?: CatalogEntitiesRequest['filter'];
   // (undocumented)
   static fromConfig(
     _config: Config,
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
index f1b7cfe862..bb556fc49f 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.test.ts
@@ -16,10 +16,7 @@
 
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
-import {
-  DefaultCatalogCollator,
-  mapFilterToQueryString,
-} from './DefaultCatalogCollator';
+import { DefaultCatalogCollator } from './DefaultCatalogCollator';
 import { setupServer } from 'msw/node';
 import { rest } from 'msw';
 import { ConfigReader } from '@backstage/config';
@@ -59,7 +56,7 @@ describe('DefaultCatalogCollator', () => {
       rest.get('http://localhost:7000/entities', (req, res, ctx) => {
         if (req.url.searchParams.has('filter')) {
           const filter = req.url.searchParams.get('filter');
-          if (filter === 'kind=Foo,Bar') {
+          if (filter === 'kind=Foo,kind=Bar') {
             // When filtering on the 'Foo,Bar' kinds we simply return no items, to simulate a filter
             return res(ctx.json([]));
           }
@@ -120,23 +117,4 @@ describe('DefaultCatalogCollator', () => {
     // The simulated 'Foo,Bar' filter should return in an empty list
     expect(documents).toHaveLength(0);
   });
-
-  it('can map filters to query strings', () => {
-    expect(
-      mapFilterToQueryString({
-        a: 'Foo',
-      }),
-    ).toEqual('?filter=a=Foo');
-    expect(
-      mapFilterToQueryString({
-        a: ['Foo', 'Bar'],
-      }),
-    ).toEqual('?filter=a=Foo,Bar');
-    expect(
-      mapFilterToQueryString({
-        a: ['Foo', 'Bar'],
-        b: ['Quu', 'Qux'],
-      }),
-    ).toEqual('?filter=a=Foo,Bar,b=Quu,Qux');
-  });
 });
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
index b372350a08..6292b2a833 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts
@@ -17,9 +17,12 @@
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
 import { IndexableDocument, DocumentCollator } from '@backstage/search-common';
-import fetch from 'cross-fetch';
 import { Config } from '@backstage/config';
-import { CatalogEntitiesRequest } from '@backstage/catalog-client';
+import {
+  CatalogApi,
+  CatalogClient,
+  CatalogEntitiesRequest,
+} from '@backstage/catalog-client';
 
 export interface CatalogEntityDocument extends IndexableDocument {
   componentType: string;
@@ -32,7 +35,8 @@ export interface CatalogEntityDocument extends IndexableDocument {
 export class DefaultCatalogCollator implements DocumentCollator {
   protected discovery: PluginEndpointDiscovery;
   protected locationTemplate: string;
-  protected filterUrl?: string;
+  protected filter?: CatalogEntitiesRequest['filter'];
+  protected readonly catalogClient: CatalogApi;
   public readonly type: string = 'software-catalog';
 
   static fromConfig(
@@ -51,15 +55,19 @@ export class DefaultCatalogCollator implements DocumentCollator {
     discovery,
     locationTemplate,
     filter,
+    catalogClient,
   }: {
     discovery: PluginEndpointDiscovery;
     locationTemplate?: string;
     filter?: CatalogEntitiesRequest['filter'];
+    catalogClient?: CatalogApi;
   }) {
     this.discovery = discovery;
     this.locationTemplate =
       locationTemplate || '/catalog/:namespace/:kind/:name';
-    this.filterUrl = mapFilterToQueryString(filter);
+    this.filter = filter;
+    this.catalogClient =
+      catalogClient || new CatalogClient({ discoveryApi: discovery });
   }
 
   protected applyArgsToFormat(
@@ -74,10 +82,10 @@ export class DefaultCatalogCollator implements DocumentCollator {
   }
 
   async execute() {
-    const baseUrl = await this.discovery.getBaseUrl('catalog');
-    const res = await fetch(`${baseUrl}/entities${this.filterUrl || ''}`);
-    const entities: Entity[] = await res.json();
-    return entities.map((entity: Entity): CatalogEntityDocument => {
+    const response = await this.catalogClient.getEntities({
+      filter: this.filter,
+    });
+    return response.items.map((entity: Entity): CatalogEntityDocument => {
       return {
         title: entity.metadata.name,
         location: this.applyArgsToFormat(this.locationTemplate, {
@@ -95,18 +103,3 @@ export class DefaultCatalogCollator implements DocumentCollator {
     });
   }
 }
-
-export function mapFilterToQueryString(
-  filter: CatalogEntitiesRequest['filter'],
-): string | undefined {
-  if (!filter) {
-    return undefined;
-  }
-
-  const mappedFilters = Object.entries(filter).map(kvp => {
-    const type = kvp[0];
-    const values = [].concat(kvp[1]);
-    return `${type}=${values.join(',')}`;
-  });
-  return `?filter=${mappedFilters.join(',')}`;
-}

From a5013957e40d042638e25f762e86f67b06edab5b Mon Sep 17 00:00:00 2001
From: Roy Jacobs <roy.jacobs@gmail.com>
Date: Thu, 2 Sep 2021 15:10:15 +0200
Subject: [PATCH 83/83] Update the 'create-app' template to use the new
 constructor for DefaultCatalogCollator

Signed-off-by: Roy Jacobs <roy.jacobs@gmail.com>
---
 .changeset/fast-wasps-matter.md               | 23 +++++++++++++++++++
 .../packages/backend/src/plugins/search.ts    |  3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/fast-wasps-matter.md

diff --git a/.changeset/fast-wasps-matter.md b/.changeset/fast-wasps-matter.md
new file mode 100644
index 0000000000..6b6a682a37
--- /dev/null
+++ b/.changeset/fast-wasps-matter.md
@@ -0,0 +1,23 @@
+---
+'@backstage/create-app': patch
+---
+
+Updated the search configuration class to use the static `fromConfig`-based constructor for the `DefaultCatalogCollator`.
+
+To apply this change to an existing app, replace the following line in `search.ts`:
+
+```diff
+-collator: new DefaultCatalogCollator({ discovery })
++collator: DefaultCatalogCollator.fromConfig(config, { discovery })
+```
+
+The `config` parameter was not needed before, so make sure you also add that in the signature of `createPlugin`
+in `search.ts`:
+
+```diff
+export default async function createPlugin({
+  logger,
+  discovery,
++  config,
+}: PluginEnvironment) {
+```
diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts
index 248ed37ea8..7fc317d23d 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/search.ts
@@ -10,6 +10,7 @@ import { DefaultCatalogCollator } from '@backstage/plugin-catalog-backend';
 export default async function createPlugin({
   logger,
   discovery,
+  config,
 }: PluginEnvironment) {
   // Initialize a connection to a search engine.
   const searchEngine = new LunrSearchEngine({ logger });
@@ -19,7 +20,7 @@ export default async function createPlugin({
   // particular collator gathers entities from the software catalog.
   indexBuilder.addCollator({
     defaultRefreshIntervalSeconds: 600,
-    collator: new DefaultCatalogCollator({ discovery }),
+    collator: DefaultCatalogCollator.fromConfig(config, { discovery }),
   });
 
   // The scheduler controls when documents are gathered from collators and sent