Merge branch 'master' of https://github.com/spotify/backstage

plugins/scaffolder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder",
-  "version": "0.1.1-alpha.20",
+  "version": "0.1.1-alpha.21",
   "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.1.1-alpha.20",
-    "@backstage/core": "^0.1.1-alpha.20",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.20",
-    "@backstage/theme": "^0.1.1-alpha.20",
+    "@backstage/catalog-model": "^0.1.1-alpha.21",
+    "@backstage/core": "^0.1.1-alpha.21",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.21",
+    "@backstage/theme": "^0.1.1-alpha.21",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -41,9 +41,9 @@
     "swr": "^0.3.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.20",
-    "@backstage/dev-utils": "^0.1.1-alpha.20",
-    "@backstage/test-utils": "^0.1.1-alpha.20",
+    "@backstage/cli": "^0.1.1-alpha.21",
+    "@backstage/dev-utils": "^0.1.1-alpha.21",
+    "@backstage/test-utils": "^0.1.1-alpha.21",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",

plugins/scaffolder/src/components/JobStatusModal/JobStatusModal.tsx

@@ -26,7 +26,7 @@ import { useJobPolling } from './useJobPolling';
 import { Job } from '../../types';
 import { TemplateEntityV1alpha1 } from '@backstage/catalog-model';
 import { Button } from '@backstage/core';
-import { entityRouteDefault } from '@backstage/plugin-catalog';
+import { entityRoute } from '@backstage/plugin-catalog';
 import { generatePath } from 'react-router-dom';
 
 type Props = {
@@ -72,7 +72,7 @@ export const JobStatusModal = ({
       {entity && (
         <DialogActions>
           <Button
-            to={generatePath(entityRouteDefault.path, {
+            to={generatePath(entityRoute.path, {
               kind: entity.kind,
               optionalNamespaceAndName: [
                 entity.metadata.namespace,

plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx

@@ -64,7 +64,7 @@ export const ScaffolderPage: React.FC<{}> = () => {
   }, [error, errorApi]);
 
   return (
-    <Page theme={pageTheme.other}>
+    <Page theme={pageTheme.home}>
       <Header
         pageTitleOverride="Create a new component"
         title={
@@ -95,7 +95,7 @@ export const ScaffolderPage: React.FC<{}> = () => {
           <Typography variant="body2">
             Shoot! Looks like you don't have any templates. Check out the
             documentation{' '}
-            <Link href="docs/backstage/features/software-templates/adding-templates">
+            <Link href="https://backstage.io/docs/features/software-templates/adding-templates">
               here!
             </Link>
           </Typography>

plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx

@@ -136,7 +136,7 @@ export const TemplatePage = () => {
   }
 
   return (
-    <Page theme={pageTheme.other}>
+    <Page theme={pageTheme.home}>
       <Header
         pageTitleOverride="Create a new component"
         title={