From 0cf279b67cec829b0898308db79417aa77974de6 Mon Sep 17 00:00:00 2001 From: blakeganderson <85515364+blakeganderson@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:18:42 -0400 Subject: [PATCH 1/2] updated small promo to make the headline editable (#2248) --- .prettierrc | 4 ++-- blocks/small-promo-block/features/small-promo/default.jsx | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.prettierrc b/.prettierrc index f7b00e972..9d6346b28 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,5 @@ { "useTabs": true, "printWidth": 100, - experimentalTernaries: false, -} + "experimentalTernaries": false +} \ No newline at end of file diff --git a/blocks/small-promo-block/features/small-promo/default.jsx b/blocks/small-promo-block/features/small-promo/default.jsx index 7bc6e985d..bced08732 100644 --- a/blocks/small-promo-block/features/small-promo/default.jsx +++ b/blocks/small-promo-block/features/small-promo/default.jsx @@ -35,7 +35,7 @@ const SmallPromo = ({ customFields }) => { } = customFields; const { registerSuccessEvent } = useComponentContext(); const { arcSite, isAdmin } = useFusionContext(); - const { searchableField } = useEditableContent(); + const { editableContent, searchableField } = useEditableContent(); const shouldLazyLoad = lazyLoad && !isAdmin; const content = @@ -171,9 +171,12 @@ const SmallPromo = ({ customFields }) => { ) : null; + const editableItem = + content?.headlines ? editableContent(content, "headlines.basic") : {}; + const promoHeading = showHeadline && headline ? ( - + Date: Fri, 1 Nov 2024 16:26:32 -0400 Subject: [PATCH 2/2] Themes 2013 (#2247) * Add editable headline and description for medium-promo-block * Added testing for editable headline and description on medium-promo-block * Removed unneeded line in medium-promo-block test file * Updated test file queries for medium-promo-block * Updated test file queries for medium-promo-block --------- Co-authored-by: Gripholder --- .../features/medium-promo/default.jsx | 16 ++++-- .../features/medium-promo/default.test.jsx | 49 ++++++++++++++----- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/blocks/medium-promo-block/features/medium-promo/default.jsx b/blocks/medium-promo-block/features/medium-promo/default.jsx index 8607eed5c..9a69a4d8a 100644 --- a/blocks/medium-promo-block/features/medium-promo/default.jsx +++ b/blocks/medium-promo-block/features/medium-promo/default.jsx @@ -35,7 +35,7 @@ const BLOCK_CLASS_NAME = "b-medium-promo"; const MediumPromo = ({ customFields }) => { const { registerSuccessEvent } = useComponentContext(); const { arcSite, isAdmin } = useFusionContext(); - const { searchableField } = useEditableContent(); + const { editableContent, searchableField } = useEditableContent(); const { dateLocalization: { language, timeZone, dateTimeFormat } = { language: "en", @@ -163,7 +163,13 @@ const MediumPromo = ({ customFields }) => { const hasAuthors = showByline ? content?.credits?.by && content?.credits?.by?.length : null; const contentDescription = showDescription ? content?.description?.basic : null; + const editableDescription = content?.description + ? editableContent(content, "description.basic") + : {}; const contentHeading = showHeadline ? content?.headlines?.basic : null; + const editableHeading = content?.headlines?.basic + ? editableContent(content, "headlines.basic") + : {}; const contentUrl = content?.websites?.[arcSite]?.website_url; const contentDate = content?.display_date; @@ -237,7 +243,7 @@ const MediumPromo = ({ customFields }) => { ) : null} {contentHeading ? ( - + { ) : null} - {showDescription ? {contentDescription} : null} + {showDescription ? ( + + {contentDescription} + + ) : null} {hasAuthors || showDate ? ( diff --git a/blocks/medium-promo-block/features/medium-promo/default.test.jsx b/blocks/medium-promo-block/features/medium-promo/default.test.jsx index ad50adcd6..5a960560c 100644 --- a/blocks/medium-promo-block/features/medium-promo/default.test.jsx +++ b/blocks/medium-promo-block/features/medium-promo/default.test.jsx @@ -1,4 +1,5 @@ import React from "react"; +import "@testing-library/jest-dom"; import { render, screen } from "@testing-library/react"; import { useContent } from "fusion:content"; @@ -27,18 +28,18 @@ describe("the medium promo feature", () => { jest.clearAllMocks(); }); - it("should return null if lazyLoad on the server and not in the admin", () => { + it("should not render if lazyLoad on the server and not in the admin", () => { const config = { lazyLoad: true, }; - const { container } = render(); - expect(container.firstChild).toBe(null); + render(); + expect(screen.queryByRole("article")).not.toBeInTheDocument(); }); - it("should return null if none of the show... flags are true", () => { + it("should not render if none of the show... flags are true", () => { const config = {}; - const { container } = render(); - expect(container.firstChild).toBeNull(); + render(); + expect(screen.queryByRole("article")).not.toBeInTheDocument(); }); it("should display a headline if showHeadline is true", () => { @@ -47,7 +48,27 @@ describe("the medium promo feature", () => { }; render(); - expect(screen.queryByRole("heading", { name: config.headline })).not.toBeNull(); + expect(screen.getByRole("heading", { name: mockData.headlines.basic })).not.toBeNull(); + }); + + it("should headline be an editable field", () => { + const config = { + showHeadline: true, + }; + render(); + + expect(screen.queryByRole("heading", { name: mockData.headlines.basic })).toHaveAttribute( + "contenteditable", + ); + }); + + it("should description be an editable field", () => { + const config = { + showDescription: true, + }; + render(); + + expect(screen.queryByText(mockData.description.basic)).toHaveAttribute("contenteditable"); }); it("should display an image if showImage is true", () => { @@ -57,7 +78,7 @@ describe("the medium promo feature", () => { showImage: true, }; render(); - expect(screen.queryByRole("img", { name: config.headline })).not.toBeNull(); + expect(screen.getByRole("img", { name: config.headline })).not.toBeNull(); }); it("should make a blank call to the signing-service if the image is from PhotoCenter and has an Auth value", () => { @@ -108,7 +129,7 @@ describe("the medium promo feature", () => { showImage: true, }; render(); - expect(screen.queryByRole("img", { name: config.headline })).not.toBeNull(); + expect(screen.getByRole("img", { name: config.headline })).not.toBeNull(); }); it("should display a description if showDescription is true", () => { @@ -117,7 +138,7 @@ describe("the medium promo feature", () => { }; render(); expect( - screen.queryByText("Why does August seem hotter? Maybe it comes from weariness."), + screen.getByText("Why does August seem hotter? Maybe it comes from weariness."), ).not.toBeNull(); }); @@ -125,9 +146,11 @@ describe("the medium promo feature", () => { const config = { showByline: true, }; - const { getByText } = render(); + render(); expect( - getByText("global.by-text Example Author1, Example Author2, global.and-text Example Author3"), + screen.getByText( + "global.by-text Example Author1, Example Author2, global.and-text Example Author3", + ), ).not.toBeNull(); }); @@ -136,6 +159,6 @@ describe("the medium promo feature", () => { showDate: true, }; render(); - expect(screen.queryByText("January 30, 2020", { exact: false })).not.toBeNull(); + expect(screen.getByText("January 30, 2020", { exact: false })).not.toBeNull(); }); });