Skip to content

Commit

Permalink
fix: permission check for billing migration
Browse files Browse the repository at this point in the history
  • Loading branch information
kevcodez committed Sep 20, 2023
1 parent f2bcdd7 commit cf9a3f0
Showing 2 changed files with 4 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -32,15 +32,12 @@ const BillingSettings = () => {
: customerBalance

const orgBillingMigrationEnabled = useFlag('orgBillingMigration')
const canMigrateOrganization = useCheckPermissions(PermissionAction.UPDATE, 'organizations')
const selectedOrganization = useSelectedOrganization()
const { subscription_id } = selectedOrganization ?? {}

return (
<ScaffoldContainerLegacy>
{orgBillingMigrationEnabled && canMigrateOrganization && !subscription_id && (
<OrganizationBillingMigrationPanel />
)}
{orgBillingMigrationEnabled && !subscription_id && <OrganizationBillingMigrationPanel />}

<ProjectsSummary projects={projects} />

Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ const MigrateOrganizationBillingButton = observer(() => {
const organization = useSelectedOrganization()

const disableOrgBillingMigration = useFlag('disableOrgBillingMigration')
const canMigrateOrg = useCheckPermissions(PermissionAction.UPDATE, 'organizations')
const canMigrateOrg = useCheckPermissions(PermissionAction.BILLING_WRITE, 'stripe.subscriptions')

const [isOpen, setIsOpen] = useState(false)
const [tier, setTier] = useState('')
@@ -93,8 +93,6 @@ const MigrateOrganizationBillingButton = observer(() => {
}
}, [isOpen])

const canMigrateOrganization = useCheckPermissions(PermissionAction.UPDATE, 'organizations')

const selectedLimitedUsage = useMemo(
() => tier === 'PRO' && isSpendCapEnabled,
[tier, isSpendCapEnabled]
@@ -118,7 +116,7 @@ const MigrateOrganizationBillingButton = observer(() => {

const onConfirmMigrate = async () => {
if (!tier) return
if (!canMigrateOrganization) {
if (!canMigrateOrg) {
return ui.setNotification({
category: 'error',
message: 'You do not have the required permissions to migrate this organization',
@@ -136,7 +134,7 @@ const MigrateOrganizationBillingButton = observer(() => {
loading={!organization?.slug}
onClick={toggle}
type="primary"
disabled={!canMigrateOrg || disableOrgBillingMigration}
disabled={disableOrgBillingMigration}
>
Migrate organization
</Button>

0 comments on commit cf9a3f0

Please sign in to comment.