fix(organisation): disable delete button when active subscription exists#7809
Open
afsuyadi wants to merge 2 commits into
Open
fix(organisation): disable delete button when active subscription exists#7809afsuyadi wants to merge 2 commits into
afsuyadi wants to merge 2 commits into
Conversation
|
@afsuyadi is attempting to deploy a commit to the Flagsmith Team on Vercel. A member of the Team first needs to authorize it. |
This comment was marked as spam.
This comment was marked as spam.
Zaimwa9
requested changes
Jun 23, 2026
Zaimwa9
left a comment
Contributor
There was a problem hiding this comment.
Thanks for the contribution. We'll need to be more precise to not block free customers to delete their organization
Comment on lines
+56
to
+60
| disabled={ | ||
| isLoading || | ||
| (organisation.subscription.plan !== null && | ||
| organisation.subscription.cancellation_date === null) | ||
| } |
Contributor
There was a problem hiding this comment.
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
Contributor
Author
There was a problem hiding this comment.
I see. I just knew that planNames variable exists. Thanks for the additional info.
6ae43cd to
2093bbf
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Thanks for submitting a PR! Please check the boxes below:
docs/if required so people know about the feature.Changes
Contributes to #7700
DeleteOrganisation.tsx, the button Delete Organisation is disabled only whenisLoadingis true.DeleteOrganisationreceivesOrganisationdata, which hasSubscriptionproperty.Subscriptionitself accepts 2 properties;planandcancellation_date, for which we can use them as the guarding condition.plan !== nullandcancellation_date === null.How did you test this code?
planandcancellation_date.Before changes:
Screencast from 18-06-26 08:44:50.webm
Input for python shell:
Input for console.log:
Output of python shell:

Output of console.log:
Screencast from 18-06-26 09:11:24.webm