From 1f5aa04ee9ec36d1301d7e69dfb27d1c58a375c7 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Mon, 14 Nov 2022 13:58:17 +0100
Subject: [PATCH 1/2] feat: small fixes

---
 .../settings/+page.svelte                     | 19 ++++++++++++++++---
 .../function-[function]/[[page]]/+page.svelte |  2 +-
 .../bucket-[bucket]/settings/+page.svelte     | 19 ++++++++++++++++---
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
index 838e832a3d..6c3d74fbc0 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
@@ -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';
@@ -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">
diff --git a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
index fb694f4df7..869bfa1c12 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
@@ -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>
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
index 5cac624b70..348908373d 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
@@ -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,
@@ -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">

From ee70582c8b96389e662a62b37f1141f1abc87fa9 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Mon, 14 Nov 2022 13:59:18 +0100
Subject: [PATCH 2/2] fix: sorting

---
 .../console/organization-[organization]/[[page]]/+page.ts      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/routes/console/organization-[organization]/[[page]]/+page.ts b/src/routes/console/organization-[organization]/[[page]]/+page.ts
index c4a81164dd..b74d798dea 100644
--- a/src/routes/console/organization-[organization]/[[page]]/+page.ts
+++ b/src/routes/console/organization-[organization]/[[page]]/+page.ts
@@ -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')
         ])
     };
 };