From f3f9345fd3deabfa629b3d77158f02b21486fbe5 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 8 Dec 2023 21:46:34 +0100 Subject: [PATCH] fix: function creation button is created --- src/lib/layout/containerHeader.svelte | 18 +-------------- src/lib/stores/billing.ts | 23 +++++++++++++++++++ .../project-[project]/functions/store.ts | 2 ++ .../functions/templates/+page.svelte | 14 ++++++++++- .../template-[template]/+page.svelte | 11 ++++++++- 5 files changed, 49 insertions(+), 19 deletions(-) diff --git a/src/lib/layout/containerHeader.svelte b/src/lib/layout/containerHeader.svelte index 3ca83f26b..15177b854 100644 --- a/src/lib/layout/containerHeader.svelte +++ b/src/lib/layout/containerHeader.svelte @@ -4,7 +4,7 @@ getServiceLimit, type PlanServices, showUsageRatesModal, - type Tier + checkForUsageFees } from '$lib/stores/billing'; import { tooltip } from '$lib/actions/tooltip'; import { Alert, DropList, Heading } from '$lib/components'; @@ -47,22 +47,6 @@ onMount(() => { dispatch('data', { isButtonDisabled, limit, tier }); }); - - function checkForUsageFees(plan: Tier, id: PlanServices) { - if (plan === 'tier-1' || plan === 'tier-2') { - switch (id) { - case 'bandwidth': - case 'storage': - case 'users': - case 'executions': - case 'realtime': - return true; - - default: - return false; - } - } else return false; - } {#if isCloud && showAlert && total && limit !== 0 && total >= limit} diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts index 3dd4640e8..9c6d13e9b 100644 --- a/src/lib/stores/billing.ts +++ b/src/lib/stores/billing.ts @@ -109,3 +109,26 @@ export const tierScale: TierData = { }; export const showUsageRatesModal = writable(false); + +export function checkForUsageFees(plan: Tier, id: PlanServices) { + if (plan === 'tier-1' || plan === 'tier-2') { + switch (id) { + case 'bandwidth': + case 'storage': + case 'users': + case 'executions': + case 'realtime': + return true; + + default: + return false; + } + } else return false; +} + +export function isServiceLimited(serviceId: PlanServices, plan: Tier, total: number) { + const limit = getServiceLimit(serviceId) || Infinity; + const isLimited = limit !== 0 && limit < Infinity; + const hasUsageFees = checkForUsageFees(plan, serviceId); + return isLimited && total >= limit && !hasUsageFees; +} diff --git a/src/routes/console/project-[project]/functions/store.ts b/src/routes/console/project-[project]/functions/store.ts index 6f4824186..9093c22b4 100644 --- a/src/routes/console/project-[project]/functions/store.ts +++ b/src/routes/console/project-[project]/functions/store.ts @@ -15,3 +15,5 @@ export const baseRuntimesList = derived(runtimesList, async ($runtimesList) => { } return { runtimes: [...baseRuntimes.values()] }; }); + +export const functionsList = derived(page, ($page) => $page.data?.projects as Models.FunctionList); diff --git a/src/routes/console/project-[project]/functions/templates/+page.svelte b/src/routes/console/project-[project]/functions/templates/+page.svelte index 110cb04fb..568f4b433 100644 --- a/src/routes/console/project-[project]/functions/templates/+page.svelte +++ b/src/routes/console/project-[project]/functions/templates/+page.svelte @@ -14,8 +14,11 @@ import { Button, InputSearch } from '$lib/elements/forms'; import { Container } from '$lib/layout'; import { app } from '$lib/stores/app'; + import { isServiceLimited } from '$lib/stores/billing'; import type { Runtime } from '$lib/stores/marketplace.js'; + import { organization } from '$lib/stores/organization'; import { connectTemplate } from '$lib/wizards/functions/cover.svelte'; + import { functionsList } from '../store.js'; export let data; @@ -83,6 +86,12 @@ target.searchParams.delete('page'); goto(target.toString(), { keepFocus: true }); } + + $: buttonDisabled = isServiceLimited( + 'functions', + $organization?.billingPlan, + $functionsList?.total ?? 0 + ); @@ -218,7 +227,10 @@ View details - diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte index 15e43c994..4adb63394 100644 --- a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte +++ b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte @@ -10,8 +10,17 @@ import { consoleVariables } from '$routes/console/store'; import { template } from './store'; import { app } from '$lib/stores/app'; + import { isServiceLimited } from '$lib/stores/billing'; + import { organization } from '$lib/stores/organization'; + import { functionsList } from '../../store'; const isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true; + + $: buttonDisabled = isServiceLimited( + 'functions', + $organization?.billingPlan, + $functionsList?.total ?? 0 + ); @@ -91,7 +100,7 @@