Merge branch 'master' of github.com:spotify/backstage into shmidt-i/circle-ci-plugin-new-route-api

packages/create-app/templates/default-app/packages/app/src/App.tsx

@@ -11,6 +11,8 @@ import { AppSidebar } from './sidebar';
 import { Route, Routes, Navigate } from 'react-router';
 import { Router as CatalogRouter } from '@backstage/plugin-catalog';
 import { Router as DocsRouter } from '@backstage/plugin-techdocs';
+
+import { Router as TechRadarRouter } from '@backstage/plugin-tech-radar';
 import { EntityPage } from './components/catalog/EntityPage';
 
 const app = createApp({
@@ -30,12 +32,16 @@ const App: FC<{}> = () => (
       <SidebarPage>
         <AppSidebar />
         <Routes>
+          <Navigate key="/" to="/catalog" />
           <Route
             path="/catalog/*"
             element={<CatalogRouter EntityPage={EntityPage} />}
           />
           <Route path="/docs/*" element={<DocsRouter />} />
-          <Navigate key="/" to="/catalog" />
+          <Route
+            path="/tech-radar"
+            element={<TechRadarRouter width={1500} height={800} />}
+          />
           {deprecatedAppRoutes}
         </Routes>
       </SidebarPage>

packages/create-app/templates/default-app/packages/app/src/apis.ts

@@ -1,89 +1,17 @@
 import {
-  ApiRegistry,
-  alertApiRef,
-  errorApiRef,
-  AlertApiForwarder,
-  ConfigApi,
-  ErrorApiForwarder,
-  ErrorAlerter,
   discoveryApiRef,
   UrlPatternDiscovery,
-  oauthRequestApiRef,
-  OAuthRequestManager,
-  storageApiRef,
-  WebStorage,
+  createApiFactory,
+  configApiRef,
 } from '@backstage/core';
 
-import {
-  lighthouseApiRef,
-  LighthouseRestApi,
-} from '@backstage/plugin-lighthouse';
-
-import {
-  GithubActionsClient,
-  githubActionsApiRef,
-} from '@backstage/plugin-github-actions';
-
-import {
-  techdocsStorageApiRef,
-  TechDocsStorageApi,
-} from '@backstage/plugin-techdocs';
-
-import { techRadarApiRef, TechRadar } from '@backstage/plugin-tech-radar';
-
-import { catalogApiRef, CatalogClient } from '@backstage/plugin-catalog';
-import { CircleCIApi, circleCIApiRef } from '@backstage/plugin-circleci';
-
-import { scaffolderApiRef, ScaffolderApi } from '@backstage/plugin-scaffolder';
-
-
-
-export const apis = (config: ConfigApi) => {
-  // eslint-disable-next-line no-console
-  console.log(`Creating APIs for ${config.getString('app.title')}`);
-
-  const backendUrl = config.getString('backend.baseUrl');
-  const techdocsStorageUrl = config.getString('techdocs.storageUrl');
-
-  const builder = ApiRegistry.builder();
-
-  const discoveryApi = builder.add(
-    discoveryApiRef,
-    UrlPatternDiscovery.compile(`${backendUrl}/{{ pluginId }}`),
-  );
-  const alertApi = builder.add(alertApiRef, new AlertApiForwarder());
-  const errorApi = builder.add(
-    errorApiRef,
-    new ErrorAlerter(alertApi, new ErrorApiForwarder()),
-  );
-
-  builder.add(storageApiRef, WebStorage.create({ errorApi }));
-  builder.add(oauthRequestApiRef, new OAuthRequestManager());
-
-  builder.add(catalogApiRef, new CatalogClient({ discoveryApi }));
-  builder.add(githubActionsApiRef, new GithubActionsClient());
-
-  builder.add(lighthouseApiRef, new LighthouseRestApi('http://localhost:3003'));
-
-  builder.add(
-    circleCIApiRef,
-    new CircleCIApi(`${backendUrl}/proxy/circleci/api`),
-  );
-
-  builder.add(scaffolderApiRef, new ScaffolderApi({ discoveryApi }));
-
-  builder.add(
-    techRadarApiRef,
-    new TechRadar({
-      width: 1500,
-      height: 800,
-    }),
-  );
-
-  builder.add(
-    techdocsStorageApiRef,
-    new TechDocsStorageApi({ apiOrigin: techdocsStorageUrl }),
-  );
-
-  return builder.build();
-};
+export const apis = [
+  createApiFactory({
+    api: discoveryApiRef,
+    deps: { configApi: configApiRef },
+    factory: ({ configApi }) =>
+      UrlPatternDiscovery.compile(
+        `${configApi.getString('backend.baseUrl')}/{{ pluginId }}`,
+      ),
+  }),
+];

packages/create-app/templates/default-app/packages/app/src/sidebar.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 import HomeIcon from '@material-ui/icons/Home';
 import LibraryBooks from '@material-ui/icons/LibraryBooks';
 import CreateComponentIcon from '@material-ui/icons/AddCircleOutline';
-import ExploreIcon from '@material-ui/icons/Explore';
 import BuildIcon from '@material-ui/icons/BuildRounded';
 import RuleIcon from '@material-ui/icons/AssignmentTurnedIn';
 import MapIcon from '@material-ui/icons/MyLocation';
@@ -23,7 +22,6 @@ export const AppSidebar = () => (
     <SidebarDivider />
     {/* Global nav, not org-specific */}
     <SidebarItem icon={HomeIcon} to="./" text="Home" />
-    <SidebarItem icon={ExploreIcon} to="explore" text="Explore" />
     <SidebarItem icon={LibraryBooks} to="/docs" text="Docs" />
     <SidebarItem icon={CreateComponentIcon} to="create" text="Create..." />
     <SidebarDivider />