From 720fd2f36034684033fa0ce8949988d67c69197e Mon Sep 17 00:00:00 2001 From: Emma Indal Date: Mon, 24 May 2021 09:49:44 +0200 Subject: [PATCH] prettier Signed-off-by: Emma Indal Signed-off-by: Eric Peterson --- packages/app/src/App.tsx | 5 +--- packages/backend/src/plugins/search.ts | 2 +- packages/search-common/src/types.ts | 5 +++- .../CatalogResultListItem.tsx | 18 ++++++++---- .../src/engines/LunrSearchEngine.ts | 28 ++++++++----------- 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx index 04f618c583..5874465ef6 100644 --- a/packages/app/src/App.tsx +++ b/packages/app/src/App.tsx @@ -120,10 +120,7 @@ const routes = ( } /> } /> } /> - } - > + }> {searchPage} } /> diff --git a/packages/backend/src/plugins/search.ts b/packages/backend/src/plugins/search.ts index 1691f53485..861723ad47 100644 --- a/packages/backend/src/plugins/search.ts +++ b/packages/backend/src/plugins/search.ts @@ -31,7 +31,7 @@ export default async function createPlugin({ indexBuilder.addCollator({ type: 'software-catalog', - defaultRefreshIntervalSeconds: 600, + defaultRefreshIntervalSeconds: 10, collator: new DefaultCatalogCollator({ discovery }), }); diff --git a/packages/search-common/src/types.ts b/packages/search-common/src/types.ts index 07a4296b85..2aa45e0510 100644 --- a/packages/search-common/src/types.ts +++ b/packages/search-common/src/types.ts @@ -66,5 +66,8 @@ export interface DocumentCollator { * additional metadata. */ export interface DocumentDecorator { - execute(type: string, documents: IndexableDocument[]): Promise; + execute( + type: string, + documents: IndexableDocument[], + ): Promise; } diff --git a/plugins/catalog/src/components/CatalogResultListItem/CatalogResultListItem.tsx b/plugins/catalog/src/components/CatalogResultListItem/CatalogResultListItem.tsx index 88a1f9f1d6..8533de22f7 100644 --- a/plugins/catalog/src/components/CatalogResultListItem/CatalogResultListItem.tsx +++ b/plugins/catalog/src/components/CatalogResultListItem/CatalogResultListItem.tsx @@ -11,13 +11,19 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * l -imitations under the License. + * limitations under the License. */ import React from 'react'; import { Link } from '@backstage/core'; -import { Box, Chip, Divider, ListItem, ListItemText, makeStyles } from '@material-ui/core'; +import { + Box, + Chip, + Divider, + ListItem, + ListItemText, + makeStyles, +} from '@material-ui/core'; const useStyles = makeStyles({ flexContainer: { @@ -41,8 +47,10 @@ export const CatalogResultListItem = ({ result }: any) => { secondary={result.text} /> - {result.kind && ()} - {result.lifecycle && ()} + {result.kind && } + {result.lifecycle && ( + + )} diff --git a/plugins/search-backend-node/src/engines/LunrSearchEngine.ts b/plugins/search-backend-node/src/engines/LunrSearchEngine.ts index 8bff26a784..d6afdc21ae 100644 --- a/plugins/search-backend-node/src/engines/LunrSearchEngine.ts +++ b/plugins/search-backend-node/src/engines/LunrSearchEngine.ts @@ -116,14 +116,12 @@ export class LunrSearchEngine implements SearchEngine { Object.keys(this.lunrIndices).forEach(type => { try { results.push( - ...this.lunrIndices[type] - .search(lunrQueryString) - .map(result => { - return { - result: result, - type: type, - }; - }) + ...this.lunrIndices[type].search(lunrQueryString).map(result => { + return { + result: result, + type: type, + }; + }), ); } catch (err) { // if a field does not exist on a index, we can see that as a no-match @@ -141,14 +139,12 @@ export class LunrSearchEngine implements SearchEngine { .forEach(type => { try { results.push( - ...this.lunrIndices[type] - .search(lunrQueryString) - .map(result => { - return { - result: result, - type: type, - }; - }) + ...this.lunrIndices[type].search(lunrQueryString).map(result => { + return { + result: result, + type: type, + }; + }), ); } catch (err) { // if a field does not exist on a index, we can see that as a no-match