From 71167131d28f0a1faf97a181e44cd891c9c2dfda Mon Sep 17 00:00:00 2001 From: Timothy Jaeryang Baek Date: Wed, 7 Oct 2026 11:09:28 +0400 Subject: [PATCH] refac --- .../admin/Users/Groups/EditGroupModal.svelte | 53 +++++++++++-------- .../Users/Groups/InheritedMembers.svelte | 33 ++++++------ .../admin/Users/Groups/Users.svelte | 6 ++- src/lib/i18n/locales/en-US/translation.json | 1 + 4 files changed, 51 insertions(+), 42 deletions(-) diff --git a/src/lib/components/admin/Users/Groups/EditGroupModal.svelte b/src/lib/components/admin/Users/Groups/EditGroupModal.svelte index a3da0e0920..3ed6ed7657 100644 --- a/src/lib/components/admin/Users/Groups/EditGroupModal.svelte +++ b/src/lib/components/admin/Users/Groups/EditGroupModal.svelte @@ -18,6 +18,9 @@ import ConfirmDialog from '$lib/components/common/ConfirmDialog.svelte'; import Tooltip from '$lib/components/common/Tooltip.svelte'; import XMark from '$lib/components/icons/XMark.svelte'; + import Select from '$lib/components/common/Select.svelte'; + import ChevronDown from '$lib/components/icons/ChevronDown.svelte'; + import Check from '$lib/components/icons/Check.svelte'; export let onSubmit: Function = () => {}; export let onDelete: Function = () => {}; @@ -343,30 +346,36 @@ defaultPermissions={custom ? inheritedPermissions : defaultPermissions} /> {:else if selectedTab == 'users'} -
- - -
+ {#snippet membershipFilter()} +
+ +
+ {/snippet} {#if membershipTab === 'direct'} - + + {@render membershipFilter()} + {:else} - + + {@render membershipFilter()} + {/if} {:else if selectedTab == 'preview'} diff --git a/src/lib/components/admin/Users/Groups/InheritedMembers.svelte b/src/lib/components/admin/Users/Groups/InheritedMembers.svelte index 0d9aa621b0..6a4b47ff2c 100644 --- a/src/lib/components/admin/Users/Groups/InheritedMembers.svelte +++ b/src/lib/components/admin/Users/Groups/InheritedMembers.svelte @@ -15,19 +15,22 @@
-
-
- +
+
+
+ +
+ { + page = 1; + }} + />
- { - page = 1; - }} - /> +
{#await members}
@@ -80,12 +83,6 @@ {$i18n.t('No inherited members')}
{/if} -

- {$i18n.t( - 'Direct: {{direct}} · Inherited: {{inherited}} · Total: {{effective}}', - result.counts - )} -

{#if result.total > 30} {/if} diff --git a/src/lib/components/admin/Users/Groups/Users.svelte b/src/lib/components/admin/Users/Groups/Users.svelte index c41f493ec6..4bb9f6240b 100644 --- a/src/lib/components/admin/Users/Groups/Users.svelte +++ b/src/lib/components/admin/Users/Groups/Users.svelte @@ -293,8 +293,8 @@ on:change={handleFileChange} /> -
-
+
+
@@ -351,6 +351,8 @@
+ +
diff --git a/src/lib/i18n/locales/en-US/translation.json b/src/lib/i18n/locales/en-US/translation.json index 203396236a..4bcdd405d5 100644 --- a/src/lib/i18n/locales/en-US/translation.json +++ b/src/lib/i18n/locales/en-US/translation.json @@ -1228,6 +1228,7 @@ "Influences how quickly the algorithm responds to feedback from the generated text. A lower learning rate will result in slower adjustments, while a higher learning rate will make the algorithm more responsive.": "", "Info": "", "Inherit": "Inherit", + "Inherited": "Inherited", "Inherited members": "Inherited members", "Inherited members are managed in their directly assigned groups.": "Inherited members are managed in their directly assigned groups.", "Inherited via": "Inherited via",