From f348f82db68ee1259d0553d50f0ec1c5bbe34a04 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 3 Sep 2024 17:28:46 +0545 Subject: [PATCH] hide project resource create and update buttons based on scope --- src/lib/components/empty.svelte | 3 ++ src/lib/stores/roles.ts | 1 + src/routes/console/+layout.ts | 4 +- .../project-[project]/auth/+page.svelte | 7 +++- .../project-[project]/auth/header.svelte | 41 +++++++++++-------- .../project-[project]/auth/teams/+page.svelte | 4 ++ .../project-[project]/databases/+page.svelte | 4 ++ .../project-[project]/functions/+page.svelte | 3 +- .../functions/templates/+page.svelte | 4 +- .../template-[template]/+page.svelte | 3 ++ 10 files changed, 54 insertions(+), 20 deletions(-) diff --git a/src/lib/components/empty.svelte b/src/lib/components/empty.svelte index dc423a6da..ddf3ef76e 100644 --- a/src/lib/components/empty.svelte +++ b/src/lib/components/empty.svelte @@ -11,6 +11,7 @@ export let target: string = null; export let href: string = null; export let marginTop = false; + export let allowCreate = false; function track() { if (target) { @@ -54,9 +55,11 @@ text event="empty_documentation" ariaLabel="create {target}">Documentation + {#if allowCreate} + {/if} diff --git a/src/lib/stores/roles.ts b/src/lib/stores/roles.ts index 8ad792d1c..fafb5d2c9 100644 --- a/src/lib/stores/roles.ts +++ b/src/lib/stores/roles.ts @@ -18,6 +18,7 @@ export const canWriteWebhooks = derived(scopes, ($scopes) => $scopes.includes("w export const canWritePlatforms = derived(scopes, ($scopes) => $scopes.includes("platforms.write")); export const canWriteTargets = derived(scopes, ($scopes) => $scopes.includes("targets.write")); export const canWriteUsers = derived(scopes, ($scopes) => $scopes.includes("users.write")); +export const canWriteTeams = derived(scopes, ($scopes) => $scopes.includes("teams.write")); export const canWriteCollections = derived(scopes, ($scopes) => $scopes.includes("collections.write")); export const canWriteExecutions = derived(scopes, ($scopes) => $scopes.includes("executions.write")); export const canWriteSubscribers = derived(scopes, ($scopes) => $scopes.includes("subscribers.write")); diff --git a/src/routes/console/+layout.ts b/src/routes/console/+layout.ts index c1de91710..0a24466b7 100644 --- a/src/routes/console/+layout.ts +++ b/src/routes/console/+layout.ts @@ -34,6 +34,8 @@ export const load: LayoutLoad = async ({ fetch, depends, parent }) => { return { consoleVariables: variables, version: data?.version ?? null, - plansInfo + plansInfo, + roles: [], + scopes: [] }; }; diff --git a/src/routes/console/project-[project]/auth/+page.svelte b/src/routes/console/project-[project]/auth/+page.svelte index 209c3d37d..321350408 100644 --- a/src/routes/console/project-[project]/auth/+page.svelte +++ b/src/routes/console/project-[project]/auth/+page.svelte @@ -32,6 +32,7 @@ import type { PageData } from './$types'; import Create from './createUser.svelte'; import { tooltip } from '$lib/actions/tooltip'; + import { canWriteUsers } from '$lib/stores/roles'; export let data: PageData; @@ -44,6 +45,7 @@ + {#if $canWriteUsers} + + {/if} + {#if data.users.total} @@ -152,6 +156,7 @@ single href="https://appwrite.io/docs/references/cloud/server-nodejs/users" target="user" + allowCreate={$canWriteUsers} on:click={() => showCreateUser.set(true)} /> {/if} diff --git a/src/routes/console/project-[project]/auth/header.svelte b/src/routes/console/project-[project]/auth/header.svelte index e5fa08cb3..d9b4aca8d 100644 --- a/src/routes/console/project-[project]/auth/header.svelte +++ b/src/routes/console/project-[project]/auth/header.svelte @@ -3,6 +3,7 @@ import { Tab, Tabs } from '$lib/components'; import { isTabSelected } from '$lib/helpers/load'; import { Cover, CoverTitle } from '$lib/layout'; + import { canWriteUsers } from '$lib/stores/roles'; const projectId = $page.params.project; const path = `/console/project-${projectId}/auth`; @@ -19,28 +20,36 @@ hasChildren: true, event: 'teams' }, - { - href: `${path}/security`, - title: 'Security', - event: 'security' - }, - { - href: `${path}/templates`, - title: 'Templates', - hasChildren: false, - event: 'templates' - }, + ...($canWriteUsers + ? [ + { + href: `${path}/security`, + title: 'Security', + event: 'security' + }, + { + href: `${path}/templates`, + title: 'Templates', + hasChildren: false, + event: 'templates' + } + ] + : []), { href: `${path}/usage`, title: 'Usage', hasChildren: true, event: 'usage' }, - { - href: `${path}/settings`, - title: 'Settings', - event: 'settings' - } + ...($canWriteUsers + ? [ + { + href: `${path}/settings`, + title: 'Settings', + event: 'settings' + } + ] + : []) ]; diff --git a/src/routes/console/project-[project]/auth/teams/+page.svelte b/src/routes/console/project-[project]/auth/teams/+page.svelte index 5aa93c321..38e3c8773 100644 --- a/src/routes/console/project-[project]/auth/teams/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/+page.svelte @@ -32,6 +32,7 @@ import { writable } from 'svelte/store'; import { readOnly } from '$lib/stores/billing'; import { isCloud } from '$lib/system'; + import { canWriteTeams } from '$lib/stores/roles'; export let data: PageData; @@ -49,6 +50,7 @@ buttonDisabled={isCloud && $readOnly} let:isButtonDisabled> + {#if $canWriteTeams}
Create team
+ {/if}
@@ -110,6 +113,7 @@ {:else} ($showCreateTeam = true)} href="https://appwrite.io/docs/references/cloud/client-web/teams" target="team" /> diff --git a/src/routes/console/project-[project]/databases/+page.svelte b/src/routes/console/project-[project]/databases/+page.svelte index e70630db2..91eaba7be 100644 --- a/src/routes/console/project-[project]/databases/+page.svelte +++ b/src/routes/console/project-[project]/databases/+page.svelte @@ -14,6 +14,7 @@ import Table from './table.svelte'; import { registerCommands } from '$lib/commandCenter'; import { tooltip } from '$lib/actions/tooltip'; + import { canWriteDatabases } from '$lib/stores/roles'; export let data: PageData; @@ -55,6 +56,7 @@ view={data.view} hideColumns={!data.databases.total} hideView={!data.databases.total} /> + {#if $canWriteDatabases}
Create database
+ {/if} @@ -89,6 +92,7 @@ single href="https://appwrite.io/docs/products/databases/databases" target="database" + allowCreate={$canWriteDatabases} on:click={() => (showCreate = true)} /> {/if} diff --git a/src/routes/console/project-[project]/functions/+page.svelte b/src/routes/console/project-[project]/functions/+page.svelte index 2a86c9150..da81953d6 100644 --- a/src/routes/console/project-[project]/functions/+page.svelte +++ b/src/routes/console/project-[project]/functions/+page.svelte @@ -20,6 +20,7 @@ import { parseExpression } from 'cron-parser'; import { onMount } from 'svelte'; import { functionsList } from './store'; + import { canWriteFunctions } from '$lib/stores/roles'; export let data; @@ -72,7 +73,7 @@ diff --git a/src/routes/console/project-[project]/functions/templates/+page.svelte b/src/routes/console/project-[project]/functions/templates/+page.svelte index c1a0ba1f6..20809c43b 100644 --- a/src/routes/console/project-[project]/functions/templates/+page.svelte +++ b/src/routes/console/project-[project]/functions/templates/+page.svelte @@ -17,6 +17,7 @@ import { isServiceLimited } from '$lib/stores/billing'; import type { Runtime } from '$lib/stores/marketplace.js'; import { organization } from '$lib/stores/organization'; + import { canWriteFunctions } from '$lib/stores/roles'; import { connectTemplate } from '$lib/wizards/functions/cover.svelte'; import { functionsList } from '../store'; @@ -226,7 +227,7 @@ text> View details - + {#if $canWriteFunctions} + {/if} 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 fc6e5ec74..0ebee546f 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 @@ -13,6 +13,7 @@ import { isServiceLimited } from '$lib/stores/billing'; import { organization } from '$lib/stores/organization'; import { functionsList } from '../../store'; + import { canWriteFunctions } from '$lib/stores/roles'; const isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true; @@ -99,6 +100,7 @@ View source + {#if $canWriteFunctions} + {/if}