Skip to content

Commit b94d205

Browse files
mathis-marcotteMathis Marcotte
andauthored
commented out shared cost column (#224)
* commented out shared cost column --------- Co-authored-by: Mathis Marcotte <[email protected]>
1 parent 4c2a325 commit b94d205

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

frontend/jupyter/src/app/pages/index/index-default/config.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,12 @@ export const defaultCostConfig = {
246246
matColumnDef: 'storage',
247247
value: new PropertyValue({ field: 'pvCost' }),
248248
},
249-
{
250-
matHeaderCellDef: $localize`Shared`,
251-
matColumnDef: 'shared',
252-
value: new PropertyValue({ field: 'sharedCost' }),
253-
},
249+
//AAW: Commented out shared cost
250+
//{
251+
// matHeaderCellDef: $localize`Shared`,
252+
// matColumnDef: 'shared',
253+
// value: new PropertyValue({ field: 'sharedCost' }),
254+
//},
254255
{
255256
matHeaderCellDef: $localize`Total`,
256257
matColumnDef: 'total',

frontend/jupyter/src/app/pages/index/index-default/index-default.component.ts

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,9 @@ export class IndexDefaultComponent implements OnInit, OnDestroy {
470470
}
471471

472472
public costTrackByFn(index: number, cost: AllocationCostObject) {
473-
return `${cost.cpuCost}/${cost.gpuCost}/${cost.ramCost}/${cost.pvCost}/${cost.sharedCost}/${cost.totalCost}`;
473+
//AAW: Commented out shared cost
474+
//return `${cost.cpuCost}/${cost.gpuCost}/${cost.ramCost}/${cost.pvCost}/${cost.sharedCost}/${cost.totalCost}`;
475+
return `${cost.cpuCost}/${cost.gpuCost}/${cost.ramCost}/${cost.pvCost}/${cost.totalCost}`;
474476
}
475477

476478
public getCostStatus() {
@@ -503,13 +505,19 @@ export class IndexDefaultComponent implements OnInit, OnDestroy {
503505
costCopy.gpuCost = this.formatCost(alloc.gpuCost);
504506
costCopy.ramCost = this.formatCost(alloc.ramCost);
505507
costCopy.pvCost = this.formatCost(alloc.pvCost);
506-
costCopy.sharedCost = this.formatCost(alloc.sharedCost);
507-
costCopy.totalCost = Number.parseInt(costCopy.sharedCost).toString();
508-
costCopy.totalCost = this.formatCost(alloc.cpuCost
508+
//AAW: Commented out shared cost
509+
//costCopy.sharedCost = this.formatCost(alloc.sharedCost);
510+
//costCopy.totalCost = this.formatCost(alloc.cpuCost
511+
// +alloc.gpuCost
512+
// +alloc.ramCost
513+
// +alloc.pvCost
514+
// +alloc.sharedCost
515+
//);
516+
costCopy.totalCost = this.formatCost(
517+
alloc.cpuCost
509518
+alloc.gpuCost
510519
+alloc.ramCost
511520
+alloc.pvCost
512-
+alloc.sharedCost
513521
);
514522
}
515523

0 commit comments

Comments
 (0)