Skip to content

fix(organisation): disable delete button when active subscription exists #7809

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
afsuyadi wants to merge 2 commits into
base: main
Choose a base branch
from
+7 −1
Open

fix(organisation): disable delete button when active subscription exists #7809

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2093bbf
fix(organisation): disable delete button when active subscription exists
afsuyadi Jun 18, 2026
ae1ed56
fix(organisation): modify condition based on code review
afsuyadi Jun 23, 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
8 changes: 7 additions & 1 deletion ...b/components/pages/organisation-settings/tabs/general-tab/sections/DeleteOrganisation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react'
import { useHistory } from 'react-router-dom'
import { planNames } from 'common/utils/utils'
import { Organisation } from 'common/types/responses'
import { useDeleteOrganisationWithToast } from 'components/pages/organisation-settings/hooks'
import ConfirmRemoveOrganisation from 'components/modals/ConfirmRemoveOrganisation'
Expand Down Expand Up @@ -53,7 +54,12 @@ export const DeleteOrganisation = ({
data-test='delete-org-btn'
onClick={handleDelete}
theme='danger'
disabled={isLoading}
disabled={
isLoading ||
(Utils.getPlanName(organisation.subscription?.plan ?? '') !==
planNames.free &&
!organisation.subscription?.cancellation_date)
}
Comment on lines +57 to +62

@Zaimwa9 Zaimwa9 Jun 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This would disable the button for all free accounts. We might want to use the planName directly, something like:
Utils.getPlanName(organisation.subscription?.plan ?? '') !== planNames.free && !organisation.subscription?.cancellation_date

@afsuyadi afsuyadi Jun 23, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I see. I just knew that planNames variable exists. Thanks for the additional info.

>
{isLoading ? 'Deleting...' : 'Delete Organisation'}
</Button>
Expand Down
Loading