From 43e423cb85fa5c51c2f624112c26995d1db9aeb7 Mon Sep 17 00:00:00 2001 From: Emma Indal Date: Tue, 5 Jul 2022 14:51:10 +0200 Subject: [PATCH] fixup import Signed-off-by: Emma Indal --- .changeset/fair-coins-deny.md | 2 +- packages/backend/package.json | 1 + packages/backend/src/plugins/search.ts | 2 +- .../src/components/SearchPage/SearchPage.test.tsx | 14 +------------- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/.changeset/fair-coins-deny.md b/.changeset/fair-coins-deny.md index 4f01875bda..8b9fc871eb 100644 --- a/.changeset/fair-coins-deny.md +++ b/.changeset/fair-coins-deny.md @@ -7,4 +7,4 @@ '@backstage/plugin-search-backend-module-elasticsearch': major --- -This package has been promoted to 1.0. Read more about what it means in [New release: Backstage Search 1.0 blog](https://backstage.io/blog/2022/07/14/backstage-search-1.0) +This package has been promoted to 1.0. Read more about what it means in [New release: Backstage Search 1.0 blog](https://backstage.io/blog/2022/07/19/releasing-backstage-search-1.0) diff --git a/packages/backend/package.json b/packages/backend/package.json index 67070bfeee..d81af2a3c7 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -51,6 +51,7 @@ "@backstage/plugin-scaffolder-backend": "^1.4.0-next.3", "@backstage/plugin-scaffolder-backend-module-rails": "^0.4.2-next.1", "@backstage/plugin-search-backend": "^0.5.4-next.2", + "@backstage/plugin-search-common": "^0.3.6-next.0", "@backstage/plugin-search-backend-node": "^0.6.3-next.2", "@backstage/plugin-search-backend-module-elasticsearch": "^0.2.0-next.2", "@backstage/plugin-search-backend-module-pg": "^0.3.5-next.2", diff --git a/packages/backend/src/plugins/search.ts b/packages/backend/src/plugins/search.ts index c478ecdd05..084b1a54e5 100644 --- a/packages/backend/src/plugins/search.ts +++ b/packages/backend/src/plugins/search.ts @@ -22,8 +22,8 @@ import { PgSearchEngine } from '@backstage/plugin-search-backend-module-pg'; import { IndexBuilder, LunrSearchEngine, - SearchEngine, } from '@backstage/plugin-search-backend-node'; +import { SearchEngine } from '@backstage/plugin-search-common'; import { DefaultTechDocsCollatorFactory } from '@backstage/plugin-techdocs-backend'; import { Router } from 'express'; import { PluginEnvironment } from '../types'; diff --git a/plugins/search/src/components/SearchPage/SearchPage.test.tsx b/plugins/search/src/components/SearchPage/SearchPage.test.tsx index 59e6e99aaf..459a541cbd 100644 --- a/plugins/search/src/components/SearchPage/SearchPage.test.tsx +++ b/plugins/search/src/components/SearchPage/SearchPage.test.tsx @@ -16,7 +16,7 @@ import { renderInTestApp } from '@backstage/test-utils'; import React from 'react'; -import { useLocation, useOutlet } from 'react-router'; +import { useLocation } from 'react-router'; import { useSearch } from '@backstage/plugin-search-react'; import { SearchPage } from './SearchPage'; @@ -50,11 +50,6 @@ jest.mock('@backstage/plugin-search-react', () => ({ }), })); -jest.mock('../LegacySearchPage', () => ({ - ...jest.requireActual('@backstage/plugin-search-react'), - LegacySearchPage: jest.fn().mockReturnValue('LegacySearchPageMock'), -})); - describe('SearchPage', () => { const origReplaceState = window.history.replaceState; @@ -96,13 +91,6 @@ describe('SearchPage', () => { expect(getByText('Route Children')).toBeInTheDocument(); }); - it('renders legacy search when no router children are provided', async () => { - (useOutlet as jest.Mock).mockReturnValueOnce(null); - const { getByText } = await renderInTestApp(); - - expect(getByText('LegacySearchPageMock')).toBeInTheDocument(); - }); - it('replaces window history with expected query parameters', async () => { (useSearch as jest.Mock).mockReturnValueOnce({ term: 'bieber',