Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitde64d7b

Browse files
committed
Fix FE tests
1 parentcee73f7 commitde64d7b

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

‎site/src/components/Resources/ResourceCard.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,14 @@ export const ResourceCard: FC<ResourceCardProps> = ({ resource, agentRow }) => {
5353

5454
<StackalignItems="flex-start"direction="row"spacing={5}>
5555
<divclassName={styles.metadataHeader}>
56-
{resource.cost>0&&(
56+
{resource.daily_cost>0&&(
5757
<divclassName={styles.metadata}>
5858
<divclassName={styles.metadataLabel}>
5959
<b>cost</b>
6060
</div>
61-
<divclassName={styles.metadataValue}>{resource.cost}</div>
61+
<divclassName={styles.metadataValue}>
62+
{resource.daily_cost}
63+
</div>
6264
</div>
6365
)}
6466
{visibleMetadata.map((meta)=>{

‎site/src/testHelpers/entities.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ export const MockWorkspaceResource: TypesGen.WorkspaceResource = {
311311
{key:"type",value:"a-workspace-resource",sensitive:false},
312312
{key:"api_key",value:"12345678",sensitive:true},
313313
],
314+
daily_cost:10,
314315
}
315316

316317
exportconstMockWorkspaceResource2:TypesGen.WorkspaceResource={
@@ -331,6 +332,7 @@ export const MockWorkspaceResource2: TypesGen.WorkspaceResource = {
331332
{key:"type",value:"google_compute_disk",sensitive:false},
332333
{key:"size",value:"32GB",sensitive:false},
333334
],
335+
daily_cost:10,
334336
}
335337

336338
exportconstMockWorkspaceResource3:TypesGen.WorkspaceResource={
@@ -351,6 +353,7 @@ export const MockWorkspaceResource3: TypesGen.WorkspaceResource = {
351353
{key:"type",value:"google_compute_disk",sensitive:false},
352354
{key:"size",value:"32GB",sensitive:false},
353355
],
356+
daily_cost:20,
354357
}
355358

356359
exportconstMockWorkspaceAutostartDisabled:TypesGen.UpdateWorkspaceAutostartRequest=
@@ -383,6 +386,7 @@ export const MockWorkspaceBuild: TypesGen.WorkspaceBuild = {
383386
reason:"initiator",
384387
resources:[MockWorkspaceResource],
385388
status:"running",
389+
daily_cost:20,
386390
}
387391

388392
exportconstMockFailedWorkspaceBuild=(
@@ -405,6 +409,7 @@ export const MockFailedWorkspaceBuild = (
405409
reason:"initiator",
406410
resources:[],
407411
status:"running",
412+
daily_cost:20,
408413
})
409414

410415
exportconstMockWorkspaceBuildStop:TypesGen.WorkspaceBuild={
@@ -988,8 +993,8 @@ export const MockAuditLogWithWorkspaceBuild: TypesGen.AuditLog = {
988993
}
989994

990995
exportconstMockWorkspaceQuota:TypesGen.WorkspaceQuota={
991-
user_workspace_count:0,
992-
user_workspace_limit:100,
996+
credits_consumed:0,
997+
budget:100,
993998
}
994999

9951000
exportconstMockGroup:TypesGen.Group={
@@ -998,6 +1003,7 @@ export const MockGroup: TypesGen.Group = {
9981003
avatar_url:"https://example.com",
9991004
organization_id:MockOrganization.id,
10001005
members:[MockUser,MockUser2],
1006+
quota_allowance:5,
10011007
}
10021008

10031009
exportconstMockTemplateACL:TypesGen.TemplateACL={

‎site/src/testHelpers/handlers.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { WorkspaceBuildTransition } from "../api/types"
33
import{CreateWorkspaceBuildRequest}from"../api/typesGenerated"
44
import{permissionsToCheck}from"../xServices/auth/authXService"
55
import*asMfrom"./entities"
6-
import{MockGroup}from"./entities"
6+
import{MockGroup,MockWorkspaceQuota}from"./entities"
77

88
exportconsthandlers=[
99
rest.get("/api/v2/templates/:templateId/daus",async(req,res,ctx)=>{
@@ -243,4 +243,8 @@ export const handlers = [
243243
rest.delete("/api/v2/groups/:groupId",(req,res,ctx)=>{
244244
returnres(ctx.status(204))
245245
}),
246+
247+
rest.get("/api/v2/workspace-quota/:userId",(req,res,ctx)=>{
248+
returnres(ctx.status(200),ctx.json(MockWorkspaceQuota))
249+
}),
246250
]

‎site/src/util/groups.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export const everyOneGroup = (organizationId: string): Group => ({
66
organization_id:organizationId,
77
members:[],
88
avatar_url:"",
9+
quota_allowance:0,
910
})
1011

1112
exportconstgetGroupSubtitle=(group:Group):string=>{

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp