Skip to content

Commit a51ff50

Browse files
committed
fix: update organization store usage to improve type safety
1 parent 8f0c902 commit a51ff50

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

src/routes/(console)/organization-[organization]/header.svelte

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import { isTabSelected } from '$lib/helpers/load';
99
import { Cover } from '$lib/layout';
1010
import { daysLeftInTrial, getServiceLimit, plansInfo, readOnly } from '$lib/stores/billing';
11-
import { members, newMemberModal, organization } from '$lib/stores/organization';
11+
import { members, newMemberModal, type Organization } from '$lib/stores/organization';
1212
import {
1313
canSeeBilling,
1414
canSeeProjects,
@@ -21,16 +21,18 @@
2121
import { Badge, Icon, Layout, Tooltip, Typography } from '@appwrite.io/pink-svelte';
2222
2323
let areMembersLimited: boolean;
24-
$: organization.subscribe(() => {
24+
25+
$: {
2526
const limit = getServiceLimit('members') || Infinity;
2627
const isLimited = limit !== 0 && limit < Infinity;
2728
areMembersLimited =
2829
isCloud &&
2930
(($readOnly && !GRACE_PERIOD_OVERRIDE) || (isLimited && $members?.total >= limit));
30-
});
31+
}
3132
33+
$: organization = page.data.organization as Organization;
3234
$: avatars = $members.memberships?.map((m) => m.userName || m.userEmail) ?? [];
33-
$: organizationId = $organization?.$id ?? page.params.organization;
35+
$: organizationId = organization?.$id ?? page.params.organization;
3436
$: path = `${base}/organization-${organizationId}`;
3537
$: tabs = [
3638
{
@@ -75,26 +77,26 @@
7577
].filter((tab) => !tab.disabled);
7678
</script>
7779

78-
{#if $organization?.$id}
80+
{#if organization?.$id}
7981
<Cover>
8082
<svelte:fragment slot="header">
8183
<span class="u-flex u-cross-center u-gap-8 u-min-width-0">
8284
<Typography.Title color="--fgcolor-neutral-primary" size="xl" truncate>
83-
{$organization.name}
85+
{organization.name}
8486
</Typography.Title>
85-
{#if isCloud && $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION}
87+
{#if isCloud && organization?.billingPlan === BillingPlan.GITHUB_EDUCATION}
8688
<Badge variant="secondary" content="Education">
8789
<Icon icon={IconGithub} size="s" slot="start" />
8890
</Badge>
89-
{:else if isCloud && $organization?.billingPlan === BillingPlan.FREE}
91+
{:else if isCloud && organization?.billingPlan === BillingPlan.FREE}
9092
<Badge variant="secondary" content="Free"></Badge>
9193
{/if}
92-
{#if isCloud && $organization?.billingTrialStartDate && $daysLeftInTrial > 0 && $organization.billingPlan !== BillingPlan.FREE && $plansInfo.get($organization.billingPlan)?.trialDays}
94+
{#if isCloud && organization?.billingTrialStartDate && $daysLeftInTrial > 0 && organization.billingPlan !== BillingPlan.FREE && $plansInfo.get(organization.billingPlan)?.trialDays}
9395
<Tooltip>
9496
<Badge variant="secondary" content="Trial" />
9597
<svelte:fragment slot="tooltip">
9698
{`Your trial ends on ${toLocaleDate(
97-
$organization.billingStartDate
99+
organization.billingStartDate
98100
)}. ${$daysLeftInTrial} days remaining.`}
99101
</svelte:fragment>
100102
</Tooltip>

0 commit comments

Comments
 (0)