From c3e33e26385da85373636b7be8f31acf3be0fb19 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 10 Sep 2024 11:50:48 +0200 Subject: [PATCH] review fixes --- .../organization-[organization]/+layout.ts | 4 +- .../organization-[organization]/header.svelte | 2 - .../(console)/project-[project]/+layout.ts | 4 +- .../project-[project]/auth/header.svelte | 43 ++++++++----------- .../collection-[collection]/header.svelte | 15 +++---- .../database-[database]/header.svelte | 15 +++---- .../function-[function]/header.svelte | 15 +++---- .../messaging/topics/+page.svelte | 2 +- .../overview/keys/+page.svelte | 4 ++ .../settings/webhooks/+page.svelte | 9 +++- .../project-[project]/storage/+page.svelte | 2 +- 11 files changed, 55 insertions(+), 60 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/+layout.ts b/src/routes/(console)/organization-[organization]/+layout.ts index 54c4fc2f8..a640a8d71 100644 --- a/src/routes/(console)/organization-[organization]/+layout.ts +++ b/src/routes/(console)/organization-[organization]/+layout.ts @@ -17,8 +17,8 @@ export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.ORGANIZATION); depends(Dependencies.MEMBERS); depends(Dependencies.PAYMENT_METHODS); - var roles = []; - var scopes = []; + let roles = []; + let scopes = []; try { if (isCloud) { diff --git a/src/routes/(console)/organization-[organization]/header.svelte b/src/routes/(console)/organization-[organization]/header.svelte index f09ccd098..d5a4e361d 100644 --- a/src/routes/(console)/organization-[organization]/header.svelte +++ b/src/routes/(console)/organization-[organization]/header.svelte @@ -53,8 +53,6 @@ function createOrg() { showDropdown = false; - console.log('billing:', isBilling); - console.log('developer:', isDeveloper); if (isCloud) { goto(`${base}/create-organization`); } else newOrgModal.set(true); diff --git a/src/routes/(console)/project-[project]/+layout.ts b/src/routes/(console)/project-[project]/+layout.ts index 533a4c086..41d5198e0 100644 --- a/src/routes/(console)/project-[project]/+layout.ts +++ b/src/routes/(console)/project-[project]/+layout.ts @@ -18,8 +18,8 @@ export const load: LayoutLoad = async ({ params, depends }) => { const newPrefs = { ...prefs, organization: project.teamId }; sdk.forConsole.account.updatePrefs(newPrefs); preferences.loadTeamPrefs(project.teamId); - var roles = []; - var scopes = []; + let roles = []; + let scopes = []; if (isCloud) { if (get(canSeeBilling)) { await failedInvoice.load(project.teamId); diff --git a/src/routes/(console)/project-[project]/auth/header.svelte b/src/routes/(console)/project-[project]/auth/header.svelte index d47c2ae3b..1c6657e9f 100644 --- a/src/routes/(console)/project-[project]/auth/header.svelte +++ b/src/routes/(console)/project-[project]/auth/header.svelte @@ -21,36 +21,31 @@ hasChildren: true, event: 'teams' }, - ...($canWriteUsers - ? [ - { - href: `${path}/security`, - title: 'Security', - event: 'security' - }, - { - href: `${path}/templates`, - title: 'Templates', - hasChildren: false, - event: 'templates' - } - ] - : []), + { + href: `${path}/security`, + title: 'Security', + event: 'security', + disabled: !$canWriteUsers + }, + { + href: `${path}/templates`, + title: 'Templates', + hasChildren: false, + event: 'templates', + disabled: !$canWriteUsers + }, { href: `${path}/usage`, title: 'Usage', hasChildren: true, event: 'usage' }, - ...($canWriteUsers - ? [ - { - href: `${path}/settings`, - title: 'Settings', - event: 'settings' - } - ] - : []) + { + href: `${path}/settings`, + title: 'Settings', + event: 'settings', + disabled: !$canWriteUsers + } ]; diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte index d371f8aef..daf95c0c4 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte @@ -40,15 +40,12 @@ event: 'usage', hasChildren: true }, - ...($canWriteCollections - ? [ - { - href: `${path}/settings`, - title: 'Settings', - event: 'settings' - } - ] - : []) + { + href: `${path}/settings`, + title: 'Settings', + event: 'settings', + disabled: !$canWriteCollections + } ]; diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/header.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/header.svelte index 0fdcc8a0a..1f61794a0 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/header.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/header.svelte @@ -23,15 +23,12 @@ event: 'usage', hasChildren: true }, - ...($canWriteDatabases - ? [ - { - href: `${path}/settings`, - event: 'settings', - title: 'Settings' - } - ] - : []) + { + href: `${path}/settings`, + event: 'settings', + title: 'Settings', + disabled: !$canWriteDatabases + } ]; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/header.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/header.svelte index 136f1da41..991d34d5f 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/header.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/header.svelte @@ -34,15 +34,12 @@ event: 'sage', hasChildren: true }, - ...($canWriteFunctions - ? [ - { - href: `${path}/settings`, - event: 'settings', - title: 'Settings' - } - ] - : []) + { + href: `${path}/settings`, + event: 'settings', + title: 'Settings', + disabled: !$canWriteFunctions + } ]; diff --git a/src/routes/(console)/project-[project]/messaging/topics/+page.svelte b/src/routes/(console)/project-[project]/messaging/topics/+page.svelte index cb99bde78..2b461c25a 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/+page.svelte +++ b/src/routes/(console)/project-[project]/messaging/topics/+page.svelte @@ -119,7 +119,7 @@ {:else} ($showCreate = true) : null} + on:click={() => $canWriteTopics && ($showCreate = true)} href="https://appwrite.io/docs/products/messaging/topics" target="topic" /> {/if} diff --git a/src/routes/(console)/project-[project]/overview/keys/+page.svelte b/src/routes/(console)/project-[project]/overview/keys/+page.svelte index f1420f73f..aed17e5a1 100644 --- a/src/routes/(console)/project-[project]/overview/keys/+page.svelte +++ b/src/routes/(console)/project-[project]/overview/keys/+page.svelte @@ -1,5 +1,8 @@ @@ -18,6 +21,7 @@ import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date'; import { canWriteKeys } from '$lib/stores/roles'; import { wizard } from '$lib/stores/wizard'; + import { get } from 'svelte/store'; import type { PageData } from './$types'; import Wizard from './wizard.svelte'; diff --git a/src/routes/(console)/project-[project]/settings/webhooks/+page.svelte b/src/routes/(console)/project-[project]/settings/webhooks/+page.svelte index d1e996bd9..8c2bc4b40 100644 --- a/src/routes/(console)/project-[project]/settings/webhooks/+page.svelte +++ b/src/routes/(console)/project-[project]/settings/webhooks/+page.svelte @@ -1,5 +1,8 @@ @@ -29,6 +32,7 @@ import FailedModal from './failedModal.svelte'; import MessageStatusPill from './messageStatusPill.svelte'; import { canWriteWebhooks } from '$lib/stores/roles'; + import { get } from 'svelte/store'; export let data: PageData; @@ -36,6 +40,9 @@ let selectedWebhook: Models.Webhook; function openWizard() { + if (!$canWriteWebhooks) { + return; + } wizard.start(Create); } @@ -123,7 +130,7 @@ single href="https://appwrite.io/docs/advanced/platform/webhooks" target="webhook" - on:click={$canWriteWebhooks ? openWizard : null} /> + on:click={openWizard} /> {/if} diff --git a/src/routes/(console)/project-[project]/storage/+page.svelte b/src/routes/(console)/project-[project]/storage/+page.svelte index d9f29e447..65ae055b8 100644 --- a/src/routes/(console)/project-[project]/storage/+page.svelte +++ b/src/routes/(console)/project-[project]/storage/+page.svelte @@ -30,7 +30,7 @@ ($showCreateBucket = true)} /> {#if data.buckets.total}