Skip to content

Commit 1a34b0b

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix-add-payment-method
2 parents 093aecf + 882c8e7 commit 1a34b0b

File tree

3 files changed

+24
-8
lines changed

3 files changed

+24
-8
lines changed

src/lib/components/csvImportBox.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
migrations.migrations.forEach(updateOrAddItem);
155155
});
156156
157-
return sdk.forConsole.client.subscribe('console', (response) => {
157+
return sdk.forConsoleIn(page.params.region).client.subscribe('console', (response) => {
158158
if (!response.channels.includes(`projects.${getProjectId()}`)) return;
159159
if (response.events.includes('migrations.*')) {
160160
updateOrAddItem(response.payload as Payload);

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
PaginationWithLimit
1717
} from '$lib/components';
1818
import { goto } from '$app/navigation';
19-
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
19+
import { Submit, trackError, trackEvent, Click } from '$lib/actions/analytics';
2020
import { sdk } from '$lib/stores/sdk';
2121
import { loading } from '$routes/store';
2222
import { ID, Region, type Models } from '@appwrite.io/console';
2323
import { openImportWizard } from '../project-[region]-[project]/settings/migrations/(import)';
24-
import { billingProjectsLimitDate, readOnly } from '$lib/stores/billing';
24+
import { billingProjectsLimitDate, readOnly, upgradeURL } from '$lib/stores/billing';
2525
import { onMount, type ComponentType } from 'svelte';
2626
import { canWriteProjects } from '$lib/stores/roles';
2727
import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect';
@@ -184,6 +184,17 @@
184184
<Button secondary size="s" on:click={() => (showSelectProject = true)}>
185185
Manage projects
186186
</Button>
187+
<Button
188+
size="s"
189+
href={$upgradeURL}
190+
on:click={() => {
191+
trackEvent(Click.OrganizationClickUpgrade, {
192+
from: 'button',
193+
source: 'projects_archive_alert'
194+
});
195+
}}>
196+
Upgrade to Pro
197+
</Button>
187198
</svelte:fragment>
188199
</Alert.Inline>
189200
{/if}

src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@
55
import { Link } from '$lib/elements';
66
import type { Models } from '@appwrite.io/console';
77
8-
let { domain, retryVerification }: { domain: Models.Domain; retryVerification: () => void } =
9-
$props();
8+
let {
9+
domain,
10+
retryVerification
11+
}: {
12+
domain: Models.Domain;
13+
retryVerification: () => void;
14+
} = $props();
1015
11-
const isDomainVerified = domain.nameservers.toLowerCase() === 'appwrite';
16+
const isDomainVerified = $derived(domain.nameservers.toLowerCase() === 'appwrite');
1217
13-
const metrics = [
18+
const metrics = $derived([
1419
{
1520
value: isDomainVerified ? 'Verified' : 'Not verified',
1621
description: 'Status'
@@ -40,7 +45,7 @@
4045
value: domain?.renewalPrice || '-',
4146
description: 'Renewal price'
4247
}
43-
];
48+
]);
4449
</script>
4550

4651
<Layout.Grid gap="m" columnsL={6} columns={3} columnsS={2} columnsXXS={1}>

0 commit comments

Comments
 (0)