Merge remote-tracking branch 'origin/qa' into feature/DR-4029/facet-filters

Author: sarangj

app/shuffle/page.tsx

@@ -1,3 +1,4 @@
+import ShufflePage from "@/src/components/pages/shufflePage/shufflePage";
 import { CollectionsApi } from "@/src/utils/apiClients/apiClients";
 import { Metadata } from "next";
 import { headers } from "next/headers";
@@ -13,5 +14,5 @@ export default async function Shuffle() {
   await headers();
 
   const url: string = await CollectionsApi.getRandomCollectionOrItem();
-  return redirect(url);
+  return <ShufflePage redirectPath={url} />;
 }

app/src/components/items/uv/universalViewer.tsx

@@ -288,7 +288,8 @@ const UniversalViewer: React.FC<UniversalViewerProps> = React.memo(
         />
       </>
     );
-  }
+  },
+  (prevProps, nextProps) => prevProps.manifestId === nextProps.manifestId
 );
 
 UniversalViewer.displayName = "UniversalViewer";

app/src/components/items/uv/universalViewerLazy.tsx

@@ -2,7 +2,7 @@
 
 import { ItemModel } from "../../../models/item";
 import React from "react";
-import { UniversalViewer } from "../uv/universalViewerLazy";
+import UniversalViewer from "../uv/universalViewer";
 import "universalviewer/dist/esm/index.css";
 import { PlyrPlayer } from "../plyr/dynamic";
 

app/src/components/items/viewer/viewer.tsx

@@ -0,0 +1,17 @@
+"use client";
+import { useEffect } from "react";
+import { useRouter } from "next/navigation";
+import { trackCTA } from "@/src/utils/ga4Utils";
+
+interface ShufflePageProps {
+  redirectPath: string;
+}
+
+export default function ShufflePage({ redirectPath }: ShufflePageProps) {
+  const router = useRouter();
+  useEffect(() => {
+    trackCTA("Shuffle", redirectPath, "Digital Collections Shuffle");
+    router.push(redirectPath);
+  });
+  return null;
+}

app/src/components/pages/shufflePage/shufflePage.tsx

@@ -9,7 +9,7 @@ const lanesData = {
           uuid: "90d41660-53a5-0130-2430-58d385a7b928",
           title: "Opportunity: journal of Negro life",
           url: "https://digitalcollections.nypl.org/collections/opportunity#/?tab=navigation",
-          imageID: "58864967",
+          imageID: "58886276",
         },
         {
           uuid: "66d899e0-b7b9-013c-626c-0242ac110002",
@@ -25,7 +25,7 @@ const lanesData = {
         },
         {
           uuid: "924921a0-3cd0-0136-c557-0af54bc5b55e",
-          title: "Reform Advocate",
+          title: "The Reform Advocate",
           url: "https://digitalcollections.nypl.org/collections/the-reform-advocate#/?tab=navigation",
           imageID: "57880025",
         },

app/src/data/lanesData.ts

@@ -58,6 +58,16 @@ export const trackAVProgress = (
   });
 };
 
+export const trackCTA = (text: string, url: string, type: string) => {
+  const dataLayer = window["dataLayer"] || [];
+  dataLayer.push({
+    event: "cta_click",
+    click_text: text,
+    click_url: url,
+    click_type: type,
+  });
+};
+
 export const trackSearchResults = (
   searchResultsLayout: "grid" | "list",
   filterNames: string[],

app/src/utils/ga4Utils.ts

@@ -86,7 +86,7 @@ export class DCHomepage {
 
     //collections
     this.recentlyDigitizedCollection = this.page.getByRole("link", {
-      name: "Reform Advocate",
+      name: "The Reform Advocate",
       exact: true,
     });
     this.farmSecurityAdministrationPhotographsCollection = this.page.locator(
@@ -96,7 +96,7 @@ export class DCHomepage {
     //collections' items total count
     //these locators are used to verify that the collections have items
     this.recentlyDigitizedCollectionItems = this.page.locator(
-      "#item-count-reform-advocate-3"
+      "#item-count-the-reform-advocate-3"
     );
     this.farmSecurityAdministrationPhotographsCollectionItems =
       this.page.locator(