Skip to content

fix: show upgrade cta only to free users #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lohanidamodar merged 2 commits into from
Dec 20, 2023
Merged

fix: show upgrade cta only to free users #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
206c3ee
fix: show upgrade cta only to free users
ArmanNik Dec 20, 2023
4996b49
fix: remove warning in deployment page
ArmanNik Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/lib/layout/activity.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import { tierToPlan, type PlanServices } from '$lib/stores/billing';
import { isCloud } from '$lib/system';
import { organization } from '$lib/stores/organization';
import { Button } from '$lib/elements/forms';

export let logs: Models.LogList;
export let offset = 0;
Expand Down Expand Up @@ -50,8 +51,10 @@
Logs are retained in rolling {hoursToDays(limit)} intervals with the
{tierToPlan($organization.billingPlan).name}
plan.
<button class="link" type="button" on:click|preventDefault={upgradeMethod}
>Upgrade</button> to increase your log retention for a longer period.
{#if $organization?.billingPlan === 'tier-0'}
<Button link on:click={upgradeMethod}>Upgrade</Button> to increase your log
retention for a longer period.
{/if}
</p>
</svelte:fragment>
{#each logs.logs as log}
Expand Down
16 changes: 9 additions & 7 deletions src/lib/layout/logs.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import { getServiceLimit, tierToPlan } from '$lib/stores/billing';
import { organization } from '$lib/stores/organization';
import { app } from '$lib/stores/app';
import { Button } from '$lib/elements/forms';

let selectedRequest = 'parameters';
let selectedResponse = 'logs';
Expand Down Expand Up @@ -310,13 +311,14 @@
<Alert>
Logs are retained in rolling {hoursToDays(limit)} intervals
with the {tier} plan.
<button
class="link"
type="button"
on:click|preventDefault={() =>
wizard.start(ChangeOrganizationTierCloud)}
>Upgrade</button> to increase your log retention for
a longer period.
{#if $organization.billingPlan === 'tier-0'}
<Button
link
on:click={() =>
wizard.start(ChangeOrganizationTierCloud)}
>Upgrade</Button> to increase your log retention
for a longer period.
{/if}
</Alert>
{/if}
<Code withCopy noMargin code={execution.logs} language="sh" />
Expand Down
18 changes: 2 additions & 16 deletions src/routes/console/project-[project]/functions/function-[function]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@
import DeploymentCreatedBy from './deploymentCreatedBy.svelte';
import DeploymentDomains from './deploymentDomains.svelte';
import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system';
import { readOnly, tierToPlan } from '$lib/stores/billing';
import { hoursToDays } from '$lib/helpers/date';
import { organization } from '$lib/stores/organization';
import { readOnly } from '$lib/stores/billing';

export let data;

Expand Down Expand Up @@ -215,19 +213,7 @@
<TableCellHead width={80}>Size</TableCellHead>
<TableCellHead width={40} />
</TableHeader>
<TableBody service="logs" total={isCloud ? Infinity : 0}>
<svelte:fragment slot="limit" let:limit let:upgradeMethod>
<p class="text">
Logs are retained in rolling {hoursToDays(limit)} intervals with the
{tierToPlan($organization.billingPlan).name}
plan.
<button
class="link"
type="button"
on:click|preventDefault={upgradeMethod}>Upgrade</button> to increase
your log retention for a longer period.
</p>
</svelte:fragment>
<TableBody>
{#each $deploymentList.deployments as deployment, index (deployment.$id)}
{@const status = deployment.status}
<TableRow>
Expand Down