Skip to content

Commit 98711c1

Browse files
committed
Move month selection into details view
1 parent 2c0ab7a commit 98711c1

1 file changed

Lines changed: 19 additions & 10 deletions

File tree

src/slurmcostmanager.js

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -666,9 +666,17 @@ function UserDetails({ users }) {
666666
);
667667
}
668668

669-
function Details({ details, daily, partitions = [], accounts = [], users = [] }) {
669+
function Details({
670+
details,
671+
daily,
672+
partitions = [],
673+
accounts = [],
674+
users = [],
675+
month,
676+
onMonthChange,
677+
monthOptions = []
678+
}) {
670679
const [expanded, setExpanded] = useState(null);
671-
const [dateRange, setDateRange] = useState('30');
672680
const [filters, setFilters] = useState({
673681
partition: '',
674682
account: '',
@@ -755,12 +763,10 @@ function Details({ details, daily, partitions = [], accounts = [], users = [] })
755763
{ className: 'filter-bar' },
756764
React.createElement(
757765
'select',
758-
{ value: dateRange, onChange: e => setDateRange(e.target.value) },
759-
React.createElement('option', { value: 'today' }, 'Today'),
760-
React.createElement('option', { value: '7' }, '7 days'),
761-
React.createElement('option', { value: '30' }, '30 days'),
762-
React.createElement('option', { value: 'q' }, 'Q-to-date'),
763-
React.createElement('option', { value: 'y' }, 'Year')
766+
{ value: month, onChange: e => onMonthChange(e.target.value) },
767+
monthOptions.map(m =>
768+
React.createElement('option', { key: m, value: m }, m)
769+
)
764770
),
765771
['Partition', 'Account', 'User'].map(name => {
766772
const opts =
@@ -1143,7 +1149,7 @@ function App() {
11431149
'Settings'
11441150
)
11451151
),
1146-
view !== 'settings' &&
1152+
view === 'summary' &&
11471153
React.createElement(
11481154
'div',
11491155
{ className: 'month-select' },
@@ -1200,7 +1206,10 @@ function App() {
12001206
daily: data.daily,
12011207
partitions: data.partitions,
12021208
accounts: data.accounts,
1203-
users: data.users
1209+
users: data.users,
1210+
month,
1211+
onMonthChange: setMonth,
1212+
monthOptions
12041213
}),
12051214
view === 'settings' && React.createElement(Rates, { onRatesUpdated: reload })
12061215
);

0 commit comments

Comments
 (0)