+}
+
+export const useReadTimer = ({ articleId, container }: Props) => {
+ const router = useRouter()
+
+ //in ms
+ const interval = 5000
+
+ const dummy = useRef(0)
+ const readTimer = useRef(0)
+ const lastScroll = useRef(Date.now() / 1000)
+
+ useEffect(() => {
+ const handleScroll = _throttle(() => {
+ lastScroll.current = Date.now() / 1000
+ }, 3000)
+
+ const storeReadTime = () => {
+ if (articleId && readTimer?.current)
+ analytics.trackEvent('read_time', {
+ articleId,
+ time: readTimer.current,
+ })
+ }
+
+ window.addEventListener('scroll', handleScroll)
+ window.addEventListener('beforeunload', storeReadTime)
+ router.events.on('routeChangeStart', storeReadTime)
+
+ return () => {
+ window.removeEventListener('scroll', handleScroll)
+ window.removeEventListener('beforeunload', storeReadTime)
+ router.events.off('routeChangeStart', storeReadTime)
+ }
+ }, [])
+
+ // reading timer
+ useEffect(() => {
+ const timerId = setInterval(
+ (function heartbeat() {
+ const isReading = () => {
+ // tab hidden
+ if (document.hidden) {
+ return false
+ }
+
+ // content not rendered
+ if (!container || !container.current) {
+ return false
+ }
+
+ // idle for more than 3 minutes
+ if (Date.now() / 1000 - lastScroll.current > 60 * 3) {
+ return false
+ }
+
+ // if overlay is shown
+ const overlaySelectors = ['reach-portal', '.tippy-popper']
+ if (document.querySelector(overlaySelectors.join(','))) {
+ return false
+ }
+
+ // if drawer is opened
+ if (document.querySelector('[id^="Drawer__"].open')) {
+ return false
+ }
+
+ // if bottom is above center
+ const { bottom } = (
+ container.current as unknown as Element
+ ).getBoundingClientRect()
+
+ const isBottom = bottom <= window.innerHeight * 0.8
+ return !isBottom
+ }
+
+ // don't count the first time
+ if (dummy.current === 0) {
+ dummy.current = 1
+ return heartbeat
+ }
+
+ if (isReading()) {
+ readTimer.current = readTimer.current + interval
+ }
+ return heartbeat
+ })(),
+ interval
+ )
+
+ return () => {
+ clearInterval(timerId)
+ }
+ }, [])
+}
diff --git a/src/views/ArticleDetail/Content/index.tsx b/src/views/ArticleDetail/Content/index.tsx
index 578f380447..ee3570620b 100644
--- a/src/views/ArticleDetail/Content/index.tsx
+++ b/src/views/ArticleDetail/Content/index.tsx
@@ -12,6 +12,7 @@ import {
useRoute,
ViewerContext,
} from '~/components'
+import { useReadTimer } from '~/components/Hook'
import { ReadArticleMutation } from '~/gql/graphql'
import styles from './styles.module.css'
@@ -118,6 +119,8 @@ const Content = ({
}
}, [lastScroll])
+ useReadTimer({ articleId, container: contentContainer })
+
return (
<>
Date: Mon, 2 Dec 2024 14:52:55 +0800
Subject: [PATCH 57/69] fix(TagDigest): add word-break to tag names for better
text wrapping
PR-2411-1-1
---
src/components/TagDigest/Feed/styles.module.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/TagDigest/Feed/styles.module.css b/src/components/TagDigest/Feed/styles.module.css
index 7ba1341211..2ec224d579 100644
--- a/src/components/TagDigest/Feed/styles.module.css
+++ b/src/components/TagDigest/Feed/styles.module.css
@@ -8,6 +8,7 @@
font-size: var(--text16);
line-height: 1.5rem; /* 24px */
+ word-break: break-all;
}
& .nums {
From 27227cd16e370434042d03dc1d014563cdcf5171 Mon Sep 17 00:00:00 2001
From: Kechicode <186776112+Kechicode@users.noreply.github.com>
Date: Mon, 2 Dec 2024 14:59:09 +0800
Subject: [PATCH 58/69] fix(i18n): fix copy
---
lang/en.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lang/en.json b/lang/en.json
index 1ec6f90326..8511a9c5d0 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1214,7 +1214,7 @@
"defaultMessage": "Agree"
},
"IUS82d": {
- "defaultMessage": "Recommended Authors",
+ "defaultMessage": "Tag active authors",
"description": "src/views/TagDetail/RecommendedAuthors/index.tsx"
},
"IXycMo": {
From e16337d3a915aa34a59a1f474f3d0890c43a0d89 Mon Sep 17 00:00:00 2001
From: Kechicode <186776112+Kechicode@users.noreply.github.com>
Date: Mon, 2 Dec 2024 15:21:18 +0800
Subject: [PATCH 59/69] fix(tag): add space separator between tag words
ref:
PR-2411-1-5
---
src/common/utils/text/tag.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/common/utils/text/tag.ts b/src/common/utils/text/tag.ts
index 1242d582dc..1d716d4816 100644
--- a/src/common/utils/text/tag.ts
+++ b/src/common/utils/text/tag.ts
@@ -25,7 +25,7 @@ const stripTagAllPunct = (content: string) => {
return words[0]
default:
const [first, ...rest] = words
- return `${first} ${rest.join('')}`
+ return `${first} ${rest.join(' ')}`
}
}
From 7c84f7340846e4fc04303934cf2df1a5cd181015 Mon Sep 17 00:00:00 2001
From: Kechicode <186776112+Kechicode@users.noreply.github.com>
Date: Mon, 2 Dec 2024 15:44:54 +0800
Subject: [PATCH 60/69] fix(Tags): add reactive tag data fetching
---
src/views/Tags/Feed.tsx | 26 ++++++++++++++++++++++++--
src/views/Tags/gql.ts | 11 +++++++++++
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/views/Tags/Feed.tsx b/src/views/Tags/Feed.tsx
index 7d286e01b2..82455aa2a0 100644
--- a/src/views/Tags/Feed.tsx
+++ b/src/views/Tags/Feed.tsx
@@ -1,4 +1,5 @@
import _get from 'lodash/get'
+import { useEffect } from 'react'
import { analytics, mergeConnections } from '~/common/utils'
import {
@@ -11,7 +12,7 @@ import {
} from '~/components'
import { AllTagsHottestQuery } from '~/gql/graphql'
-import { ALL_TAGS_HOTTEST } from './gql'
+import { ALL_TAGS_HOTTEST, TAG_REACTIVE_DATA } from './gql'
export type FeedType = 'recommended' | 'hottest'
@@ -26,7 +27,28 @@ const Feed = ({ type }: Props) => {
const query = ALL_TAGS_HOTTEST
- const { data, loading, error, fetchMore } = usePublicQuery(query)
+ const { data, loading, error, fetchMore, client } =
+ usePublicQuery(query)
+
+ // fetch the latest tag data
+ const loadTagReactiveData = (publicData?: FeedQuery) => {
+ const publicEdges = publicData?.viewer?.recommendation.tags.edges || []
+ const publicIds = publicEdges.map(({ node }) => node.id)
+
+ if (publicIds.length <= 0) {
+ return
+ }
+
+ client.query({
+ query: TAG_REACTIVE_DATA,
+ fetchPolicy: 'network-only',
+ variables: { ids: publicIds },
+ })
+ }
+
+ useEffect(() => {
+ loadTagReactiveData(data)
+ }, [data])
if (loading) {
return
diff --git a/src/views/Tags/gql.ts b/src/views/Tags/gql.ts
index 23261429a9..94dbb2448a 100644
--- a/src/views/Tags/gql.ts
+++ b/src/views/Tags/gql.ts
@@ -27,3 +27,14 @@ export const ALL_TAGS_HOTTEST = gql`
}
${TagDigest.Feed.fragments.tag}
`
+
+export const TAG_REACTIVE_DATA = gql`
+ query TagReactiveData($ids: [ID!]!) {
+ nodes(input: { ids: $ids }) {
+ id
+ ... on Tag {
+ numArticles
+ }
+ }
+ }
+`
From efa08149be0cf8dff038f61e63b980a95018d088 Mon Sep 17 00:00:00 2001
From: Kechicode <186776112+Kechicode@users.noreply.github.com>
Date: Mon, 2 Dec 2024 16:59:17 +0800
Subject: [PATCH 61/69] feat(TagDetail): enhance RecommendedAuthors with Slides
component
ref:
PR-2411-1-7
---
src/components/Slides/index.tsx | 2 +-
src/components/Slides/styles.module.css | 4 ++
.../TagDetail/RecommendedAuthors/index.tsx | 47 ++++++++++++++-----
.../RecommendedAuthors/styles.module.css | 11 +++--
4 files changed, 49 insertions(+), 15 deletions(-)
diff --git a/src/components/Slides/index.tsx b/src/components/Slides/index.tsx
index 541cafc620..e89084fe0f 100644
--- a/src/components/Slides/index.tsx
+++ b/src/components/Slides/index.tsx
@@ -12,7 +12,7 @@ interface SlidesProps {
}
interface SlideItemProps {
- size?: 'sm' | 'md'
+ size?: 'xs' | 'sm' | 'md'
onClick?: () => any
}
diff --git a/src/components/Slides/styles.module.css b/src/components/Slides/styles.module.css
index d94027868e..e0797c3639 100644
--- a/src/components/Slides/styles.module.css
+++ b/src/components/Slides/styles.module.css
@@ -48,6 +48,10 @@
background: var(--color-grey-lighter);
}
+.sizeXs {
+ width: 15rem;
+}
+
.sizeSm {
width: 18rem;
}
diff --git a/src/views/TagDetail/RecommendedAuthors/index.tsx b/src/views/TagDetail/RecommendedAuthors/index.tsx
index ecd430d9f5..b2df587273 100644
--- a/src/views/TagDetail/RecommendedAuthors/index.tsx
+++ b/src/views/TagDetail/RecommendedAuthors/index.tsx
@@ -5,7 +5,7 @@ import _random from 'lodash/random'
import { FormattedMessage } from 'react-intl'
import { analytics } from '~/common/utils'
-import { List, usePublicQuery, UserDigest } from '~/components'
+import { List, Slides, usePublicQuery, UserDigest } from '~/components'
import { TagDetailRecommendedAuthorsQuery } from '~/gql/graphql'
import { RECOMMENDED_AUTHORS } from './gql'
@@ -32,6 +32,7 @@ const RecommendedAuthors: React.FC = ({
tagId,
inSidebar,
}) => {
+ const perColumn = 3
const { data } = usePublicQuery(
RECOMMENDED_AUTHORS,
{
@@ -59,25 +60,49 @@ const RecommendedAuthors: React.FC = ({
[styles.inSidebar]: inSidebar,
})
+ if (inSidebar) {
+ return (
+
+
+
+
+ {edges.map(({ node, cursor }, i) => (
+
+ trackRecommendedAuthors(i, node.id)}
+ hasFollow={false}
+ hasState={false}
+ />
+
+ ))}
+
+
+
+ )
+ }
+
return (
-
-
-
- {edges.map(({ node, cursor }, i) => (
-
+ }>
+ {_chunk(edges, perColumn).map((chunks, i) => (
+
+ {chunks.map(({ node, cursor }) => (
trackRecommendedAuthors(i, node.id)}
hasFollow={false}
hasState={false}
/>
-
- ))}
-
-
+ ))}
+
+ ))}
+
)
}
diff --git a/src/views/TagDetail/RecommendedAuthors/styles.module.css b/src/views/TagDetail/RecommendedAuthors/styles.module.css
index 705672e91e..8aa5c05b58 100644
--- a/src/views/TagDetail/RecommendedAuthors/styles.module.css
+++ b/src/views/TagDetail/RecommendedAuthors/styles.module.css
@@ -1,7 +1,12 @@
.recommendedAuthors {
- padding-bottom: var(--sp24);
- margin-top: var(--sp24);
+ padding-bottom: var(--sp20);
+ margin-top: var(--sp8);
border-bottom: 1px dashed var(--color-grey-light);
+
+ @media (--sm-up) {
+ padding-bottom: var(--sp24);
+ margin-top: var(--sp24);
+ }
}
.inSidebar {
@@ -11,7 +16,7 @@
}
.header {
- margin-bottom: var(--sp18);
+ margin-bottom: var(--sp6);
font-size: var(--text14);
font-weight: var(--font-medium);
line-height: 1.375rem;
From 3f78e4f807f66628e9ee81071fdbaeee044744a8 Mon Sep 17 00:00:00 2001
From: Kechicode <186776112+Kechicode@users.noreply.github.com>
Date: Mon, 2 Dec 2024 18:26:06 +0800
Subject: [PATCH 62/69] fix(Tag): fix tails on letters cut off
PR-2411-1-8
---
src/components/Tag/InlineTag/styles.module.css | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/components/Tag/InlineTag/styles.module.css b/src/components/Tag/InlineTag/styles.module.css
index 3ff6789424..b6b64f164e 100644
--- a/src/components/Tag/InlineTag/styles.module.css
+++ b/src/components/Tag/InlineTag/styles.module.css
@@ -15,9 +15,8 @@
& .name {
@mixin line-clamp;
- @mixin fix-cropped-letters;
- line-height: inherit;
+ line-height: 1.01;
color: var(--color-black);
}
From 7d5a781501edeab77c8ba930874c339fd253abce Mon Sep 17 00:00:00 2001
From: Kechicode <186776112+Kechicode@users.noreply.github.com>
Date: Mon, 2 Dec 2024 18:46:56 +0800
Subject: [PATCH 63/69] fix(BookmarksTags): revise empty state
PR-2411-1-9
---
lang/default.json | 3 +++
lang/en.json | 3 +++
lang/zh-Hans.json | 3 +++
lang/zh-Hant.json | 3 +++
src/components/Empty/EmptyTagBookmark.tsx | 15 +++++++++++++++
src/components/Empty/index.tsx | 1 +
src/views/Me/Bookmarks/BookmarksTags.tsx | 4 ++--
7 files changed, 30 insertions(+), 2 deletions(-)
create mode 100644 src/components/Empty/EmptyTagBookmark.tsx
diff --git a/lang/default.json b/lang/default.json
index 12c702c931..784c113eba 100644
--- a/lang/default.json
+++ b/lang/default.json
@@ -2544,6 +2544,9 @@
"iEJeQH": {
"defaultMessage": "Liker ID"
},
+ "iIitRg": {
+ "defaultMessage": "Tag not bookmarked yet"
+ },
"iNZdM/": {
"defaultMessage": "Switch to support creators with the Optimism network {br} Make support more convenient and affordable",
"description": "src/components/Forms/PaymentForm/SwitchNetwork/index.tsx"
diff --git a/lang/en.json b/lang/en.json
index 8511a9c5d0..2fcbe0300c 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -2544,6 +2544,9 @@
"iEJeQH": {
"defaultMessage": "Liker ID"
},
+ "iIitRg": {
+ "defaultMessage": "Tag not bookmarked yet"
+ },
"iNZdM/": {
"defaultMessage": "Switch to support creators with the Optimism network {br} Make support more convenient and affordable",
"description": "src/components/Forms/PaymentForm/SwitchNetwork/index.tsx"
diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
index 3a9b30715c..82a99d37af 100644
--- a/lang/zh-Hans.json
+++ b/lang/zh-Hans.json
@@ -2544,6 +2544,9 @@
"iEJeQH": {
"defaultMessage": "设置 Liker ID"
},
+ "iIitRg": {
+ "defaultMessage": "尚未收藏标签"
+ },
"iNZdM/": {
"defaultMessage": "切换后即可支持创作者，采用 Optimism 网络{br}让支持更方便且费用低廉",
"description": "src/components/Forms/PaymentForm/SwitchNetwork/index.tsx"
diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
index 6a769d5231..4d31476398 100644
--- a/lang/zh-Hant.json
+++ b/lang/zh-Hant.json
@@ -2544,6 +2544,9 @@
"iEJeQH": {
"defaultMessage": "設置 Liker ID"
},
+ "iIitRg": {
+ "defaultMessage": "尚未收藏標籤"
+ },
"iNZdM/": {
"defaultMessage": "切換後即可支持創作者，採用 Optimism 網路{br}讓支持更方便且費用低廉",
"description": "src/components/Forms/PaymentForm/SwitchNetwork/index.tsx"
diff --git a/src/components/Empty/EmptyTagBookmark.tsx b/src/components/Empty/EmptyTagBookmark.tsx
new file mode 100644
index 0000000000..30c8930fdf
--- /dev/null
+++ b/src/components/Empty/EmptyTagBookmark.tsx
@@ -0,0 +1,15 @@
+import { FormattedMessage } from 'react-intl'
+
+import { ReactComponent as IconSave } from '@/public/static/icons/24px/save.svg'
+import { Empty, Icon } from '~/components'
+
+export const EmptyTagBookmark = () => (
+ }
+ description={
+ <>
+
+
+ }
+ />
+)
diff --git a/src/components/Empty/index.tsx b/src/components/Empty/index.tsx
index 5d1916b856..d684f0358b 100644
--- a/src/components/Empty/index.tsx
+++ b/src/components/Empty/index.tsx
@@ -13,6 +13,7 @@ export * from './EmptyResponse'
export * from './EmptySearch'
export * from './EmptyTag'
export * from './EmptyTagArticles'
+export * from './EmptyTagBookmark'
export * from './EmptyTransaction'
export * from './EmptyTransactionCurrency'
export * from './EmptyTransactionSubscription'
diff --git a/src/views/Me/Bookmarks/BookmarksTags.tsx b/src/views/Me/Bookmarks/BookmarksTags.tsx
index f5b36991c2..0c79f403ed 100644
--- a/src/views/Me/Bookmarks/BookmarksTags.tsx
+++ b/src/views/Me/Bookmarks/BookmarksTags.tsx
@@ -4,7 +4,7 @@ import { FormattedMessage, useIntl } from 'react-intl'
import { mergeConnections } from '~/common/utils'
import {
- EmptyBookmark,
+ EmptyTagBookmark,
Head,
InfiniteScroll,
Layout,
@@ -58,7 +58,7 @@ const BaseMeBookmarksTags = () => {
const { edges, pageInfo } = data?.viewer?.following?.tags || {}
if (!edges || edges.length <= 0 || !pageInfo) {
- return
+ return
}
const loadMore = () =>
From 300c6956ab8e6419e20cde9f6aee639d4a3810f3 Mon Sep 17 00:00:00 2001
From: Kechicode <186776112+Kechicode@users.noreply.github.com>
Date: Mon, 2 Dec 2024 19:04:09 +0800
Subject: [PATCH 64/69] fix(Bookmarks): add followed tags check in
BookmarksTags
PR-2411-1-13
---
src/views/Me/Bookmarks/BookmarksTags.tsx | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/views/Me/Bookmarks/BookmarksTags.tsx b/src/views/Me/Bookmarks/BookmarksTags.tsx
index 0c79f403ed..095d06b51f 100644
--- a/src/views/Me/Bookmarks/BookmarksTags.tsx
+++ b/src/views/Me/Bookmarks/BookmarksTags.tsx
@@ -61,6 +61,14 @@ const BaseMeBookmarksTags = () => {
return
}
+ const hasFollowedTags = edges.some(
+ ({ node }) => node.__typename === 'Tag' && node.isFollower
+ )
+
+ if (!hasFollowedTags) {
+ return
+ }
+
const loadMore = () =>
fetchMore({
variables: { after: pageInfo.endCursor },
From c81f5d4ca9d17a40781dbf497134171b0f7b8c78 Mon Sep 17 00:00:00 2001
From: Kechicode <186776112+Kechicode@users.noreply.github.com>
Date: Mon, 2 Dec 2024 20:09:27 +0800
Subject: [PATCH 65/69] fix(Bookmarks): ensure tag bookmarks update with
refetch
ref:
PR-2411-1-13
---
src/components/Buttons/TagBookmark/Bookmark.tsx | 8 ++++++++
src/views/Me/Bookmarks/BookmarksTags.tsx | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/components/Buttons/TagBookmark/Bookmark.tsx b/src/components/Buttons/TagBookmark/Bookmark.tsx
index 3e167b90e8..29273344a7 100644
--- a/src/components/Buttons/TagBookmark/Bookmark.tsx
+++ b/src/components/Buttons/TagBookmark/Bookmark.tsx
@@ -21,6 +21,9 @@ interface BookmarkProps {
const Bookmark = ({ tag }: BookmarkProps) => {
const viewer = useContext(ViewerContext)
const intl = useIntl()
+ const {
+ ME_BOOKMARK_TAGS_FEED,
+ } = require('~/views/Me/Bookmarks/BookmarksTags')
const [bookmark] = useMutation(
TOGGLE_BOOKMARK_TAG,
{
@@ -35,6 +38,11 @@ const Bookmark = ({ tag }: BookmarkProps) => {
},
}
: undefined,
+ refetchQueries: [
+ {
+ query: ME_BOOKMARK_TAGS_FEED,
+ },
+ ],
}
)
diff --git a/src/views/Me/Bookmarks/BookmarksTags.tsx b/src/views/Me/Bookmarks/BookmarksTags.tsx
index 095d06b51f..9022976cb3 100644
--- a/src/views/Me/Bookmarks/BookmarksTags.tsx
+++ b/src/views/Me/Bookmarks/BookmarksTags.tsx
@@ -17,7 +17,7 @@ import { MeBookmarkTagsFeedQuery } from '~/gql/graphql'
import BookmarksTabs from './BookmarksTabs'
-const ME_BOOKMARK_TAGS_FEED = gql`
+export const ME_BOOKMARK_TAGS_FEED = gql`
query MeBookmarkTagsFeed($after: String) {
viewer {
id
From 4c53af1cc2a865cad996ba842b82d4bb58c95b9d Mon Sep 17 00:00:00 2001
From: gitwoz <177856586+gitwoz@users.noreply.github.com>
Date: Mon, 2 Dec 2024 22:25:03 +0700
Subject: [PATCH 66/69] feat(tag): revise tag queries
---
src/common/enums/oauth.ts | 2 +-
src/components/Context/Viewer/index.tsx | 3 --
src/components/GQL/updates/index.ts | 1 -
.../GQL/updates/viewerFollowingTagCount.ts | 48 -------------------
.../TagDigest/Buttons/FollowButton/Follow.tsx | 4 --
.../Buttons/FollowButton/Unfollow.tsx | 4 --
src/views/Me/Bookmarks/BookmarksArticles.tsx | 6 +--
src/views/Me/Bookmarks/BookmarksTags.tsx | 31 ++++++------
8 files changed, 19 insertions(+), 80 deletions(-)
delete mode 100644 src/components/GQL/updates/viewerFollowingTagCount.ts
diff --git a/src/common/enums/oauth.ts b/src/common/enums/oauth.ts
index 5d9d60fc80..28594a3968 100644
--- a/src/common/enums/oauth.ts
+++ b/src/common/enums/oauth.ts
@@ -31,7 +31,7 @@ export const OAUTH_SCOPE_TREE = {
zh_hans: '草稿',
},
},
- subscriptions: {
+ bookmarkedArticles: {
_t: {
zh_hant: '收藏作品',
zh_hans: '收藏作品',
diff --git a/src/components/Context/Viewer/index.tsx b/src/components/Context/Viewer/index.tsx
index 1108f0e46d..fcf44623b2 100644
--- a/src/components/Context/Viewer/index.tsx
+++ b/src/components/Context/Viewer/index.tsx
@@ -56,9 +56,6 @@ const ViewerFragments = {
users(input: { first: 0 }) {
totalCount
}
- tags(input: { first: 0 }) {
- totalCount
- }
}
followers(input: { first: 0 }) {
totalCount
diff --git a/src/components/GQL/updates/index.ts b/src/components/GQL/updates/index.ts
index 5c66de9d90..69d12fde0e 100644
--- a/src/components/GQL/updates/index.ts
+++ b/src/components/GQL/updates/index.ts
@@ -16,7 +16,6 @@ export * from './userProfile'
export * from './userWritings'
export * from './viewerFolloweeCount'
export * from './viewerFolloweeCount'
-export * from './viewerFollowingTagCount'
export * from './viewerUnreadFollowing'
export * from './viewerUnreadNoticeCount'
export * from './viewerWorksTabs'
diff --git a/src/components/GQL/updates/viewerFollowingTagCount.ts b/src/components/GQL/updates/viewerFollowingTagCount.ts
deleted file mode 100644
index 13851bfb78..0000000000
--- a/src/components/GQL/updates/viewerFollowingTagCount.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { DataProxy } from 'apollo-cache'
-import gql from 'graphql-tag'
-
-import { ViewerFollowingTagCountQuery } from '~/gql/graphql'
-
-const VIEWER_FOLLOWING_TAG_COUNT = gql`
- query ViewerFollowingTagCount {
- viewer {
- id
- following {
- tags(input: { first: 0 }) {
- totalCount
- }
- }
- }
- }
-`
-
-export const updateViewerFollowingTagCount = ({
- cache,
- type,
-}: {
- cache: DataProxy
- type: 'increment' | 'decrement'
-}) => {
- try {
- const cacheData = cache.readQuery({
- query: VIEWER_FOLLOWING_TAG_COUNT,
- })
-
- if (!cacheData || !cacheData.viewer) {
- return
- }
-
- if (type === 'increment') {
- cacheData.viewer.following.tags.totalCount++
- } else {
- cacheData.viewer.following.tags.totalCount--
- }
-
- cache.writeQuery({
- query: VIEWER_FOLLOWING_TAG_COUNT,
- data: cacheData,
- })
- } catch (e) {
- console.error(e)
- }
-}
diff --git a/src/components/TagDigest/Buttons/FollowButton/Follow.tsx b/src/components/TagDigest/Buttons/FollowButton/Follow.tsx
index d51319ec50..0e1203f461 100644
--- a/src/components/TagDigest/Buttons/FollowButton/Follow.tsx
+++ b/src/components/TagDigest/Buttons/FollowButton/Follow.tsx
@@ -7,7 +7,6 @@ import {
UNIVERSAL_AUTH_TRIGGER,
} from '~/common/enums'
import { Button, TextIcon, useMutation, ViewerContext } from '~/components'
-import { updateViewerFollowingTagCount } from '~/components/GQL'
import TOGGLE_BOOKMARK_TAG from '~/components/GQL/mutations/toggleBookmarkTag'
import {
TagDigestFollowButtonPrivateFragment,
@@ -33,9 +32,6 @@ const Follow = ({ tag }: Props) => {
},
}
: undefined,
- update: (cache) => {
- updateViewerFollowingTagCount({ cache, type: 'increment' })
- },
})
const onClick = () => {
diff --git a/src/components/TagDigest/Buttons/FollowButton/Unfollow.tsx b/src/components/TagDigest/Buttons/FollowButton/Unfollow.tsx
index a83e9509a1..41dc85a341 100644
--- a/src/components/TagDigest/Buttons/FollowButton/Unfollow.tsx
+++ b/src/components/TagDigest/Buttons/FollowButton/Unfollow.tsx
@@ -3,7 +3,6 @@ import { useState } from 'react'
import { FormattedMessage } from 'react-intl'
import { Button, TextIcon, useMutation } from '~/components'
-import { updateViewerFollowingTagCount } from '~/components/GQL'
import TOGGLE_BOOKMARK_TAG from '~/components/GQL/mutations/toggleBookmarkTag'
import {
TagDigestFollowButtonPrivateFragment,
@@ -30,9 +29,6 @@ const Unfollow = ({ tag }: UnfollowTagProps) => {
},
}
: undefined,
- update: (cache) => {
- updateViewerFollowingTagCount({ cache, type: 'decrement' })
- },
}
)
diff --git a/src/views/Me/Bookmarks/BookmarksArticles.tsx b/src/views/Me/Bookmarks/BookmarksArticles.tsx
index aef610348b..8b7a3e2084 100644
--- a/src/views/Me/Bookmarks/BookmarksArticles.tsx
+++ b/src/views/Me/Bookmarks/BookmarksArticles.tsx
@@ -21,7 +21,7 @@ const ME_BOOKMARK_ARTICLES_FEED = gql`
query MeBookmarkArticlesFeed($after: String) {
viewer {
id
- subscriptions(input: { first: 10, after: $after }) {
+ bookmarkedArticles(input: { first: 10, after: $after }) {
pageInfo {
startCursor
endCursor
@@ -53,8 +53,8 @@ const BaseMeBookmarksArticles = () => {
return
}
- const connectionPath = 'viewer.subscriptions'
- const { edges, pageInfo } = data?.viewer?.subscriptions || {}
+ const connectionPath = 'viewer.bookmarkedArticles'
+ const { edges, pageInfo } = data?.viewer?.bookmarkedArticles || {}
if (!edges || edges.length <= 0 || !pageInfo) {
return
diff --git a/src/views/Me/Bookmarks/BookmarksTags.tsx b/src/views/Me/Bookmarks/BookmarksTags.tsx
index f5b36991c2..d63c23626b 100644
--- a/src/views/Me/Bookmarks/BookmarksTags.tsx
+++ b/src/views/Me/Bookmarks/BookmarksTags.tsx
@@ -1,5 +1,6 @@
import { useQuery } from '@apollo/react-hooks'
import gql from 'graphql-tag'
+import { Fragment } from 'react'
import { FormattedMessage, useIntl } from 'react-intl'
import { mergeConnections } from '~/common/utils'
@@ -21,18 +22,16 @@ const ME_BOOKMARK_TAGS_FEED = gql`
query MeBookmarkTagsFeed($after: String) {
viewer {
id
- following {
- tags(input: { first: 20, after: $after }) {
- pageInfo {
- startCursor
- endCursor
- hasNextPage
- }
- edges {
- cursor
- node {
- ...TagDigestBookmarkTag
- }
+ bookmarkedTags(input: { first: 20, after: $after }) {
+ pageInfo {
+ startCursor
+ endCursor
+ hasNextPage
+ }
+ edges {
+ cursor
+ node {
+ ...TagDigestBookmarkTag
}
}
}
@@ -54,8 +53,8 @@ const BaseMeBookmarksTags = () => {
return
}
- const connectionPath = 'viewer.following.tags'
- const { edges, pageInfo } = data?.viewer?.following?.tags || {}
+ const connectionPath = 'viewer.bookmarkedTags'
+ const { edges, pageInfo } = data?.viewer?.bookmarkedTags || {}
if (!edges || edges.length <= 0 || !pageInfo) {
return
@@ -76,13 +75,13 @@ const BaseMeBookmarksTags = () => {
{edges.map(({ node, cursor }) => (
- <>
+
{node.isFollower && (
)}
-
+
))}
From abedc51eb0ae6e9c94440a8e7cdc8bf97b72e797 Mon Sep 17 00:00:00 2001
From: Kechicode <186776112+Kechicode@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:23:38 +0800
Subject: [PATCH 67/69] fix(TagDigest): delete Bookmark test
---
.../TagDigest/Bookmark/Bookmark.test.tsx | 51 -------------------
1 file changed, 51 deletions(-)
delete mode 100644 src/components/TagDigest/Bookmark/Bookmark.test.tsx
diff --git a/src/components/TagDigest/Bookmark/Bookmark.test.tsx b/src/components/TagDigest/Bookmark/Bookmark.test.tsx
deleted file mode 100644
index de25ee0cf4..0000000000
--- a/src/components/TagDigest/Bookmark/Bookmark.test.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { MockedProvider } from '@apollo/react-testing'
-import { render, screen } from '@testing-library/react'
-import { IntlProvider } from 'react-intl'
-import { describe, expect, it } from 'vitest'
-
-import { TEST_ID } from '~/common/enums'
-import { TagDigest } from '~/components'
-import { MOCK_TAG } from '~/stories/mocks'
-
-describe('', () => {
- it('should render a TagDigest.Bookmark', () => {
- render(
-
-
-
-
-
- )
-
- const $bookmark = screen.getByTestId(TEST_ID.DIGEST_TAG_BOOKMARK)
- expect($bookmark).toBeInTheDocument()
-
- const $name = screen.getByText(MOCK_TAG.content)
- expect($name).toBeInTheDocument()
-
- const $bookmarkButton = screen.getByRole('button', {
- name: 'Bookmark',
- })
- expect($bookmarkButton).toBeInTheDocument()
- })
-
- it('should render a TagDigest.Bookmark with isFollower', () => {
- render(
-
-
-
-
-
- )
-
- const $bookmarkButton = screen.getByRole('button', {
- name: 'Remove bookmark',
- })
- expect($bookmarkButton).toBeInTheDocument()
- })
-})
From ad84630b6d1a6db809dac33f326d3eb6d2298da0 Mon Sep 17 00:00:00 2001
From: gitwoz <177856586+gitwoz@users.noreply.github.com>
Date: Tue, 3 Dec 2024 22:34:48 +0700
Subject: [PATCH 68/69] feat(tag): use numArticles instead of
articles.totalCount for tag article count
---
src/components/GQL/fragments/tag.ts | 16 -------
.../GQL/queries/tagArticlesCount.ts | 15 ------
src/components/GQL/updates/index.ts | 1 -
.../GQL/updates/tagArticlesCount.ts | 48 -------------------
src/components/Tag/ArticleTag/index.tsx | 1 -
src/components/Tag/InlineTag/index.tsx | 1 -
src/components/Tag/ListTag/index.tsx | 1 -
src/components/Tag/PlainTag/index.tsx | 1 -
src/components/TagDigest/Feed/index.tsx | 1 -
src/views/Home/Sidebar/Tags/index.tsx | 5 +-
src/views/TagDetail/ArticlesCount/index.tsx | 10 +---
src/views/TagDetail/gql.ts | 6 ---
src/views/Tags/Feed.tsx | 26 +---------
src/views/Tags/gql.ts | 11 -----
14 files changed, 6 insertions(+), 137 deletions(-)
delete mode 100644 src/components/GQL/fragments/tag.ts
delete mode 100644 src/components/GQL/queries/tagArticlesCount.ts
delete mode 100644 src/components/GQL/updates/tagArticlesCount.ts
diff --git a/src/components/GQL/fragments/tag.ts b/src/components/GQL/fragments/tag.ts
deleted file mode 100644
index c01009e6f4..0000000000
--- a/src/components/GQL/fragments/tag.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import gql from 'graphql-tag'
-
-const fragments = {
- articleCount: gql`
- fragment ArticleCountTag on Tag {
- id
- numAuthors
- numArticles
- articles(input: { first: 0 }) {
- totalCount
- }
- }
- `,
-}
-
-export default fragments
diff --git a/src/components/GQL/queries/tagArticlesCount.ts b/src/components/GQL/queries/tagArticlesCount.ts
deleted file mode 100644
index 563061da10..0000000000
--- a/src/components/GQL/queries/tagArticlesCount.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import gql from 'graphql-tag'
-
-import tagFragments from '../fragments/tag'
-
-export default gql`
- query TagArticlesCount($id: ID!) {
- node(input: { id: $id }) {
- ... on Tag {
- id
- ...ArticleCountTag
- }
- }
- }
- ${tagFragments.articleCount}
-`
diff --git a/src/components/GQL/updates/index.ts b/src/components/GQL/updates/index.ts
index 69d12fde0e..4aa90f493c 100644
--- a/src/components/GQL/updates/index.ts
+++ b/src/components/GQL/updates/index.ts
@@ -6,7 +6,6 @@ export * from './circleFollowers'
export * from './commentDetail'
export * from './draftAssets'
export * from './momentDetail'
-export * from './tagArticlesCount'
export * from './userCollectionDetail'
export * from './userCollections'
export * from './userCollectionsArticles'
diff --git a/src/components/GQL/updates/tagArticlesCount.ts b/src/components/GQL/updates/tagArticlesCount.ts
deleted file mode 100644
index 46382f9c23..0000000000
--- a/src/components/GQL/updates/tagArticlesCount.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { DataProxy } from 'apollo-cache'
-import _cloneDeep from 'lodash/cloneDeep'
-
-import TAG_ARTICLES_COUNT from '~/components/GQL/queries/tagArticlesCount'
-import { TagArticlesCountQuery } from '~/gql/graphql'
-
-export const updateTagArticlesCount = ({
- cache,
- id,
- count = 1,
- type,
-}: {
- cache: DataProxy
- id: string
- count?: number
- type: 'increment' | 'decrement'
-}) => {
- try {
- if (!id) {
- return
- }
-
- const variables = { id }
- const cacheData = cache.readQuery({
- query: TAG_ARTICLES_COUNT,
- variables,
- })
-
- const data = _cloneDeep(cacheData)
- if (data?.node?.__typename !== 'Tag') {
- return
- }
-
- if (type === 'increment') {
- data.node.articles.totalCount += count
- } else {
- data.node.articles.totalCount -= count
- }
-
- cache.writeQuery({
- query: TAG_ARTICLES_COUNT,
- variables,
- data,
- })
- } catch (e) {
- console.error(e)
- }
-}
diff --git a/src/components/Tag/ArticleTag/index.tsx b/src/components/Tag/ArticleTag/index.tsx
index 4c4e7d95ce..d41a1342f0 100644
--- a/src/components/Tag/ArticleTag/index.tsx
+++ b/src/components/Tag/ArticleTag/index.tsx
@@ -59,7 +59,6 @@ ArticleTag.fragments = {
id
content
numArticles
- numAuthors
}
`,
}
diff --git a/src/components/Tag/InlineTag/index.tsx b/src/components/Tag/InlineTag/index.tsx
index 8808fd9556..4137d574e6 100644
--- a/src/components/Tag/InlineTag/index.tsx
+++ b/src/components/Tag/InlineTag/index.tsx
@@ -75,7 +75,6 @@ InlineTag.fragments = {
id
content
numArticles
- numAuthors
}
`,
}
diff --git a/src/components/Tag/ListTag/index.tsx b/src/components/Tag/ListTag/index.tsx
index 1fcacdfcdb..1f59a29742 100644
--- a/src/components/Tag/ListTag/index.tsx
+++ b/src/components/Tag/ListTag/index.tsx
@@ -81,7 +81,6 @@ ListTag.fragments = {
id
content
numArticles
- numAuthors
}
`,
}
diff --git a/src/components/Tag/PlainTag/index.tsx b/src/components/Tag/PlainTag/index.tsx
index 0dc778eb1a..aa1ad9763b 100644
--- a/src/components/Tag/PlainTag/index.tsx
+++ b/src/components/Tag/PlainTag/index.tsx
@@ -52,7 +52,6 @@ PlainTag.fragments = {
id
content
numArticles
- numAuthors
}
`,
}
diff --git a/src/components/TagDigest/Feed/index.tsx b/src/components/TagDigest/Feed/index.tsx
index ddfc6af9c3..104320423f 100644
--- a/src/components/TagDigest/Feed/index.tsx
+++ b/src/components/TagDigest/Feed/index.tsx
@@ -19,7 +19,6 @@ const fragments = {
id
content
numArticles
- numAuthors
}
`,
}
diff --git a/src/views/Home/Sidebar/Tags/index.tsx b/src/views/Home/Sidebar/Tags/index.tsx
index 9656d0b804..645478cecf 100644
--- a/src/views/Home/Sidebar/Tags/index.tsx
+++ b/src/views/Home/Sidebar/Tags/index.tsx
@@ -5,7 +5,6 @@ import { useContext } from 'react'
import { analytics } from '~/common/utils'
import {
List,
- ListTag,
QueryError,
ShuffleButton,
SpinnerBlock,
@@ -33,14 +32,14 @@ const SIDEBAR_TAGS = gql`
cursor
node {
id
- ...DigestTag
+ ...TagDigestSidebarTag
}
}
}
}
}
}
- ${ListTag.fragments.tag}
+ ${TagDigest.Sidebar.fragments.tag}
`
const Tags = () => {
diff --git a/src/views/TagDetail/ArticlesCount/index.tsx b/src/views/TagDetail/ArticlesCount/index.tsx
index 1f5f45a83e..5b09252b06 100644
--- a/src/views/TagDetail/ArticlesCount/index.tsx
+++ b/src/views/TagDetail/ArticlesCount/index.tsx
@@ -1,17 +1,15 @@
import { FormattedMessage } from 'react-intl'
import { numAbbr } from '~/common/utils'
-import tagFragments from '~/components/GQL/fragments/tag'
-import { ArticleCountTagFragment } from '~/gql/graphql'
import styles from './styles.module.css'
interface ArticlesCountProps {
- tag: ArticleCountTagFragment
+ tag: { numArticles: number }
}
const ArticlesCount = ({ tag }: ArticlesCountProps) => {
- const { totalCount } = tag.articles || { totalCount: 0 }
+ const totalCount = tag.numArticles
return (
@@ -30,8 +28,4 @@ const ArticlesCount = ({ tag }: ArticlesCountProps) => {
)
}
-ArticlesCount.fragments = {
- tag: tagFragments.articleCount,
-}
-
export default ArticlesCount
diff --git a/src/views/TagDetail/gql.ts b/src/views/TagDetail/gql.ts
index 5898869933..c58ccc9930 100644
--- a/src/views/TagDetail/gql.ts
+++ b/src/views/TagDetail/gql.ts
@@ -2,18 +2,14 @@ import gql from 'graphql-tag'
import { TagBookmarkButton } from '~/components'
-import ArticlesCount from './ArticlesCount'
-
const tagFragment = gql`
fragment TagFragment on Tag {
id
content
numArticles
- numAuthors
selectedArticles: articles(input: { first: 0 }) {
totalCount
}
- ...ArticleCountTag
...TagBookmarkButtonTagPrivate
hottestArticles: articles(input: { first: 0, sortBy: byHottestDesc }) {
totalCount
@@ -25,12 +21,10 @@ const tagFragment = gql`
id
content
numArticles
- numAuthors
}
}
}
}
- ${ArticlesCount.fragments.tag}
${TagBookmarkButton.fragments.tag.private}
`
diff --git a/src/views/Tags/Feed.tsx b/src/views/Tags/Feed.tsx
index 82455aa2a0..7d286e01b2 100644
--- a/src/views/Tags/Feed.tsx
+++ b/src/views/Tags/Feed.tsx
@@ -1,5 +1,4 @@
import _get from 'lodash/get'
-import { useEffect } from 'react'
import { analytics, mergeConnections } from '~/common/utils'
import {
@@ -12,7 +11,7 @@ import {
} from '~/components'
import { AllTagsHottestQuery } from '~/gql/graphql'
-import { ALL_TAGS_HOTTEST, TAG_REACTIVE_DATA } from './gql'
+import { ALL_TAGS_HOTTEST } from './gql'
export type FeedType = 'recommended' | 'hottest'
@@ -27,28 +26,7 @@ const Feed = ({ type }: Props) => {
const query = ALL_TAGS_HOTTEST
- const { data, loading, error, fetchMore, client } =
- usePublicQuery(query)
-
- // fetch the latest tag data
- const loadTagReactiveData = (publicData?: FeedQuery) => {
- const publicEdges = publicData?.viewer?.recommendation.tags.edges || []
- const publicIds = publicEdges.map(({ node }) => node.id)
-
- if (publicIds.length <= 0) {
- return
- }
-
- client.query({
- query: TAG_REACTIVE_DATA,
- fetchPolicy: 'network-only',
- variables: { ids: publicIds },
- })
- }
-
- useEffect(() => {
- loadTagReactiveData(data)
- }, [data])
+ const { data, loading, error, fetchMore } = usePublicQuery(query)
if (loading) {
return
diff --git a/src/views/Tags/gql.ts b/src/views/Tags/gql.ts
index 94dbb2448a..23261429a9 100644
--- a/src/views/Tags/gql.ts
+++ b/src/views/Tags/gql.ts
@@ -27,14 +27,3 @@ export const ALL_TAGS_HOTTEST = gql`
}
${TagDigest.Feed.fragments.tag}
`
-
-export const TAG_REACTIVE_DATA = gql`
- query TagReactiveData($ids: [ID!]!) {
- nodes(input: { ids: $ids }) {
- id
- ... on Tag {
- numArticles
- }
- }
- }
-`
From c99d2f159fb495dd466bc80db98c3b2ec31cc2c6 Mon Sep 17 00:00:00 2001
From: Woz <177856586+gitwoz@users.noreply.github.com>
Date: Wed, 4 Dec 2024 13:50:09 +0800
Subject: [PATCH 69/69] chore(release): v5.7.0
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 242319ed45..d0c625f838 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "matters-web",
- "version": "5.6.6",
+ "version": "5.7.0",
"description": "codebase of Matters' website",
"author": "Matters ",
"engines": {