Merge pull request #4099 from thematters/fix/prod-search-version

fix(search): remove $version on search queries
thematters · Dec 18, 2023 · ce1ebe5 · ce1ebe5
2 parents 3172ec4 + 995a3e5
commit ce1ebe5
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 31 deletions.
diff --git a/src/components/Search/SearchQuickResult/gql.ts b/src/components/Search/SearchQuickResult/gql.ts
@@ -4,15 +4,14 @@ import { TagDigest } from '~/components/TagDigest'
 import { UserDigest } from '~/components/UserDigest'
 
 export const QUICK_RESULT = gql`
-  query QuickResult($key: String!, $version: SearchAPIVersion = v20230601) {
+  query QuickResult($key: String!) {
     user: search(
       input: {
         type: User
         quicksearch: true
         record: true
         first: 5
         key: $key
-        version: $version
       }
     ) {
       edges {
@@ -25,14 +24,7 @@ export const QUICK_RESULT = gql`
       }
     }
     tag: search(
-      input: {
-        type: Tag
-        quicksearch: true
-        record: true
-        first: 5
-        key: $key
-        version: $version
-      }
+      input: { type: Tag, quicksearch: true, record: true, first: 5, key: $key }
     ) {
       edges {
         cursor

diff --git a/src/components/Search/SearchQuickResult/index.tsx b/src/components/Search/SearchQuickResult/index.tsx
@@ -14,7 +14,6 @@ import {
   Spinner,
   TagDigest,
   UserDigest,
-  useRoute,
 } from '~/components'
 import { QuickResultQuery } from '~/gql/graphql'
 
@@ -31,9 +30,6 @@ interface QuickSearchProps {
 }
 
 export const SearchQuickResult = (props: QuickSearchProps) => {
-  const { getQuery } = useRoute()
-  const version = getQuery('version')
-
   const { searchKey, inPage, activeItem, onUpdateData, closeDropdown } = props
   const client = useApolloClient()
   const [data, setData] = useState<QuickResultQuery>()
@@ -76,7 +72,6 @@ export const SearchQuickResult = (props: QuickSearchProps) => {
         query: QUICK_RESULT,
         variables: {
           key: searchKey,
-          version: version === '' ? undefined : version,
         },
         fetchPolicy: 'no-cache',
       })

diff --git a/src/views/Search/AggregateResults/Articles.tsx b/src/views/Search/AggregateResults/Articles.tsx
@@ -28,7 +28,6 @@ import { SEARCH_AGGREGATE_ARTICLES_PUBLIC } from './gql'
 const AggregateArticleResults = () => {
   const { getQuery } = useRoute()
   const q = getQuery('q')
-  const version = getQuery('version')
 
   /**
    * Data Fetching
@@ -38,7 +37,7 @@ const AggregateArticleResults = () => {
     usePublicQuery<SearchAggregateArticlesPublicQuery>(
       SEARCH_AGGREGATE_ARTICLES_PUBLIC,
       {
-        variables: { key: q, version: version === '' ? undefined : version },
+        variables: { key: q },
       }
     )
 

diff --git a/src/views/Search/AggregateResults/Tags.tsx b/src/views/Search/AggregateResults/Tags.tsx
@@ -24,7 +24,6 @@ import styles from './styles.module.css'
 const AggregateTagResults = () => {
   const { getQuery } = useRoute()
   const q = getQuery('q')
-  const version = getQuery('version')
 
   /**
    * Data Fetching
@@ -33,7 +32,7 @@ const AggregateTagResults = () => {
   const { data, loading, fetchMore } =
     usePublicQuery<SearchAggregateTagsPublicQuery>(
       SEARCH_AGGREGATE_TAGS_PUBLIC,
-      { variables: { key: q, version: version === '' ? undefined : version } }
+      { variables: { key: q } }
     )
 
   useEffect(() => {

diff --git a/src/views/Search/AggregateResults/Users.tsx b/src/views/Search/AggregateResults/Users.tsx
@@ -24,7 +24,6 @@ import styles from './styles.module.css'
 const AggregateUserResults = () => {
   const { getQuery } = useRoute()
   const q = getQuery('q')
-  const version = getQuery('version')
 
   /**
    * Data Fetching
@@ -33,7 +32,7 @@ const AggregateUserResults = () => {
   const { data, loading, fetchMore } =
     usePublicQuery<SearchAggregateUsersPublicQuery>(
       SEARCH_AGGREGATE_USERS_PUBLIC,
-      { variables: { key: q, version: version === '' ? undefined : version } }
+      { variables: { key: q } }
     )
 
   useEffect(() => {

diff --git a/src/views/Search/AggregateResults/gql.ts b/src/views/Search/AggregateResults/gql.ts
@@ -7,7 +7,6 @@ export const SEARCH_AGGREGATE_ARTICLES_PUBLIC = gql`
     $key: String!
     $first: first_Int_min_0 = 30
     $after: String
-    $version: SearchAPIVersion = v20230601
   ) {
     search(
       input: {
@@ -16,7 +15,6 @@ export const SEARCH_AGGREGATE_ARTICLES_PUBLIC = gql`
         first: $first
         key: $key
         after: $after
-        version: $version
       }
     ) {
       totalCount
@@ -43,7 +41,6 @@ export const SEARCH_AGGREGATE_TAGS_PUBLIC = gql`
     $key: String!
     $first: first_Int_min_0 = 30
     $after: String
-    $version: SearchAPIVersion = v20230601
   ) {
     search(
       input: {
@@ -52,7 +49,6 @@ export const SEARCH_AGGREGATE_TAGS_PUBLIC = gql`
         first: $first
         key: $key
         after: $after
-        version: $version
       }
     ) {
       pageInfo {
@@ -78,7 +74,6 @@ export const SEARCH_AGGREGATE_USERS_PUBLIC = gql`
     $key: String!
     $first: first_Int_min_0 = 30
     $after: String
-    $version: SearchAPIVersion = v20230601
   ) {
     search(
       input: {
@@ -87,7 +82,6 @@ export const SEARCH_AGGREGATE_USERS_PUBLIC = gql`
         first: $first
         key: $key
         after: $after
-        version: $version
       }
     ) {
       pageInfo {

diff --git a/src/views/Search/AggregateResults/index.tsx b/src/views/Search/AggregateResults/index.tsx
@@ -27,7 +27,6 @@ const AggregateResults = () => {
     getSearchType(getQuery('type')) || Type.ARTICLE
   )
   const q = getQuery('q')
-  const version = getQuery('version')
 
   const isArticle = type === Type.ARTICLE
   const isUser = type === Type.USER
@@ -42,17 +41,17 @@ const AggregateResults = () => {
   useEffect(() => {
     client.query({
       query: SEARCH_AGGREGATE_ARTICLES_PUBLIC,
-      variables: { key: q, version: version === '' ? undefined : version },
+      variables: { key: q },
       fetchPolicy: 'network-only',
     })
     client.query({
       query: SEARCH_AGGREGATE_USERS_PUBLIC,
-      variables: { key: q, version: version === '' ? undefined : version },
+      variables: { key: q },
       fetchPolicy: 'network-only',
     })
     client.query({
       query: SEARCH_AGGREGATE_TAGS_PUBLIC,
-      variables: { key: q, version: version === '' ? undefined : version },
+      variables: { key: q },
       fetchPolicy: 'network-only',
     })
   }, [q])