Merge branch 'master' of github.com:backstage/backstage into catalog-import-instructions

plugins/catalog-import/src/api/CatalogImportApi.ts

@@ -18,7 +18,7 @@ import { createApiRef } from '@backstage/core';
 import { PartialEntity } from '../util/types';
 
 export const catalogImportApiRef = createApiRef<CatalogImportApi>({
-  id: 'plugin.catalogimport.service',
+  id: 'plugin.catalog-import.service',
   description: 'Used by the catalog import plugin to make requests',
 });
 

plugins/catalog-import/src/api/CatalogImportClient.ts

@@ -160,7 +160,7 @@ export class CatalogImportClient implements CatalogImportApi {
         );
       });
 
-    const pullRequestRespone = await octo.pulls
+    const pullRequestResponse = await octo.pulls
       .create({
         owner,
         repo,
@@ -178,7 +178,7 @@ export class CatalogImportClient implements CatalogImportApi {
       });
 
     return {
-      link: pullRequestRespone.data.html_url,
+      link: pullRequestResponse.data.html_url,
       location: `https://github.com/${owner}/${repo}/blob/${repoData.data.default_branch}/${fileName}`,
     };
   }

plugins/scaffolder-backend/package.json

@@ -26,13 +26,13 @@
     "@gitbeaker/core": "^25.2.0",
     "@gitbeaker/node": "^25.2.0",
     "@octokit/rest": "^18.0.0",
-    "@types/dockerode": "^2.5.32",
+    "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
     "azure-devops-node-api": "^10.1.1",
     "command-exists-promise": "^2.0.2",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
-    "dockerode": "^3.2.0",
+    "dockerode": "^3.2.1",
     "express": "^4.17.1",
     "express-promise-router": "^3.0.3",
     "fs-extra": "^9.0.0",

plugins/search/src/components/SearchResult/SearchResult.tsx

@@ -251,7 +251,7 @@ export const SearchResult = ({ searchQuery }: SearchResultProps) => {
         )}
         <Grid item xs={showFilters ? 9 : 12}>
           <Table
-            options={{ paging: true, search: false }}
+            options={{ paging: true, pageSize: 20, search: false }}
             data={filteredResults}
             columns={columns}
             title={

plugins/techdocs-backend/package.json

@@ -23,7 +23,7 @@
     "@backstage/backend-common": "^0.3.3",
     "@backstage/catalog-model": "^0.4.0",
     "@backstage/config": "^0.1.1",
-    "@types/dockerode": "^2.5.34",
+    "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
     "command-exists-promise": "^2.0.2",
     "cross-fetch": "^3.0.6",