Mathis/llamactl
1
0
Fork 0
mirror of https://github.com/lordmathis/llamactl.git synced 2025-12-24 18:14:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor CreateApiKeyDialog to use instance IDs

Browse Source
This commit is contained in:
Matúš Námešný
2025-12-06 22:20:39 +01:00
parent 0fee7abc7c
commit cd1bd64889
2 changed files with 48 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
webui/src/components/apikeys/CreateApiKeyDialog.tsx
View File

@@ -8,9 +8,9 @@ import { Checkbox } from "@/components/ui/checkbox";
import { Alert, AlertDescription } from "@/components/ui/alert";
import { Loader2 } from "lucide-react";
import { apiKeysApi } from "@/lib/api";
import { CreateKeyRequest, PermissionMode, InstancePermission } from "@/types/apiKey";
import { PermissionMode, type CreateKeyRequest } from "@/types/apiKey";
import { useInstances } from "@/contexts/InstancesContext";
import { format, addDays } from "date-fns";
import { format } from "date-fns";
interface CreateApiKeyDialogProps {
open: boolean;
@@ -61,22 +61,19 @@ function CreateApiKeyDialog({ open, onOpenChange, onKeyCreated }: CreateApiKeyDi
}
// Build request
const permissions: InstancePermission[] = [];
const instanceIds: number[] = [];
if (permissionMode === PermissionMode.PerInstance) {
Object.entries(instancePermissions).forEach(([instanceId, canInfer]) => {
if (canInfer) {
permissions.push({
InstanceID: parseInt(instanceId),
CanInfer: true,
});
Object.entries(instancePermissions).forEach(([instanceId, hasPermission]) => {
if (hasPermission) {
instanceIds.push(parseInt(instanceId));
}
});
}
const request: CreateKeyRequest = {
Name: name.trim(),
PermissionMode: permissionMode,
InstancePermissions: permissions,
name: name.trim(),
permission_mode: permissionMode,
instance_ids: instanceIds,
};
// Add expiration if provided
@@ -87,7 +84,7 @@ function CreateApiKeyDialog({ open, onOpenChange, onKeyCreated }: CreateApiKeyDi
setError("Expiration date must be in the future");
return;
}
request.ExpiresAt = Math.floor(expirationDate.getTime() / 1000);
request.expires_at = Math.floor(expirationDate.getTime() / 1000);
}
setLoading(true);
@@ -107,10 +104,10 @@ function CreateApiKeyDialog({ open, onOpenChange, onKeyCreated }: CreateApiKeyDi
};
const handleInstancePermissionChange = (instanceId: number, checked: boolean) => {
setInstancePermissions({
...instancePermissions,
setInstancePermissions(prev => ({
...prev,
[instanceId]: checked,
});
}));
};
return (
@@ -172,25 +169,30 @@ function CreateApiKeyDialog({ open, onOpenChange, onKeyCreated }: CreateApiKeyDi
<p className="text-sm text-muted-foreground">No instances available</p>
) : (
<div className="space-y-2">
{instances.map((instance) => (
<div key={instance.id} className="flex items-center space-x-2">
<Checkbox
id={`instance-${instance.id}`}
checked={instancePermissions[instance.id] || false}
onCheckedChange={(checked) =>
handleInstancePermissionChange(instance.id, checked as boolean)
}
disabled={loading}
/>
<Label
htmlFor={`instance-${instance.id}`}
className="font-normal cursor-pointer flex-1"
{instances.map((instance, index) => {
const isChecked = !!instancePermissions[instance.id];
return (
<div
key={`${instance.name}-${index}`}
className="flex items-center space-x-2"
>
{instance.name}
</Label>
<span className="text-sm text-muted-foreground">Can Infer</span>
</div>
))}
<Checkbox
id={`instance-${instance.id}`}
checked={isChecked}
onCheckedChange={(checked) => {
handleInstancePermissionChange(instance.id, checked as boolean);
}}
disabled={loading}
/>
<Label
htmlFor={`instance-${instance.id}`}
className="font-normal cursor-pointer flex-1"
>
{instance.name}
</Label>
</div>
);
})}
</div>
)}
</div>