diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts index 304aeacdb..e81629d94 100644 --- a/packages/api/src/generated/graphql.ts +++ b/packages/api/src/generated/graphql.ts @@ -1280,7 +1280,7 @@ export type Query = { sendInstallInstructions: SendInstallInstructionsResult; sharedArticle: SharedArticleResult; subscriptions: SubscriptionsResult; - typeahead: TypeaheadResult; + typeaheadSearch: TypeaheadSearchResult; user: UserResult; users: UsersResult; validateUsername: Scalars['Boolean']; @@ -1352,7 +1352,7 @@ export type QuerySubscriptionsArgs = { }; -export type QueryTypeaheadArgs = { +export type QueryTypeaheadSearchArgs = { query: Scalars['String']; size?: InputMaybe; }; @@ -1929,27 +1929,27 @@ export type SubscriptionsSuccess = { subscriptions: Array; }; -export type TypeaheadError = { - __typename?: 'TypeaheadError'; - errorCodes: Array; +export type TypeaheadSearchError = { + __typename?: 'TypeaheadSearchError'; + errorCodes: Array; }; -export enum TypeaheadErrorCode { +export enum TypeaheadSearchErrorCode { Unauthorized = 'UNAUTHORIZED' } -export type TypeaheadItem = { - __typename?: 'TypeaheadItem'; +export type TypeaheadSearchItem = { + __typename?: 'TypeaheadSearchItem'; id: Scalars['ID']; slug: Scalars['String']; title: Scalars['String']; }; -export type TypeaheadResult = TypeaheadError | TypeaheadSuccess; +export type TypeaheadSearchResult = TypeaheadSearchError | TypeaheadSearchSuccess; -export type TypeaheadSuccess = { - __typename?: 'TypeaheadSuccess'; - items: Array; +export type TypeaheadSearchSuccess = { + __typename?: 'TypeaheadSearchSuccess'; + items: Array; }; export type UnsubscribeError = { @@ -2694,11 +2694,11 @@ export type ResolversTypes = { SubscriptionsErrorCode: SubscriptionsErrorCode; SubscriptionsResult: ResolversTypes['SubscriptionsError'] | ResolversTypes['SubscriptionsSuccess']; SubscriptionsSuccess: ResolverTypeWrapper; - TypeaheadError: ResolverTypeWrapper; - TypeaheadErrorCode: TypeaheadErrorCode; - TypeaheadItem: ResolverTypeWrapper; - TypeaheadResult: ResolversTypes['TypeaheadError'] | ResolversTypes['TypeaheadSuccess']; - TypeaheadSuccess: ResolverTypeWrapper; + TypeaheadSearchError: ResolverTypeWrapper; + TypeaheadSearchErrorCode: TypeaheadSearchErrorCode; + TypeaheadSearchItem: ResolverTypeWrapper; + TypeaheadSearchResult: ResolversTypes['TypeaheadSearchError'] | ResolversTypes['TypeaheadSearchSuccess']; + TypeaheadSearchSuccess: ResolverTypeWrapper; UnsubscribeError: ResolverTypeWrapper; UnsubscribeErrorCode: UnsubscribeErrorCode; UnsubscribeResult: ResolversTypes['UnsubscribeError'] | ResolversTypes['UnsubscribeSuccess']; @@ -2996,10 +2996,10 @@ export type ResolversParentTypes = { SubscriptionsError: SubscriptionsError; SubscriptionsResult: ResolversParentTypes['SubscriptionsError'] | ResolversParentTypes['SubscriptionsSuccess']; SubscriptionsSuccess: SubscriptionsSuccess; - TypeaheadError: TypeaheadError; - TypeaheadItem: TypeaheadItem; - TypeaheadResult: ResolversParentTypes['TypeaheadError'] | ResolversParentTypes['TypeaheadSuccess']; - TypeaheadSuccess: TypeaheadSuccess; + TypeaheadSearchError: TypeaheadSearchError; + TypeaheadSearchItem: TypeaheadSearchItem; + TypeaheadSearchResult: ResolversParentTypes['TypeaheadSearchError'] | ResolversParentTypes['TypeaheadSearchSuccess']; + TypeaheadSearchSuccess: TypeaheadSearchSuccess; UnsubscribeError: UnsubscribeError; UnsubscribeResult: ResolversParentTypes['UnsubscribeError'] | ResolversParentTypes['UnsubscribeSuccess']; UnsubscribeSuccess: UnsubscribeSuccess; @@ -3821,7 +3821,7 @@ export type QueryResolvers; sharedArticle?: Resolver>; subscriptions?: Resolver>; - typeahead?: Resolver>; + typeaheadSearch?: Resolver>; user?: Resolver>; users?: Resolver; validateUsername?: Resolver>; @@ -4178,24 +4178,24 @@ export type SubscriptionsSuccessResolvers; }; -export type TypeaheadErrorResolvers = { - errorCodes?: Resolver, ParentType, ContextType>; +export type TypeaheadSearchErrorResolvers = { + errorCodes?: Resolver, ParentType, ContextType>; __isTypeOf?: IsTypeOfResolverFn; }; -export type TypeaheadItemResolvers = { +export type TypeaheadSearchItemResolvers = { id?: Resolver; slug?: Resolver; title?: Resolver; __isTypeOf?: IsTypeOfResolverFn; }; -export type TypeaheadResultResolvers = { - __resolveType: TypeResolveFn<'TypeaheadError' | 'TypeaheadSuccess', ParentType, ContextType>; +export type TypeaheadSearchResultResolvers = { + __resolveType: TypeResolveFn<'TypeaheadSearchError' | 'TypeaheadSearchSuccess', ParentType, ContextType>; }; -export type TypeaheadSuccessResolvers = { - items?: Resolver, ParentType, ContextType>; +export type TypeaheadSearchSuccessResolvers = { + items?: Resolver, ParentType, ContextType>; __isTypeOf?: IsTypeOfResolverFn; }; @@ -4635,10 +4635,10 @@ export type Resolvers = { SubscriptionsError?: SubscriptionsErrorResolvers; SubscriptionsResult?: SubscriptionsResultResolvers; SubscriptionsSuccess?: SubscriptionsSuccessResolvers; - TypeaheadError?: TypeaheadErrorResolvers; - TypeaheadItem?: TypeaheadItemResolvers; - TypeaheadResult?: TypeaheadResultResolvers; - TypeaheadSuccess?: TypeaheadSuccessResolvers; + TypeaheadSearchError?: TypeaheadSearchErrorResolvers; + TypeaheadSearchItem?: TypeaheadSearchItemResolvers; + TypeaheadSearchResult?: TypeaheadSearchResultResolvers; + TypeaheadSearchSuccess?: TypeaheadSearchSuccessResolvers; UnsubscribeError?: UnsubscribeErrorResolvers; UnsubscribeResult?: UnsubscribeResultResolvers; UnsubscribeSuccess?: UnsubscribeSuccessResolvers; diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql index 6b405eb34..4137193e1 100644 --- a/packages/api/src/generated/schema.graphql +++ b/packages/api/src/generated/schema.graphql @@ -924,7 +924,7 @@ type Query { sendInstallInstructions: SendInstallInstructionsResult! sharedArticle(selectedHighlightId: String, slug: String!, username: String!): SharedArticleResult! subscriptions(sort: SortParams): SubscriptionsResult! - typeahead(query: String!, size: Int): TypeaheadResult! + typeaheadSearch(query: String!, size: Int): TypeaheadSearchResult! user(userId: ID, username: String): UserResult! users: UsersResult! validateUsername(username: String!): Boolean! @@ -1444,24 +1444,24 @@ type SubscriptionsSuccess { subscriptions: [Subscription!]! } -type TypeaheadError { - errorCodes: [TypeaheadErrorCode!]! +type TypeaheadSearchError { + errorCodes: [TypeaheadSearchErrorCode!]! } -enum TypeaheadErrorCode { +enum TypeaheadSearchErrorCode { UNAUTHORIZED } -type TypeaheadItem { +type TypeaheadSearchItem { id: ID! slug: String! title: String! } -union TypeaheadResult = TypeaheadError | TypeaheadSuccess +union TypeaheadSearchResult = TypeaheadSearchError | TypeaheadSearchSuccess -type TypeaheadSuccess { - items: [TypeaheadItem!]! +type TypeaheadSearchSuccess { + items: [TypeaheadSearchItem!]! } type UnsubscribeError { diff --git a/packages/api/src/resolvers/article/index.ts b/packages/api/src/resolvers/article/index.ts index beacdd026..c62081c0d 100644 --- a/packages/api/src/resolvers/article/index.ts +++ b/packages/api/src/resolvers/article/index.ts @@ -22,7 +22,7 @@ import { QueryArticleArgs, QueryArticlesArgs, QuerySearchArgs, - QueryTypeaheadArgs, + QueryTypeaheadSearchArgs, ResolverFn, SaveArticleReadingProgressError, SaveArticleReadingProgressErrorCode, @@ -36,9 +36,9 @@ import { SetShareArticleError, SetShareArticleErrorCode, SetShareArticleSuccess, - TypeaheadError, - TypeaheadErrorCode, - TypeaheadSuccess, + TypeaheadSearchError, + TypeaheadSearchErrorCode, + TypeaheadSearchSuccess, } from '../../generated/graphql' /* eslint-disable @typescript-eslint/no-explicit-any */ import { Merge } from '../../util' @@ -895,13 +895,13 @@ export const searchResolver = authorized< } }) -export const typeaheadResolver = authorized< - TypeaheadSuccess, - TypeaheadError, - QueryTypeaheadArgs +export const typeaheadSearchResolver = authorized< + TypeaheadSearchSuccess, + TypeaheadSearchError, + QueryTypeaheadSearchArgs >(async (_obj, { query, size }, { claims }) => { if (!claims?.uid) { - return { errorCodes: [TypeaheadErrorCode.Unauthorized] } + return { errorCodes: [TypeaheadSearchErrorCode.Unauthorized] } } analytics.track({ diff --git a/packages/api/src/resolvers/function_resolvers.ts b/packages/api/src/resolvers/function_resolvers.ts index 73c938da4..0ba6ac410 100644 --- a/packages/api/src/resolvers/function_resolvers.ts +++ b/packages/api/src/resolvers/function_resolvers.ts @@ -76,7 +76,7 @@ import { signupResolver, subscribeResolver, subscriptionsResolver, - typeaheadResolver, + typeaheadSearchResolver, unsubscribeResolver, updateHighlightResolver, updateLabelResolver, @@ -189,7 +189,7 @@ export const functionResolvers = { webhooks: webhooksResolver, webhook: webhookResolver, apiKeys: apiKeysResolver, - typeahead: typeaheadResolver, + typeaheadSearch: typeaheadSearchResolver, }, User: { async sharedArticles( @@ -591,5 +591,5 @@ export const functionResolvers = { ...resultResolveTypeResolver('ApiKeys'), ...resultResolveTypeResolver('RevokeApiKey'), ...resultResolveTypeResolver('DeleteAccount'), - ...resultResolveTypeResolver('Typeahead'), + ...resultResolveTypeResolver('TypeaheadSearch'), } diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts index 8afdee59a..f81c3cf12 100755 --- a/packages/api/src/schema.ts +++ b/packages/api/src/schema.ts @@ -1763,21 +1763,21 @@ const schema = gql` labelIds: [ID!]! } - union TypeaheadResult = TypeaheadSuccess | TypeaheadError + union TypeaheadSearchResult = TypeaheadSearchSuccess | TypeaheadSearchError - type TypeaheadSuccess { - items: [TypeaheadItem!]! + type TypeaheadSearchSuccess { + items: [TypeaheadSearchItem!]! } - type TypeaheadError { - errorCodes: [TypeaheadErrorCode!]! + type TypeaheadSearchError { + errorCodes: [TypeaheadSearchErrorCode!]! } - enum TypeaheadErrorCode { + enum TypeaheadSearchErrorCode { UNAUTHORIZED } - type TypeaheadItem { + type TypeaheadSearchItem { id: ID! title: String! slug: String! @@ -1896,7 +1896,7 @@ const schema = gql` webhooks: WebhooksResult! webhook(id: ID!): WebhookResult! apiKeys: ApiKeysResult! - typeahead(query: String!, size: Int): TypeaheadResult! + typeaheadSearch(query: String!, size: Int): TypeaheadSearchResult! } `