From 5540146a4e2cea111702f8f97b05254db39c1105 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Tue, 15 Nov 2022 14:12:23 +0100
Subject: [PATCH] fix: permissions alert

---
 .../bucket-[bucket]/file-[file]/+page.svelte  | 27 +++++++++++++++++--
 .../bucket-[bucket]/settings/+page.svelte     | 19 +++----------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
index 8f5c5b53a..b993a1252 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { CardGrid, Box, Copy, Heading } from '$lib/components';
+    import { CardGrid, Box, Copy, Heading, Alert } from '$lib/components';
     import { Container } from '$lib/layout';
     import { Button } from '$lib/elements/forms';
     import { Pill } from '$lib/elements';
@@ -15,7 +15,9 @@
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import { trackEvent } from '$lib/actions/analytics';
+    import { bucket } from '../store';
 
+    let showFileAlert = true;
     onMount(async () => {
         filePermissions = $file?.$permissions;
     });
@@ -115,7 +117,28 @@
                 permissions are enabled, file permissions will be ignored.
             </p>
             <svelte:fragment slot="aside">
-                <Permissions bind:permissions={filePermissions} />
+                {#if $bucket.fileSecurity}
+                    {#if showFileAlert}
+                        <Alert type="info" dismissible on:dismiss={() => (showFileAlert = false)}>
+                            <svelte:fragment slot="title">File security is enabled</svelte:fragment>
+                            <p class="text">
+                                Users will be able to access this file if they have been granted <b
+                                    >either File or Bucket permissions.
+                                </b>
+                            </p>
+                        </Alert>
+                    {/if}
+                    <Permissions bind:permissions={filePermissions} />
+                {: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">
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 d427bf480..5f519731d 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, Alert } from '$lib/components';
+    import { CardGrid, Box, Heading } from '$lib/components';
     import { Container } from '$lib/layout';
     import {
         Form,
@@ -282,21 +282,8 @@
                         rel="noopener noreferrer">Permissions Guide</a> in our documentation.
                 </p>
                 <svelte:fragment slot="aside">
-                    {#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 bucketPermissions}
+                        <Permissions bind:permissions={bucketPermissions} />
                     {/if}
                 </svelte:fragment>
                 <svelte:fragment slot="actions">