Merge branch 'master' into pfs-cookie

quiltdata · Apr 26, 2024 · 527b01b · 527b01b
2 parents e30aad2 + 2d4d359
commit 527b01b
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 10 deletions.
diff --git a/catalog/app/containers/Search/ResultType.tsx b/catalog/app/containers/Search/ResultType.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react'
 import * as M from '@material-ui/core'
 
+import * as GQL from 'utils/GraphQL'
 import * as SearchUIModel from './model'
 
 const VALUES = [SearchUIModel.ResultType.QuiltPackage, SearchUIModel.ResultType.S3Object]
@@ -45,6 +46,10 @@ const useResultTypeStyles = M.makeStyles((t) => ({
   icon: {
     minWidth: t.spacing(3.5),
   },
+  chip: {
+    backgroundColor: t.palette.text.hint,
+    color: t.palette.getContrastText(t.palette.text.hint),
+  },
   item: {
     paddingLeft: t.spacing(1.5),
     paddingRight: t.spacing(1),
@@ -60,10 +65,47 @@ const useResultTypeStyles = M.makeStyles((t) => ({
 export default function ResultType() {
   const classes = useResultTypeStyles()
   const model = SearchUIModel.use()
+
+  const getTotalSelectedResults = () => {
+    if (model.firstPageQuery._tag !== 'data') return null
+    const d = model.firstPageQuery.data
+    switch (d.__typename) {
+      case 'ObjectsSearchResultSet':
+      case 'PackagesSearchResultSet':
+        return d.stats.total
+      case 'EmptySearchResultSet':
+        return 0
+      default:
+        return null
+    }
+  }
+
+  const getTotalOtherResults = (resultType: SearchUIModel.ResultType) =>
+    GQL.fold(model.baseSearchQuery, {
+      data: (data) => {
+        const r =
+          resultType === SearchUIModel.ResultType.QuiltPackage
+            ? data.searchPackages
+            : data.searchObjects
+        switch (r.__typename) {
+          case 'EmptySearchResultSet':
+            return 0
+          case 'ObjectsSearchResultSet':
+          case 'PackagesSearchResultSet':
+            return r.stats.total
+          default:
+            return null
+        }
+      },
+      fetching: () => null,
+      error: () => null,
+    })
+
   return (
     <M.List dense disablePadding className={classes.root}>
       {VALUES.map((v) => {
         const selected = model.state.resultType === v
+        const total = selected ? getTotalSelectedResults() : getTotalOtherResults(v)
         return (
           <M.ListItem
             button
@@ -77,6 +119,11 @@ export default function ResultType() {
               <Icon resultType={v} />
             </M.ListItemIcon>
             <M.ListItemText primary={getLabel(v)} />
+            {total != null && (
+              <M.ListItemSecondaryAction>
+                <M.Chip className={classes.chip} size="small" label={total} />
+              </M.ListItemSecondaryAction>
+            )}
           </M.ListItem>
         )
       })}

diff --git a/catalog/app/containers/Search/Results.tsx b/catalog/app/containers/Search/Results.tsx
@@ -5,6 +5,7 @@ import * as M from '@material-ui/core'
 import { ES_REF_SYNTAX } from 'components/SearchResults'
 import Skeleton from 'components/Skeleton'
 import { useNavBar } from 'containers/NavBar'
+import * as GQL from 'utils/GraphQL'
 import StyledLink from 'utils/StyledLink'
 
 import * as SearchUIModel from './model'
@@ -103,6 +104,7 @@ export function EmptyResults({ className }: EmptyResultsProps) {
   const classes = useEmptyResultsStyles()
   const {
     actions: { clearFilters, reset, setBuckets, setResultType },
+    baseSearchQuery,
     state,
   } = SearchUIModel.use()
   const focus = useNavBar()?.focus
@@ -121,6 +123,29 @@ export function EmptyResults({ className }: EmptyResultsProps) {
       ? SearchUIModel.ResultType.S3Object
       : SearchUIModel.ResultType.QuiltPackage
 
+  const getTotalResults = (resultType: SearchUIModel.ResultType) =>
+    GQL.fold(baseSearchQuery, {
+      data: (data) => {
+        const r =
+          resultType === SearchUIModel.ResultType.QuiltPackage
+            ? data.searchPackages
+            : data.searchObjects
+        switch (r.__typename) {
+          case 'EmptySearchResultSet':
+            return 0
+          case 'ObjectsSearchResultSet':
+          case 'PackagesSearchResultSet':
+            return r.stats.total
+          default:
+            return null
+        }
+      },
+      fetching: () => null,
+      error: () => null,
+    })
+
+  const totalOtherResults = getTotalResults(otherResultType)
+
   const switchResultType = React.useCallback(() => {
     setResultType(otherResultType)
   }, [setResultType, otherResultType])
@@ -136,10 +161,10 @@ export function EmptyResults({ className }: EmptyResultsProps) {
 
       <M.Box mt={3} />
       <M.Typography variant="body1" align="center" className={classes.body}>
-        Could not find any <b>{LABELS[state.resultType]}</b> matching your search
-        criteria.
-        <br />
-        Some suggestions to help you find what you're looking for:
+        Search for{' '}
+        <StyledLink onClick={switchResultType}>{LABELS[otherResultType]}</StyledLink>{' '}
+        instead{totalOtherResults != null && ` (${totalOtherResults} found)`} or adjust
+        your search:
       </M.Typography>
 
       <ul className={classes.list}>
@@ -154,12 +179,7 @@ export function EmptyResults({ className }: EmptyResultsProps) {
           </li>
         )}
         <li>
-          Search for{' '}
-          <StyledLink onClick={switchResultType}>{LABELS[otherResultType]}</StyledLink>{' '}
-          instead
-        </li>
-        <li>
-          Adjust your <StyledLink onClick={focus}>search query</StyledLink>
+          Edit your <StyledLink onClick={focus}>search query</StyledLink>
         </li>
         <li>
           Start <StyledLink onClick={startNewSearch}>from scratch</StyledLink>

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -18,6 +18,7 @@ Entries inside each section should be ordered by type:
 ## Python API
 * [Added] `quilt3.search()` and `quilt3.Bucket.search()` now accept custom Elasticsearch queries ([#3448](https://github.com/quiltdata/quilt/pull/3448))
 * [Fixed] `quilt3.search()` and `quilt3.Bucket.search()` now work with 2022+ Quilt stacks ([#3448](https://github.com/quiltdata/quilt/pull/3448))
+* [Changed] Search UI QoL improvements ([#3967](https://github.com/quiltdata/quilt/pull/3967))
 
 ## Catalog, Lambdas
 * [Added] Added "text" as a file type for quilt_summarize.json ([#3946](https://github.com/quiltdata/quilt/pull/3946))