Skip to content

fix: limits for membership #681

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

Merged
christyjacob4 merged 3 commits into from
Dec 21, 2023
Merged

fix: limits for membership #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d2cf02
fix: plan limit tag shown for users, upgrade flow wrong step, upgrade…
ArmanNik Dec 21, 2023
a82c26f
fix: conditional chaining
ArmanNik Dec 21, 2023
abf8fe0
fix: suggestions
ArmanNik Dec 21, 2023
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
12 changes: 9 additions & 3 deletions src/lib/stores/billing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,18 +183,24 @@ export function checkForTrialEnding(org: Organization) {
}
}

export function checkForUsageLimit(org: Organization) {
export async function checkForUsageLimit(org: Organization) {
if (!org?.billingLimits) {
readOnly.set(false);
return;
}
const { bandwidth, documents, executions, storage, users } = org.billingLimits;
const { bandwidth, documents, executions, storage, users } = org?.billingLimits ?? {};
const members = await sdk.forConsole.teams.listMemberships(org.$id);
const plan = get(plansInfo).plans.find((plan) => plan.$id === org.billingPlan);
const membersOverflow =
members?.total > plan.members ? members.total - (plan.members || members.total) : 0;

if (
bandwidth >= 100 ||
documents >= 100 ||
executions >= 100 ||
storage >= 100 ||
users >= 100
users >= 100 ||
membersOverflow > 0
) {
readOnly.set(true);
} else readOnly.set(false);
Expand Down
2 changes: 1 addition & 1 deletion src/routes/console/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
calculateTrialDay(org);
checkForTrialEnding(org);
await paymentExpired(org);
checkForUsageLimit(org);
await checkForUsageLimit(org);
checkForMarkedForDeletion(org);
await checkPaymentAuthorizationRequired(org);
}
Expand Down
3 changes: 0 additions & 3 deletions src/routes/console/changeOrganizationTierCloud.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
wizard.hide();

trackEvent(Submit.OrganizationDowngrade, {
customId: !!$changeOrganizationTier.id,
plan: tierToPlan($changeOrganizationTier.billingPlan)?.name
});
} catch (e) {
Expand Down Expand Up @@ -144,7 +143,6 @@
});
}
trackEvent($isUpgrade ? Submit.OrganizationUpgrade : Submit.OrganizationDowngrade, {
customId: !!$changeOrganizationTier.id,
plan: tierToPlan($changeOrganizationTier.billingPlan)?.name
});
wizard.hide();
Expand All @@ -164,7 +162,6 @@

onDestroy(() => {
$changeOrganizationTier = {
id: null,
billingPlan: 'tier-1',
paymentMethodId: null,
collaborators: [],
Expand Down
11 changes: 6 additions & 5 deletions src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,12 @@
members: members.total > plan.members ? members.total - (plan.members || Infinity) : 0
};
if (
$changeOrganizationTier.limitOverflow.bandwidth > 0 ||
$changeOrganizationTier.limitOverflow.storage > 0 ||
$changeOrganizationTier.limitOverflow.users > 0 ||
$changeOrganizationTier.limitOverflow.executions > 0 ||
$changeOrganizationTier.limitOverflow.members > 0
($changeOrganizationTier.limitOverflow.bandwidth > 0 ||
$changeOrganizationTier.limitOverflow.storage > 0 ||
$changeOrganizationTier.limitOverflow.users > 0 ||
$changeOrganizationTier.limitOverflow.executions > 0 ||
$changeOrganizationTier.limitOverflow.members > 0) &&
$changeOrganizationTier.billingPlan === 'tier-0'
) {
$changeOrganizationTier.isOverLimit = true;
$changeTierSteps = updateStepStatus($changeTierSteps, 5, false);
Expand Down
4 changes: 0 additions & 4 deletions src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<script lang="ts">
import { Box, CreditCardBrandImage } from '$lib/components';
import { CouponInput } from '$lib/components/billing';
import { Pill } from '$lib/elements';
import { FormList, InputTextarea } from '$lib/elements/forms';
import { toLocaleDate } from '$lib/helpers/date';
import { WizardStep } from '$lib/layout';
Expand Down Expand Up @@ -72,9 +71,6 @@
<p class="body-text-1 u-bold">Organization name</p>
<div class="u-flex u-gap-8 u-cross-center u-margin-block-start-8">
<p class="text">{$organization.name}</p>
{#if $changeOrganizationTier?.id}
<Pill>{$changeOrganizationTier.id}</Pill>
{/if}
</div>

{#if $changeOrganizationTier.billingPlan !== 'tier-0'}
Expand Down
3 changes: 2 additions & 1 deletion src/routes/console/wizard/cloudOrganizationChangeTier/inviteMembers.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@
import { changeOrganizationTier } from './store';
import { sdk } from '$lib/stores/sdk';
import { user } from '$lib/stores/user';
import { organization } from '$lib/stores/organization';

const plan = $plansInfo.plans.find((p) => p.$id === $changeOrganizationTier.billingPlan);

let email: string;

onMount(async () => {
const members = await sdk.forConsole.teams.listMemberships($changeOrganizationTier.id);
const members = await sdk.forConsole.teams.listMemberships($organization.$id);
if (members.total) {
$changeOrganizationTier.collaborators = members.memberships
.map((m) => {
Expand Down
2 changes: 2 additions & 0 deletions src/routes/console/wizard/cloudOrganizationChangeTier/planExcess.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,14 @@
{#if currentTier === 'tier-0'}
<Button
text
external
href="https://appwrite.io/docs/advanced/platform/starter#reaching-resource-limits">
Learn more
</Button>
{:else if currentTier === 'tier-1'}
<Button
text
external
href="https://appwrite.io/docs/advanced/platform/pro#reaching-resource-limits">
Learn more
</Button>
Expand Down
2 changes: 0 additions & 2 deletions src/routes/console/wizard/cloudOrganizationChangeTier/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export const isUpgrade = writable<boolean>(false);
export const changeOrganizationFinalAction = writable<string>('Start trial');

export const changeOrganizationTier = writable<{
id?: string;
billingPlan: Tier;
paymentMethodId: string;
billingAddressId: string;
Expand All @@ -25,7 +24,6 @@ export const changeOrganizationTier = writable<{
feedbackMessage?: string;
couponCode?: string;
}>({
id: null,
billingPlan: 'tier-1',
paymentMethodId: null,
collaborators: [],
Expand Down