Skip to content

Commit 71d1664

Browse files
ciyerciyer
committed
refactor: rename usage_available to usage_hours_remaining
1 parent 902125f commit 71d1664

9 files changed

Lines changed: 38 additions & 30 deletions

File tree

‎client/src/features/sessionsV2/SessionShowPage/StartSessionProgressBar.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ export function StartSessionProgressBarV2({
5656
<div data-cy="session-status-starting">
5757
<h2 className="fw-bold">Launching Session</h2>
5858
<p className="pb-0">Starting session services</p>
59-
{resourceClass?.usage_available != null && (
60-
<UsageAvailable usageAvailableHours={resourceClass.usage_available} />
59+
{resourceClass?.usage_hours_remaining != null && (
60+
<UsageAvailable
61+
usageAvailableHours={resourceClass.usage_hours_remaining}
62+
/>
6163
)}
6264
<div className={cx("d-flex", "gap-3", "mt-3")}>
6365
<Loader inline={true} size={24} />

‎client/src/features/sessionsV2/SessionStartPage.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,9 @@ function SessionStarting({ launcher, project }: StartSessionFromLauncherProps) {
319319
title={`Launching session ${launcher.name}`}
320320
status={steps}
321321
extraDescription={
322-
resourceClass?.usage_available != null && (
322+
resourceClass?.usage_hours_remaining != null && (
323323
<UsageAvailable
324-
usageAvailableHours={resourceClass?.usage_available}
324+
usageAvailableHours={resourceClass?.usage_hours_remaining}
325325
/>
326326
)
327327
}
@@ -659,9 +659,9 @@ function StartSessionFromLauncher({
659659
title={`Launching session ${launcher.name}`}
660660
status={steps}
661661
extraDescription={
662-
resourceClass?.usage_available != null && (
662+
resourceClass?.usage_hours_remaining != null && (
663663
<UsageAvailable
664-
usageAvailableHours={resourceClass?.usage_available}
664+
usageAvailableHours={resourceClass?.usage_hours_remaining}
665665
/>
666666
)
667667
}

‎client/src/features/sessionsV2/StartSessionButton.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ function SessionStartDefaultActionButton({
5353

5454
if (resourceClass) {
5555
if (
56-
resourceClass.usage_available != null &&
57-
resourceClass.usage_available <= 0
56+
resourceClass.usage_hours_remaining != null &&
57+
resourceClass.usage_hours_remaining <= 0
5858
) {
5959
return <UsageQuotaReachedLaunchButton />;
6060
}

‎client/src/features/sessionsV2/components/SessionButton/ActiveSessionButton.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ function ActiveSessionDefaultButton({
181181
if (status === "hibernated") {
182182
if (
183183
usageLimit.quotaEnforced &&
184-
usageLimit.resourceClass?.usage_available != null &&
185-
usageLimit.resourceClass.usage_available <= 0
184+
usageLimit.resourceClass?.usage_hours_remaining != null &&
185+
usageLimit.resourceClass.usage_hours_remaining <= 0
186186
) {
187187
return (
188188
<>

‎client/src/features/sessionsV2/components/SessionClassSelector.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,8 @@ const OptionOrSingleValueContent = ({
279279
}: OptionOrSingleValueContentProps) => {
280280
const canBeUsed =
281281
sessionClass.matching &&
282-
(sessionClass.usage_available == null || sessionClass.usage_available > 0);
282+
(sessionClass.usage_hours_remaining == null ||
283+
sessionClass.usage_hours_remaining > 0);
283284
const labelClassName = cx(
284285
"text-wrap",
285286
"text-break",
@@ -294,7 +295,7 @@ const OptionOrSingleValueContent = ({
294295
<span className={labelClassName}>
295296
<FontAwesomeIcon icon={icon} /> {sessionClass.name}{" "}
296297
<span className="text-muted">
297-
{usageAvailableString(sessionClass.usage_available, true)}
298+
{usageAvailableString(sessionClass.usage_hours_remaining, true)}
298299
</span>
299300
</span>{" "}
300301
<span className={detailValueClassName}>{sessionClass.cpu}</span>{" "}

‎client/src/features/sessionsV2/components/SessionLauncherButtons.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ function SessionLauncherDefaultAction({
120120

121121
if (resourceClass) {
122122
if (
123-
resourceClass.usage_available != null &&
124-
resourceClass.usage_available <= 0
123+
resourceClass.usage_hours_remaining != null &&
124+
resourceClass.usage_hours_remaining <= 0
125125
) {
126126
return <UsageQuotaReachedLaunchButton />;
127127
}

‎client/src/features/sessionsV2/components/SessionStatus/SessionStatus.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,11 +451,14 @@ function SessionStatusV2TextQuotaInformation({
451451
const resourceClass = resourcePools
452452
?.flatMap((pool) => pool.classes)
453453
.find((cls) => cls.id === resourceClassId);
454-
if (!resourceClass || resourceClass.usage_available == null) return null;
454+
if (!resourceClass || resourceClass.usage_hours_remaining == null)
455+
return null;
455456

456457
return (
457458
<span className={cx("text-muted")}>
458-
<UsageAvailable usageAvailableHours={resourceClass.usage_available} />
459+
<UsageAvailable
460+
usageAvailableHours={resourceClass.usage_hours_remaining}
461+
/>
459462
</span>
460463
);
461464
}

‎client/src/features/sessionsV2/components/SessionsList.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,14 @@ export function SessionRowResourceRequests({
8686
</span>
8787
))}
8888
</div>
89-
{usageLimit.resourceClass?.usage_available != null && (
89+
{usageLimit.resourceClass?.usage_hours_remaining != null && (
9090
<div data-cy="session-view-resource-class-availability">
9191
<span key="available">
9292
<span className="text-nowrap">
9393
<UsageAvailable
94-
usageAvailableHours={usageLimit.resourceClass.usage_available}
94+
usageAvailableHours={
95+
usageLimit.resourceClass.usage_hours_remaining
96+
}
9597
/>
9698
</span>
9799
</span>

‎tests/cypress/fixtures/dataServices/resource-pools-consumed.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"default_storage": 5,
2323
"default": true,
2424
"matching": false,
25-
"usage_available": 0,
26-
"usage_available_percentage": 0
25+
"usage_hours_remaining": 0,
26+
"usage_hours_total": 1
2727
},
2828
{
2929
"id": 2,
@@ -35,8 +35,8 @@
3535
"default_storage": 5,
3636
"default": false,
3737
"matching": true,
38-
"usage_available": 0,
39-
"usage_available_percentage": 0
38+
"usage_hours_remaining": 0,
39+
"usage_hours_total": 1
4040
}
4141
]
4242
},
@@ -65,8 +65,8 @@
6565
"default_storage": 10,
6666
"default": false,
6767
"matching": true,
68-
"usage_available": 200,
69-
"usage_available_percentage": 100
68+
"usage_hours_remaining": 200,
69+
"usage_hours_total": 200
7070
},
7171
{
7272
"id": 4,
@@ -78,8 +78,8 @@
7878
"default_storage": 10,
7979
"default": false,
8080
"matching": true,
81-
"usage_available": 100,
82-
"usage_available_percentage": 100
81+
"usage_hours_remaining": 100,
82+
"usage_hours_total": 100
8383
},
8484
{
8585
"id": 5,
@@ -91,8 +91,8 @@
9191
"default_storage": 10,
9292
"default": false,
9393
"matching": true,
94-
"usage_available": 50,
95-
"usage_available_percentage": 100
94+
"usage_hours_remaining": 50,
95+
"usage_hours_total": 50
9696
},
9797
{
9898
"id": 6,
@@ -104,8 +104,8 @@
104104
"default_storage": 10,
105105
"default": false,
106106
"matching": true,
107-
"usage_available": 25,
108-
"usage_available_percentage": 100
107+
"usage_hours_remaining": 25,
108+
"usage_hours_total": 25
109109
}
110110
]
111111
}

0 commit comments

Comments
 (0)