From 08fa252ee75c83c0e6b712cf3644912a6e5143c2 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 2 Nov 2022 16:20:29 +0100 Subject: [PATCH] fix: roles --- src/lib/components/permissions/roles.svelte | 22 +++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/lib/components/permissions/roles.svelte b/src/lib/components/permissions/roles.svelte index 62f5aeed2..2bcca253f 100644 --- a/src/lib/components/permissions/roles.svelte +++ b/src/lib/components/permissions/roles.svelte @@ -71,16 +71,34 @@ return n; }); } + + function sortRoles(a: string, b: string) { + if ((a === 'any') !== (b === 'any')) { + return a === 'any' ? -1 : 1; + } + if ((a === 'users') !== (b === 'users')) { + return a === 'users' ? -1 : 1; + } + if ((a === 'guests') !== (b === 'guests')) { + return a === 'guests' ? -1 : 1; + } + + return a.localeCompare(b); + } + + $: if (roles) { + roles.forEach(addRole); + } -{#if roles?.length} +{#if [...$groups.keys()]?.length} Role - {#each [...$groups.keys()] as role} + {#each [...$groups.keys()].sort(sortRoles) as role}