From 7e08055ad04504781a7d7e1847712ce0c7723a2e Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 4 Sep 2024 10:08:01 +0545 Subject: [PATCH] more fixes --- src/lib/pages/domains/index.svelte | 7 +++++++ .../console/organization-[organization]/+page.ts | 5 ++--- .../databases/database-[database]/+page.svelte | 3 +++ .../attributes/+page.svelte | 3 +++ .../collection-[collection]/header.svelte | 5 +++-- .../collection-[collection]/indexes/+page.svelte | 3 +++ .../databases/database-[database]/header.svelte | 15 ++++++++++----- .../project-[project]/functions/+page.svelte | 1 + .../functions/function-[function]/+page.svelte | 5 +++++ .../functions/function-[function]/create.svelte | 3 +++ .../functions/function-[function]/header.svelte | 5 +++-- 11 files changed, 43 insertions(+), 12 deletions(-) diff --git a/src/lib/pages/domains/index.svelte b/src/lib/pages/domains/index.svelte index 518bc6260..cbae52670 100644 --- a/src/lib/pages/domains/index.svelte +++ b/src/lib/pages/domains/index.svelte @@ -20,6 +20,7 @@ import Delete from './delete.svelte'; import Retry from './wizard/retry.svelte'; import { Pill } from '$lib/elements'; + import { canWriteRules } from '$lib/stores/roles'; export let rules: Models.ProxyRuleList; export let type: ResourceType; @@ -55,9 +56,11 @@ + {#if $canWriteRules} + {/if} {#if rules.total} @@ -65,7 +68,9 @@ Name Verification Status Certificate Status + {#if $canWriteRules} + {/if} {#each rules.rules as domain, i} @@ -134,6 +139,7 @@ {/if} + {#if $canWriteRules} + {/if} {/each} diff --git a/src/routes/console/organization-[organization]/+page.ts b/src/routes/console/organization-[organization]/+page.ts index dad2967fb..512a47c8a 100644 --- a/src/routes/console/organization-[organization]/+page.ts +++ b/src/routes/console/organization-[organization]/+page.ts @@ -3,17 +3,16 @@ import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT, Dependencies } from '$lib/constants'; import type { PageLoad } from './$types'; -import { canSeeProjects } from '$lib/stores/roles'; import { redirect } from '@sveltejs/kit'; export const load: PageLoad = async ({ params, url, route, depends, parent }) => { - await parent(); + const parentData = await parent(); depends(Dependencies.ORGANIZATION); const page = getPage(url); const limit = getLimit(url, route, CARD_LIMIT); const offset = pageToOffset(page, limit); - if(!canSeeProjects) { + if(!parentData.scopes.includes('projects.read')) { return redirect(301, `/console/organization-${params.organization}/billing`); } diff --git a/src/routes/console/project-[project]/databases/database-[database]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/+page.svelte index 5c60a73bf..858011e0b 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/+page.svelte @@ -6,6 +6,7 @@ import Table from './table.svelte'; import Grid from './grid.svelte'; import type { PageData } from './$types'; + import { canWriteCollections } from '$lib/stores/roles'; export let data: PageData; @@ -17,10 +18,12 @@ view={data.view} hideColumns={!data.collections.total} hideView={!data.collections.total}> + {#if $canWriteCollections} + {/if} {#if data.collections.total} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte index 88bc3bef7..23c5f8ebf 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte @@ -14,6 +14,7 @@ TableRow } from '$lib/elements/table'; import { Container } from '$lib/layout'; + import { canWriteCollections } from '$lib/stores/roles'; import Create from '../createAttribute.svelte'; import { isRelationship } from '../document-[document]/attributes/store'; import FailedModal from '../failedModal.svelte'; @@ -51,7 +52,9 @@
Attributes + {#if $canWriteCollections} + {/if}
{#if $attributes.length} 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 2fe829bef..a184e527d 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 @@ -3,6 +3,7 @@ import { Id, Tab, Tabs } from '$lib/components'; import { isTabSelected } from '$lib/helpers/load'; import { Cover, CoverTitle } from '$lib/layout'; + import { canWriteCollections } from '$lib/stores/roles'; import { collection } from './store'; $: projectId = $page.params.project; @@ -38,11 +39,11 @@ event: 'usage', hasChildren: true }, - { + ...$canWriteCollections ? [{ href: `${path}/settings`, title: 'Settings', event: 'settings' - } + }]:[] ]; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte index a3d50bb09..cfc720c20 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte @@ -21,6 +21,7 @@ import CreateAttributeDropdown from '../attributes/createAttributeDropdown.svelte'; import type { Option } from '../attributes/store'; import FailedModal from '../failedModal.svelte'; + import { canWriteCollections } from '$lib/stores/roles'; let showDropdown = []; let selectedIndex: Models.Index = null; @@ -38,6 +39,7 @@
Indexes + {#if $canWriteCollections} + {/if}
{#if $collection?.attributes?.length} {#if $indexes.length} 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 b5a068d72..a334cafc8 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/header.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/header.svelte @@ -3,6 +3,7 @@ import { Id, Tab, Tabs } from '$lib/components'; import { isTabSelected } from '$lib/helpers/load'; import { Cover, CoverTitle } from '$lib/layout'; + import { canWriteDatabases } from '$lib/stores/roles'; import { database } from './store'; const projectId = $page.params.project; @@ -21,11 +22,15 @@ event: 'usage', hasChildren: true }, - { - href: `${path}/settings`, - event: 'settings', - title: 'Settings' - } + ...($canWriteDatabases + ? [ + { + href: `${path}/settings`, + event: 'settings', + title: 'Settings' + } + ] + : []) ]; diff --git a/src/routes/console/project-[project]/functions/+page.svelte b/src/routes/console/project-[project]/functions/+page.svelte index da81953d6..63f983467 100644 --- a/src/routes/console/project-[project]/functions/+page.svelte +++ b/src/routes/console/project-[project]/functions/+page.svelte @@ -81,6 +81,7 @@ {#if data.functions.total} + {#if $canWriteFunctions} + {/if} {#if $deploymentList?.total} {@const activeDeployment = data.activeDeployment} @@ -163,9 +166,11 @@ {:else if $deploymentList.total} + {#if $canWriteFunctions} + {/if}

Add a new deployment, or activate an existing one to see your function in diff --git a/src/routes/console/project-[project]/functions/function-[function]/create.svelte b/src/routes/console/project-[project]/functions/function-[function]/create.svelte index 507352e0f..9d35a0023 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/create.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/create.svelte @@ -2,6 +2,7 @@ import { beforeNavigate } from '$app/navigation'; import { DropList, DropListItem } from '$lib/components'; import { Button } from '$lib/elements/forms'; + import { canWriteFunctions } from '$lib/stores/roles'; import CreateCli from './createCli.svelte'; import CreateGit from './createGit.svelte'; import CreateManual from './createManual.svelte'; @@ -24,6 +25,7 @@ + {#if $canWriteFunctions} + {/if} { 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 1bc52e83c..d144c7e13 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/header.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/header.svelte @@ -3,6 +3,7 @@ import { Id, Tab, Tabs } from '$lib/components'; import { isTabSelected } from '$lib/helpers/load'; import { Cover, CoverTitle } from '$lib/layout'; + import { canWriteFunctions } from '$lib/stores/roles'; import { func } from './store'; const projectId = $page.params.project; @@ -32,11 +33,11 @@ event: 'sage', hasChildren: true }, - { + ...$canWriteFunctions ? [{ href: `${path}/settings`, event: 'settings', title: 'Settings' - } + }] : [] ];