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/organization-dialog.tsx
+2 -2
View File
@@ -64,7 +64,7 @@ export function OrganizationDialog({ open, onOpenChange, organization }: Organiz
reset({
organizationCode: organization.organizationCode,
organizationName: organization.organizationName,
roleId: organization.roleId?.toString() || '',
roleId: organization.publicId?.toString() || '',
isActive: organization.isActive,
});
} else {
@@ -80,7 +80,7 @@ export function OrganizationDialog({ open, onOpenChange, organization }: Organiz
const onSubmit = (data: OrganizationFormData) => {
const submitData = {
...data,
roleId: data.roleId ? Number(data.roleId) : undefined,
roleId: data.roleId ? String(data.roleId) : undefined,
};
if (organization) {
frontend/components/admin/security/rbac-matrix.tsx
+4 -4
View File
@@ -137,7 +137,7 @@ export function RbacMatrix() {
<TableRow>
<TableHead className="w-[300px]">Permission</TableHead>
{roleList.map((role) => (
<TableHead key={role.roleId} className="text-center min-w-[100px]">
<TableHead key={role.publicId} className="text-center min-w-[100px]">
{role.roleName}
</TableHead>
))}
@@ -153,14 +153,14 @@ export function RbacMatrix() {
{roleList.map((role) => {
// Assume role.permissions is populated
const currentRolePerms = role.permissions?.map((p) => p.permissionId) || [];
const activePerms = pendingChanges[role.roleId] || currentRolePerms;
const activePerms = pendingChanges[role.publicId] || currentRolePerms;
const isChecked = activePerms.includes(perm.permissionId);
return (
<TableCell key={`${role.roleId}-${perm.permissionId}`} className="text-center">
<TableCell key={`${role.publicId}-${perm.permissionId}`} className="text-center">
<Checkbox
checked={isChecked}
onCheckedChange={() => handleToggle(role.roleId, perm.permissionId, currentRolePerms)}
onCheckedChange={() => handleToggle(role.publicId, perm.permissionId, currentRolePerms)}
/>
</TableCell>
);
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}