Skip to content

Use percentage discount and account dropdown #107

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
NessieCanCode merged 1 commit into from
Aug 7, 2025
Merged

Use percentage discount and account dropdown #107

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
66 changes: 56 additions & 10 deletions src/slurmcostmanager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,7 @@ function Details({ details, daily, partitions = [], accounts = [], users = [] })
function Rates({ onRatesUpdated }) {
const [config, setConfig] = useState(null);
const [overrides, setOverrides] = useState([]);
const [accounts, setAccounts] = useState([]);
const [error, setError] = useState(null);
const [saving, setSaving] = useState(false);
const [status, setStatus] = useState(null);
Expand All @@ -851,7 +852,7 @@ function Rates({ onRatesUpdated }) {
? Object.entries(json.overrides).map(([account, cfg]) => ({
account,
rate: cfg.rate ?? '',
discount: cfg.discount ?? ''
discount: cfg.discount != null ? cfg.discount * 100 : ''
}))
: [];
setOverrides(ovrs);
Expand All @@ -866,6 +867,41 @@ function Rates({ onRatesUpdated }) {
};
}, []);

useEffect(() => {
let cancelled = false;
async function loadAccounts() {
try {
let json;
if (window.cockpit && window.cockpit.spawn) {
const { start, end } = getBillingPeriod();
const args = [
'python3',
`${PLUGIN_BASE}/slurmdb.py`,
'--start',
start,
'--end',
end,
'--output',
'-',
];
const output = await window.cockpit.spawn(args, { err: 'message' });
json = JSON.parse(output);
} else {
const resp = await fetch('billing.json');
if (!resp.ok) throw new Error('Failed to fetch billing data');
json = await resp.json();
}
if (!cancelled) setAccounts(json.accounts || []);
} catch (e) {
console.error(e);
}
}
loadAccounts();
return () => {
cancelled = true;
};
}, []);

function updateOverride(index, field, value) {
setOverrides(prev =>
prev.map((o, i) => (i === index ? { ...o, [field]: value } : o))
Expand Down Expand Up @@ -911,7 +947,7 @@ function Rates({ onRatesUpdated }) {
if (o.discount !== '') {
const discount = parseFloat(o.discount);
if (Number.isFinite(discount)) {
entry.discount = discount;
entry.discount = discount / 100;
} else {
console.warn(
`Ignoring invalid discount for account ${o.account}:`,
Expand Down Expand Up @@ -981,7 +1017,7 @@ function Rates({ onRatesUpdated }) {
null,
React.createElement('th', null, 'Account'),
React.createElement('th', null, 'Rate'),
React.createElement('th', null, 'Discount'),
React.createElement('th', null, 'Discount (%)'),
React.createElement('th', null)
)
),
Expand All @@ -992,12 +1028,22 @@ function Rates({ onRatesUpdated }) {
React.createElement(
'tr',
{ key: idx },
React.createElement('td', null,
React.createElement('input', {
value: o.account,
onChange: e =>
updateOverride(idx, 'account', e.target.value)
})
React.createElement(
'td',
null,
React.createElement(
'select',
{
value: o.account,
onChange: e => updateOverride(idx, 'account', e.target.value)
},
[
React.createElement('option', { key: '', value: '' }, ''),
...accounts.map(acct =>
React.createElement('option', { key: acct, value: acct }, acct)
)
]
)
),
React.createElement('td', null,
React.createElement('input', {
Expand All @@ -1011,7 +1057,7 @@ function Rates({ onRatesUpdated }) {
React.createElement('td', null,
React.createElement('input', {
type: 'number',
step: '0.01',
step: '0.1',
value: o.discount,
onChange: e =>
updateOverride(idx, 'discount', e.target.value)
Expand Down
Loading