diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index 859a87529..d2a5517ae 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -68,7 +68,8 @@
width="250"
height="30"
frameborder="0"
- scrolling="no">
+ scrolling="no">
+
diff --git a/src/lib/layout/containerButton.svelte b/src/lib/layout/containerButton.svelte
new file mode 100644
index 000000000..48459fb81
--- /dev/null
+++ b/src/lib/layout/containerButton.svelte
@@ -0,0 +1,39 @@
+
+
+
+
+
diff --git a/src/lib/layout/containerHeader.svelte b/src/lib/layout/containerHeader.svelte
index 15177b854..86162aa8c 100644
--- a/src/lib/layout/containerHeader.svelte
+++ b/src/lib/layout/containerHeader.svelte
@@ -6,7 +6,6 @@
showUsageRatesModal,
checkForUsageFees
} from '$lib/stores/billing';
- import { tooltip } from '$lib/actions/tooltip';
import { Alert, DropList, Heading } from '$lib/components';
import { Pill } from '$lib/elements';
import { organization } from '$lib/stores/organization';
@@ -14,7 +13,7 @@
import { createEventDispatcher, onMount } from 'svelte';
import { wizard } from '$lib/stores/wizard';
import ChangeOrganizationTierCloud from '$routes/console/changeOrganizationTierCloud.svelte';
- import { Button } from '$lib/elements/forms';
+ import { ContainerButton } from '.';
export let isFlex = true;
export let title: string;
@@ -26,7 +25,7 @@
export let showAlert = true;
export let buttonText: string = null;
- export let buttonMethod: () => void = null;
+ export let buttonMethod: () => void | Promise = null;
export let buttonEvent: string = buttonText?.toLocaleLowerCase();
export let buttonDisabled = false;
@@ -120,19 +119,12 @@
{#if buttonText}
-
-
-
+
{/if}
diff --git a/src/lib/layout/index.ts b/src/lib/layout/index.ts
index 7b1c1ddc0..cf1bd6e4b 100644
--- a/src/lib/layout/index.ts
+++ b/src/lib/layout/index.ts
@@ -18,3 +18,4 @@ export { default as Progress } from './progress.svelte';
export { default as GridHeader } from './gridHeader.svelte';
export { default as ContainerHeader } from './containerHeader.svelte';
export { default as HeaderAlert } from './headerAlert.svelte';
+export { default as ContainerButton } from './containerButton.svelte';
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index 9c6d13e9b..3337dca45 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -127,8 +127,10 @@ export function checkForUsageFees(plan: Tier, id: PlanServices) {
}
export function isServiceLimited(serviceId: PlanServices, plan: Tier, total: number) {
+ if (!total) return false;
const limit = getServiceLimit(serviceId) || Infinity;
const isLimited = limit !== 0 && limit < Infinity;
const hasUsageFees = checkForUsageFees(plan, serviceId);
+ console.log(serviceId, plan, total, limit, isLimited, hasUsageFees);
return isLimited && total >= limit && !hasUsageFees;
}
diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index c1ebbcfc4..1a1fe9b23 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -476,8 +476,6 @@
afterUpdate(() => {
selectedHeaderAlert = headerAlert.get();
});
-
- $: console.log(selectedHeaderAlert);
diff --git a/src/routes/console/project-[project]/functions/+page.svelte b/src/routes/console/project-[project]/functions/+page.svelte
index 707ec3bf9..e3568f789 100644
--- a/src/routes/console/project-[project]/functions/+page.svelte
+++ b/src/routes/console/project-[project]/functions/+page.svelte
@@ -16,6 +16,9 @@
template as templateStore
} from '$lib/wizards/functions/store.js';
import { marketplace } from '$lib/stores/marketplace.js';
+ import { functionsList } from './store';
+ import { organization } from '$lib/stores/organization';
+ import { isServiceLimited } from '$lib/stores/billing';
export let data;
@@ -54,13 +57,17 @@
label: 'Create function',
callback: openWizard,
keys: ['c'],
- disabled: $wizard.show,
+ disabled:
+ $wizard.show ||
+ isServiceLimited('functions', $organization?.billingPlan, $functionsList?.total),
icon: 'plus',
group: 'functions'
}
]);
$updateCommandGroupRanks({ functions: 1000 });
+
+ $: console.log($functionsList);
diff --git a/src/routes/console/project-[project]/functions/store.ts b/src/routes/console/project-[project]/functions/store.ts
index 9093c22b4..3acf62136 100644
--- a/src/routes/console/project-[project]/functions/store.ts
+++ b/src/routes/console/project-[project]/functions/store.ts
@@ -16,4 +16,4 @@ export const baseRuntimesList = derived(runtimesList, async ($runtimesList) => {
return { runtimes: [...baseRuntimes.values()] };
});
-export const functionsList = derived(page, ($page) => $page.data?.projects as Models.FunctionList);
+export const functionsList = derived(page, ($page) => $page.data.functions 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 568f4b433..c1a0ba1f6 100644
--- a/src/routes/console/project-[project]/functions/templates/+page.svelte
+++ b/src/routes/console/project-[project]/functions/templates/+page.svelte
@@ -12,13 +12,13 @@
SvgIcon
} from '$lib/components';
import { Button, InputSearch } from '$lib/elements/forms';
- import { Container } from '$lib/layout';
+ import { Container, ContainerButton } 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';
+ import { functionsList } from '../store';
export let data;
@@ -227,12 +227,14 @@
View details
-
+ buttonType="secondary"
+ buttonMethod={() => connectTemplate(template)}
+ showIcon={false}
+ buttonText="Create function"
+ buttonEvent="create_function" />
diff --git a/src/routes/console/project-[project]/functions/templates/+page.ts b/src/routes/console/project-[project]/functions/templates/+page.ts
index b4ae67288..3ce6a8184 100644
--- a/src/routes/console/project-[project]/functions/templates/+page.ts
+++ b/src/routes/console/project-[project]/functions/templates/+page.ts
@@ -1,9 +1,12 @@
-import { CARD_LIMIT } from '$lib/constants';
+import { CARD_LIMIT, Dependencies } from '$lib/constants';
import { getPage, getSearch, getView, pageToOffset, View } from '$lib/helpers/load';
import { marketplace } from '$lib/stores/marketplace';
+import { sdk } from '$lib/stores/sdk';
import type { PageLoad } from './$types';
-export const load: PageLoad = async ({ url, route }) => {
+export const load: PageLoad = async ({ url, route, depends }) => {
+ depends(Dependencies.FUNCTIONS);
+
const limit = CARD_LIMIT;
const page = getPage(url);
const search = getSearch(url);
@@ -52,6 +55,7 @@ export const load: PageLoad = async ({ url, route }) => {
runtimes,
useCases,
sum: templates.length,
- templates: templates.splice(((page === 0 ? 1 : page) - 1) * limit, limit)
+ templates: templates.splice(((page === 0 ? 1 : page) - 1) * limit, limit),
+ functions: await sdk.forProject.functions.list()
};
};
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 4adb63394..ea6ddfc06 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
@@ -2,7 +2,7 @@
import { Alert, Card, Collapsible, Heading } from '$lib/components';
import { Pill } from '$lib/elements';
import { Button } from '$lib/elements/forms';
- import { Container } from '$lib/layout';
+ import { Container, ContainerButton } from '$lib/layout';
import { isSelfHosted } from '$lib/system';
import AppwriteLogoDark from '$lib/images/appwrite-logo-dark.svg';
import AppwriteLogoLight from '$lib/images/appwrite-logo-light.svg';
@@ -19,7 +19,7 @@
$: buttonDisabled = isServiceLimited(
'functions',
$organization?.billingPlan,
- $functionsList?.total ?? 0
+ $functionsList?.total
);
@@ -99,11 +99,14 @@
View source
-
+ buttonMethod={() => connectTemplate($template)}
+ showIcon={false}
+ buttonText="Create function"
+ buttonEvent="create_function" />
diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.ts b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.ts
index 7936cc751..0c7a6dec4 100644
--- a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.ts
+++ b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.ts
@@ -1,8 +1,13 @@
+import { Dependencies } from '$lib/constants';
import { marketplace } from '$lib/stores/marketplace';
+import { sdk } from '$lib/stores/sdk';
import type { PageLoad } from './$types';
-export const load: PageLoad = async ({ params }) => {
+export const load: PageLoad = async ({ params, depends }) => {
+ depends(Dependencies.FUNCTIONS);
+
return {
- template: marketplace.find((template) => template.id === params.template)
+ template: marketplace.find((template) => template.id === params.template),
+ functions: await sdk.forProject.functions.list()
};
};