Skip to content

CIAB: Don’t allow site address changes #108565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WPprodigy wants to merge 2 commits into
base: trunk
Choose a base branch
from
+10 −2
Open

CIAB: Don’t allow site address changes #108565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
615f94c
Don’t allow site address changes for ciab sites
WPprodigy Feb 6, 2026
ec62a74
Hide actions column if empty
WPprodigy Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion client/dashboard/domains/dataviews/actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,10 @@ export const useActions = ( { user, sites }: { user: User; sites?: Site[] } ) =>
isEligible: ( item: DomainSummary ) => {
const site = sitesByBlogId[ item.blog_id ];
return (
!! site && ! site?.is_wpcom_atomic && item.subtype.id === DomainSubtype.DEFAULT_ADDRESS
!! site &&
! site?.is_wpcom_atomic &&
! site?.is_garden &&
item.subtype.id === DomainSubtype.DEFAULT_ADDRESS
);
},
RenderModal: ( { items, closeModal = noop } ) => {
Expand Down
7 changes: 6 additions & 1 deletion client/dashboard/sites/domains/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ function SiteDomains() {
fields
);

// Hide actions column when no domain has eligible actions.
const hasEligibleActions = filteredData?.some( ( item ) =>
actions.some( ( action ) => action.isEligible === undefined || action.isEligible( item ) )
);
Comment on lines +64 to +66
Copy link
Member

@p-jackson p-jackson Feb 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix!

I think this should use siteDomains, not filteredData. Doing the check post-filtering means that the actions column will appear and disappear as the user types in the search field, or as the user clicks between pages. I think the presence of the column should be more stable, and so it should run over all the domain data.


return (
<PageLayout
header={ <PageHeader title={ __( 'Domains' ) } actions={ <AddDomainButton /> } /> }
Expand Down Expand Up @@ -94,7 +99,7 @@ function SiteDomains() {
onChangeView={ updateView }
onResetView={ resetView }
view={ view }
actions={ actions }
actions={ hasEligibleActions ? actions : [] }
search
paginationInfo={ paginationInfo }
getItemId={ getDomainId }
Expand Down
Loading