Merge pull request #1393 from thematters/fix/tag-detail

[hotfix - master] Fix TagDetail shows incorrect feed and more;
thematters · Aug 4, 2020 · 139ae64 · 139ae64
2 parents e7640a4 + 871cb63
commit 139ae64
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matters-web",
-  "version": "3.12.0",
+  "version": "3.12.1",
   "description": "codebase of Matters' website",
   "sideEffects": false,
   "author": "Matters <[email protected]>",

diff --git a/src/components/ArticleDigest/DropdownActions/SetTagUnselectedButton.tsx b/src/components/ArticleDigest/DropdownActions/SetTagUnselectedButton.tsx
@@ -57,9 +57,10 @@ const SetTagUnselectedButton = ({
     variables: { id: tagId, articles: [article.id] },
     update: (cache) => {
       try {
+        // FIXME: circular dependencies
         const {
           TAG_ARTICLES_PUBLIC: query,
-        } = require('~/components/GQL/queries/tagArticles').default
+        } = require('~/components/GQL/queries/tagArticles')
         const variables = { id: tagId, selected: true }
         const data = cache.readQuery<TagArticlesPublic>({ query, variables })
         const node = _get(data, 'node', {}) as TagArticlesPublic_node_Tag

diff --git a/src/components/DropdownDialog/index.tsx b/src/components/DropdownDialog/index.tsx
@@ -12,7 +12,7 @@ import {
   useResponsive,
 } from '~/components'
 
-import { KEYCODES, TEXT, TextId } from '~/common/enums'
+import { KEYCODES, TEXT, TextId, Z_INDEX } from '~/common/enums'
 
 /**
  * This is a responsive component which will show
@@ -113,12 +113,14 @@ const BaseDropdownDialog = ({
   if (isSmallUp) {
     return (
       <Dropdown
-        {...dropdown}
         trigger={undefined}
-        content={<Content>{dropdown.content}</Content>}
         onHidden={close}
         onClickOutside={close}
         visible={showDialog}
+        zIndex={Z_INDEX.OVER_STICKY_TABS}
+        appendTo={process.browser ? document.body : undefined}
+        {...dropdown}
+        content={<Content>{dropdown.content}</Content>}
       >
         <ForwardChildren open={toggle} children={children} />
       </Dropdown>

diff --git a/src/components/GQL/updates/userArticles.ts b/src/components/GQL/updates/userArticles.ts
@@ -28,7 +28,7 @@ const update = ({
   // FIXME: circular dependencies
   const {
     USER_ARTICLES_PUBLIC,
-  } = require('~/components/GQL/queries/userArticles').default
+  } = require('~/components/GQL/queries/userArticles')
 
   if (!userName) {
     return

diff --git a/src/components/UserProfile/DropdownActions/index.tsx b/src/components/UserProfile/DropdownActions/index.tsx
@@ -13,7 +13,7 @@ import {
 } from '~/components'
 import { BlockUser } from '~/components/BlockUser'
 
-import { TEXT, Z_INDEX } from '~/common/enums'
+import { TEXT } from '~/common/enums'
 
 import { DropdownActionsUserPublic } from './__generated__/DropdownActionsUserPublic'
 
@@ -74,8 +74,6 @@ const BaseDropdownActions = ({
       dropdown={{
         content: <Content isInDropdown />,
         placement: 'bottom-end',
-        zIndex: Z_INDEX.OVER_STICKY_TABS,
-        appendTo: process.browser ? document.body : undefined,
       }}
       dialog={{
         content: <Content />,

diff --git a/src/views/TagDetail/Articles/index.tsx b/src/views/TagDetail/Articles/index.tsx
@@ -179,7 +179,8 @@ const TagDetailArticles = ({ tagId, selected }: TagArticlesProps) => {
                   location: i,
                 })
               }
-              inTagDetailLatest
+              inTagDetailSelected={selected}
+              inTagDetailLatest={!selected}
             />
           </List.Item>
         ))}

diff --git a/src/views/TagDetail/Buttons/AddButton/index.tsx b/src/views/TagDetail/Buttons/AddButton/index.tsx
@@ -17,7 +17,7 @@ import {
 import { useMutation } from '~/components/GQL'
 import CREATE_DRAFT from '~/components/GQL/mutations/createDraft'
 
-import { ADD_TOAST, Z_INDEX } from '~/common/enums'
+import { ADD_TOAST } from '~/common/enums'
 import {
   analytics,
   parseFormSubmitErrors,
@@ -158,8 +158,6 @@ const BaseDropdownActions = ({
       dropdown={{
         content: <Content isInDropdown />,
         placement: 'bottom-end',
-        zIndex: Z_INDEX.OVER_STICKY_TABS,
-        appendTo: process.browser ? document.body : undefined,
       }}
       dialog={{
         content: <Content />,

diff --git a/src/views/TagDetail/DropdownActions/index.tsx b/src/views/TagDetail/DropdownActions/index.tsx
@@ -13,7 +13,7 @@ import {
   useResponsive,
 } from '~/components'
 
-import { TEXT, Z_INDEX } from '~/common/enums'
+import { TEXT } from '~/common/enums'
 
 type DropdownActionsProps = {
   isMaintainer: boolean
@@ -56,8 +56,6 @@ const BaseDropdownActions = ({
       dropdown={{
         content: <Content isInDropdown />,
         placement: 'bottom-end',
-        zIndex: Z_INDEX.OVER_STICKY_TABS,
-        appendTo: process.browser ? document.body : undefined,
       }}
       dialog={{
         content: <Content />,

diff --git a/src/views/TagDetail/gql.ts b/src/views/TagDetail/gql.ts
@@ -22,6 +22,9 @@ export const TAG_DETAIL_PUBLIC = gql`
           id
           ...UserDigestMiniUser
         }
+        selectedArticles: articles(input: { first: 0, selected: true }) {
+          totalCount
+        }
         ...FollowersTag
         ...ArticleCountTag
         ...FollowButtonTagPrivate

diff --git a/src/views/TagDetail/index.tsx b/src/views/TagDetail/index.tsx
@@ -53,7 +53,7 @@ const TagDetail = ({ tag }: { tag: TagDetailPublic_node_Tag }) => {
   const viewer = useContext(ViewerContext)
 
   // feed type
-  const hasSelected = (tag?.articles.totalCount || 0) > 0
+  const hasSelected = (tag?.selectedArticles.totalCount || 0) > 0
   const [feed, setFeed] = useState<TagFeedType>(
     hasSelected ? 'selected' : 'latest'
   )