From 8681e6104b85b7a620d08f4d4c26f84393b95ed3 Mon Sep 17 00:00:00 2001
From: Andrew Noblet <andrewbnoblet@gmail.com>
Date: Tue, 5 Mar 2024 11:59:23 -0500
Subject: [PATCH 1/3] feat: add custom buttons to the navigation bar

---
 .../ui-react/src/components/Header/Header.tsx | 15 ++++++++
 .../ui-react/src/containers/Layout/Layout.tsx | 36 +++++++++++++++++--
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/packages/ui-react/src/components/Header/Header.tsx b/packages/ui-react/src/components/Header/Header.tsx
index 3aedb2575..4a8ef537a 100644
--- a/packages/ui-react/src/components/Header/Header.tsx
+++ b/packages/ui-react/src/components/Header/Header.tsx
@@ -66,6 +66,15 @@ type Props = {
     selectProfile: ({ avatarUrl, id }: { avatarUrl: string; id: string }) => void;
     isSelectingProfile: boolean;
   };
+
+  rightSideItems?: CustomMenuItem[];
+};
+
+type CustomMenuItem = {
+  label: string;
+  url: string;
+  position?: 'before' | 'right' | 'after';
+  key: string;
 };
 
 const Header: React.FC<Props> = ({
@@ -97,6 +106,7 @@ const Header: React.FC<Props> = ({
   siteName,
   profilesData: { currentProfile, profiles, profilesEnabled, selectProfile, isSelectingProfile } = {},
   navItems = [],
+  rightSideItems,
 }) => {
   const { t } = useTranslation('menu');
   const [logoLoaded, setLogoLoaded] = useState(false);
@@ -236,6 +246,11 @@ const Header: React.FC<Props> = ({
           </div>
         )}
         <nav className={styles.nav}>{logoLoaded || !logoSrc ? renderNav() : null}</nav>
+        <div className={styles.customActions}>
+          {rightSideItems?.map((item) => (
+            <Button key={item.key} label={item.label} to={item.url} variant="text" />
+          ))}
+        </div>
         <div className={styles.actions}>
           {renderSearch()}
           {renderLanguageDropdown()}
diff --git a/packages/ui-react/src/containers/Layout/Layout.tsx b/packages/ui-react/src/containers/Layout/Layout.tsx
index f4bba8739..b609c9c8d 100644
--- a/packages/ui-react/src/containers/Layout/Layout.tsx
+++ b/packages/ui-react/src/containers/Layout/Layout.tsx
@@ -41,6 +41,23 @@ const Layout = () => {
   const isLoggedIn = !!useAccountStore(({ user }) => user);
   const favoritesEnabled = !!config.features?.favoritesList;
   const { menu, assets, siteName, description, features, styling, custom } = config;
+
+  const customItems = useMemo(() => {
+    if (!custom) return [];
+
+    return Object.keys(custom)
+      .filter((key) => key.startsWith('navItem'))
+      .map((key) => {
+        const item = JSON.parse(custom[key] as string);
+        item.key = Math.random().toString();
+        return item;
+      });
+  }, [custom]);
+
+  const beforeItems = customItems.filter((item) => item.position === 'before');
+  const rightItems = customItems.filter((item) => item.position === 'right');
+  const afterItems = customItems.filter((item) => !['before', 'right'].includes(item.position));
+
   const metaDescription = description || t('default_description');
   const { footerText: configFooterText } = styling || {};
   const footerText = configFooterText || unicodeToChar(env.APP_FOOTER_TEXT);
@@ -199,8 +216,12 @@ const Layout = () => {
             selectProfile: ({ avatarUrl, id }) => selectProfile.mutate({ id, avatarUrl }),
             isSelectingProfile: selectProfile.isLoading,
           }}
-          navItems={navItems}
-        />
+        >
+          <Button activeClassname={styles.headerButton} label={t('home')} to="/" variant="text" />
+          {menu.map((item) => (
+            <Button activeClassname={styles.headerButton} key={item.contentId} label={item.label} to={playlistURL(item.contentId)} variant="text" />
+          ))}
+        </Header>
         <main id="content" className={styles.main} tabIndex={-1}>
           <Outlet />
         </main>
@@ -211,12 +232,21 @@ const Layout = () => {
           <li>
             <MenuButton label={t('home')} to="/" />
           </li>
-          {menu.map((item) => (
+          {beforeItems.map((item) => (
+          <MenuButton key={item.key} label={item.label} to={item.url} tabIndex={sideBarOpen ? 0 : -1} />
+        ))}
+        {menu.map((item) => (
             <li key={item.contentId}>
               <MenuButton label={item.label} to={playlistURL(item.contentId)} />
             </li>
           ))}
+        {afterItems.map((item) => (
+          <Button key={item.key} label={item.label} to={item.url} variant="text" />
+        ))}
         </ul>
+        {rightItems.map((item) => (
+          <MenuButton key={item.key} label={item.label} to={item.url} tabIndex={sideBarOpen ? 0 : -1} />
+        ))}
         {renderUserActions(sideBarOpen)}
       </Sidebar>
     </div>

From 4d4fdf6e6340ee34db395922526384a001032ecc Mon Sep 17 00:00:00 2001
From: Andrew Noblet <andrewbnoblet@gmail.com>
Date: Tue, 5 Mar 2024 23:53:16 -0500
Subject: [PATCH 2/3] feat: add custom buttons to the video details section

---
 .../ui-react/src/components/Button/Button.tsx |  1 +
 .../src/components/CTAButton/CTAButton.tsx    | 23 +++++++++++++
 .../components/VideoDetails/VideoDetails.tsx  |  6 ++++
 .../VideoDetailsInline/VideoDetailsInline.tsx |  6 +++-
 .../components/VideoLayout/VideoLayout.tsx    | 17 +++++++++-
 .../ui-react/src/hooks/useCustomCTAButtons.ts | 32 +++++++++++++++++++
 6 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 packages/ui-react/src/components/CTAButton/CTAButton.tsx
 create mode 100644 packages/ui-react/src/hooks/useCustomCTAButtons.ts

diff --git a/packages/ui-react/src/components/Button/Button.tsx b/packages/ui-react/src/components/Button/Button.tsx
index 0961aacc0..1792ada34 100644
--- a/packages/ui-react/src/components/Button/Button.tsx
+++ b/packages/ui-react/src/components/Button/Button.tsx
@@ -30,6 +30,7 @@ type Props = {
   id?: string;
   as?: 'button' | 'a';
   activeClassname?: string;
+  target?: string;
 } & React.AriaAttributes;
 
 const Button: React.FC<Props> = ({
diff --git a/packages/ui-react/src/components/CTAButton/CTAButton.tsx b/packages/ui-react/src/components/CTAButton/CTAButton.tsx
new file mode 100644
index 000000000..d99ce1f11
--- /dev/null
+++ b/packages/ui-react/src/components/CTAButton/CTAButton.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+
+import useBreakpoint, { Breakpoint } from '../../hooks/useBreakpoint';
+import Button from '../Button/Button';
+
+type Props = {
+  label: string;
+  url: string;
+};
+
+export type CTAItem = {
+  label: string;
+  url: string;
+  description?: string;
+};
+
+const CTAButton = ({ label, url }: Props) => {
+  const breakpoint = useBreakpoint();
+
+  return <Button label={label} to={url} fullWidth={breakpoint < Breakpoint.md} target="_blank" />;
+};
+
+export default CTAButton;
diff --git a/packages/ui-react/src/components/VideoDetails/VideoDetails.tsx b/packages/ui-react/src/components/VideoDetails/VideoDetails.tsx
index 804e0f2a5..2c6fdd31c 100644
--- a/packages/ui-react/src/components/VideoDetails/VideoDetails.tsx
+++ b/packages/ui-react/src/components/VideoDetails/VideoDetails.tsx
@@ -19,6 +19,8 @@ type Props = {
   favoriteButton?: React.ReactNode;
   trailerButton?: React.ReactNode;
   children: React.ReactNode;
+  ctaButton?: React.ReactNode;
+  extraButtons?: React.ReactNode[];
 };
 
 const VideoDetails: React.VFC<Props> = ({
@@ -32,6 +34,7 @@ const VideoDetails: React.VFC<Props> = ({
   favoriteButton,
   trailerButton,
   children,
+  extraButtons = [],
 }) => {
   const breakpoint: Breakpoint = useBreakpoint();
   const isMobile = breakpoint === Breakpoint.xs;
@@ -56,6 +59,9 @@ const VideoDetails: React.VFC<Props> = ({
               {trailerButton}
               {favoriteButton}
               {shareButton}
+              {extraButtons.map((button, index) => (
+                <React.Fragment key={index}>{button}</React.Fragment>
+              ))}
             </div>
           </div>
         </div>
diff --git a/packages/ui-react/src/components/VideoDetailsInline/VideoDetailsInline.tsx b/packages/ui-react/src/components/VideoDetailsInline/VideoDetailsInline.tsx
index ba72bf94f..acddd32ea 100644
--- a/packages/ui-react/src/components/VideoDetailsInline/VideoDetailsInline.tsx
+++ b/packages/ui-react/src/components/VideoDetailsInline/VideoDetailsInline.tsx
@@ -14,9 +14,10 @@ type Props = {
   favoriteButton: React.ReactNode;
   trailerButton: React.ReactNode;
   live?: boolean;
+  extraButtons?: React.ReactNode[];
 };
 
-const VideoDetailsInline: React.FC<Props> = ({ title, description, primaryMetadata, shareButton, favoriteButton, trailerButton }) => {
+const VideoDetailsInline: React.FC<Props> = ({ title, description, primaryMetadata, shareButton, favoriteButton, trailerButton, extraButtons = [] }) => {
   const breakpoint: Breakpoint = useBreakpoint();
   const isMobile = breakpoint === Breakpoint.xs;
 
@@ -30,6 +31,9 @@ const VideoDetailsInline: React.FC<Props> = ({ title, description, primaryMetada
         {trailerButton}
         {favoriteButton}
         {shareButton}
+        {extraButtons.map((button, index) => (
+          <React.Fragment key={index}>{button}</React.Fragment>
+        ))}
       </div>
       <CollapsibleText text={description} className={styles.description} maxHeight={isMobile ? 60 : 'none'} />
     </div>
diff --git a/packages/ui-react/src/components/VideoLayout/VideoLayout.tsx b/packages/ui-react/src/components/VideoLayout/VideoLayout.tsx
index 5fe5b5f98..16ecf5146 100644
--- a/packages/ui-react/src/components/VideoLayout/VideoLayout.tsx
+++ b/packages/ui-react/src/components/VideoLayout/VideoLayout.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import type { Playlist, PlaylistItem } from '@jwp/ott-common/types/playlist';
 import type { AccessModel } from '@jwp/ott-common/types/config';
@@ -10,6 +10,8 @@ import Filter from '../Filter/Filter';
 import VideoDetails from '../VideoDetails/VideoDetails';
 import VideoDetailsInline from '../VideoDetailsInline/VideoDetailsInline';
 import VideoList from '../VideoList/VideoList';
+import useCustomCtaButtons from '../../hooks/useCustomCTAButtons';
+import CTAButton from '../CTAButton/CTAButton';
 
 import styles from './VideoLayout.module.scss';
 
@@ -161,6 +163,17 @@ const VideoLayout: React.FC<Props> = ({
     );
   };
 
+  const customCTAs = useCustomCtaButtons(player);
+
+  // Check and setup CTAs
+  const extraButtons: React.ReactNode[] = useMemo(() => {
+    return customCTAs.map((cta, index) => {
+      if (!cta) return undefined;
+
+      return <CTAButton key={index + cta.label} label={cta.label} url={cta.url} />;
+    });
+  }, [customCTAs]);
+
   if (inlineLayout) {
     return (
       <div className={styles.videoInlineLayout} data-testid={testId('inline-layout')}>
@@ -174,6 +187,7 @@ const VideoLayout: React.FC<Props> = ({
             shareButton={shareButton}
             favoriteButton={favoriteButton}
             trailerButton={trailerButton}
+            extraButtons={extraButtons}
           />
         </div>
         {renderRelatedVideos(isTablet)}
@@ -193,6 +207,7 @@ const VideoLayout: React.FC<Props> = ({
       shareButton={shareButton}
       primaryMetadata={primaryMetadata}
       secondaryMetadata={secondaryMetadata}
+      extraButtons={extraButtons}
     >
       {playlist && <div className={styles.relatedVideos}>{renderRelatedVideos(true)}</div>}
       {children}
diff --git a/packages/ui-react/src/hooks/useCustomCTAButtons.ts b/packages/ui-react/src/hooks/useCustomCTAButtons.ts
new file mode 100644
index 000000000..2e9a913b6
--- /dev/null
+++ b/packages/ui-react/src/hooks/useCustomCTAButtons.ts
@@ -0,0 +1,32 @@
+// React hook
+import { useMemo } from 'react';
+
+import type { CTAItem } from '../components/CTAButton/CTAButton';
+
+const useCustomCtaButtons = (player: any) => {
+  const itemData = player.props.seriesItem;
+
+  // Check and setup CTAs
+  const customItems = useMemo(() => {
+    const allowedKeys = ['cta_exam', 'cta_slides', 'cta_resource1', 'cta_resource2', 'cta_resource3'];
+    return allowedKeys.map((key) => {
+      if (itemData && !itemData[key]) {
+        return undefined;
+      }
+      if (itemData && itemData[key] && typeof itemData[key] === 'string') {
+        try {
+          const data = JSON.parse(itemData[key] as string) as CTAItem;
+          return data;
+        } catch (error: unknown) {
+          console.error(`Failed to parse custom item ${key}`);
+          console.error(error);
+          return undefined;
+        }
+      }
+    });
+  }, [itemData]);
+
+  return customItems;
+};
+
+export default useCustomCtaButtons;

From 596b281668b223702bc214080f726c1fd2f2a898 Mon Sep 17 00:00:00 2001
From: Andrew Noblet <andrewbnoblet@gmail.com>
Date: Wed, 6 Mar 2024 11:10:10 -0500
Subject: [PATCH 3/3] feat: updates

---
 packages/ui-react/src/components/Card/Card.tsx       |  4 ++--
 .../src/components/Header/Header.module.scss         |  7 +++++++
 .../components/VideoDetails/VideoDetails.module.scss | 12 ++++++++++++
 packages/ui-react/src/containers/Layout/Layout.tsx   |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/packages/ui-react/src/components/Card/Card.tsx b/packages/ui-react/src/components/Card/Card.tsx
index 1d9b7d497..0c5880846 100644
--- a/packages/ui-react/src/components/Card/Card.tsx
+++ b/packages/ui-react/src/components/Card/Card.tsx
@@ -50,7 +50,7 @@ function Card({
   url,
   tabIndex = 0,
 }: CardProps): JSX.Element {
-  const { title, duration, episodeNumber, seasonNumber, cardImage: image, mediaStatus, scheduledStart } = item;
+  const { title, duration, episodeNumber, seasonNumber, cardImage: image, mediaStatus, scheduledStart, series_label } = item;
   const {
     t,
     i18n: { language },
@@ -78,7 +78,7 @@ function Card({
     if (loading || disabled || !title) return null;
 
     if (isSeriesItem) {
-      return <div className={styles.tag}>{t('video:series')}</div>;
+      return <div className={styles.tag}>{(series_label as string) || t('video:series')}</div>;
     } else if (episodeNumber) {
       return <div className={styles.tag}>{formatSeriesMetaString(seasonNumber, episodeNumber)}</div>;
     } else if (duration) {
diff --git a/packages/ui-react/src/components/Header/Header.module.scss b/packages/ui-react/src/components/Header/Header.module.scss
index 18c5d00cc..27bfb89c8 100644
--- a/packages/ui-react/src/components/Header/Header.module.scss
+++ b/packages/ui-react/src/components/Header/Header.module.scss
@@ -255,3 +255,10 @@
     width: 80px;
   }
 }
+
+// Custom
+@include responsive.mobile-only() {
+  .customActions {
+    display: none;
+  }
+}
diff --git a/packages/ui-react/src/components/VideoDetails/VideoDetails.module.scss b/packages/ui-react/src/components/VideoDetails/VideoDetails.module.scss
index 4d406e36f..3c1ae1826 100644
--- a/packages/ui-react/src/components/VideoDetails/VideoDetails.module.scss
+++ b/packages/ui-react/src/components/VideoDetails/VideoDetails.module.scss
@@ -182,3 +182,15 @@
   border: 3px solid white;
   border-radius: 100%;
 }
+
+// Custom
+
+/* stylelint-disable no-duplicate-selectors */
+
+.buttonBar {
+  flex-wrap: wrap;
+
+  > a {
+    margin: 6px;
+  }
+}
diff --git a/packages/ui-react/src/containers/Layout/Layout.tsx b/packages/ui-react/src/containers/Layout/Layout.tsx
index b609c9c8d..4f70584e5 100644
--- a/packages/ui-react/src/containers/Layout/Layout.tsx
+++ b/packages/ui-react/src/containers/Layout/Layout.tsx
@@ -241,7 +241,7 @@ const Layout = () => {
             </li>
           ))}
         {afterItems.map((item) => (
-          <Button key={item.key} label={item.label} to={item.url} variant="text" />
+          <MenuButton key={item.key} label={item.label} to={item.url} tabIndex={sideBarOpen ? 0 : -1} />
         ))}
         </ul>
         {rightItems.map((item) => (