Merge pull request #2102 from HarshMN2345/fix-SER-51-fix-permissions-dialog

Author: ItzNotABug

src/lib/components/permissions/actions.svelte

@@ -12,7 +12,6 @@
     export let showTeam: boolean;
     export let showLabel: boolean;
     export let showCustom: boolean;
-    export let hideOnClick: boolean = false;
     export let groups: Writable<Map<string, Permission>>;
 
     const dispatch = createEventDispatcher();
@@ -25,46 +24,46 @@
             <ActionMenu.Item.Button
                 disabled={$groups.has('any')}
                 on:click={(e) => {
-                    if (hideOnClick) hide(e);
+                    hide(e);
                     dispatch('create', ['any']);
                 }}>
                 Any
             </ActionMenu.Item.Button>
             <ActionMenu.Item.Button
                 disabled={$groups.has('guests')}
                 on:click={(e) => {
-                    if (hideOnClick) hide(e);
+                    hide(e);
                     dispatch('create', ['guests']);
                 }}>
                 All guests
             </ActionMenu.Item.Button>
             <ActionMenu.Item.Button
                 disabled={$groups.has('users')}
                 on:click={(e) => {
-                    if (hideOnClick) hide(e);
+                    hide(e);
                     dispatch('create', ['users']);
                 }}>
                 All users
             </ActionMenu.Item.Button>
             <ActionMenu.Item.Button
                 on:click={(e) => {
                     showUser = true;
-                    if (hideOnClick) hide(e);
+                    hide(e);
                 }}>Select users</ActionMenu.Item.Button>
             <ActionMenu.Item.Button
                 on:click={(e) => {
                     showTeam = true;
-                    if (hideOnClick) hide(e);
+                    hide(e);
                 }}>Select teams</ActionMenu.Item.Button>
             <ActionMenu.Item.Button
                 on:click={(e) => {
                     showLabel = true;
-                    if (hideOnClick) hide(e);
+                    hide(e);
                 }}>Label</ActionMenu.Item.Button>
             <ActionMenu.Item.Button
                 on:click={(e) => {
                     showCustom = true;
-                    if (hideOnClick) hide(e);
+                    hide(e);
                 }}>Custom permission</ActionMenu.Item.Button>
         </ActionMenu.Root>
     </svelte:fragment>

src/lib/components/permissions/permissions.svelte

@@ -22,7 +22,6 @@
     import { Card } from '$lib/components';
 
     export let withCreate = false;
-    export let hideOnClick = false;
     export let permissions: string[] = [];
 
     let showUser = false;
@@ -197,7 +196,6 @@
             bind:showTeam
             bind:showUser
             {groups}
-            {hideOnClick}
             on:create={create}
             let:toggle>
             <Button secondary on:click={toggle}>
@@ -215,7 +213,6 @@
                 bind:showTeam
                 bind:showUser
                 {groups}
-                {hideOnClick}
                 on:create={create}
                 let:toggle>
                 <Button secondary icon on:click={toggle}>

src/lib/components/permissions/team.svelte

@@ -34,6 +34,7 @@
         offset = 0;
         search = '';
         selected.clear();
+        show = false;
     }
 
     function create() {

src/lib/components/permissions/user.svelte

@@ -37,6 +37,7 @@
         offset = 0;
         search = '';
         selected.clear();
+        show = false;
     }
 
     function create() {