From 615fe7ced1ea12d1c2a7f87811a312618a66ee2a Mon Sep 17 00:00:00 2001 From: Arman Date: Sun, 10 Dec 2023 20:54:35 +0100 Subject: [PATCH] fix: block assistan user and team creation on readOnly --- src/lib/layout/header.svelte | 14 ++++---- .../project-[project]/auth/+layout.svelte | 10 ++++-- .../project-[project]/auth/+page.svelte | 32 +++++++++++++------ .../console/project-[project]/auth/store.ts | 8 +++++ 4 files changed, 47 insertions(+), 17 deletions(-) create mode 100644 src/routes/console/project-[project]/auth/store.ts diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte index c79c88e2a..4b7308ae8 100644 --- a/src/lib/layout/header.svelte +++ b/src/lib/layout/header.svelte @@ -105,12 +105,14 @@ {/if} {#if !$page.url.pathname.includes('/console/account') && $readOnly} - ($showExcess = true)}> -
-
-
+
+ ($showExcess = true)}> +
+
+
+
{/if}
diff --git a/src/routes/console/project-[project]/auth/+layout.svelte b/src/routes/console/project-[project]/auth/+layout.svelte index 69c53375a..a8f0f3c9a 100644 --- a/src/routes/console/project-[project]/auth/+layout.svelte +++ b/src/routes/console/project-[project]/auth/+layout.svelte @@ -2,8 +2,11 @@ import { goto } from '$app/navigation'; import { page } from '$app/stores'; import { registerCommands, updateCommandGroupRanks } from '$lib/commandCenter'; + import { isServiceLimited, readOnly } from '$lib/stores/billing'; + import { organization } from '$lib/stores/organization'; import { project } from '../store'; import { showCreateUser } from './+page.svelte'; + import { userList } from './store'; import { showCreateTeam } from './teams/+page.svelte'; $: $registerCommands([ @@ -19,7 +22,9 @@ group: 'users', icon: 'plus', - rank: $page.url.pathname.endsWith('auth') ? 10 : 0 + rank: $page.url.pathname.endsWith('auth') ? 10 : 0, + disabled: + $readOnly || isServiceLimited('users', $organization.billingPlan, $userList.total) }, { label: 'Create team', @@ -33,7 +38,8 @@ group: 'teams', icon: 'plus', - rank: $page.url.pathname.endsWith('teams') ? 10 : 0 + rank: $page.url.pathname.endsWith('teams') ? 10 : 0, + disabled: $readOnly }, { label: 'Go to teams', diff --git a/src/routes/console/project-[project]/auth/+page.svelte b/src/routes/console/project-[project]/auth/+page.svelte index f01c9f08a..d0a0fda09 100644 --- a/src/routes/console/project-[project]/auth/+page.svelte +++ b/src/routes/console/project-[project]/auth/+page.svelte @@ -26,13 +26,14 @@ TableRowLink } from '$lib/elements/table'; import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date'; - import { Container } from '$lib/layout'; + import { Container, ContainerHeader } from '$lib/layout'; import type { Models } from '@appwrite.io/console'; import { writable } from 'svelte/store'; import type { PageData } from './$types'; import Create from './createUser.svelte'; import { readOnly } from '$lib/stores/billing'; import { isCloud } from '$lib/system'; + import { tooltip } from '$lib/actions/tooltip'; export let data: PageData; @@ -43,14 +44,27 @@ - - - + + +
+ +
+
{#if data.users.total} diff --git a/src/routes/console/project-[project]/auth/store.ts b/src/routes/console/project-[project]/auth/store.ts new file mode 100644 index 000000000..ae7e544db --- /dev/null +++ b/src/routes/console/project-[project]/auth/store.ts @@ -0,0 +1,8 @@ +import { page } from '$app/stores'; +import type { Models } from '@appwrite.io/console'; +import { derived } from 'svelte/store'; + +export const userList = derived( + page, + ($page) => $page.data.users as unknown as Models.UserList> +);