V3-cleanup-namingconventions

src/app/(main)/[slug]/page.tsx

@@ -12,9 +12,9 @@ import { getDraftModeInfo } from "src/utils/draftmode";
 import SectionRenderer from "src/utils/renderSection";
 import { fetchSeoData, generateMetadataFromSeo } from "src/utils/seo";
 import { CompanyLocation } from "studio/lib/interfaces/companyDetails";
-import { CompensationsPage } from "studio/lib/interfaces/compensations";
+import { CompensationsDocument } from "studio/lib/interfaces/compensations";
 import { BlogPage, PageBuilder, Post } from "studio/lib/interfaces/pages";
-import { CustomerCasePage } from "studio/lib/interfaces/specialPages";
+import { CustomerCaseDocument } from "studio/lib/interfaces/specialPages";
 import { COMPANY_LOCATIONS_QUERY } from "studio/lib/queries/companyDetails";
 import {
   BLOG_PAGE_QUERY,
@@ -57,13 +57,13 @@ async function Page({ params }: Props) {
   const [
     initialPage,
     initialBlogPage,
-    initialCompensationsPage,
+    initialCompensationsDocument,
     initialLocationsData,
     initialCustomerCases,
   ] = await Promise.all([
     loadStudioQuery<PageBuilder>(SLUG_QUERY, { slug }, { perspective }),
     loadStudioQuery<BlogPage>(BLOG_PAGE_QUERY, { slug }, { perspective }),
-    loadStudioQuery<CompensationsPage>(
+    loadStudioQuery<CompensationsDocument>(
       COMPENSATIONS_PAGE_QUERY,
       { slug },
       { perspective },
@@ -73,7 +73,7 @@ async function Page({ params }: Props) {
       {},
       { perspective },
     ),
-    loadStudioQuery<CustomerCasePage>(
+    loadStudioQuery<CustomerCaseDocument>(
       CUSTOMER_CASES_PAGE_QUERY,
       { slug },
       { perspective },
@@ -123,15 +123,15 @@ async function Page({ params }: Props) {
     );
   }
 
-  if (initialCompensationsPage.data && initialLocationsData.data) {
+  if (initialCompensationsDocument.data && initialLocationsData.data) {
     return isDraftMode ? (
       <CompensationsPreview
-        initialCompensations={initialCompensationsPage}
+        initialCompensations={initialCompensationsDocument}
         initialLocations={initialLocationsData}
       />
     ) : (
       <Compensations
-        compensations={initialCompensationsPage.data}
+        compensations={initialCompensationsDocument.data}
         locations={initialLocationsData.data}
       />
     );

src/compensations/Compensations.tsx

@@ -7,7 +7,7 @@ import {
 } from "src/components/forms/radioButtonGroup/RadioButtonGroup";
 import Text from "src/components/text/Text";
 import { CompanyLocation } from "studio/lib/interfaces/companyDetails";
-import { CompensationsPage } from "studio/lib/interfaces/compensations";
+import { CompensationsDocument } from "studio/lib/interfaces/compensations";
 
 import styles from "./compensations.module.css";
 import BenefitsByLocation from "./components/benefitsByLocation/BenefitsByLocation";
@@ -24,7 +24,7 @@ import {
 } from "./utils/salary";
 
 interface CompensationsProps {
-  compensations: CompensationsPage;
+  compensations: CompensationsDocument;
   locations: CompanyLocation[];
 }
 

src/compensations/CompensationsPreview.tsx

@@ -4,22 +4,22 @@ import { QueryResponseInitial, useQuery } from "@sanity/react-loader";
 import { Suspense } from "react";
 
 import { CompanyLocation } from "studio/lib/interfaces/companyDetails";
-import { CompensationsPage } from "studio/lib/interfaces/compensations";
+import { CompensationsDocument } from "studio/lib/interfaces/compensations";
 import { COMPANY_LOCATIONS_QUERY } from "studio/lib/queries/companyDetails";
 import { COMPENSATIONS_PAGE_QUERY } from "studio/lib/queries/specialPages";
 
 import Compensations from "./Compensations";
 
 interface CompensationsPreviewProps {
-  initialCompensations: QueryResponseInitial<CompensationsPage>;
+  initialCompensations: QueryResponseInitial<CompensationsDocument>;
   initialLocations: QueryResponseInitial<CompanyLocation[]>;
 }
 
 const CompensationsPreview = ({
   initialCompensations,
   initialLocations,
 }: CompensationsPreviewProps) => {
-  const { data: compensationsData } = useQuery<CompensationsPage>(
+  const { data: compensationsData } = useQuery<CompensationsDocument>(
     COMPENSATIONS_PAGE_QUERY,
     { slug: initialCompensations.data.slug.current },
     { initial: initialCompensations },

src/compensations/components/yearlyBonuses/YearlyBonuses.tsx

@@ -1,10 +1,10 @@
 import Text from "src/components/text/Text";
-import { BonusPage } from "studio/lib/interfaces/compensations";
+import { BonusObject } from "studio/lib/interfaces/compensations";
 
 import styles from "./yearlyBonuses.module.css";
 
 interface YearlyBonusesProps {
-  bonuses: BonusPage[];
+  bonuses: BonusObject[];
 }
 
 const YearlyBonuses = ({ bonuses }: YearlyBonusesProps) => {

src/components/navigation/mockData.ts

@@ -59,7 +59,7 @@ export const mockNavigation: Navigation = {
   footer: [
     {
       _key: "47456f5da563",
-      _type: "footerSection",
+      _type: "footer",
       sectionTitle: "Social Media",
       sectionType: SectionType.SocialMedia,
       socialMediaLinks: {
@@ -68,7 +68,7 @@ export const mockNavigation: Navigation = {
     },
     {
       _key: "c3d5803182fb",
-      _type: "footerSection",
+      _type: "footer",
       sectionTitle: "Content",
       sectionType: SectionType.Content,
       linksAndContent: [

src/components/sections/article/Article.tsx

@@ -3,12 +3,12 @@ import CustomLink from "src/components/link/CustomLink";
 import { RichText } from "src/components/richText/RichText";
 import Text from "src/components/text/Text";
 import { useConvertSanityImageToNextImage } from "src/utils/hooks/useConvertImage";
-import { ArticleSection } from "studio/lib/interfaces/pages";
+import { ArticleObject } from "studio/lib/interfaces/pages";
 
 import styles from "./article.module.css";
 
 interface ArticleProps {
-  article: ArticleSection;
+  article: ArticleObject;
 }
 
 const Article = ({ article }: ArticleProps) => {

src/components/sections/article/ArticlePreview.tsx

@@ -4,7 +4,7 @@ import { useQuery } from "@sanity/react-loader";
 import { Suspense } from "react";
 
 import { PreviewProps } from "src/types/preview";
-import { ArticleSection, PageBuilder } from "studio/lib/interfaces/pages";
+import { ArticleObject, PageBuilder } from "studio/lib/interfaces/pages";
 import { PAGE_QUERY } from "studio/lib/queries/page";
 
 import Article from "./Article";
@@ -19,13 +19,13 @@ export default function ArticlePreview({
     { initial: initialData },
   );
 
-  const articleSection = data.sections.find(
+  const article = data.sections.find(
     (section, index) => section._type === "article" && index === sectionIndex,
-  ) as ArticleSection;
+  ) as ArticleObject;
 
   return (
     <Suspense>
-      <Article article={articleSection} />
+      <Article article={article} />
     </Suspense>
   );
 }

src/components/sections/article/mockData.ts

@@ -2,7 +2,7 @@ import { PortableTextBlock } from "sanity";
 
 import placeholder from "src/stories/assets/image-placeholder.png";
 import { LinkType } from "studio/lib/interfaces/navigation";
-import { ArticleSection } from "studio/lib/interfaces/pages";
+import { ArticleObject } from "studio/lib/interfaces/pages";
 import { ImageAlignment } from "studio/schemas/fields/media";
 
 const commonRichText: PortableTextBlock[] = [
@@ -43,11 +43,11 @@ const commonLink = {
   },
 };
 
-const createArticleSection = (
+const createArticle = (
   imageAlignment: ImageAlignment,
   includeLink: boolean,
   tag?: string,
-): ArticleSection => ({
+): ArticleObject => ({
   _key: "286f87152fce",
   _type: "article",
   basicTitle: "AI Carbon Accounting",
@@ -63,19 +63,16 @@ const createArticleSection = (
   ...(includeLink ? { link: commonLink } : {}),
 });
 
-export const extendedArticleLargeLeftMock = createArticleSection(
+export const extendedArticleLargeLeftMock = createArticle(
   ImageAlignment.Left,
   true,
   "Measure",
 );
-export const extendedArticleLargeRightMock = createArticleSection(
+export const extendedArticleLargeRightMock = createArticle(
   ImageAlignment.Right,
   true,
   "Measure",
 );
 
-export const articleLeftMock = createArticleSection(ImageAlignment.Left, false);
-export const articleRightMock = createArticleSection(
-  ImageAlignment.Right,
-  false,
-);
+export const articleLeftMock = createArticle(ImageAlignment.Left, false);
+export const articleRightMock = createArticle(ImageAlignment.Right, false);

src/components/sections/callToAction/CallToAction.tsx

@@ -1,11 +1,11 @@
 import LinkButton from "src/components/linkButton/LinkButton";
 import Text from "src/components/text/Text";
-import { CallToActionSection } from "studio/lib/interfaces/pages";
+import { CallToActionObject } from "studio/lib/interfaces/pages";
 
 import styles from "./callToAction.module.css";
 
 interface CallToActionProps {
-  callToAction: CallToActionSection;
+  callToAction: CallToActionObject;
 }
 
 const CallToAction = ({ callToAction }: CallToActionProps) => {

src/components/sections/callToAction/CallToActionPreview.tsx

@@ -4,7 +4,7 @@ import { useQuery } from "@sanity/react-loader";
 import { Suspense } from "react";
 
 import { PreviewProps } from "src/types/preview";
-import { CallToActionSection, PageBuilder } from "studio/lib/interfaces/pages";
+import { CallToActionObject, PageBuilder } from "studio/lib/interfaces/pages";
 import { PAGE_QUERY } from "studio/lib/queries/page";
 
 import CallToAction from "./CallToAction";
@@ -19,19 +19,19 @@ export default function CallToActionPreview({
     { initial: initialData },
   );
 
-  const callToActionSection = newData
+  const callToAction = newData
     ? (newData.sections.find(
         (section, index) =>
           section._type === "ctaSection" && index === sectionIndex,
-      ) as CallToActionSection)
+      ) as CallToActionObject)
     : (initialData.data.sections.find(
         (section, index) =>
           section._type === "ctaSection" && index === sectionIndex,
-      ) as CallToActionSection);
+      ) as CallToActionObject);
 
   return (
     <Suspense>
-      <CallToAction callToAction={callToActionSection} />
+      <CallToAction callToAction={callToAction} />
     </Suspense>
   );
 }

src/components/sections/callout/Callout.tsx

@@ -2,12 +2,12 @@ import { PortableText, PortableTextReactComponents } from "@portabletext/react";
 
 import CustomLink from "src/components/link/CustomLink";
 import Text from "src/components/text/Text";
-import { CalloutSection } from "studio/lib/interfaces/pages";
+import { CalloutObject } from "studio/lib/interfaces/pages";
 
 import styles from "./callout.module.css";
 
 interface CalloutProps {
-  callout: CalloutSection;
+  callout: CalloutObject;
 }
 
 const myPortableTextComponents: Partial<PortableTextReactComponents> = {

src/components/sections/callout/CalloutPreview.tsx

@@ -4,7 +4,7 @@ import { useQuery } from "@sanity/react-loader";
 import { Suspense } from "react";
 
 import { PreviewProps } from "src/types/preview";
-import { CalloutSection, PageBuilder } from "studio/lib/interfaces/pages";
+import { CalloutObject, PageBuilder } from "studio/lib/interfaces/pages";
 import { PAGE_QUERY } from "studio/lib/queries/page";
 
 import Callout from "./Callout";
@@ -19,19 +19,19 @@ export default function CalloutPreview({
     { initial: initialData },
   );
 
-  const calloutSection = newData
+  const callout = newData
     ? (newData.sections.find(
         (section, index) =>
           section._type === "callout" && index === sectionIndex,
-      ) as CalloutSection)
+      ) as CalloutObject)
     : (initialData.data.sections.find(
         (section, index) =>
           section._type === "callout" && index === sectionIndex,
-      ) as CalloutSection);
+      ) as CalloutObject);
 
   return (
     <Suspense>
-      <Callout callout={calloutSection} />
+      <Callout callout={callout} />
     </Suspense>
   );
 }

src/components/sections/hero/Hero.stories.tsx

@@ -1,7 +1,7 @@
 import { Meta, StoryObj } from "@storybook/react";
 
 import { Hero } from "./Hero";
-import { mockHeroSection } from "./mockData";
+import { mockHero } from "./mockData";
 
 const meta: Meta<typeof Hero> = {
   title: "Components/Sections/Hero",
@@ -21,14 +21,14 @@ type Story = StoryObj<typeof Hero>;
 
 export const Landing: Story = {
   args: {
-    hero: mockHeroSection,
+    hero: mockHero,
     isLanding: true,
   },
 };
 
 export const Default: Story = {
   args: {
-    hero: mockHeroSection,
+    hero: mockHero,
     isLanding: false,
   },
 };

src/components/sections/hero/Hero.tsx

@@ -1,12 +1,12 @@
 import LinkButton from "src/components/linkButton/LinkButton";
 import Text from "src/components/text/Text";
 import { ILink } from "studio/lib/interfaces/navigation";
-import { HeroSection } from "studio/lib/interfaces/pages";
+import { HeroObject } from "studio/lib/interfaces/pages";
 
 import styles from "./hero.module.css";
 
 interface HeroProps {
-  hero: HeroSection;
+  hero: HeroObject;
   isLanding: boolean;
 }
 

src/components/sections/hero/HeroPreview.tsx

@@ -4,7 +4,7 @@ import { useQuery } from "@sanity/react-loader";
 import { Suspense } from "react";
 
 import { PreviewProps } from "src/types/preview";
-import { HeroSection, PageBuilder } from "studio/lib/interfaces/pages";
+import { HeroObject, PageBuilder } from "studio/lib/interfaces/pages";
 import { PAGE_QUERY } from "studio/lib/queries/page";
 
 import { Hero } from "./Hero";
@@ -24,17 +24,17 @@ export default function HeroPreview({
     { initial: initialData },
   );
 
-  const heroSection = newData
+  const heroObject = newData
     ? (newData.sections.find(
         (section, index) => section._type === "hero" && index === sectionIndex,
-      ) as HeroSection)
+      ) as HeroObject)
     : (initialData.data.sections.find(
         (section, index) => section._type === "hero" && index === sectionIndex,
-      ) as HeroSection);
+      ) as HeroObject);
 
   return (
     <Suspense>
-      <Hero hero={heroSection} isLanding={isLanding} />
+      <Hero hero={heroObject} isLanding={isLanding} />
     </Suspense>
   );
 }

src/components/sections/hero/mockData.ts

@@ -1,7 +1,7 @@
 import { LinkType } from "studio/lib/interfaces/navigation";
-import { HeroSection } from "studio/lib/interfaces/pages";
+import { HeroObject } from "studio/lib/interfaces/pages";
 
-export const mockHeroSection: HeroSection = {
+export const mockHero: HeroObject = {
   _key: "",
   _type: "hero",
   basicTitle: "Effortless Climate Action",