From 97e13d178d07a8854061e1a1b4f573b7bbb2f772 Mon Sep 17 00:00:00 2001 From: Eric Peterson Date: Sun, 5 Sep 2021 21:43:33 +0200 Subject: [PATCH 1/2] Prevent chromatic build error on SearchBar Signed-off-by: Eric Peterson --- plugins/search/src/components/SearchBar/SearchBar.test.tsx | 4 ++-- plugins/search/src/components/SearchBar/SearchBar.tsx | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/search/src/components/SearchBar/SearchBar.test.tsx b/plugins/search/src/components/SearchBar/SearchBar.test.tsx index 2c5a02eacb..481c2d5523 100644 --- a/plugins/search/src/components/SearchBar/SearchBar.test.tsx +++ b/plugins/search/src/components/SearchBar/SearchBar.test.tsx @@ -37,10 +37,10 @@ describe('SearchBar', () => { }; const query = jest.fn().mockResolvedValue({}); - const getString = jest.fn().mockReturnValue('Mock title'); + const getOptionalString = jest.fn().mockReturnValue('Mock title'); const apiRegistry = ApiRegistry.from([ - [configApiRef, { getString }], + [configApiRef, { getOptionalString }], [searchApiRef, { query }], ]); diff --git a/plugins/search/src/components/SearchBar/SearchBar.tsx b/plugins/search/src/components/SearchBar/SearchBar.tsx index a1b88cbae7..214e22520c 100644 --- a/plugins/search/src/components/SearchBar/SearchBar.tsx +++ b/plugins/search/src/components/SearchBar/SearchBar.tsx @@ -55,7 +55,8 @@ export const SearchBarBase = ({ }, [onChange]); const placeholder = - overridePlaceholder ?? `Search in ${configApi.getString('app.title')}`; + overridePlaceholder ?? + `Search in ${configApi.getOptionalString('app.title') || 'Backstage'}`; return ( Date: Mon, 6 Sep 2021 09:30:35 +0200 Subject: [PATCH 2/2] ConfigReader-ify SearchBar test. Signed-off-by: Eric Peterson --- .../search/src/components/SearchBar/SearchBar.test.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/search/src/components/SearchBar/SearchBar.test.tsx b/plugins/search/src/components/SearchBar/SearchBar.test.tsx index 481c2d5523..de8ea9a5a7 100644 --- a/plugins/search/src/components/SearchBar/SearchBar.test.tsx +++ b/plugins/search/src/components/SearchBar/SearchBar.test.tsx @@ -21,7 +21,11 @@ import { SearchContextProvider } from '../SearchContext'; import { SearchBar } from './SearchBar'; import { configApiRef } from '@backstage/core-plugin-api'; -import { ApiProvider, ApiRegistry } from '@backstage/core-app-api'; +import { + ApiProvider, + ApiRegistry, + ConfigReader, +} from '@backstage/core-app-api'; import { searchApiRef } from '../../apis'; jest.mock('@backstage/core-plugin-api', () => ({ @@ -37,10 +41,9 @@ describe('SearchBar', () => { }; const query = jest.fn().mockResolvedValue({}); - const getOptionalString = jest.fn().mockReturnValue('Mock title'); const apiRegistry = ApiRegistry.from([ - [configApiRef, { getOptionalString }], + [configApiRef, new ConfigReader({ app: { title: 'Mock title' } })], [searchApiRef, { query }], ]);