feat(project): rename hooks

jwplayer · Nov 8, 2023 · 71dc1b8 · 71dc1b8
1 parent dab3804
commit 71dc1b8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/components/Player/Player.tsx b/src/components/Player/Player.tsx
@@ -59,7 +59,7 @@ const Player: React.FC<Props> = ({
   const startTimeRef = useRef(startTime);
   const setPlayer = useOttAnalytics(item, feedId);
 
-  const { data: adsData, isLoading: isAdsLoading } = useAds({ mediaId: item?.mediaid });
+  const { data: adsData = {}, isLoading: isAdsLoading } = useAds({ mediaId: item?.mediaid });
 
   const handleBeforePlay = useEventCallback(onBeforePlay);
   const handlePlay = useEventCallback(onPlay);
@@ -163,6 +163,7 @@ const Player: React.FC<Props> = ({
       const playerOptions: { [key: string]: unknown } = {
         advertising: {
           ...adsData,
+          // Beta feature
           showCountdown: true,
         },
         timeSlider: {

diff --git a/src/hooks/useAds.ts b/src/hooks/useAds.ts
@@ -5,7 +5,10 @@ import { useConfigStore } from '#src/stores/ConfigStore';
 
 const CACHE_TIME = 60 * 1000 * 20;
 
-const useAdSchedule = ({ adScheduleId, enabled }: { adScheduleId: string | null | undefined; enabled: boolean }) => {
+/**
+ * @deprecated Use {@link useAppBasedAds} instead.
+ */
+const useLegacyStandaloneAds = ({ adScheduleId, enabled }: { adScheduleId: string | null | undefined; enabled: boolean }) => {
   const { isLoading, data } = useQuery(
     ['ad-schedule', adScheduleId],
     async () => {
@@ -22,7 +25,7 @@ const useAdSchedule = ({ adScheduleId, enabled }: { adScheduleId: string | null
   };
 };
 
-const useMediaAds = ({ jsonUrl, mediaId, enabled }: { jsonUrl: string | null | undefined; mediaId: string; enabled: boolean }) => {
+const useAppBasedAds = ({ jsonUrl, mediaId, enabled }: { jsonUrl: string | null | undefined; mediaId: string; enabled: boolean }) => {
   const { isLoading, data } = useQuery(
     ['media-ads', mediaId],
     async () => {
@@ -44,13 +47,13 @@ export const useAds = ({ mediaId }: { mediaId: string }) => {
   const { adSchedule: adScheduleId, adScheduleUrls } = useConfigStore((s) => s.config);
 
   // adScheduleUrls.json prop exists when ad-config is attached to the App Config
-  const usePerMediaAds = !!adScheduleUrls?.json;
+  const useAppBasedFlow = !!adScheduleUrls?.json;
 
-  const { data: mediaAds, isLoading: isMediaAdsLoading } = useMediaAds({ jsonUrl: adScheduleUrls?.json, mediaId, enabled: usePerMediaAds });
-  const { data: adSchedule, isLoading: isAdScheduleLoading } = useAdSchedule({ adScheduleId, enabled: !usePerMediaAds });
+  const { data: mediaAds, isLoading: isMediaAdsLoading } = useAppBasedAds({ jsonUrl: adScheduleUrls?.json, mediaId, enabled: useAppBasedFlow });
+  const { data: adSchedule, isLoading: isAdScheduleLoading } = useLegacyStandaloneAds({ adScheduleId, enabled: !useAppBasedFlow });
 
   return {
-    isLoading: usePerMediaAds ? isMediaAdsLoading : isAdScheduleLoading,
-    data: usePerMediaAds ? mediaAds : adSchedule,
+    isLoading: useAppBasedFlow ? isMediaAdsLoading : isAdScheduleLoading,
+    data: useAppBasedFlow ? mediaAds : adSchedule,
   };
 };