From 5a7598df2aadca8c6f6b2d4148b03a885ef2e61b Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 21 Dec 2023 12:11:01 +0100 Subject: [PATCH] fix: upgrade flow --- .../cloudOrganizationChangeTier/choosePlan.svelte | 4 ++-- .../cloudOrganizationChangeTier/inviteMembers.svelte | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte index e1aea276e..64d01a71c 100644 --- a/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte +++ b/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte @@ -64,10 +64,10 @@ $changeOrganizationTier.limitOverflow.members > 0 ) { $changeOrganizationTier.isOverLimit = true; - $changeTierSteps = updateStepStatus($changeTierSteps, 4, false); + $changeTierSteps = updateStepStatus($changeTierSteps, 5, false); } else { $changeOrganizationTier.isOverLimit = false; - $changeTierSteps = updateStepStatus($changeTierSteps, 4, true); + $changeTierSteps = updateStepStatus($changeTierSteps, 5, true); } } diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/inviteMembers.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/inviteMembers.svelte index 61a5f1154..b1eee6a60 100644 --- a/src/routes/console/wizard/cloudOrganizationChangeTier/inviteMembers.svelte +++ b/src/routes/console/wizard/cloudOrganizationChangeTier/inviteMembers.svelte @@ -12,12 +12,24 @@ } from '$lib/elements/table'; import { WizardStep } from '$lib/layout'; import { plansInfo } from '$lib/stores/billing'; + import { onMount } from 'svelte'; import { changeOrganizationTier } from './store'; + import { sdk } from '$lib/stores/sdk'; + import { user } from '$lib/stores/user'; const plan = $plansInfo.plans.find((p) => p.$id === $changeOrganizationTier.billingPlan); let email: string; + onMount(async () => { + const members = await sdk.forConsole.teams.listMemberships($changeOrganizationTier.id); + if (members.total) { + $changeOrganizationTier.collaborators = members.memberships.map((m) => { + if (m.userEmail !== $user.email) return m.userEmail; + }); + } + }); + function addCollaborator() { if (!email) return; if ($changeOrganizationTier.collaborators.includes(email)) return;