diff --git a/blocks/results-list-block/features/results-list/default.jsx b/blocks/results-list-block/features/results-list/default.jsx index 4d98d7474f..9fad75baa3 100644 --- a/blocks/results-list-block/features/results-list/default.jsx +++ b/blocks/results-list-block/features/results-list/default.jsx @@ -28,10 +28,6 @@ const ResultsList = ({ customFields }) => { const configuredSize = parseInt(contentConfigValues?.size, 10) || parseInt(contentConfigValues?.feedSize, 10) || 10; - if (isServerSideLazy) { - // On Server - return null; - } return ( diff --git a/blocks/results-list-block/features/results-list/default.test.jsx b/blocks/results-list-block/features/results-list/default.test.jsx index e33b723392..10cd3e30a5 100644 --- a/blocks/results-list-block/features/results-list/default.test.jsx +++ b/blocks/results-list-block/features/results-list/default.test.jsx @@ -57,7 +57,7 @@ describe("Results List", () => { }; const { unmount } = render(); - expect(screen.queryByText("Results")).toBeInTheDocument(); + expect(screen.getByText("Results")).toBeInTheDocument(); unmount(); }); @@ -80,7 +80,7 @@ describe("Results List", () => { }; const { unmount } = render(); - expect(screen.queryByText("Results")).toBeInTheDocument(); + expect(screen.getByText("Results")).toBeInTheDocument(); unmount(); }); }); @@ -132,7 +132,7 @@ describe("configured values", () => { }; const { unmount } = render(); - expect(screen.queryByText(/"configuredOffset":0/i)).toBeInTheDocument(); + expect(screen.getByText(/"configuredOffset":0/i)).toBeInTheDocument(); unmount(); }); it("should default size to 10 if not configured", () => { @@ -145,7 +145,7 @@ describe("configured values", () => { }; const { unmount } = render(); - expect(screen.queryByText(/"configuredSize":10/i)).toBeInTheDocument(); + expect(screen.getByText(/"configuredSize":10/i)).toBeInTheDocument(); unmount(); }); }); @@ -161,7 +161,7 @@ describe("isServerSideLazy flag", () => { }; const { unmount } = render(); - expect(screen.queryByText(/"isServerSideLazy":false/i)).toBeInTheDocument(); + expect(screen.getByText(/"isServerSideLazy":false/i)).toBeInTheDocument(); unmount(); }); it("should be false if isAdmin is true", () => { @@ -181,7 +181,7 @@ describe("isServerSideLazy flag", () => { }; const { unmount } = render(); - expect(screen.queryByText(/"isServerSideLazy":false/i)).toBeInTheDocument(); + expect(screen.getByText(/"isServerSideLazy":false/i)).toBeInTheDocument(); unmount(); }); it("should be true if isServerSide is true, admin is false, and lazyload is false", () => { @@ -201,7 +201,7 @@ describe("isServerSideLazy flag", () => { }; const { unmount } = render(); - expect(screen.queryByText(/"isServerSideLazy":true/i)).toBeInTheDocument(); + expect(screen.getByText(/"isServerSideLazy":true/i)).toBeInTheDocument(); unmount(); }); }); diff --git a/blocks/results-list-block/features/results-list/results/index.jsx b/blocks/results-list-block/features/results-list/results/index.jsx index d977f19d5d..e7c7d33945 100644 --- a/blocks/results-list-block/features/results-list/results/index.jsx +++ b/blocks/results-list-block/features/results-list/results/index.jsx @@ -135,7 +135,7 @@ const Results = ({ }`, }); - const [resultList, alterResultList] = useReducer(reduceResultList, { content_elements: [] }); + const [resultList, alterResultList] = useReducer(reduceResultList, { content_elements: requestedResultList?.content_elements || [] }); useEffect(() => { if (requestedResultList) { diff --git a/blocks/results-list-block/features/results-list/results/index.test.jsx b/blocks/results-list-block/features/results-list/results/index.test.jsx index 0b30923ba8..713e72fa31 100644 --- a/blocks/results-list-block/features/results-list/results/index.test.jsx +++ b/blocks/results-list-block/features/results-list/results/index.test.jsx @@ -139,9 +139,7 @@ describe("seeMore", () => { it("should trigger a state update", () => { useContent .mockReset() - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[0]) - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[1]); const { unmount } = render( @@ -168,7 +166,7 @@ describe("seeMore", () => { }); it("should not show for the last items", () => { - useContent.mockReset().mockReturnValueOnce({}).mockReturnValueOnce(mockLastItemContent[0]); + useContent.mockReset().mockReturnValueOnce(mockLastItemContent[0]); const { unmount } = render( { describe("focus", () => { it("should not be set on the very first item on the page", () => { - useContent.mockReset().mockReturnValueOnce({}).mockReturnValueOnce(mockContent[0]); + useContent.mockReset().mockReturnValueOnce(mockContent[0]); const { unmount } = render( { it("should be set on the first new item added", () => { useContent .mockReset() - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[0]) - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[1]); const { unmount } = render( @@ -237,9 +233,7 @@ describe("focus", () => { it("should not set focus if there is no link", () => { useContent .mockReset() - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[0]) - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[1]); const { unmount } = render( @@ -264,9 +258,7 @@ describe("story-feed-query service", () => { it("should call useContent with appropriate query parameters", () => { useContent .mockReset() - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[0]) - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[1]); const { unmount } = render( @@ -313,9 +305,7 @@ describe("content-api-collections service", () => { it("should call useContent with appropriate query parameters", () => { useContent .mockReset() - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[0]) - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[1]); const { unmount } = render( @@ -364,9 +354,7 @@ describe("story-feed-author service", () => { it("should call useContent with appropriate query parameters", () => { useContent .mockReset() - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[0]) - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[1]); const { unmount } = render( @@ -413,9 +401,7 @@ describe("story-feed-sections service", () => { it("should call useContent with appropriate query parameters", () => { useContent .mockReset() - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[0]) - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[1]); const { unmount } = render( @@ -506,9 +492,7 @@ describe("unknown service", () => { it("should call useContent with appropriate query parameters", () => { useContent .mockReset() - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[0]) - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[1]); const { unmount } = render( @@ -548,10 +532,8 @@ describe("lazy flags", () => { it("should return nothing if isServerSideLazy is true", () => { useContent .mockReset() - .mockReturnValueOnce({}) - .mockReturnValueOnce(mockContent[0]) - .mockReturnValueOnce({}) - .mockReturnValueOnce(mockContent[1]); + .mockReturnValueOnce(null) + .mockReturnValueOnce(null); const { unmount } = render( { it("should return even if the fallback image is not a /resource/ path", () => { useContent .mockReset() - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[0]) - .mockReturnValueOnce({}) .mockReturnValueOnce(mockContent[1]); const { unmount } = render(