Skip to content

fix: QA v12 #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 14, 2022
Merged

fix: QA v12 #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f5aa04
feat: small fixes
ArmanNik Nov 14, 2022
ee70582
fix: sorting
ArmanNik Nov 14, 2022
9cbb6ba
Merge branch 'main' of github.com:appwrite/appwrite-console-poc into …
ArmanNik Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/routes/console/organization-[organization]/[[page]]/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ export const load: PageLoad = async ({ params }) => {
projects: await sdkForConsole.projects.list([
Query.offset(offset),
Query.limit(CARD_LIMIT),
Query.equal('teamId', params.organization)
Query.equal('teamId', params.organization),
Query.orderDesc('$createdAt')
])
};
};
19 changes: 16 additions & 3 deletions ...ect-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { CardGrid, Box, Heading } from '$lib/components';
import { CardGrid, Box, Heading, Alert } from '$lib/components';
import { Container } from '$lib/layout';
import { Button, InputText, InputSwitch, Helper } from '$lib/elements/forms';
import { Permissions } from '$lib/components/permissions';
Expand Down Expand Up @@ -192,8 +192,21 @@
rel="noopener noreferrer">Permissions Guide</a> in our documentation.
</p>
<svelte:fragment slot="aside">
{#if collectionPermissions}
<Permissions bind:permissions={collectionPermissions} withCreate />
{#if $collection.documentSecurity}
{#if collectionPermissions}
<Permissions bind:permissions={collectionPermissions} withCreate />
{/if}
{:else}
<Alert type="info">
<svelte:fragment slot="title">
Document security is disabled
</svelte:fragment>
<p class="text">
If you want to assign document permissions, navigate to Collection
settings and enable document security. Otherwise, only Collection
permissions will be used.
</p>
</Alert>
{/if}
</svelte:fragment>
<svelte:fragment slot="actions">
Expand Down
2 changes: 1 addition & 1 deletion src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@

<Table>
<TableHeader>
<TableCellHead width={100}>Deployment ID</TableCellHead>
<TableCellHead width={90}>Deployment ID</TableCellHead>
<TableCellHead width={140}>Created</TableCellHead>
<TableCellHead width={100}>Status</TableCellHead>
<TableCellHead width={70}>Size</TableCellHead>
Expand Down
19 changes: 16 additions & 3 deletions src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { Pill } from '$lib/elements';
import { CardGrid, Box, Heading } from '$lib/components';
import { CardGrid, Box, Heading, Alert } from '$lib/components';
import { Container } from '$lib/layout';
import {
Form,
Expand Down Expand Up @@ -272,8 +272,21 @@
rel="noopener noreferrer">Permissions Guide</a> in our documentation.
</p>
<svelte:fragment slot="aside">
{#if bucketPermissions}
<Permissions bind:permissions={bucketPermissions} />
{#if $bucket.fileSecurity}
{#if bucketPermissions}
<Permissions bind:permissions={bucketPermissions} />
{/if}
{:else}
<Alert type="info">
<svelte:fragment slot="title">
File security is disabled
</svelte:fragment>
<p class="text">
If you want to assign document permissions, navigate to Bucket
settings and enable file security. Otherwise, only Bucket
permissions will be used.
</p>
</Alert>
{/if}
</svelte:fragment>
<svelte:fragment slot="actions">
Expand Down