Merge branch 'backstage:master' into plugin-azure-functions

packages/app/CHANGELOG.md

@@ -1,5 +1,67 @@
 # example-app
 
+## 0.2.76-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder@1.7.0-next.2
+  - @backstage/plugin-catalog-common@1.0.7-next.2
+  - @backstage/plugin-catalog-import@0.9.0-next.2
+  - @backstage/cli@0.20.0-next.2
+  - @backstage/plugin-catalog-react@1.2.0-next.2
+  - @backstage/plugin-playlist@0.1.1-next.2
+  - @backstage/plugin-permission-react@0.4.6-next.2
+  - @backstage/plugin-search-common@1.1.0-next.2
+  - @backstage/app-defaults@1.0.7-next.2
+  - @backstage/catalog-model@1.1.2-next.2
+  - @backstage/config@1.0.3-next.2
+  - @backstage/core-app-api@1.1.1-next.2
+  - @backstage/core-components@0.11.2-next.2
+  - @backstage/core-plugin-api@1.0.7-next.2
+  - @backstage/integration-react@1.1.5-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-airbrake@0.3.10-next.2
+  - @backstage/plugin-apache-airflow@0.2.3-next.2
+  - @backstage/plugin-api-docs@0.8.10-next.2
+  - @backstage/plugin-azure-devops@0.2.1-next.2
+  - @backstage/plugin-badges@0.2.34-next.2
+  - @backstage/plugin-catalog-graph@0.2.22-next.2
+  - @backstage/plugin-circleci@0.3.10-next.2
+  - @backstage/plugin-cloudbuild@0.3.10-next.2
+  - @backstage/plugin-code-coverage@0.2.3-next.2
+  - @backstage/plugin-cost-insights@0.11.32-next.2
+  - @backstage/plugin-dynatrace@1.0.0-next.2
+  - @backstage/plugin-explore@0.3.41-next.2
+  - @backstage/plugin-gcalendar@0.3.6-next.2
+  - @backstage/plugin-gcp-projects@0.3.29-next.2
+  - @backstage/plugin-github-actions@0.5.10-next.2
+  - @backstage/plugin-gocd@0.1.16-next.2
+  - @backstage/plugin-graphiql@0.2.42-next.2
+  - @backstage/plugin-home@0.4.26-next.2
+  - @backstage/plugin-jenkins@0.7.9-next.2
+  - @backstage/plugin-kafka@0.3.10-next.2
+  - @backstage/plugin-kubernetes@0.7.3-next.2
+  - @backstage/plugin-lighthouse@0.3.10-next.2
+  - @backstage/plugin-newrelic@0.3.28-next.2
+  - @backstage/plugin-newrelic-dashboard@0.2.3-next.2
+  - @backstage/plugin-org@0.5.10-next.2
+  - @backstage/plugin-pagerduty@0.5.3-next.2
+  - @backstage/plugin-rollbar@0.4.10-next.2
+  - @backstage/plugin-search@1.0.3-next.2
+  - @backstage/plugin-search-react@1.2.0-next.2
+  - @backstage/plugin-sentry@0.4.3-next.2
+  - @backstage/plugin-shortcuts@0.3.2-next.2
+  - @backstage/plugin-stack-overflow@0.1.6-next.2
+  - @backstage/plugin-tech-insights@0.3.1-next.2
+  - @backstage/plugin-tech-radar@0.5.17-next.2
+  - @backstage/plugin-techdocs@1.3.3-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.5-next.2
+  - @backstage/plugin-techdocs-react@1.0.5-next.2
+  - @backstage/plugin-todo@0.2.12-next.2
+  - @backstage/plugin-user-settings@0.5.0-next.2
+  - @internal/plugin-catalog-customized@0.0.3-next.2
+
 ## 0.2.76-next.1
 
 ### Patch Changes

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "example-app",
-  "version": "0.2.76-next.1",
+  "version": "0.2.76-next.2",
   "private": true,
   "backstage": {
     "role": "frontend"
@@ -84,7 +84,6 @@
   },
   "devDependencies": {
     "@backstage/test-utils": "workspace:^",
-    "@rjsf/core": "^3.2.1",
     "@testing-library/cypress": "^8.0.2",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",

packages/app/src/components/search/SearchPage.tsx

@@ -35,6 +35,7 @@ import {
   SearchBar,
   SearchFilter,
   SearchResult,
+  SearchPagination,
   SearchResultPager,
   useSearch,
 } from '@backstage/plugin-search-react';
@@ -129,6 +130,7 @@ const SearchPage = () => {
             </Grid>
           )}
           <Grid item xs>
+            <SearchPagination />
             <SearchResult>
               {({ results }) => (
                 <List>