Skip to content

[fix]: clear stuck entity-assignment validation on virtual key sheet #5805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akshaydeo merged 4 commits into from
Aug 3, 2026
Merged

[fix]: clear stuck entity-assignment validation on virtual key sheet #5805

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c71178b
[fix]: clear stuck entity-assignment validation on virtual key sheet
CMWR421 Aug 3, 2026
d387838
[docs]: add before/after screenshots for virtual key entity-assignmen…
CMWR421 Aug 3, 2026
a61c7a3
[docs]: add on-submit validation screenshot for entity-assignment fix
CMWR421 Aug 3, 2026
fcfff0f
[chore]: remove PR screenshots from .github/assets
CMWR421 Aug 3, 2026
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
49 changes: 15 additions & 34 deletions ui/app/workspace/virtual-keys/views/virtualKeySheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,6 +1413,7 @@ export default function VirtualKeySheet({ virtualKey, defaultTeamId, onSave, onC
form.setValue("teamId", pendingTeamId, {
shouldDirty: true,
});
void form.trigger("entityType");
}
setPendingTeamId(null);
setShowReassignTeamWarning(false);
Expand Down Expand Up @@ -1550,7 +1551,7 @@ export default function VirtualKeySheet({ virtualKey, defaultTeamId, onSave, onC
<div className="space-y-4">
<Label className="text-sm font-medium">Entity Assignment</Label>

<div className="grid grid-cols-1 items-center gap-2 md:grid-cols-2">
<div className="grid grid-cols-1 items-start gap-2 md:grid-cols-2">
<FormField
control={form.control}
name="entityType"
Expand All @@ -1567,42 +1568,16 @@ export default function VirtualKeySheet({ virtualKey, defaultTeamId, onSave, onC
},
]}
value={field.value}
onValueChange={async (value) => {
onValueChange={(value) => {
const val = value ?? "none";
field.onChange(val);
// Switching type clears both ids and lets the user pick;
// there is no entity list loaded to default from.
if (val === "team") {
form.setValue("teamId", "", {
shouldDirty: true,
shouldValidate: true,
});
form.setValue("customerId", "", {
shouldDirty: true,
shouldValidate: true,
});
await form.trigger(["teamId", "customerId", "entityType"]);
} else if (val === "customer") {
form.setValue("customerId", "", {
shouldDirty: true,
shouldValidate: true,
});
form.setValue("teamId", "", {
shouldDirty: true,
shouldValidate: true,
});
await form.trigger(["teamId", "customerId", "entityType"]);
} else {
form.setValue("teamId", "", {
shouldDirty: true,
shouldValidate: true,
});
form.setValue("customerId", "", {
shouldDirty: true,
shouldValidate: true,
});
await form.trigger(["teamId", "customerId", "entityType"]);
}
// Defer validation until submit or until an entity is chosen —
// eager trigger left a stuck refine error on entityType.
form.setValue("teamId", "", { shouldDirty: true });
form.setValue("customerId", "", { shouldDirty: true });
form.clearErrors(["entityType", "teamId", "customerId"]);
}}
disabled={isTeamLocked || (isEditing && assignedUsers.length > 0)}
disableSearch
Expand Down Expand Up @@ -1634,6 +1609,9 @@ export default function VirtualKeySheet({ virtualKey, defaultTeamId, onSave, onC
setShowReassignTeamWarning(true);
} else {
field.onChange(newVal);
// Refine error lives on entityType; re-run so a valid
// team selection clears the assignment-type message.
void form.trigger("entityType");
}
}}
// The already-assigned team may fall outside the
Expand Down Expand Up @@ -1665,7 +1643,10 @@ export default function VirtualKeySheet({ virtualKey, defaultTeamId, onSave, onC
<FormLabel className="font-normal">Select Customer</FormLabel>
<CustomerSelector
value={field.value || ""}
onChange={(val) => field.onChange(val)}
onChange={(val) => {
field.onChange(val);
void form.trigger("entityType");
}}
fallbackOption={
field.value
? {
Expand Down