Merge branch 'handle-search-timeout' into qurator-more-devtools

* handle-search-timeout:
  move comment
  cl
  Revert "deploy"
  deploy
  display search timeout errors
  handle search operation errors WIP
  adjust gql queries, regen
  sync gql schema

Author: nl0

catalog/CHANGELOG.md

@@ -18,6 +18,7 @@ where verb is one of
 
 ## Changes
 
+- [Changed] Adjust GQL schema for the upstream changes and handle search timeouts ([#4477](https://github.com/quiltdata/quilt/pull/4477))
 - [Fixed] Correctly sign and proxy S3 requests and URIs in OPEN mode ([#4470](https://github.com/quiltdata/quilt/pull/4470))
 - [Fixed] Show "0 packages" when no packages ([#4473](https://github.com/quiltdata/quilt/pull/4473))
 - [Changed] Search: handle invalid numbers gracefully ([#4468](https://github.com/quiltdata/quilt/pull/4468))

catalog/app/containers/Bucket/Overview/Header.tsx

@@ -313,6 +313,7 @@ function useStats(bucket: string, overviewUrl?: string | null) {
             case 'EmptySearchResultSet':
               return formatQuantity(0)
             case 'InvalidInput':
+            case 'OperationError':
               return '?'
             case 'PackagesSearchResultSet':
               // `-1` == secure search

catalog/app/containers/Bucket/Overview/gql/StatCounts.generated.ts

@@ -23,6 +23,10 @@ export type containers_Bucket_Overview_gql_StatCountsQuery = {
           >
         >
       })
+    | ({ readonly __typename: 'OperationError' } & Pick<
+        Types.OperationError,
+        'name' | 'message' | 'context'
+      >)
   readonly searchObjects:
     | ({ readonly __typename: 'ObjectsSearchResultSet' } & Pick<
         Types.ObjectsSearchResultSet,
@@ -37,6 +41,10 @@ export type containers_Bucket_Overview_gql_StatCountsQuery = {
           >
         >
       })
+    | ({ readonly __typename: 'OperationError' } & Pick<
+        Types.OperationError,
+        'name' | 'message' | 'context'
+      >)
 }
 
 export const containers_Bucket_Overview_gql_StatCountsDocument = {
@@ -114,6 +122,21 @@ export const containers_Bucket_Overview_gql_StatCountsDocument = {
                     ],
                   },
                 },
+                {
+                  kind: 'InlineFragment',
+                  typeCondition: {
+                    kind: 'NamedType',
+                    name: { kind: 'Name', value: 'OperationError' },
+                  },
+                  selectionSet: {
+                    kind: 'SelectionSet',
+                    selections: [
+                      { kind: 'Field', name: { kind: 'Name', value: 'name' } },
+                      { kind: 'Field', name: { kind: 'Name', value: 'message' } },
+                      { kind: 'Field', name: { kind: 'Name', value: 'context' } },
+                    ],
+                  },
+                },
               ],
             },
           },
@@ -169,6 +192,21 @@ export const containers_Bucket_Overview_gql_StatCountsDocument = {
                     ],
                   },
                 },
+                {
+                  kind: 'InlineFragment',
+                  typeCondition: {
+                    kind: 'NamedType',
+                    name: { kind: 'Name', value: 'OperationError' },
+                  },
+                  selectionSet: {
+                    kind: 'SelectionSet',
+                    selections: [
+                      { kind: 'Field', name: { kind: 'Name', value: 'name' } },
+                      { kind: 'Field', name: { kind: 'Name', value: 'message' } },
+                      { kind: 'Field', name: { kind: 'Name', value: 'context' } },
+                    ],
+                  },
+                },
               ],
             },
           },

catalog/app/containers/Bucket/Overview/gql/StatCounts.graphql

@@ -12,6 +12,11 @@ query ($buckets: [String!]) {
         context
       }
     }
+    ... on OperationError {
+      name
+      message
+      context
+    }
   }
   searchObjects(buckets: $buckets) {
     __typename
@@ -26,5 +31,10 @@ query ($buckets: [String!]) {
         context
       }
     }
+    ... on OperationError {
+      name
+      message
+      context
+    }
   }
 }

catalog/app/containers/Bucket/Workflows/Detail.tsx

@@ -150,6 +150,8 @@ function Packages({ bucket, workflow }: PackagesProps) {
           )
         case 'InvalidInput':
           return <M.Typography>Error: Invalid input</M.Typography>
+        case 'OperationError':
+          return <M.Typography>{d.searchPackages.message}</M.Typography>
         default:
           return Eff.absurd<never>(d.searchPackages)
       }

catalog/app/containers/Bucket/Workflows/List.tsx

@@ -61,8 +61,13 @@ function PackagesLink({ bucket, workflow }: PackagesLinkProps) {
             </RR.Link>
           )
         case 'InvalidInput':
+        case 'OperationError':
+          const tip =
+            r.__typename === 'OperationError'
+              ? r.name
+              : `Invalid input: ${r.errors[0].message}`
           return (
-            <M.Tooltip arrow title={`Invalid input: ${r.errors[0].message}`}>
+            <M.Tooltip arrow title={tip}>
               <span className={classes.root}>? packages</span>
             </M.Tooltip>
           )

catalog/app/containers/Bucket/Workflows/gql/WorkflowPackageCount.generated.ts

@@ -25,6 +25,10 @@ export type containers_Bucket_Workflows_gql_WorkflowPackageCountQuery = {
           >
         >
       })
+    | ({ readonly __typename: 'OperationError' } & Pick<
+        Types.OperationError,
+        'name' | 'message' | 'context'
+      >)
 }
 
 export const containers_Bucket_Workflows_gql_WorkflowPackageCountDocument = {
@@ -129,6 +133,21 @@ export const containers_Bucket_Workflows_gql_WorkflowPackageCountDocument = {
                     ],
                   },
                 },
+                {
+                  kind: 'InlineFragment',
+                  typeCondition: {
+                    kind: 'NamedType',
+                    name: { kind: 'Name', value: 'OperationError' },
+                  },
+                  selectionSet: {
+                    kind: 'SelectionSet',
+                    selections: [
+                      { kind: 'Field', name: { kind: 'Name', value: 'name' } },
+                      { kind: 'Field', name: { kind: 'Name', value: 'message' } },
+                      { kind: 'Field', name: { kind: 'Name', value: 'context' } },
+                    ],
+                  },
+                },
               ],
             },
           },

catalog/app/containers/Bucket/Workflows/gql/WorkflowPackageCount.graphql

@@ -12,5 +12,10 @@ query ($buckets: [String!]!, $filter: PackagesSearchFilter!) {
         context
       }
     }
+    ... on OperationError {
+      name
+      message
+      context
+    }
   }
 }

catalog/app/containers/Bucket/Workflows/gql/WorkflowPackages.generated.ts

@@ -41,6 +41,10 @@ export type containers_Bucket_Workflows_gql_WorkflowPackagesQuery = {
           >
         >
       })
+    | ({ readonly __typename: 'OperationError' } & Pick<
+        Types.OperationError,
+        'name' | 'message' | 'context'
+      >)
 }
 
 export const containers_Bucket_Workflows_gql_WorkflowPackagesDocument = {
@@ -209,6 +213,21 @@ export const containers_Bucket_Workflows_gql_WorkflowPackagesDocument = {
                     ],
                   },
                 },
+                {
+                  kind: 'InlineFragment',
+                  typeCondition: {
+                    kind: 'NamedType',
+                    name: { kind: 'Name', value: 'OperationError' },
+                  },
+                  selectionSet: {
+                    kind: 'SelectionSet',
+                    selections: [
+                      { kind: 'Field', name: { kind: 'Name', value: 'name' } },
+                      { kind: 'Field', name: { kind: 'Name', value: 'message' } },
+                      { kind: 'Field', name: { kind: 'Name', value: 'context' } },
+                    ],
+                  },
+                },
               ],
             },
           },

catalog/app/containers/Bucket/Workflows/gql/WorkflowPackages.graphql

@@ -26,5 +26,10 @@ query ($buckets: [String!]!, $filter: PackagesSearchFilter!) {
         context
       }
     }
+    ... on OperationError {
+      name
+      message
+      context
+    }
   }
 }