From d0f15f06f98b5de662ac3a8fcb56a53f6e103091 Mon Sep 17 00:00:00 2001 From: derekwilhelm Date: Fri, 26 Jul 2024 09:11:01 -0600 Subject: [PATCH 1/3] Allow unsuccessful results to be counted --- .../src/main/webapp/component/result-selector/query-feed.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ui-frontend/packages/catalog-ui-search/src/main/webapp/component/result-selector/query-feed.tsx b/ui-frontend/packages/catalog-ui-search/src/main/webapp/component/result-selector/query-feed.tsx index b8f19d3b214..9df530d75f4 100644 --- a/ui-frontend/packages/catalog-ui-search/src/main/webapp/component/result-selector/query-feed.tsx +++ b/ui-frontend/packages/catalog-ui-search/src/main/webapp/component/result-selector/query-feed.tsx @@ -238,9 +238,7 @@ const QueryFeed = ({ selectionInterface }: Props) => { ) if (sourcesThatHaveReturned.length > 0) { - const results = statusBySource - .filter((status) => status.hasReturned) - .filter((status) => status.successful) + const results = statusBySource.filter((status) => status.hasReturned) let available = 0 let possible = 0 From dfe7b60f57db87917fb20ad65a4423e7b0689836 Mon Sep 17 00:00:00 2001 From: derekwilhelm Date: Fri, 26 Jul 2024 10:16:06 -0600 Subject: [PATCH 2/3] protect against undefined hits and count on results --- .../src/main/webapp/component/result-selector/query-feed.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-frontend/packages/catalog-ui-search/src/main/webapp/component/result-selector/query-feed.tsx b/ui-frontend/packages/catalog-ui-search/src/main/webapp/component/result-selector/query-feed.tsx index 9df530d75f4..f9654362dfd 100644 --- a/ui-frontend/packages/catalog-ui-search/src/main/webapp/component/result-selector/query-feed.tsx +++ b/ui-frontend/packages/catalog-ui-search/src/main/webapp/component/result-selector/query-feed.tsx @@ -244,8 +244,8 @@ const QueryFeed = ({ selectionInterface }: Props) => { let possible = 0 results.forEach((result) => { - available += result.count - possible += result.hits + available += result?.count ?? 0 + possible += result?.hits ?? 0 }) resultMessage = `${available} hit${ From 26d10bcc79962aadf6e84f27794719cad71300e9 Mon Sep 17 00:00:00 2001 From: derekwilhelm Date: Fri, 26 Jul 2024 11:23:23 -0600 Subject: [PATCH 3/3] Show statistics in query status for unsuccessful sources --- .../src/main/webapp/component/result-selector/query-feed.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ui-frontend/packages/catalog-ui-search/src/main/webapp/component/result-selector/query-feed.tsx b/ui-frontend/packages/catalog-ui-search/src/main/webapp/component/result-selector/query-feed.tsx index f9654362dfd..d148b8b094a 100644 --- a/ui-frontend/packages/catalog-ui-search/src/main/webapp/component/result-selector/query-feed.tsx +++ b/ui-frontend/packages/catalog-ui-search/src/main/webapp/component/result-selector/query-feed.tsx @@ -82,9 +82,7 @@ const CellValue = (props: CellValueProps) => { )} - {alwaysShowValue || (!message && hasReturned && successful) - ? value - : null} + {alwaysShowValue || (!message && hasReturned) ? value : null} {!hasReturned && !alwaysShowValue && (