Skip to content

feat(admin): require expiration for credit grants unless 'Never expires' is checked #15

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

Open
kilo-code-bot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(admin): require expiration for credit grants unless 'Never expires' is checked #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 35 additions & 5 deletions src/app/admin/components/UserAdmin/UserAdminCreditGrant.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export function UserAdminCreditGrant({
const [customDescription, setCustomDescription] = useState<string>('');
const [expirationDate, setExpirationDate] = useState<string>('');
const [expiryHours, setExpiryHours] = useState<string>('');
const [neverExpires, setNeverExpires] = useState(false);

// API state
const [isGrantingCredit, setIsGrantingCredit] = useState(false);
Expand All @@ -55,8 +56,17 @@ export function UserAdminCreditGrant({
);
const expectNegative = selectedCreditCategory?.expect_negative_amount ?? false;

// Form validation - credit category required; description required for negative amount categories
const isFormValid = selectedCredit && (!expectNegative || customDescription.trim().length > 0);
// Check if expiration is set (either via date or hours)
const hasExpiration = expirationDate.trim() !== '' || expiryHours.trim() !== '';

// Form validation:
// - credit category required
// - description required for negative amount categories
// - expiration required unless "Never expires" is checked (only for non-negative categories)
const isFormValid =
selectedCredit &&
(!expectNegative || customDescription.trim().length > 0) &&
(expectNegative || neverExpires || hasExpiration);

const handleCreditTypeChange = (value: string) => {
setSelectedCredit(value);
Expand All @@ -65,6 +75,7 @@ export function UserAdminCreditGrant({
setCustomDescription('');
setExpirationDate('');
setExpiryHours('');
setNeverExpires(false);
};

const handleGrantCredit = async () => {
Expand Down Expand Up @@ -109,6 +120,7 @@ export function UserAdminCreditGrant({
setCustomDescription('');
setExpirationDate('');
setExpiryHours('');
setNeverExpires(false);
await queryClient.invalidateQueries({ queryKey: ['admin-user-credit-transactions', id] });
} else {
setCreditMessage({
Expand Down Expand Up @@ -220,7 +232,7 @@ export function UserAdminCreditGrant({
<>
<div>
<Label className="text-sm font-medium" htmlFor="expiry-hours">
Expiry Hours
Expiry Hours{!neverExpires && !expirationDate ? ' (required)' : ''}
Copy link
Contributor Author

@kilo-code-bot kilo-code-bot bot Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WARNING: Required indicator condition is incorrect for "Expiry Hours"

This shows "(required)" whenever expirationDate is empty, even if the user already entered expiryHours. Consider only showing required when neither expiration field is set.

Suggested change
Expiry Hours{!neverExpires && !expirationDate ? ' (required)' : ''}
Expiry Hours{!neverExpires && !expiryHours && !expirationDate ? ' (required)' : ''}

</Label>
<Input
type="number"
Expand All @@ -230,12 +242,12 @@ export function UserAdminCreditGrant({
min="0"
step="0.01"
id="expiry-hours"
disabled={!selectedCredit}
disabled={!selectedCredit || neverExpires}
Copy link
Contributor Author

@kilo-code-bot kilo-code-bot bot Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WARNING: Required indicator condition is incorrect for "Expiration Date"

This shows "(required)" whenever expiryHours is empty, even if the user already selected an expirationDate. Consider only showing required when neither expiration field is set.

Suggested change
disabled={!selectedCredit || neverExpires}
Expiration Date{!neverExpires && !expiryHours && !expirationDate ? ' (required)' : ''}

/>
</div>
<div>
<Label className="text-sm font-medium" htmlFor="date">
Expiration Date
Expiration Date{!neverExpires && !expiryHours ? ' (required)' : ''}
Copy link
Contributor Author

@kilo-code-bot kilo-code-bot bot Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SUGGESTION: Date input value fallback likely never triggers + format mismatch

expirationDate is a string state initialized to '', so expirationDate ?? ... will always pick expirationDate (empty string is not nullish) and never fall back to the category default. Also, <input type="date"> expects YYYY-MM-DD, while toISOString() produces a full timestamp (YYYY-MM-DDTHH:mm:ss.sssZ).

Consider using something like expirationDate || (selectedCreditCategory?.credit_expiry_date ? selectedCreditCategory.credit_expiry_date.toISOString().slice(0, 10) : '').

</Label>
<Input
type="date"
Expand All @@ -244,8 +256,26 @@ export function UserAdminCreditGrant({
}
onChange={e => setExpirationDate(e.target.value)}
id="date"
disabled={!selectedCredit || neverExpires}
/>
</div>
<div className="flex items-end">
<Label className="flex items-center gap-2 text-sm font-medium">
<input
type="checkbox"
checked={neverExpires}
onChange={e => {
setNeverExpires(e.target.checked);
if (e.target.checked) {
setExpirationDate('');
setExpiryHours('');
}
}}
disabled={!selectedCredit}
/>
Never expires
</Label>
</div>
</>
)}
</div>
Expand Down