From 80d0146f72503c46376d3694d1878558e149a8fc Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Wed, 4 May 2022 11:55:16 +0800 Subject: [PATCH] Show unable to parse if page is failed to save within 30 seconds --- packages/api/src/resolvers/article/index.ts | 4 ++-- packages/api/src/services/create_page_save_request.ts | 1 - .../web/components/templates/homeFeed/HomeFeedContainer.tsx | 6 +++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/api/src/resolvers/article/index.ts b/packages/api/src/resolvers/article/index.ts index 02312f8b6..37d95d9ae 100644 --- a/packages/api/src/resolvers/article/index.ts +++ b/packages/api/src/resolvers/article/index.ts @@ -102,7 +102,7 @@ const FORCE_PUPPETEER_URLS = [ /twitter\.com\/(?:#!\/)?(\w+)\/status(?:es)?\/(\d+)(?:\/.*)?/, /^((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w-]+\?v=|embed\/|v\/)?)([\w-]+)(\S+)?$/, ] -const UNPARSEABLE_CONTENT = 'We were unable to parse this page.' +const UNPARSEABLE_CONTENT = '

We were unable to parse this page.

' export type CreateArticlesSuccessPartial = Merge< CreateArticleSuccess, @@ -434,7 +434,7 @@ export const getArticleResolver: ResolverFn< if ( page.state === ArticleSavingRequestStatus.Processing && - new Date(page.createdAt).getTime() < new Date().getTime() - 1000 * 60 + new Date(page.createdAt).getTime() < new Date().getTime() - 1000 * 30 ) { page.content = UNPARSEABLE_CONTENT page.description = UNPARSEABLE_CONTENT diff --git a/packages/api/src/services/create_page_save_request.ts b/packages/api/src/services/create_page_save_request.ts index 4c0170012..b5a70f784 100644 --- a/packages/api/src/services/create_page_save_request.ts +++ b/packages/api/src/services/create_page_save_request.ts @@ -96,7 +96,6 @@ export const createPageSaveRequest = async ( const existingPage = await getPageByParam({ userId, url, - state: ArticleSavingRequestStatus.Succeeded, }) if (existingPage) { console.log('Page already exists', url) diff --git a/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx b/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx index 916f02d05..fed9a1337 100644 --- a/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx +++ b/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx @@ -259,7 +259,11 @@ export function HomeFeedContainer(props: HomeFeedContainerProps): JSX.Element { const username = viewerData?.me?.profile.username if (username) { setActiveCardId(item.node.id) - if (item.node.state === State.PROCESSING) { + if ( + item.node.state === State.PROCESSING && + new Date(item.node.createdAt).getTime() >= + new Date().getTime() - 1000 * 30 + ) { router.push(`/${username}/links/${item.node.id}`) } else { router.push(`/${username}/${item.node.slug}`)