refactor(SalaryAndBenefits): rename SalaryAndBenefitsPayload -> Salar…

…yAndBenefitsPage
varianter · Aug 22, 2024 · 1e53edd · 1e53edd
1 parent 9f418b6
commit 1e53edd
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 21 deletions.
diff --git a/src/app/(main)/[slug]/page.tsx b/src/app/(main)/[slug]/page.tsx
@@ -2,12 +2,12 @@ import { Metadata } from "next";
 import { redirect } from "next/navigation";
 import { Blog } from "src/blog/Blog";
 import BlogPreview from "src/blog/BlogPreview";
-import SalaryAndBenefits from 'src/salaryAndBenefits/SalaryAndBenefits';
+import SalaryAndBenefits from "src/salaryAndBenefits/SalaryAndBenefits";
 import { getDraftModeInfo } from "src/utils/draftmode";
 import SectionRenderer from "src/utils/renderSection";
 import { fetchSeoData, generateMetadataFromSeo } from "src/utils/seo";
 import { BlogPage, PageBuilder, Post } from "studio/lib/payloads/pages";
-import { SalaryAndBenefits as SalaryAndBenefitsPayload } from 'studio/lib/payloads/salaryAndBenefits';
+import { SalaryAndBenefitsPage } from "studio/lib/payloads/salaryAndBenefits";
 import {
   BLOG_PAGE_QUERY,
   POSTS_QUERY,
@@ -36,13 +36,22 @@ async function Page({ params }: Props) {
   const { slug } = params;
   const { perspective, isDraftMode } = getDraftModeInfo();
 
-  const [initialPage, initialBlogPage, initialSalaryAndBenefitsPage] = await Promise.all([
-    loadQuery<PageBuilder>(SLUG_QUERY, { slug }, { perspective }),
-    loadQuery<BlogPage>(BLOG_PAGE_QUERY, { slug }, { perspective }),
-    loadQuery<SalaryAndBenefitsPayload>(SALARY_AND_BENEFITS_PAGE_QUERY, { slug }, { perspective }),
-  ]);
+  const [initialPage, initialBlogPage, initialSalaryAndBenefitsPage] =
+    await Promise.all([
+      loadQuery<PageBuilder>(SLUG_QUERY, { slug }, { perspective }),
+      loadQuery<BlogPage>(BLOG_PAGE_QUERY, { slug }, { perspective }),
+      loadQuery<SalaryAndBenefitsPage>(
+        SALARY_AND_BENEFITS_PAGE_QUERY,
+        { slug },
+        { perspective },
+      ),
+    ]);
 
-  if (!initialPage.data && !initialBlogPage.data && !initialSalaryAndBenefitsPage.data) {
+  if (
+    !initialPage.data &&
+    !initialBlogPage.data &&
+    !initialSalaryAndBenefitsPage.data
+  ) {
     console.log(`Page ${slug} not found`);
     // TODO: add error snackbar
     redirect("/");
@@ -53,7 +62,7 @@ async function Page({ params }: Props) {
     const initialPosts = await loadQuery<Post[]>(
       POSTS_QUERY,
       { slug },
-      { perspective }
+      { perspective },
     );
 
     if (!initialPosts) {
@@ -95,9 +104,13 @@ async function Page({ params }: Props) {
 
   if (initialSalaryAndBenefitsPage.data) {
     return isDraftMode ? (
-      <SalaryAndBenefitsPreview initialSalaryAndBenefits={initialSalaryAndBenefitsPage} />
+      <SalaryAndBenefitsPreview
+        initialSalaryAndBenefits={initialSalaryAndBenefitsPage}
+      />
     ) : (
-      <SalaryAndBenefits salaryAndBenefits={initialSalaryAndBenefitsPage.data} />
+      <SalaryAndBenefits
+        salaryAndBenefits={initialSalaryAndBenefitsPage.data}
+      />
     );
   }
 

diff --git a/src/salaryAndBenefits/SalaryAndBenefits.tsx b/src/salaryAndBenefits/SalaryAndBenefits.tsx
@@ -1,10 +1,10 @@
 import styles from "./salaryAndBenefits.module.css";
 import Text from "src/components/text/Text";
-import { SalaryAndBenefits as SalaryAndBenefitsPayload } from "studio/lib/payloads/salaryAndBenefits";
+import { SalaryAndBenefitsPage } from "studio/lib/payloads/salaryAndBenefits";
 import { RichText } from "src/components/richText/RichText";
 
 interface SalaryAndBenefitsProps {
-  salaryAndBenefits: SalaryAndBenefitsPayload;
+  salaryAndBenefits: SalaryAndBenefitsPage;
 }
 
 const SalaryAndBenefits = ({ salaryAndBenefits }: SalaryAndBenefitsProps) => {

diff --git a/src/salaryAndBenefits/SalaryAndBenefitsPreview.tsx b/src/salaryAndBenefits/SalaryAndBenefitsPreview.tsx
@@ -2,17 +2,17 @@
 import { Suspense } from "react";
 import SalaryAndBenefits from "./SalaryAndBenefits";
 import { QueryResponseInitial, useQuery } from "@sanity/react-loader";
-import { SalaryAndBenefits as SalaryAndBenefitsPayload } from "studio/lib/payloads/salaryAndBenefits";
+import { SalaryAndBenefitsPage } from "studio/lib/payloads/salaryAndBenefits";
 import { SALARY_AND_BENEFITS_PAGE_QUERY } from "studio/lib/queries/pages";
 
 interface SalaryAndBenefitsPreviewProps {
-  initialSalaryAndBenefits: QueryResponseInitial<SalaryAndBenefitsPayload>;
+  initialSalaryAndBenefits: QueryResponseInitial<SalaryAndBenefitsPage>;
 }
 
 const SalaryAndBenefitsPreview = ({
   initialSalaryAndBenefits,
 }: SalaryAndBenefitsPreviewProps) => {
-  const { data: newData } = useQuery<SalaryAndBenefitsPayload>(
+  const { data: newData } = useQuery<SalaryAndBenefitsPage>(
     SALARY_AND_BENEFITS_PAGE_QUERY,
     { slug: initialSalaryAndBenefits.data.slug.current },
     { initial: initialSalaryAndBenefits },

diff --git a/studio/lib/payloads/salaryAndBenefits.ts b/studio/lib/payloads/salaryAndBenefits.ts
@@ -1,5 +1,5 @@
-import { PortableTextBlock } from 'src/components/richText/RichText';
-import { Slug } from './global';
+import { PortableTextBlock } from "src/components/richText/RichText";
+import { Slug } from "./global";
 
 export interface Benefit {
   _type: string;
@@ -8,8 +8,7 @@ export interface Benefit {
   richText: PortableTextBlock[];
 }
 
-
-export interface SalaryAndBenefits {
+export interface SalaryAndBenefitsPage {
   _createdAt: string;
   _id: string;
   _rev: string;
@@ -19,4 +18,4 @@ export interface SalaryAndBenefits {
   page: string;
   slug: Slug;
   benefits: Benefit[];
-}
+}