np-dms/lcbp3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

690328:1547 Fixing Refactor uuid by Kimi #10
CI / CD Pipeline / build (push) Successful in 6m16s
Details
CI / CD Pipeline / deploy (push) Failing after 7m15s
Details

Browse Source
This commit is contained in:
admin
2026-03-28 15:47:07 +07:00
parent 3f78f0ec00
commit 57a3ed2d37
29 changed files with 162 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/components/admin/user-dialog.tsx
+8 -8
View File
@@ -108,7 +108,7 @@ export function UserDialog({ open, onOpenChange, user }: UserDialogProps) {
isActive: user.isActive,
lineId: user.lineId || '',
primaryOrganizationId: user.primaryOrganizationId?.toString() || ALL_ORGANIZATIONS_VALUE,
roleIds: user.roles?.map((r: { roleId: number }) => r.roleId) || [],
roleIds: user.roles?.map((r: { publicId: string }) => r.publicId) || [],
password: '',
confirmPassword: '',
});
@@ -297,26 +297,26 @@ export function UserDialog({ open, onOpenChange, user }: UserDialogProps) {
<p className="text-sm text-muted-foreground">Loading roles...</p>
)}
{Array.isArray(roles) &&
roles.map((role: { roleId: number; roleName: string; description?: string }) => (
<div key={role.roleId} className="flex items-start space-x-2">
roles.map((role: { publicId: string; roleName: string; description?: string }) => (
<div key={role.publicId} className="flex items-start space-x-2">
<Checkbox
id={`role-${role.roleId}`}
checked={selectedRoleIds.includes(role.roleId)}
id={`role-${role.publicId}`}
checked={selectedRoleIds.includes(role.publicId)}
onCheckedChange={(checked) => {
const current = selectedRoleIds;
if (checked) {
setValue('roleIds', [...current, role.roleId]);
setValue('roleIds', [...current, role.publicId]);
} else {
setValue(
'roleIds',
current.filter((id) => id !== role.roleId)
current.filter((id) => id !== role.publicId)
);
}
}}
/>
<div className="grid gap-1.5 leading-none">
<label
htmlFor={`role-${role.roleId}`}
htmlFor={`role-${role.publicId}`}
className="text-sm font-medium leading-none cursor-pointer"
>
{role.roleName}