feat: handle change in hygraph tags

Blazity · Nov 9, 2023 · 190e1f3 · 190e1f3
1 parent c1ff0df
commit 190e1f3
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 18 deletions.
diff --git a/src/app/[lang]/article/[slug]/page.tsx b/src/app/[lang]/article/[slug]/page.tsx
@@ -41,7 +41,7 @@ export default async function Web({ params: { slug, lang } }: ArticlePageProps)
  publicationDate: publishedAt,
  title,
  author: { name: author?.name ?? "Anonymous", imageUrl: author?.avatar?.data?.url },
- tags,
+ tags: tags.map(({ tag }) => tag),
  slug,
  }}
  asLink={false}

diff --git a/src/app/api/webhook/publish/route.ts b/src/app/api/webhook/publish/route.ts
@@ -26,7 +26,7 @@ async function handleAlgoliaPublishWebhook(req: NextRequestWithValidBody<Publish
  title,
  content: slateToText(content),
  slug,
- tags,
+ tags: tags.map(({ tag }) => tag),
  })
 
  return { title, locale }
@@ -55,7 +55,7 @@ const articleSchema = z.object({
  title: z.string(),
  locale: z.string(),
  slug: z.string(),
- tags: z.array(z.string()),
+ tags: z.array(z.object({ tag: z.string() })),
  })
  ),
  id: z.string(),

diff --git a/src/components/ArticleCard/ArticleCard.tsx b/src/components/ArticleCard/ArticleCard.tsx
@@ -30,7 +30,7 @@ type ArticleCardProps = {
 }
 
 export const hygraphArticleToCardProps = (article: {
- tags: string[]
+ tags: { tag: string }[]
  title: string
  author?: { name: string; avatar?: { data: { url: string } } | undefined | null } | null
  image?: { data: { url: string }; description?: { text: string } | undefined | null } | null
@@ -39,7 +39,7 @@ export const hygraphArticleToCardProps = (article: {
  slug: string
 }) => {
  return {
- tags: article?.tags,
+ tags: article?.tags?.map(({ tag }) => tag),
  imageUrl: article?.image?.data?.url,
  imageAlt: article.image?.description?.text,
  title: article?.title,

diff --git a/src/components/ArticlesGrid/ArticlesGrid.tsx b/src/components/ArticlesGrid/ArticlesGrid.tsx
@@ -16,7 +16,7 @@ type Article = {
  id: string
  slug: string
  title: string
- tags: string[]
+ tags: { tag: string }[]
  image?: Nullable<{
  description?: ImageDescription
  data: ImageData

diff --git a/src/lib/client.ts b/src/lib/client.ts
@@ -1,9 +1,9 @@
+import { env } from "@/env.mjs"
+import { Locale, standardNotationToHygraphLocale } from "@/i18n/i18n"
 import { TypedDocumentNode } from "@graphql-typed-document-node/core"
 import { print } from "graphql"
 import omit from "lodash/omit"
 import pThrottle from "p-throttle"
-import { env } from "@/env.mjs"
-import { Locale, standardNotationToHygraphLocale } from "@/i18n/i18n"
 import {
  getArticleBySlugQuery,
  getArticleMetadataBySlugQuery,
@@ -149,7 +149,8 @@ export async function getRecentArticles(variables: { locale: Locale; skip?: numb
  tags: ["ARTICLE"],
  variables,
  })
- return { articles, count: articlesConnection.aggregate.count }
+
+ return { articles: articles, count: articlesConnection.aggregate.count }
 }
 
 export async function getRecentArticlesWithMain(variables: { locale: Locale; skip?: number; first?: number }) {
@@ -159,6 +160,7 @@ export async function getRecentArticlesWithMain(variables: { locale: Locale; ski
  tags: ["ARTICLE"],
  variables,
  })
+
  return { articles, count: articlesConnection.aggregate.count, mainArticle }
 }
 

diff --git a/src/lib/queries/articles.ts b/src/lib/queries/articles.ts
@@ -46,7 +46,9 @@ export const getRecentArticlesWithMainQuery = graphql(`
  locale
  slug
  title
- tags
+ tags {
+ tag
+ }
  content {
  raw
  }
@@ -74,7 +76,9 @@ export const getRecentArticlesWithMainQuery = graphql(`
  locale
  slug
  title
- tags
+ tags {
+ tag
+ }
  image {
  description {
  text
@@ -109,7 +113,9 @@ export const getRecentArticlesQuery = graphql(`
  locale
  slug
  title
- tags
+ tags {
+ tag
+ }
  image {
  description {
  text
@@ -134,7 +140,9 @@ export const getArticleRecommendedArticlesQuery = graphql(`
  title
  slug
  id
- tags
+ tags {
+ tag
+ }
  publishedAt
  author {
  name
@@ -163,7 +171,9 @@ export const getArticleBySlugQuery = graphql(`
  id
  title
  publishedAt
- tags
+ tags {
+ tag
+ }
  image(forceParentLocale: true) {
  id
  description {
@@ -249,7 +259,9 @@ export const listArticlesBySlugQuery = graphql(`
  }
  }
  }
- tags
+ tags {
+ tag
+ }
  }
  }
 `)
@@ -280,7 +292,9 @@ export const listArticlesByCategoryQuery = graphql(`
  }
  }
  publishedAt
- tags
+ tags {
+ tag
+ }
  slug
  title
  id

diff --git a/src/lib/queries/components.ts b/src/lib/queries/components.ts
@@ -76,7 +76,9 @@ export const getHomepageQuery = graphql(`
  locale
  slug
  title
- tags
+ tags {
+ tag
+ }
  image {
  description {
  text
@@ -109,7 +111,9 @@ export const getHomepageQuery = graphql(`
  locale
  slug
  title
- tags
+ tags {
+ tag
+ }
  image {
  description {
  text