From 371e6423396de0af164d6e837e2ba2e2cb9a298a Mon Sep 17 00:00:00 2001 From: Tom Wayson Date: Thu, 21 Feb 2019 16:19:13 -0800 Subject: [PATCH] short circuit searchEvents() if there are no sites to search --- packages/events/src/search.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/events/src/search.ts b/packages/events/src/search.ts index cd4119dc935..f729637f7aa 100644 --- a/packages/events/src/search.ts +++ b/packages/events/src/search.ts @@ -97,6 +97,7 @@ function formatEventResponse( ) { const siteIds: string[] = []; const data: IEventResourceObject[] = []; + const included: IEventResourceObject[] = []; const cacheBust = new Date().getTime(); let siteSearchQuery = ""; @@ -128,14 +129,15 @@ function formatEventResponse( siteSearchQuery += attributes.siteId; } }); - + if (siteIds.length === 0) { + return { included, data }; + } + // search for site items and include those in the response const searchRequestOptions = requestOptions as ISearchRequestOptions; searchRequestOptions.searchForm = { q: siteSearchQuery }; return searchItems(searchRequestOptions).then(function(siteInfo) { - const included: IEventResourceObject[] = []; - siteInfo.results.forEach(siteItem => { included.push({ id: siteItem.id,