💸 Presenter has needlessly nested props

.github/workflows/get-people-profiles.js

@@ -36,12 +36,25 @@ const GetPeopleProfiles = async ( {
         presenterJson = existingPresenterFile.data;
       }
 
+      const remoteData = peopleMatter.data;
+
+      // this is required to flatten presenter object
+      if (!!presenterJson.presenter) {
+        presenterJson = flattenObject(presenterJson);
+      }
+
+      // this is required to flatten presenter object
+      if (!!remoteData.presenter) {
+        remoteData = flattenObject(remoteData);
+      }
+
+      // merge remote data with existing data giving preference to remote data
       presenterJson = {
         ...presenterJson,
-        ...peopleMatter.data,
+        ...remoteData,
       };
 
-      const personName = presenterJson.presenter?.name?.split(' ')?.join('-') ?? 'not-found';
+      const personName = presenterJson.name?.split(' ')?.join('-') ?? 'not-found';
       const profileImageRelativePath = `${peopleImagePath}/${personName}.jpg`;
       const peopleProfileImagePath = `${peopleDirectory}/${personName}/Images/${personName}-Profile.jpg`;
 
@@ -60,4 +73,18 @@ const GetPeopleProfiles = async ( {
   }
 }
 
+const flattenObject = (obj) => {
+  const flattened = {};
+
+  for (const [key, value] of Object.entries(obj)) {
+      if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+          Object.assign(flattened, flattenObject(value));
+      } else {
+          flattened[key] = value;
+      }
+  }
+
+  return flattened;
+};
+
 module.exports = GetPeopleProfiles;

app/live-steam-banner/liveStreamWidget.tsx

@@ -15,8 +15,8 @@ import Script from "next/script";
 import { useEffect, useState } from "react";
 import { TfiAngleDown, TfiAngleUp } from "react-icons/tfi";
 import { Tooltip } from "react-tooltip";
-import { LiveStreamProps } from "../../hooks/useLiveStreamProps";
 import { TinaMarkdown } from "tinacms/dist/rich-text";
+import { LiveStreamProps } from "../../hooks/useLiveStreamProps";
 
 type LiveStreamWidgetProps = {
   isLive?: boolean;
@@ -290,23 +290,21 @@ export const LiveStreamWidget = ({ isLive, event }: LiveStreamWidgetProps) => {
                       {!!presenterDetails.profileImg && (
                         <Image
                           src={presenterDetails.profileImg}
-                          alt={presenterDetails.presenter.name}
+                          alt={presenterDetails.name}
                           width={200}
                           height={200}
                         />
                       )}
                     </div>
                     <div className="col-span-5">
-                      <p className="mb-3 font-bold">
-                        {presenterDetails.presenter.name}
-                      </p>
+                      <p className="mb-3 font-bold">{presenterDetails.name}</p>
                       <TinaMarkdown content={presenterDetails.about} />
-                      {!!presenterDetails.presenter.peopleProfileURL && (
+                      {!!presenterDetails.peopleProfileURL && (
                         <CustomLink
                           className="float-right border-b-1 border-dotted border-gray-450 !no-underline"
-                          href={presenterDetails.presenter.peopleProfileURL}
+                          href={presenterDetails.peopleProfileURL}
                         >
-                          {`${presenterDetails.presenter.name}'s profile >`}
+                          {`${presenterDetails.name}'s profile >`}
                         </CustomLink>
                       )}
                     </div>

components/articles/articlesList.tsx

@@ -21,7 +21,7 @@ const ArticlesList = () => {
       url: `/articles/${filename}`,
       title,
       authorImage: author?.profileImg,
-      authorName: author?.presenter?.name,
+      authorName: author?.name,
       authorPosition: author?.position,
       body: description,
     };

components/liveStream/liveStreamWidget.tsx

@@ -9,6 +9,7 @@ import Script from "next/script";
 import { useEffect, useState } from "react";
 import { TfiAngleDown, TfiAngleUp } from "react-icons/tfi";
 import { Tooltip } from "react-tooltip";
+import { TinaMarkdown } from "tinacms/dist/rich-text";
 import layoutData, {
   default as globals,
 } from "../../content/global/index.json";
@@ -18,7 +19,6 @@ import { InlineJotForm } from "../blocks";
 import { CustomLink } from "../customLink";
 import { YouTubeEmbed } from "../embeds/youtubeEmbed";
 import { SocialIcons } from "../socialIcons/socialIcons";
-import { TinaMarkdown } from "tinacms/dist/rich-text";
 
 type LiveStreamWidgetProps = {
   isLive?: boolean;
@@ -291,23 +291,21 @@ export const LiveStreamWidget = ({ isLive, event }: LiveStreamWidgetProps) => {
                       {!!presenterDetails.profileImg && (
                         <Image
                           src={presenterDetails.profileImg}
-                          alt={presenterDetails.presenter.name}
+                          alt={presenterDetails.name}
                           width={200}
                           height={200}
                         />
                       )}
                     </div>
                     <div className="col-span-5">
-                      <p className="mb-3 font-bold">
-                        {presenterDetails.presenter.name}
-                      </p>
+                      <p className="mb-3 font-bold">{presenterDetails.name}</p>
                       <TinaMarkdown content={presenterDetails.about} />
-                      {!!presenterDetails.presenter.peopleProfileURL && (
+                      {!!presenterDetails.peopleProfileURL && (
                         <CustomLink
                           className="float-right border-b-1 border-dotted border-gray-450 !no-underline"
-                          href={presenterDetails.presenter.peopleProfileURL}
+                          href={presenterDetails.peopleProfileURL}
                         >
-                          {`${presenterDetails.presenter.name}'s profile >`}
+                          {`${presenterDetails.name}'s profile >`}
                         </CustomLink>
                       )}
                     </div>

components/training/presenterBlock.tsx

@@ -61,12 +61,12 @@ const PresenterCard = ({ presenter, schema, index }) => {
         className="not-prose flex flex-col items-center"
         data-tina-field={tinaField(
           schema[index].presenter,
-          presenterSchemaConstants.presenter.peopleProfileURL
+          presenterSchemaConstants.peopleProfileURL
         )}
       >
         <span className="size-32 overflow-hidden rounded-full">
           <Image
-            alt={`Picture of ${presenter?.presenter?.name ?? "Presenter"}`}
+            alt={`Picture of ${presenter?.name ?? "Presenter"}`}
             src={presenter?.profileImg ?? ""}
             height={120}
             width={120}
@@ -79,7 +79,7 @@ const PresenterCard = ({ presenter, schema, index }) => {
         className="mt-4 font-normal"
         data-tina-field={tinaField(
           schema[index].presenter?.presenter,
-          presenterSchemaConstants.presenter.name
+          presenterSchemaConstants.name
         )}
       >
         {presenter?.presenter?.name}

pages/articles/[filename].tsx

@@ -70,10 +70,10 @@ export default function ArticlesPage(
         {!!data.articles.author && (
           <Section className="mx-auto w-full max-w-9xl px-8">
             <ArticleAuthor
-              name={author?.presenter?.name}
+              name={author?.name}
               position={author?.position}
               image={author?.profileImg}
-              url={author?.presenter?.peopleProfileURL}
+              url={author?.peopleProfileURL}
             />
           </Section>
         )}

services/server/events.ts

@@ -1,6 +1,6 @@
+import { TinaMarkdownContent } from "tinacms/dist/rich-text";
 import { EventTrimmed } from "../../components/filter/events";
 import client from "../../tina/__generated__/client";
-import { TinaMarkdownContent } from "tinacms/dist/rich-text";
 
 /**
  * Querying TinaCMS event data for the next UG event
@@ -87,10 +87,8 @@ export interface EventInfo extends EventTrimmed {
     presenter?: {
       profileImg?: string;
       torsoImg?: string;
-      presenter?: {
-        name?: string;
-        peopleProfileURL?: string;
-      };
+      name?: string;
+      peopleProfileURL?: string;
       about?: TinaMarkdownContent;
       tip?: string;
     };

tina/collections/presenter.tsx

@@ -5,11 +5,8 @@ export const presenterSchemaConstants = {
   value: "presenter",
   profileImg: "profileImg",
   torsoImg: "torsoImg",
-  presenter: {
-    value: "presenter",
-    name: "name",
-    peopleProfileURL: "peopleProfileURL",
-  },
+  name: "name",
+  peopleProfileURL: "peopleProfileURL",
   about: "about",
   position: "position",
   skills: "skills",
@@ -39,21 +36,14 @@ export const presenterSchema: Collection = {
       uploadDir: () => "people",
     },
     {
-      type: "object",
-      name: presenterSchemaConstants.presenter.value,
-      label: "Presenter",
-      fields: [
-        {
-          type: "string",
-          label: "Full Name",
-          name: presenterSchemaConstants.presenter.name,
-        },
-        {
-          type: "string",
-          label: "People Profile URL",
-          name: presenterSchemaConstants.presenter.peopleProfileURL,
-        },
-      ],
+      type: "string",
+      label: "Full Name",
+      name: presenterSchemaConstants.name,
+    },
+    {
+      type: "string",
+      label: "People Profile URL",
+      name: presenterSchemaConstants.peopleProfileURL,
     },
     {
       type: "rich-text",