fix: revert index page component changes by seaerchin · Pull Request #1903 · opengovsg/isomer

seaerchin · 2026-03-19T09:18:16Z

Problem

Recent changes to the index page components introduced issues that need to be reverted:

PR refactor: centralize isExternalUrl check into ImageClient #1865: Centralized isExternalUrl check into ImageClient
PR feat(components): support contain image variant for child pages #1889: Added contain image variant support for child pages
PR refactor: update RowLayout styling to match InfoCards design #1891: Updated RowLayout styling to match InfoCards design

These changes caused regressions that require reverting to restore stable functionality.

Solution

This PR reverts three commits:

56229e26 - Revert "refactor: centralize isExternalUrl check into ImageClient (refactor: centralize isExternalUrl check into ImageClient #1865)"
3e003a35 - Revert "feat(components): support contain image variant for child pages (feat(components): support contain image variant for child pages #1889)"
30209a17 - Revert "refactor: update RowLayout styling to match InfoCards design (refactor: update RowLayout styling to match InfoCards design #1891)"

Breaking Changes

Yes - this PR contains breaking changes
No - this PR is backwards compatible

Bug Fixes:

Reverts ChildrenPages component back to previous implementation with local ChildpageImage component and original styling
Removes maxColumns and imageFit props that were added to ChildrenPages
Restores original BoxLayout and RowLayout styles
Moves ImageClient back from internal/ImageClient to complex/Image
Restores isExternalUrl usage directly in components rather than centralized in ImageClient

Before & After Screenshots

N/A - This is a revert to restore previous behavior

Tests

Existing tests should pass. Manual verification that index pages render correctly with:

Child page thumbnails
Row and box layouts
Fallback images when no thumbnail is set

New scripts:

None

New dependencies:

None

New dev dependencies:

None

…1891)" This reverts commit 30209a1.

…es (#1889)" This reverts commit 3e003a3.

)" This reverts commit 56229e2.

Copilot

Pull request overview

Reverts a set of recent Index page-related component refactors/features to restore prior rendering and styling behavior, including moving ImageClient back to complex/Image and undoing ChildrenPages contain/maxColumns support.

Changes:

Reverted ImageClient URL prefixing centralization; callers again construct prefixed src values using isExternalUrl + assetsBaseUrl.
Reverted ChildrenPages back to its previous implementation and styling; removed maxColumns and imageFit support and related Studio controls/stories.
Removed the shared imageFitSchema / IMAGE_FIT constants introduced for the contain variant.

Reviewed changes

Copilot reviewed 43 out of 43 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
packages/components/src/templates/next/layouts/IndexPage/IndexPage.stories.tsx	Removes IndexPage stories that exercised `imageFit="contain"` for ChildrenPages.
packages/components/src/templates/next/layouts/Collection/utils/processCollectionItems.ts	Reintroduces per-caller image URL prefixing for collection card images.
packages/components/src/templates/next/components/internal/Navbar/NavbarClient.tsx	Switches `ImageClient` import back to `complex/Image`.
packages/components/src/templates/next/components/internal/Navbar/Navbar.tsx	Reintroduces logo URL prefixing logic in the caller.
packages/components/src/templates/next/components/internal/ImageClient/index.ts	Removes internal `ImageClient` re-export (revert).
packages/components/src/templates/next/components/internal/ContentPageHeader/ContentPageHeader.tsx	Switches `ImageClient` import back to `complex/Image`.
packages/components/src/templates/next/components/internal/CollectionCard/CollectionCard.tsx	Switches `ImageClient` import back to `complex/Image`.
packages/components/src/templates/next/components/internal/BlogCard/BlogCard.tsx	Switches `ImageClient` import back to `complex/Image`.
packages/components/src/templates/next/components/complex/Video/LiteYouTubeEmbed.tsx	Switches `ImageClient` import path back to complex Image implementation.
packages/components/src/templates/next/components/complex/Video/LiteVimeoEmbed.tsx	Switches `ImageClient` import path back to complex Image implementation.
packages/components/src/templates/next/components/complex/LogoCloud/LogoCloud.tsx	Reintroduces caller-side logo URL transformation and adjusts mapping.
packages/components/src/templates/next/components/complex/Infopic/components/BlockInfopic.tsx	Switches `ImageClient` import back to complex Image implementation.
packages/components/src/templates/next/components/complex/InfoCards/components/InfoCardWithImage.tsx	Removes `isFallback` prop usage (revert of contain/fallback styling work).
packages/components/src/templates/next/components/complex/InfoCards/components/InfoCardWithFullImage.tsx	Removes `isFallback` prop usage (revert).
packages/components/src/templates/next/components/complex/InfoCards/components/InfoCardImage.tsx	Moves URL prefixing back into InfoCards image rendering and removes `isFallback` handling.
packages/components/src/templates/next/components/complex/InfoCards/common.ts	Reverts InfoCards shared styling (incl. title arrow styles and fallback variants).
packages/components/src/templates/next/components/complex/ImageGallery/ImageGalleryClient.tsx	Switches `ImageClient` import back to complex Image implementation.
packages/components/src/templates/next/components/complex/Image/index.ts	Re-exports `ImageClient` from complex Image module.
packages/components/src/templates/next/components/complex/Image/ImageClient.tsx	Reverts `ImageClient` to render `src` directly (no prefixing).
packages/components/src/templates/next/components/complex/Image/Image.tsx	Reintroduces caller-side URL prefixing for the Image component.
packages/components/src/templates/next/components/complex/Hero/HeroSearchbar/HeroSearchbar.tsx	Reintroduces caller-side background image URL prefixing.
packages/components/src/templates/next/components/complex/Hero/HeroLargeImage/ImageContainer.tsx	Removes passing `assetsBaseUrl` down; uses already-prefixed `imageSrc`.
packages/components/src/templates/next/components/complex/Hero/HeroLargeImage/HeroLargeImage.tsx	Reintroduces caller-side background image URL prefixing.
packages/components/src/templates/next/components/complex/Hero/HeroGradient.tsx	Reintroduces caller-side background image URL prefixing.
packages/components/src/templates/next/components/complex/Hero/HeroFloating.tsx	Reintroduces caller-side background image URL prefixing.
packages/components/src/templates/next/components/complex/Hero/HeroBlock.tsx	Reintroduces caller-side background image URL prefixing.
packages/components/src/templates/next/components/complex/Contentpic/Contentpic.tsx	Reintroduces caller-side content image URL prefixing.
packages/components/src/templates/next/components/complex/CollectionBlock/CollectionBlock.tsx	Reintroduces caller-side card image URL prefixing.
packages/components/src/templates/next/components/complex/ChildrenPages/ChildrenPages.tsx	Reverts ChildrenPages implementation/styling; removes `maxColumns`/`imageFit` support and restores local image handling.
packages/components/src/templates/next/components/complex/ChildrenPages/ChildrenPages.stories.tsx	Removes Stories that exercised `imageFit="contain"`.
packages/components/src/templates/next/components/complex/Blockquote/Blockquote.tsx	Reintroduces caller-side blockquote image URL prefixing.
packages/components/src/schemas/internal/index.ts	Stops exporting `imageFitSchema`.
packages/components/src/schemas/internal/imageFitSchema.ts	Removes internal ImageFit schema definitions (revert).
packages/components/src/interfaces/constants.ts	Removes `IMAGE_FIT` constant (revert).
packages/components/src/interfaces/complex/InfoCards.ts	Inlines ImageFit schema/constants and removes `isFallback` from props.
packages/components/src/interfaces/complex/ChildrenPages/ChildrenPages.ts	Removes `maxColumns` and `imageFit` fields from ChildrenPages schema.
apps/studio/tests/msw/handlers/page.ts	Updates MSW page fixture content for childrenpages block.
apps/studio/tests/msw/handlers/folder.ts	Removes MSW `listChildPages` handler.
apps/studio/src/stories/Page/EditPage/EditIndexPage.stories.tsx	Removes use of `folderHandlers.listChildPages` in the story.
apps/studio/src/features/editing-experience/components/form-builder/renderers/controls/index.ts	Removes export for `JsonFormsMaxColumnsControl`.
apps/studio/src/features/editing-experience/components/form-builder/renderers/controls/JsonFormsMaxColumnsControl.tsx	Deletes max-columns JSONForms control (revert).
apps/studio/src/features/editing-experience/components/form-builder/FormBuilder.tsx	Removes renderer registration for max-columns control.
apps/studio/src/constants/formBuilder.ts	Removes ranking constant for ChildrenPages columns control.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

apps/studio/tests/msw/handlers/page.ts

+                summary: false,
+                thumbnail: false,


apps/studio/tests/msw/handlers/folder.ts

@@ -23,16 +23,4 @@ export const folderHandlers = {
      })
    },
  },


packages/components/src/templates/next/components/complex/LogoCloud/LogoCloud.tsx

+  const images = baseImages.map(({ src, alt }) => {
+    const transformedSrc =
+      isExternalUrl(src) || (assetsBaseUrl === undefined && !!src)
+        ? src
+        : `${assetsBaseUrl}${src}`
+


This reverts commit 54a2e25.

* Revert "fix: revert index page component changes (#1903)" This reverts commit 54a2e25. * chore: remove unused

seaerchin added 3 commits March 19, 2026 17:16

Revert "refactor: update RowLayout styling to match InfoCards design (#…

cc4f1d2

…1891)" This reverts commit 30209a1.

Revert "feat(components): support contain image variant for child pag…

a415b6a

…es (#1889)" This reverts commit 3e003a3.

Revert "refactor: centralize isExternalUrl check into ImageClient (#1865

360ae89

)" This reverts commit 56229e2.

seaerchin requested a review from a team as a code owner March 19, 2026 09:18

Copilot AI review requested due to automatic review settings March 19, 2026 09:18

seaerchin temporarily deployed to staging March 19, 2026 09:18 — with GitHub Actions Inactive

dcshzj approved these changes Mar 19, 2026

View reviewed changes

seaerchin enabled auto-merge (squash) March 19, 2026 09:19

Copilot AI reviewed Mar 19, 2026

View reviewed changes

seaerchin merged commit 54a2e25 into main Mar 19, 2026
22 of 26 checks passed

seaerchin deleted the fix/revert-index-pages branch March 19, 2026 09:26

seaerchin added a commit that referenced this pull request Mar 23, 2026

Revert "fix: revert index page component changes (#1903)"

758fc1c

This reverts commit 54a2e25.

seaerchin mentioned this pull request Mar 23, 2026

chore: restore index page component changes #1918

Merged

2 tasks

seaerchin added a commit that referenced this pull request Mar 25, 2026

Revert "fix: revert index page component changes (#1903)"

6ca8f27

This reverts commit 54a2e25.

seaerchin added a commit that referenced this pull request Mar 25, 2026

chore: restore index page component changes (#1918)

dce3726

* Revert "fix: revert index page component changes (#1903)" This reverts commit 54a2e25. * chore: remove unused

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: revert index page component changes#1903

fix: revert index page component changes#1903
seaerchin merged 3 commits intomainfrom
fix/revert-index-pages

seaerchin commented Mar 19, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

@@ @@ -23,16 +23,4 @@ export const folderHandlers = { @@
                     })
                   },
                 },

Conversation

seaerchin commented Mar 19, 2026

Problem

Solution

Before & After Screenshots

Tests

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants