Skip to content

Commit cedfdbb

Browse files
Merge pull request #674 from appwrite/fix-logs-message-pro-users
fix: show upgrade cta only to free users
2 parents 97ecbb6 + 4996b49 commit cedfdbb

File tree

3 files changed

+16
-25
lines changed

3 files changed

+16
-25
lines changed

src/lib/layout/activity.svelte

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import { tierToPlan, type PlanServices } from '$lib/stores/billing';
2222
import { isCloud } from '$lib/system';
2323
import { organization } from '$lib/stores/organization';
24+
import { Button } from '$lib/elements/forms';
2425
2526
export let logs: Models.LogList;
2627
export let offset = 0;
@@ -50,8 +51,10 @@
5051
Logs are retained in rolling {hoursToDays(limit)} intervals with the
5152
{tierToPlan($organization.billingPlan).name}
5253
plan.
53-
<button class="link" type="button" on:click|preventDefault={upgradeMethod}
54-
>Upgrade</button> to increase your log retention for a longer period.
54+
{#if $organization?.billingPlan === 'tier-0'}
55+
<Button link on:click={upgradeMethod}>Upgrade</Button> to increase your log
56+
retention for a longer period.
57+
{/if}
5558
</p>
5659
</svelte:fragment>
5760
{#each logs.logs as log}

src/lib/layout/logs.svelte

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import { getServiceLimit, tierToPlan } from '$lib/stores/billing';
2020
import { organization } from '$lib/stores/organization';
2121
import { app } from '$lib/stores/app';
22+
import { Button } from '$lib/elements/forms';
2223
2324
let selectedRequest = 'parameters';
2425
let selectedResponse = 'logs';
@@ -310,13 +311,14 @@
310311
<Alert>
311312
Logs are retained in rolling {hoursToDays(limit)} intervals
312313
with the {tier} plan.
313-
<button
314-
class="link"
315-
type="button"
316-
on:click|preventDefault={() =>
317-
wizard.start(ChangeOrganizationTierCloud)}
318-
>Upgrade</button> to increase your log retention for
319-
a longer period.
314+
{#if $organization.billingPlan === 'tier-0'}
315+
<Button
316+
link
317+
on:click={() =>
318+
wizard.start(ChangeOrganizationTierCloud)}
319+
>Upgrade</Button> to increase your log retention
320+
for a longer period.
321+
{/if}
320322
</Alert>
321323
{/if}
322324
<Code withCopy noMargin code={execution.logs} language="sh" />

src/routes/console/project-[project]/functions/function-[function]/+page.svelte

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@
4040
import DeploymentCreatedBy from './deploymentCreatedBy.svelte';
4141
import DeploymentDomains from './deploymentDomains.svelte';
4242
import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system';
43-
import { readOnly, tierToPlan } from '$lib/stores/billing';
44-
import { hoursToDays } from '$lib/helpers/date';
45-
import { organization } from '$lib/stores/organization';
43+
import { readOnly } from '$lib/stores/billing';
4644
4745
export let data;
4846
@@ -215,19 +213,7 @@
215213
<TableCellHead width={80}>Size</TableCellHead>
216214
<TableCellHead width={40} />
217215
</TableHeader>
218-
<TableBody service="logs" total={isCloud ? Infinity : 0}>
219-
<svelte:fragment slot="limit" let:limit let:upgradeMethod>
220-
<p class="text">
221-
Logs are retained in rolling {hoursToDays(limit)} intervals with the
222-
{tierToPlan($organization.billingPlan).name}
223-
plan.
224-
<button
225-
class="link"
226-
type="button"
227-
on:click|preventDefault={upgradeMethod}>Upgrade</button> to increase
228-
your log retention for a longer period.
229-
</p>
230-
</svelte:fragment>
216+
<TableBody>
231217
{#each $deploymentList.deployments as deployment, index (deployment.$id)}
232218
{@const status = deployment.status}
233219
<TableRow>

0 commit comments

Comments
 (0)