Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions src/components/access/CreateGroupDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import type { AdminUserSearchResult } from '@librechat/data-schemas';
import type * as t from '@/types';
import { SelectedMemberList, UserSearchInline } from '@/components/shared';
import { addGroupMemberFn, createGroupFn } from '@/server';
import { cn, notifySuccess, notifyError } from '@/utils';
import { useLocalize } from '@/hooks';
import { cn } from '@/utils';

export function CreateGroupDialog({ open, onClose }: t.CreateGroupDialogProps) {
const localize = useLocalize();
Expand All @@ -27,20 +27,24 @@ export function CreateGroupDialog({ open, onClose }: t.CreateGroupDialogProps) {
};

const mutation = useMutation({
mutationFn: async () => {
const { group } = await createGroupFn({ data: { name, description } });
mutationFn: async ({ name: submittedName }: { name: string }) => {
const { group } = await createGroupFn({
data: { name: submittedName, description },
});
for (const user of selectedUsers) {
await addGroupMemberFn({ data: { groupId: group.id, userId: user.id } });
}
return { name: submittedName };
},
onSuccess: () => {
onSuccess: (data) => {
queryClient.invalidateQueries({ queryKey: ['groups'] });
queryClient.invalidateQueries({ queryKey: ['groupMembers'] });
queryClient.invalidateQueries({ queryKey: ['availableScopes'] });
queryClient.invalidateQueries({ queryKey: ['groupAssignments'] });
notifySuccess(localize('com_toast_group_created', { name: data.name }));
resetAndClose();
},
onError: (err: Error) => setError(err.message),
onError: (err: Error) => notifyError(err.message),
Comment thread
cursor[bot] marked this conversation as resolved.
});

const doSubmit = () => {
Expand All @@ -50,7 +54,7 @@ export function CreateGroupDialog({ open, onClose }: t.CreateGroupDialogProps) {
setActiveTab('details');
return;
}
mutation.mutate();
mutation.mutate({ name });
};

const handleSubmit = (e: React.FormEvent) => {
Expand Down Expand Up @@ -89,14 +93,15 @@ export function CreateGroupDialog({ open, onClose }: t.CreateGroupDialogProps) {
ariaLabel={localize('com_access_create_group')}
>
<Tabs.TriggersList>
<Tabs.Trigger value="details">
{localize('com_access_tab_details')}
</Tabs.Trigger>
<Tabs.Trigger value="members">
{localize('com_access_tab_members')}
</Tabs.Trigger>
<Tabs.Trigger value="details">{localize('com_access_tab_details')}</Tabs.Trigger>
<Tabs.Trigger value="members">{localize('com_access_tab_members')}</Tabs.Trigger>
</Tabs.TriggersList>
<Tabs.Content value="details" forceMount tabIndex={-1} className={cn(activeTab !== 'details' && 'hidden')}>
<Tabs.Content
value="details"
forceMount
tabIndex={-1}
className={cn(activeTab !== 'details' && 'hidden')}
>
<div className="flex flex-col gap-5 pt-5">
<div className="flex flex-col gap-1.5">
<label
Expand Down Expand Up @@ -133,7 +138,12 @@ export function CreateGroupDialog({ open, onClose }: t.CreateGroupDialogProps) {
</div>
</div>
</Tabs.Content>
<Tabs.Content value="members" forceMount tabIndex={-1} className={cn(activeTab !== 'members' && 'hidden')}>
<Tabs.Content
value="members"
forceMount
tabIndex={-1}
className={cn(activeTab !== 'members' && 'hidden')}
>
<div className="flex flex-col gap-4 pt-5">
<UserSearchInline
existingIds={selectedUsers.map((u) => u.id)}
Expand Down
43 changes: 28 additions & 15 deletions src/components/access/CreateRoleDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import type * as t from '@/types';
import { addRoleMemberFn, createRoleFn, updateRolePermissionsFn } from '@/server';
import { SelectedMemberList, UserSearchInline } from '@/components/shared';
import { RolePermissionsPanel } from './RolePermissionsPanel';
import { cn, notifySuccess, notifyError } from '@/utils';
import { defaultPermissions } from '@/constants';
import { useLocalize } from '@/hooks';
import { cn } from '@/utils';

export function CreateRoleDialog({ open, onClose }: t.CreateRoleDialogProps) {
const localize = useLocalize();
Expand All @@ -31,21 +31,23 @@ export function CreateRoleDialog({ open, onClose }: t.CreateRoleDialogProps) {
};

const mutation = useMutation({
mutationFn: async () => {
const { role } = await createRoleFn({ data: { name, description } });
mutationFn: async ({ name: submittedName }: { name: string }) => {
const { role } = await createRoleFn({ data: { name: submittedName, description } });
await updateRolePermissionsFn({ data: { id: role.id, permissions } });
for (const user of selectedUsers) {
await addRoleMemberFn({ data: { roleId: role.id, userId: user.id } });
}
return { name: submittedName };
},
onSuccess: () => {
onSuccess: (data) => {
queryClient.invalidateQueries({ queryKey: ['roles'] });
queryClient.invalidateQueries({ queryKey: ['roleMembers'] });
queryClient.invalidateQueries({ queryKey: ['availableScopes'] });
queryClient.invalidateQueries({ queryKey: ['roleAssignments'] });
notifySuccess(localize('com_toast_role_created', { name: data.name }));
resetAndClose();
},
onError: (err: Error) => setError(err.message),
onError: (err: Error) => notifyError(err.message),
});

const doSubmit = () => {
Expand All @@ -55,7 +57,7 @@ export function CreateRoleDialog({ open, onClose }: t.CreateRoleDialogProps) {
setActiveTab('details');
return;
}
mutation.mutate();
mutation.mutate({ name });
};

const handleSubmit = (e: React.FormEvent) => {
Expand Down Expand Up @@ -94,17 +96,18 @@ export function CreateRoleDialog({ open, onClose }: t.CreateRoleDialogProps) {
ariaLabel={localize('com_access_create_role')}
>
<Tabs.TriggersList>
<Tabs.Trigger value="details">
{localize('com_access_tab_details')}
</Tabs.Trigger>
<Tabs.Trigger value="details">{localize('com_access_tab_details')}</Tabs.Trigger>
<Tabs.Trigger value="permissions">
{localize('com_access_tab_permissions')}
</Tabs.Trigger>
<Tabs.Trigger value="members">
{localize('com_access_tab_members')}
</Tabs.Trigger>
<Tabs.Trigger value="members">{localize('com_access_tab_members')}</Tabs.Trigger>
</Tabs.TriggersList>
<Tabs.Content value="details" forceMount tabIndex={-1} className={cn(activeTab !== 'details' && 'hidden')}>
<Tabs.Content
value="details"
forceMount
tabIndex={-1}
className={cn(activeTab !== 'details' && 'hidden')}
>
<div className="flex flex-col gap-5 pt-5">
<div className="flex flex-col gap-1.5">
<label
Expand Down Expand Up @@ -141,7 +144,12 @@ export function CreateRoleDialog({ open, onClose }: t.CreateRoleDialogProps) {
</div>
</div>
</Tabs.Content>
<Tabs.Content value="permissions" forceMount tabIndex={-1} className={cn(activeTab !== 'permissions' && 'hidden')}>
<Tabs.Content
value="permissions"
forceMount
tabIndex={-1}
className={cn(activeTab !== 'permissions' && 'hidden')}
>
<div className="pt-5">
<RolePermissionsPanel
permissions={permissions}
Expand All @@ -150,7 +158,12 @@ export function CreateRoleDialog({ open, onClose }: t.CreateRoleDialogProps) {
/>
</div>
</Tabs.Content>
<Tabs.Content value="members" forceMount tabIndex={-1} className={cn(activeTab !== 'members' && 'hidden')}>
<Tabs.Content
value="members"
forceMount
tabIndex={-1}
className={cn(activeTab !== 'members' && 'hidden')}
>
<div className="flex flex-col gap-4 pt-5">
<UserSearchInline
existingIds={selectedUsers.map((u) => u.id)}
Expand Down
50 changes: 33 additions & 17 deletions src/components/access/EditGroupDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import {
TrashButton,
UserSearchInline,
} from '@/components/shared';
import { cn, notifySuccess, notifyError } from '@/utils';
import { useLocalize } from '@/hooks';
import { cn } from '@/utils';

type EditGroupTab = 'details' | 'members';

Expand Down Expand Up @@ -73,10 +73,10 @@ export function EditGroupDialog({ group, canManage, onClose }: t.EditGroupDialog
};

const mutation = useMutation({
mutationFn: async () => {
if (!group) return;
mutationFn: async ({ name: submittedName }: { name: string }) => {
if (!group) throw new Error(localize('com_access_group_unavailable'));
if (detailsDirty) {
await updateGroupFn({ data: { id: group.id, name, description } });
await updateGroupFn({ data: { id: group.id, name: submittedName, description } });
}
const memberResults = await Promise.allSettled([
...pendingAdditions.map((user) =>
Expand All @@ -95,24 +95,27 @@ export function EditGroupDialog({ group, canManage, onClose }: t.EditGroupDialog
parts.push(localize('com_access_member_ops_failed', { count: failures.length }));
throw new Error(parts.join(', '));
}
return { name: submittedName };
},
onSuccess: () => {
onSuccess: (data) => {
queryClient.invalidateQueries({ queryKey: ['groups'] });
queryClient.invalidateQueries({ queryKey: ['groupAssignments'] });
queryClient.invalidateQueries({ queryKey: ['groupMembers', group?.id] });
notifySuccess(localize('com_toast_group_updated', { name: data.name }));
onClose();
},
onError: (err: Error) => setError(err.message),
Comment thread
cursor[bot] marked this conversation as resolved.
onError: (err: Error) => notifyError(err.message),
});

const doSubmit = () => {
setError('');
if (!group) return;
if (!name.trim()) {
setError(localize('com_access_name_required'));
setActiveTab('details');
return;
}
mutation.mutate();
mutation.mutate({ name });
};

const handleSubmit = (e: React.FormEvent) => {
Expand Down Expand Up @@ -140,14 +143,15 @@ export function EditGroupDialog({ group, canManage, onClose }: t.EditGroupDialog
ariaLabel={localize('com_access_edit_group')}
>
<Tabs.TriggersList>
<Tabs.Trigger value="details">
{localize('com_access_tab_details')}
</Tabs.Trigger>
<Tabs.Trigger value="members">
{localize('com_access_tab_members')}
</Tabs.Trigger>
<Tabs.Trigger value="details">{localize('com_access_tab_details')}</Tabs.Trigger>
<Tabs.Trigger value="members">{localize('com_access_tab_members')}</Tabs.Trigger>
</Tabs.TriggersList>
<Tabs.Content value="details" forceMount tabIndex={-1} className={cn(activeTab !== 'details' && 'hidden')}>
<Tabs.Content
value="details"
forceMount
tabIndex={-1}
className={cn(activeTab !== 'details' && 'hidden')}
>
<div className="flex flex-col gap-5 pt-5">
<div className="flex flex-col gap-1.5">
<label
Expand Down Expand Up @@ -188,7 +192,12 @@ export function EditGroupDialog({ group, canManage, onClose }: t.EditGroupDialog
</div>
</div>
</Tabs.Content>
<Tabs.Content value="members" forceMount tabIndex={-1} className={cn(activeTab !== 'members' && 'hidden')}>
<Tabs.Content
value="members"
forceMount
tabIndex={-1}
className={cn(activeTab !== 'members' && 'hidden')}
>
<div className="flex flex-col gap-4 pt-5">
{canManage && (
<UserSearchInline
Expand Down Expand Up @@ -216,7 +225,12 @@ export function EditGroupDialog({ group, canManage, onClose }: t.EditGroupDialog
{localize('com_access_pending_removals', { count: pendingRemovals.length })}
</span>
<SelectedMemberList
users={pendingRemovals.map((m) => ({ id: m.userId, name: m.name, email: m.email, avatarUrl: m.avatarUrl }))}
users={pendingRemovals.map((m) => ({
id: m.userId,
name: m.name,
email: m.email,
avatarUrl: m.avatarUrl,
}))}
onRemove={unstageRemoval}
disabled={mutation.isPending}
/>
Expand Down Expand Up @@ -254,7 +268,9 @@ export function EditGroupDialog({ group, canManage, onClose }: t.EditGroupDialog
<Button
type="primary"
label={localize('com_ui_save')}
disabled={!canManage || !name.trim() || (!detailsDirty && !membersDirty) || mutation.isPending}
disabled={
!canManage || !name.trim() || (!detailsDirty && !membersDirty) || mutation.isPending
}
/>
</div>
</form>
Expand Down
Loading