mirror of
https://github.com/omnivore-app/omnivore.git
synced 2026-03-11 08:54:26 +00:00
Merge pull request #3198 from omnivore-app/fix/move-to-folder-api
fix moveToFolder API error by skipping fetching content again
This commit is contained in:
commit
37beab64c6
4 changed files with 22 additions and 25 deletions
|
|
@ -1301,7 +1301,7 @@ export type MoveToFolderResult = MoveToFolderError | MoveToFolderSuccess;
|
|||
|
||||
export type MoveToFolderSuccess = {
|
||||
__typename?: 'MoveToFolderSuccess';
|
||||
articleSavingRequest: ArticleSavingRequest;
|
||||
success: Scalars['Boolean'];
|
||||
};
|
||||
|
||||
export type Mutation = {
|
||||
|
|
@ -5328,7 +5328,7 @@ export type MoveToFolderResultResolvers<ContextType = ResolverContext, ParentTyp
|
|||
};
|
||||
|
||||
export type MoveToFolderSuccessResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['MoveToFolderSuccess'] = ResolversParentTypes['MoveToFolderSuccess']> = {
|
||||
articleSavingRequest?: Resolver<ResolversTypes['ArticleSavingRequest'], ParentType, ContextType>;
|
||||
success?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
|
||||
__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1165,7 +1165,7 @@ enum MoveToFolderErrorCode {
|
|||
union MoveToFolderResult = MoveToFolderError | MoveToFolderSuccess
|
||||
|
||||
type MoveToFolderSuccess {
|
||||
articleSavingRequest: ArticleSavingRequest!
|
||||
success: Boolean!
|
||||
}
|
||||
|
||||
type Mutation {
|
||||
|
|
|
|||
|
|
@ -916,25 +916,25 @@ export const moveToFolderResolver = authorized<
|
|||
|
||||
const savedAt = new Date()
|
||||
|
||||
// if the content is not fetched yet, create a page save request
|
||||
if (!item.readableContent) {
|
||||
const articleSavingRequest = await createPageSaveRequest({
|
||||
userId: uid,
|
||||
url: item.originalUrl,
|
||||
articleSavingRequestId: id,
|
||||
priority: 'high',
|
||||
publishedAt: item.publishedAt || undefined,
|
||||
savedAt,
|
||||
pubsub,
|
||||
})
|
||||
// // if the content is not fetched yet, create a page save request
|
||||
// if (!item.readableContent) {
|
||||
// const articleSavingRequest = await createPageSaveRequest({
|
||||
// userId: uid,
|
||||
// url: item.originalUrl,
|
||||
// articleSavingRequestId: id,
|
||||
// priority: 'high',
|
||||
// publishedAt: item.publishedAt || undefined,
|
||||
// savedAt,
|
||||
// pubsub,
|
||||
// })
|
||||
|
||||
return {
|
||||
__typename: 'MoveToFolderSuccess',
|
||||
articleSavingRequest,
|
||||
}
|
||||
}
|
||||
// return {
|
||||
// __typename: 'MoveToFolderSuccess',
|
||||
// articleSavingRequest,
|
||||
// }
|
||||
// }
|
||||
|
||||
const updatedItem = await updateLibraryItem(
|
||||
await updateLibraryItem(
|
||||
item.id,
|
||||
{
|
||||
folder,
|
||||
|
|
@ -946,10 +946,7 @@ export const moveToFolderResolver = authorized<
|
|||
|
||||
return {
|
||||
__typename: 'MoveToFolderSuccess',
|
||||
articleSavingRequest: libraryItemToArticleSavingRequest(
|
||||
updatedItem.user,
|
||||
updatedItem
|
||||
),
|
||||
success: true,
|
||||
}
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -2665,7 +2665,7 @@ const schema = gql`
|
|||
union MoveToFolderResult = MoveToFolderSuccess | MoveToFolderError
|
||||
|
||||
type MoveToFolderSuccess {
|
||||
articleSavingRequest: ArticleSavingRequest!
|
||||
success: Boolean!
|
||||
}
|
||||
|
||||
type MoveToFolderError {
|
||||
|
|
|
|||
Loading…
Reference in a new issue