Merge pull request #5927 from backstage/iameap/search-alpha-release

[Search] Initial, Alpha Release

packages/app/src/App.tsx

@@ -43,7 +43,7 @@ import { GraphiQLPage } from '@backstage/plugin-graphiql';
 import { LighthousePage } from '@backstage/plugin-lighthouse';
 import { NewRelicPage } from '@backstage/plugin-newrelic';
 import { ScaffolderPage, scaffolderPlugin } from '@backstage/plugin-scaffolder';
-import { SearchPage, SearchPageNext } from '@backstage/plugin-search';
+import { SearchPage } from '@backstage/plugin-search';
 import { TechRadarPage } from '@backstage/plugin-tech-radar';
 import { TechdocsPage } from '@backstage/plugin-techdocs';
 import { UserSettingsPage } from '@backstage/plugin-user-settings';
@@ -119,8 +119,7 @@ const routes = (
     <Route path="/api-docs" element={<ApiExplorerPage />} />
     <Route path="/gcp-projects" element={<GcpProjectsPage />} />
     <Route path="/newrelic" element={<NewRelicPage />} />
-    <Route path="/search" element={<SearchPage />} />
-    <Route path="/search-next" element={<SearchPageNext />}>
+    <Route path="/search" element={<SearchPage />}>
       {searchPage}
     </Route>
     <Route path="/cost-insights" element={<CostInsightsPage />} />

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

@@ -20,9 +20,9 @@ import { makeStyles, Theme, Grid, List, Paper } from '@material-ui/core';
 import { Content, Header, Lifecycle, Page } from '@backstage/core';
 import { CatalogResultListItem } from '@backstage/plugin-catalog';
 import {
-  SearchBarNext as SearchBar,
-  SearchFilterNext as SearchFilter,
-  SearchResultNext as SearchResult,
+  SearchBar,
+  SearchFilter,
+  SearchResult,
   DefaultResultListItem,
 } from '@backstage/plugin-search';
 

packages/backend/src/plugins/search.ts

@@ -26,17 +26,24 @@ export default async function createPlugin({
   logger,
   discovery,
 }: PluginEnvironment) {
+  // Initialize a connection to a search engine.
   const searchEngine = new LunrSearchEngine({ logger });
   const indexBuilder = new IndexBuilder({ logger, searchEngine });
 
+  // Collators are responsible for gathering documents known to plugins. This
+  // particular collator gathers entities from the software catalog.
   indexBuilder.addCollator({
     defaultRefreshIntervalSeconds: 600,
     collator: new DefaultCatalogCollator({ discovery }),
   });
 
+  // The scheduler controls when documents are gathered from collators and sent
+  // to the search engine for indexing.
   const { scheduler } = await indexBuilder.build();
 
-  scheduler.start();
+  // A 3 second delay gives the backend server a chance to initialize before
+  // any collators are executed, which may attempt requests against the API.
+  setTimeout(() => scheduler.start(), 3000);
   useHotCleanup(module, () => scheduler.stop());
 
   return await createRouter({