From 56dc4a6270433f4a935dff0635fba553c93ff2f9 Mon Sep 17 00:00:00 2001 From: "Jason R. Stevens, CFA" Date: Mon, 16 Oct 2023 22:45:14 -0500 Subject: [PATCH 1/5] :recyclce: :label: update creativeUri to creativeUrls in parity with Promo Dashboard --- src/lib/types.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/types.ts b/src/lib/types.ts index 9c0777f..7e6a7bc 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -29,6 +29,7 @@ export interface InputValues { adCallToAction?: string; buttonText?: string; creativeUri?: object[]; + creativeUrls?: string[]; isFlat?: boolean; } export interface InputConfig { From bcda4d293968cd4d6b48c842b1a56dac994082fb Mon Sep 17 00:00:00 2001 From: "Jason R. Stevens, CFA" Date: Mon, 16 Oct 2023 22:45:25 -0500 Subject: [PATCH 2/5] :recycle: update creativeUri to creativeUrls for creative input variable --- src/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.tsx b/src/index.tsx index 32b78fe..b4146f9 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -70,7 +70,7 @@ function PromoButton({ let [isSubmitted, setIsSubmitted] = useState(false); let [isSubmitting, setIsSubmitting] = useState(false); - let [fileImage, setFileImage] = useState(options?.inputValues?.creativeUri); + let [fileImage, setFileImage] = useState(options?.inputValues?.creativeUrls); let [imageUploadError, setImageUploadError] = useState(false); let [targetLinkError, setTargetLinkError] = useState(false); let [adTitle, setAdTitle] = useState(options?.inputValues?.adTitle); @@ -140,7 +140,7 @@ function PromoButton({ content.setPromoData({ target: data.target_link, budget: data.budget, - creativeUri: fileImage, + creativeUrls: fileImage, adTitle: data.asset_title, buttonText: data.buttonText, adCallToAction: data.callToAction, From 2b3ad14c808cbd23b774d43c5bf06c1bb9d39290 Mon Sep 17 00:00:00 2001 From: "Jason R. Stevens, CFA" Date: Mon, 16 Oct 2023 23:18:10 -0500 Subject: [PATCH 3/5] :recycle: remove fileImage input props --- src/components/AdDisplay/AdDisplay.tsx | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/components/AdDisplay/AdDisplay.tsx b/src/components/AdDisplay/AdDisplay.tsx index ce3d36c..5524dee 100644 --- a/src/components/AdDisplay/AdDisplay.tsx +++ b/src/components/AdDisplay/AdDisplay.tsx @@ -75,15 +75,11 @@ function Ad({ function AdContainer({ secure_url, index, - fileImage, - setFileImage, scale, children, }: { secure_url: string; index: number; - fileImage: object[] | undefined; - setFileImage: any; scale: number | undefined; children: React.ReactNode; }) { @@ -113,9 +109,7 @@ function AdContainer({ } function Ads({ - fileImage, imageMedia, - setFileImage, scale, adTitle, adCopy, @@ -123,9 +117,7 @@ function Ads({ callToAction, buttonText, }: { - fileImage: object[] | undefined; imageMedia: { secure_url: string; mediaUrlType: string }[]; - setFileImage: any; scale: number | undefined; adTitle?: string | undefined; adCopy?: string | undefined; @@ -134,9 +126,7 @@ function Ads({ buttonText?: string | undefined; }) { const ads = getAds( - fileImage, imageMedia, - setFileImage, scale, adTitle, adCopy, @@ -154,9 +144,7 @@ function Ads({ ); } export default function AdDisplay({ - fileImage, imageMedia, - setFileImage, scale, adTitle, adCopy, @@ -164,9 +152,7 @@ export default function AdDisplay({ callToAction, buttonText, }: { - fileImage: object[]; imageMedia: { secure_url: string; mediaUrlType: string }[]; - setFileImage: any; scale?: number | undefined; adTitle?: string | undefined; adCopy?: string | undefined; @@ -176,9 +162,7 @@ export default function AdDisplay({ }) { return ( Date: Mon, 16 Oct 2023 23:18:22 -0500 Subject: [PATCH 4/5] :recycle: refactor fileImage usage and limit input props where possible --- .../DefaultAdDisplay/DefaultAdDisplay.tsx | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/components/DefaultAdDisplay/DefaultAdDisplay.tsx b/src/components/DefaultAdDisplay/DefaultAdDisplay.tsx index 58097e7..480c5d1 100644 --- a/src/components/DefaultAdDisplay/DefaultAdDisplay.tsx +++ b/src/components/DefaultAdDisplay/DefaultAdDisplay.tsx @@ -6,8 +6,10 @@ interface MediaObject { mediaUrlType: string | null; } -const getMedia = (fileImage?: object[] | undefined): any => { - return typeof fileImage !== 'undefined' +const getMedia = (fileImage?: object[] | string[] | undefined): any => { + if (typeof fileImage === 'undefined') return fileImage; + if (typeof fileImage?.length === 'undefined') return fileImage; + return typeof fileImage[0] !== 'string' ? fileImage.map((media: any): MediaObject | undefined => { const secure_url: string | null = media?.secure_url || null; if (!secure_url) return undefined; @@ -16,11 +18,16 @@ const getMedia = (fileImage?: object[] | undefined): any => { mediaUrlType: detectMediaType(secure_url), }; }) - : fileImage; + : fileImage.map((url) => { + const secure_url: string = url as string; + return { + secure_url: secure_url, + mediaUrlType: detectMediaType(secure_url), + }; + }); }; export default function DefaultAdDisplay({ fileImage, - setFileImage, scale, adTitle, adCopy, @@ -28,8 +35,7 @@ export default function DefaultAdDisplay({ callToAction, buttonText, }: { - fileImage: object[] | undefined; - setFileImage: any; + fileImage: object[] | string[] | undefined; scale: number | undefined; adTitle?: string | undefined; adCopy?: string | undefined; @@ -44,9 +50,7 @@ export default function DefaultAdDisplay({ className={'' /*"promo-scale-65 sm:promo--translate-x-4 promo--w-full"*/} > Date: Mon, 16 Oct 2023 23:18:22 -0500 Subject: [PATCH 5/5] :fire: remove setFileImage usage from AdDisplay component rendering --- src/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/index.tsx b/src/index.tsx index b4146f9..8caeda7 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -341,7 +341,6 @@ function PromoButton({