mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-18 17:30:16 +01:00
🪺 fix: Update Role Handling due to New Schema Shape (#6774)
* 📝 fix: Update translation for shared agent message in English locale * 🪺 fix: Migrate role schema to new nested structure and update permissions handling where missed
This commit is contained in:
parent
175cfe8ffb
commit
4afab52fc5
6 changed files with 185 additions and 30 deletions
|
|
@ -80,10 +80,10 @@ const AdminSettings = () => {
|
|||
const [selectedRole, setSelectedRole] = useState<SystemRoles>(SystemRoles.USER);
|
||||
|
||||
const defaultValues = useMemo(() => {
|
||||
if (roles?.[selectedRole]) {
|
||||
return roles[selectedRole][PermissionTypes.PROMPTS];
|
||||
if (roles?.[selectedRole]?.permissions) {
|
||||
return roles[selectedRole].permissions[PermissionTypes.PROMPTS];
|
||||
}
|
||||
return roleDefaults[selectedRole][PermissionTypes.PROMPTS];
|
||||
return roleDefaults[selectedRole].permissions[PermissionTypes.PROMPTS];
|
||||
}, [roles, selectedRole]);
|
||||
|
||||
const {
|
||||
|
|
@ -99,10 +99,10 @@ const AdminSettings = () => {
|
|||
});
|
||||
|
||||
useEffect(() => {
|
||||
if (roles?.[selectedRole]?.[PermissionTypes.PROMPTS]) {
|
||||
reset(roles[selectedRole][PermissionTypes.PROMPTS]);
|
||||
if (roles?.[selectedRole]?.permissions?.[PermissionTypes.PROMPTS]) {
|
||||
reset(roles[selectedRole].permissions[PermissionTypes.PROMPTS]);
|
||||
} else {
|
||||
reset(roleDefaults[selectedRole][PermissionTypes.PROMPTS]);
|
||||
reset(roleDefaults[selectedRole].permissions[PermissionTypes.PROMPTS]);
|
||||
}
|
||||
}, [roles, selectedRole, reset]);
|
||||
|
||||
|
|
|
|||
|
|
@ -72,10 +72,10 @@ const AdminSettings = () => {
|
|||
const [selectedRole, setSelectedRole] = useState<SystemRoles>(SystemRoles.USER);
|
||||
|
||||
const defaultValues = useMemo(() => {
|
||||
if (roles?.[selectedRole]) {
|
||||
return roles[selectedRole][PermissionTypes.AGENTS];
|
||||
if (roles?.[selectedRole]?.permissions) {
|
||||
return roles[selectedRole].permissions[PermissionTypes.AGENTS];
|
||||
}
|
||||
return roleDefaults[selectedRole][PermissionTypes.AGENTS];
|
||||
return roleDefaults[selectedRole].permissions[PermissionTypes.AGENTS];
|
||||
}, [roles, selectedRole]);
|
||||
|
||||
const {
|
||||
|
|
@ -91,10 +91,10 @@ const AdminSettings = () => {
|
|||
});
|
||||
|
||||
useEffect(() => {
|
||||
if (roles?.[selectedRole]?.[PermissionTypes.AGENTS]) {
|
||||
reset(roles[selectedRole][PermissionTypes.AGENTS]);
|
||||
if (roles?.[selectedRole]?.permissions?.[PermissionTypes.AGENTS]) {
|
||||
reset(roles[selectedRole].permissions[PermissionTypes.AGENTS]);
|
||||
} else {
|
||||
reset(roleDefaults[selectedRole][PermissionTypes.AGENTS]);
|
||||
reset(roleDefaults[selectedRole].permissions[PermissionTypes.AGENTS]);
|
||||
}
|
||||
}, [roles, selectedRole, reset]);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue