diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts index 472a56d36..1642cabcd 100644 --- a/packages/api/src/generated/graphql.ts +++ b/packages/api/src/generated/graphql.ts @@ -1022,7 +1022,7 @@ export type Label = { createdAt?: Maybe; description?: Maybe; id: Scalars['ID']; - internal: Scalars['Boolean']; + internal?: Maybe; name: Scalars['String']; position?: Maybe; }; @@ -4907,7 +4907,7 @@ export type LabelResolvers, ParentType, ContextType>; description?: Resolver, ParentType, ContextType>; id?: Resolver; - internal?: Resolver; + internal?: Resolver, ParentType, ContextType>; name?: Resolver; position?: Resolver, ParentType, ContextType>; __isTypeOf?: IsTypeOfResolverFn; diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql index 2ceaf5fa1..bb0d6eea2 100644 --- a/packages/api/src/generated/schema.graphql +++ b/packages/api/src/generated/schema.graphql @@ -909,7 +909,7 @@ type Label { createdAt: Date description: String id: ID! - internal: Boolean! + internal: Boolean name: String! position: Int } diff --git a/packages/api/src/resolvers/article/index.ts b/packages/api/src/resolvers/article/index.ts index 501931a99..a8d2056a0 100644 --- a/packages/api/src/resolvers/article/index.ts +++ b/packages/api/src/resolvers/article/index.ts @@ -1160,8 +1160,12 @@ export const bulkActionResolver = authorized< } ) -export const setFavoriteArticleResolver = authorized< +export type SetFavoriteArticleSuccessPartial = Merge< SetFavoriteArticleSuccess, + { favoriteArticle: PartialArticle } +> +export const setFavoriteArticleResolver = authorized< + SetFavoriteArticleSuccessPartial, SetFavoriteArticleError, MutationSetFavoriteArticleArgs >(async (_, { id }, { claims: { uid }, log, pubsub }) => { @@ -1200,7 +1204,10 @@ export const setFavoriteArticleResolver = authorized< log.debug('Favorites label added:', result) return { - favoriteArticle: page, + favoriteArticle: { + ...page, + isArchived: !!page.archivedAt, + }, } } catch (error) { log.debug('Error adding Favorites label:', error) diff --git a/packages/api/src/resolvers/function_resolvers.ts b/packages/api/src/resolvers/function_resolvers.ts index 0041c3347..49e9b6c2e 100644 --- a/packages/api/src/resolvers/function_resolvers.ts +++ b/packages/api/src/resolvers/function_resolvers.ts @@ -23,7 +23,6 @@ import { generateDownloadSignedUrl, generateUploadFilePathName, } from '../utils/uploads' -import { setFavoriteArticleResolver } from './article' import { optInFeatureResolver } from './features' import { uploadImportFileResolver } from './importers/uploadImportFileResolver' import { @@ -88,6 +87,7 @@ import { sendInstallInstructionsResolver, setBookmarkArticleResolver, setDeviceTokenResolver, + setFavoriteArticleResolver, setFollowResolver, setIntegrationResolver, setLabelsForHighlightResolver, diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts index c97d041df..1f3611dda 100755 --- a/packages/api/src/schema.ts +++ b/packages/api/src/schema.ts @@ -1418,7 +1418,7 @@ const schema = gql` description: String createdAt: Date position: Int - internal: Boolean! + internal: Boolean } type LabelsSuccess {