From 341c2af86045e9fc56a76df98c1af67ca0469233 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 22 Sep 2024 07:46:54 +0545 Subject: [PATCH] design fixes --- src/lib/stores/billing.ts | 27 ++++++++++ .../createMember.svelte | 27 +--------- .../members/+page.svelte | 50 +++++++++++++++++-- 3 files changed, 75 insertions(+), 29 deletions(-) diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts index 304781a49..ddbb3b487 100644 --- a/src/lib/stores/billing.ts +++ b/src/lib/stores/billing.ts @@ -36,12 +36,39 @@ import { canSeeBilling } from './roles'; export type Tier = 'tier-0' | 'tier-1' | 'tier-2'; +export const roles = [ + { + label: 'Owner', + value: 'owner' + }, + { + label: 'Developer', + value: 'developer' + }, + { + label: 'Editor', + value: 'editor' + }, + { + label: 'Analyst', + value: 'analyst' + }, + { + label: 'Billing', + value: 'billing' + } +]; + export const paymentMethods = derived(page, ($page) => $page.data.paymentMethods as PaymentList); export const addressList = derived(page, ($page) => $page.data.addressList as AddressesList); export const plansInfo = derived(page, ($page) => $page.data.plansInfo as PlansMap); export const daysLeftInTrial = writable(0); export const readOnly = writable(false); +export function getRoleLabel(role: string) { + return roles.find((r) => r.value === role)?.label ?? role; +} + export function tierToPlan(tier: Tier) { switch (tier) { case BillingPlan.FREE: diff --git a/src/routes/(console)/organization-[organization]/createMember.svelte b/src/routes/(console)/organization-[organization]/createMember.svelte index 32f4e6b79..6b782c7ff 100644 --- a/src/routes/(console)/organization-[organization]/createMember.svelte +++ b/src/routes/(console)/organization-[organization]/createMember.svelte @@ -11,7 +11,7 @@ import { BillingPlan, Dependencies } from '$lib/constants'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; import { isCloud } from '$lib/system'; - import { plansInfo } from '$lib/stores/billing'; + import { plansInfo, roles } from '$lib/stores/billing'; import { formatCurrency } from '$lib/helpers/numbers'; import InputSelect from '$lib/elements/forms/inputSelect.svelte'; @@ -25,30 +25,7 @@ let email: string, name: string, error: string, - role: string = 'owner'; - - const roles = [ - { - label: 'Owner', - value: 'owner' - }, - { - label: 'Developer', - value: 'developer' - }, - { - label: 'Editor', - value: 'editor' - }, - { - label: 'Analyst', - value: 'analyst' - }, - { - label: 'Billing', - value: 'billing' - } - ]; + role: string = 'developer'; async function create() { try { diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte index 55d25e42c..77e286add 100644 --- a/src/routes/(console)/organization-[organization]/members/+page.svelte +++ b/src/routes/(console)/organization-[organization]/members/+page.svelte @@ -1,7 +1,13 @@