Dashboard v2: Add the ability to delete a site #103764

arthur791004 · 2025-05-28T09:42:29Z

Proposed Changes

This PR implements the option to delete a site via the modal component SiteDeleteModal. The action is visible if the site is not a staging site.

The SiteDeleteModal has following states:

You're able to delete the site
The site has active purchases
The site is reverting to a simple site
P2 Hub
Trial site

Why are these changes being made?

Hosting Dashboard v2 implementation.

Testing Instructions

Head to /v2/sites/:siteSlug/settings
Ensure that the Delete Site action is available, and it works as described above.

Pre-merge Checklist

Has the general commit checklist been followed? (PCYsg-hS-p2)
Have you written new tests for your changes?
Have you tested the feature in Simple (P9HQHe-k8-p2), Atomic (P9HQHe-jW-p2), and self-hosted Jetpack sites (PCYsg-g6b-p2)?
Have you checked for TypeScript, React or other console errors?
Have you used memoizing on expensive computations? More info in Memoizing with create-selector and Using memoizing selectors and Our Approach to Data
Have we added the "[Status] String Freeze" label as soon as any new strings were ready for translation (p4TIVU-5Jq-p2)?
- For UI changes, have we tested the change in various languages (for example, ES, PT, FR, or DE)? The length of text and words vary significantly between languages.
For changes affecting Jetpack: Have we added the "[Status] Needs Privacy Updates" label if this pull request changes what data or activity we track or use (p4TIVU-aUh-p2)?

github-actions · 2025-05-28T09:42:42Z

Calypso Live (direct link)

	https://calypso.live?image=registry.a8c.com/calypso/app:build-146159

Jetpack Cloud live (direct link)

	https://calypso.live?image=registry.a8c.com/calypso/app:build-146159&env=jetpack

Automattic for Agencies live (direct link)

	https://calypso.live?image=registry.a8c.com/calypso/app:build-146159&env=a8c-for-agencies

matticbot · 2025-05-28T09:43:26Z

Here is how your PR affects size of JS and CSS bundles shipped to the user's browser:

App Entrypoints (~123 bytes added 📈 [gzipped])

name                    parsed_size           gzip_size
entry-dashboard-dotcom       +421 B  (+0.0%)     +123 B  (+0.0%)
entry-dashboard-a4a          +421 B  (+0.0%)     +123 B  (+0.0%)

Common code that is always downloaded and parsed every time the app is loaded, no matter which route is used.

Sections (~220 bytes added 📈 [gzipped])

name           parsed_size           gzip_size
site-settings       +421 B  (+0.0%)     +111 B  (+0.0%)
hosting             +421 B  (+0.0%)     +109 B  (+0.0%)

Sections contain code specific for a given set of routes. Is downloaded and parsed only when a particular route is navigated to.

Legend

What is parsed and gzip size?

Parsed Size: Uncompressed size of the JS and CSS files. This much code needs to be parsed and stored in memory.
Gzip Size: Compressed size of the JS and CSS files. This much data needs to be downloaded over network.

Generated by performance advisor bot at iscalypsofastyet.com.

matticbot · 2025-05-28T09:51:10Z

This PR modifies the release build for the following Calypso Apps:

For info about this notification, see here: PCYsg-OT6-p2

blaze-dashboard
help-center
odyssey-stats

To test WordPress.com changes, run install-plugin.sh $pluginSlug feat/dashboard-v2-delete-site on your sandbox.

fushar · 2025-05-28T14:00:37Z

client/dashboard/sites/settings/danger-zone.tsx

 export default function DangerZone( { site }: { site: Site } ) {
 	const canTransferSite = useCanTransferSite( { site } );

 	const actions = [
 		canTransferSite && <SiteTransferAction key="transfer-site" site={ site } />,
 		<SiteLeaveAction key="leave-site" site={ site } />,
+		showSiteDeleteAction( site ) && <SiteDeleteAction key="delete-site" site={ site } />,


Shouldn't it be canDeleteSite( site ) from site-delete-modal; why do we have two different checks 🤔

For the staging site, we don't show the "Delete site" on the Settings screen. Instead, you should go to the production site to manage your staging site. As a result, we need this to determine whether to show the action

fushar · 2025-05-28T14:01:22Z

client/dashboard/sites/site-delete-modal/index.tsx

+};
+
+const canDeleteSite = ( site: Site ) =>
+	( site.is_wpcom_atomic || ! site.jetpack ) && ! site.is_vip && ! site.options?.p2_hub_blog_id;


I know it's existing code but I wonder what || ! site.jetpack is doing here. Seems not used in other logic in dashboard v2...

I think it's self-hosted jetpack sites and we cannot delete those sites on our end.

StevenDufresne · 2025-05-29T00:22:48Z

client/dashboard/sites/site-delete-modal/index.tsx

+	};
+
+	return (
+		<Modal title={ __( 'Delete site' ) } size="medium" onRequestClose={ onClose }>


I didn't create new modals in #103723 because I thought maybe we could get transitions added to the modal, and we would have this multiple pop-up experience where the user has to watch it close and reopen. Maybe that's a conspiracy that I don't need to think about.

Done by 137245e.

taipeicoder

LGTM 👍

client/dashboard/data/index.ts

client/dashboard/sites/site-delete-modal/index.tsx

a8ci18n · 2025-05-29T13:22:47Z

This Pull Request is now available for translation here: https://translate.wordpress.com/deliverables/17524451

Some locales (Hebrew, Japanese) have been temporarily machine-translated due to translator availability. All other translations are usually ready within a few days. Untranslated and machine-translated strings will be sent for translation next Monday and are expected to be completed by the following Friday.

Thank you @arthur791004 for including a screenshot in the description! This is really helpful for our translators.

arthur791004 changed the title ~~Feat/dashboard v2 delete site~~ Dashboard v2: Add the ability to delete a site May 28, 2025

arthur791004 force-pushed the feat/dashboard-v2-delete-site branch from 12b2ca0 to 0c29ed3 Compare May 28, 2025 10:03

arthur791004 marked this pull request as ready for review May 28, 2025 10:52

arthur791004 requested review from youknowriad and a team as code owners May 28, 2025 10:52

matticbot added the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label May 28, 2025

arthur791004 self-assigned this May 28, 2025

fushar reviewed May 28, 2025

View reviewed changes

StevenDufresne reviewed May 29, 2025

View reviewed changes

taipeicoder approved these changes May 29, 2025

View reviewed changes

arthur791004 force-pushed the feat/dashboard-v2-delete-site branch 2 times, most recently from 137245e to 3f83570 Compare May 29, 2025 08:13

Base automatically changed from add/DOTCOM-13259-site-leave to trunk May 29, 2025 08:24

arthur791004 added 11 commits May 29, 2025 16:41

Dashboard v2: Implement Delete site action

0258cea

Display the warning if the site cannot be deleted

ab32312

Check the ability of the delete site

2de4526

Fix some errors

c4483d8

Update actions for sites that are reverting to simple

9b81f6f

Fix types

eb5d474

Apply text-wrap: pretty to the description of the notice component

5a78fee

Fix missing site options

4f5eb5c

Address feedback

49e5b43

Keep using the same modal component

dd92b8b

Update the button of Manage P2s

17dfb93

arthur791004 force-pushed the feat/dashboard-v2-delete-site branch from 3f83570 to 17dfb93 Compare May 29, 2025 08:41

Fix lint

c9af227

arthur791004 merged commit edbfa46 into trunk May 29, 2025
11 checks passed

arthur791004 deleted the feat/dashboard-v2-delete-site branch May 29, 2025 11:20

github-actions bot removed the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label May 29, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Dashboard v2: Add the ability to delete a site #103764

Dashboard v2: Add the ability to delete a site #103764

Uh oh!

arthur791004 commented May 28, 2025

Uh oh!

github-actions bot commented May 28, 2025 •

edited by matticbot

Loading

Uh oh!

matticbot commented May 28, 2025 •

edited

Loading

Uh oh!

matticbot commented May 28, 2025 •

edited

Loading

Uh oh!

fushar May 28, 2025

Uh oh!

arthur791004 May 29, 2025

Uh oh!

fushar May 28, 2025

Uh oh!

arthur791004 May 29, 2025 •

edited

Loading

Uh oh!

StevenDufresne May 29, 2025

Uh oh!

arthur791004 May 29, 2025

Uh oh!

taipeicoder left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

a8ci18n commented May 29, 2025

Uh oh!

Uh oh!

Dashboard v2: Add the ability to delete a site #103764

Dashboard v2: Add the ability to delete a site #103764

Uh oh!

Conversation

arthur791004 commented May 28, 2025

Proposed Changes

Why are these changes being made?

Testing Instructions

Pre-merge Checklist

Uh oh!

github-actions bot commented May 28, 2025 • edited by matticbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

matticbot commented May 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

matticbot commented May 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fushar May 28, 2025

Choose a reason for hiding this comment

Uh oh!

arthur791004 May 29, 2025

Choose a reason for hiding this comment

Uh oh!

fushar May 28, 2025

Choose a reason for hiding this comment

Uh oh!

arthur791004 May 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

StevenDufresne May 29, 2025

Choose a reason for hiding this comment

Uh oh!

arthur791004 May 29, 2025

Choose a reason for hiding this comment

Uh oh!

taipeicoder left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

a8ci18n commented May 29, 2025

Uh oh!

Uh oh!

github-actions bot commented May 28, 2025 •

edited by matticbot

Loading

matticbot commented May 28, 2025 •

edited

Loading

matticbot commented May 28, 2025 •

edited

Loading

arthur791004 May 29, 2025 •

edited

Loading