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

Commit1efe7e3

Browse files
committed
chore: cleanup entities
1 parent5f5a9f8 commit1efe7e3

File tree

2 files changed

+53
-87
lines changed

2 files changed

+53
-87
lines changed

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.test.tsx‎

Lines changed: 13 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ import {
99
MockTemplateVersionExternalAuthGithubAuthenticated,
1010
MockUserOwner,
1111
MockWorkspace,
12-
mockDropdownParameter,
13-
mockMultiSelectParameter,
14-
mockSliderParameter,
15-
mockSwitchParameter,
16-
mockTagSelectParameter,
17-
validationParameter,
12+
MockDropdownParameter,
13+
MockSliderParameter,
14+
MockValidationParameter,
15+
MockDynamicParametersResponse,
16+
MockDynamicParametersResponseWithError,
1817
}from"testHelpers/entities";
1918
import{
2019
renderWithAuth,
@@ -24,33 +23,6 @@ import { createMockWebSocket } from "testHelpers/websockets";
2423
importtype{MockWebSocketServer}from"testHelpers/websockets";
2524
importCreateWorkspacePageExperimentalfrom"./CreateWorkspacePageExperimental";
2625

27-
constmockDynamicParametersResponse:DynamicParametersResponse={
28-
id:1,
29-
parameters:[
30-
mockDropdownParameter,
31-
mockSliderParameter,
32-
mockSwitchParameter,
33-
mockTagSelectParameter,
34-
mockMultiSelectParameter,
35-
],
36-
diagnostics:[],
37-
};
38-
39-
constmockDynamicParametersResponseWithError:DynamicParametersResponse={
40-
id:2,
41-
parameters:[mockDropdownParameter],
42-
diagnostics:[
43-
{
44-
severity:"error",
45-
summary:"Validation failed",
46-
detail:"The selected instance type is not available in this region",
47-
extra:{
48-
code:"",
49-
},
50-
},
51-
],
52-
};
53-
5426
describe("CreateWorkspacePageExperimental",()=>{
5527
constrenderCreateWorkspacePageExperimental=(
5628
route=`/templates/${MockTemplate.name}/workspace`,
@@ -94,7 +66,7 @@ describe("CreateWorkspacePageExperimental", () => {
9466
publisher.publishOpen(newEvent("open"));
9567
publisher.publishMessage(
9668
newMessageEvent("message",{
97-
data:JSON.stringify(mockDynamicParametersResponse),
69+
data:JSON.stringify(MockDynamicParametersResponse),
9870
}),
9971
);
10072

@@ -149,7 +121,7 @@ describe("CreateWorkspacePageExperimental", () => {
149121
publisher.publishOpen(newEvent("open"));
150122
publisher.publishMessage(
151123
newMessageEvent("message",{
152-
data:JSON.stringify(mockDynamicParametersResponse),
124+
data:JSON.stringify(MockDynamicParametersResponse),
153125
}),
154126
);
155127

@@ -260,7 +232,7 @@ describe("CreateWorkspacePageExperimental", () => {
260232
newMessageEvent("message",{
261233
data:JSON.stringify({
262234
id:0,
263-
parameters:[mockDropdownParameter],
235+
parameters:[MockDropdownParameter],
264236
diagnostics:[],
265237
}),
266238
}),
@@ -274,12 +246,12 @@ describe("CreateWorkspacePageExperimental", () => {
274246

275247
constresponse1:DynamicParametersResponse={
276248
id:1,
277-
parameters:[mockDropdownParameter],
249+
parameters:[MockDropdownParameter],
278250
diagnostics:[],
279251
};
280252
constresponse2:DynamicParametersResponse={
281253
id:4,
282-
parameters:[mockSliderParameter],
254+
parameters:[MockSliderParameter],
283255
diagnostics:[],
284256
};
285257

@@ -399,7 +371,7 @@ describe("CreateWorkspacePageExperimental", () => {
399371

400372
publisher.publishMessage(
401373
newMessageEvent("message",{
402-
data:JSON.stringify(mockDynamicParametersResponseWithError),
374+
data:JSON.stringify(MockDynamicParametersResponseWithError),
403375
}),
404376
);
405377

@@ -422,15 +394,15 @@ describe("CreateWorkspacePageExperimental", () => {
422394
it("displays parameter validation errors for min/max constraints",async()=>{
423395
constmockResponseInitial:DynamicParametersResponse={
424396
id:1,
425-
parameters:[validationParameter],
397+
parameters:[MockValidationParameter],
426398
diagnostics:[],
427399
};
428400

429401
constmockResponseWithError:DynamicParametersResponse={
430402
id:2,
431403
parameters:[
432404
{
433-
...validationParameter,
405+
...MockValidationParameter,
434406
value:{value:"200",valid:false},
435407
diagnostics:[
436408
{

‎site/src/testHelpers/entities.ts‎

Lines changed: 40 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
}from"api/api";
66
importtype{FieldError}from"api/errors";
77
importtype*asTypesGenfrom"api/typesGenerated";
8+
import{DynamicParametersResponse}from"api/typesGenerated";
89
importtype{ProxyLatencyReport}from"contexts/useProxyLatency";
910
importrangefrom"lodash/range";
1011
importtype{Permissions}from"modules/permissions";
@@ -3125,16 +3126,12 @@ export const MockPreviewParameter: TypesGen.PreviewParameter = {
31253126
order:0,
31263127
};
31273128

3128-
exportconstmockDropdownParameter:TypesGen.PreviewParameter={
3129+
exportconstMockDropdownParameter:TypesGen.PreviewParameter={
3130+
...MockPreviewParameter,
31293131
name:"instance_type",
31303132
display_name:"Instance Type",
31313133
description:"The type of instance to create",
3132-
type:"string",
31333134
form_type:"dropdown",
3134-
mutable:true,
3135-
ephemeral:false,
3136-
required:true,
3137-
value:{value:"",valid:true},
31383135
default_value:{value:"t3.micro",valid:true},
31393136
options:[
31403137
{
@@ -3156,9 +3153,6 @@ export const mockDropdownParameter: TypesGen.PreviewParameter = {
31563153
icon:"",
31573154
},
31583155
],
3159-
validations:[],
3160-
diagnostics:[],
3161-
icon:"",
31623156
styling:{
31633157
placeholder:"",
31643158
disabled:false,
@@ -3167,21 +3161,16 @@ export const mockDropdownParameter: TypesGen.PreviewParameter = {
31673161
order:1,
31683162
};
31693163

3170-
exportconstmockTagSelectParameter:TypesGen.PreviewParameter={
3164+
exportconstMockTagSelectParameter:TypesGen.PreviewParameter={
3165+
...MockPreviewParameter,
31713166
name:"tags",
31723167
display_name:"Tags",
31733168
description:"Resource tags",
31743169
type:"list(string)",
31753170
form_type:"tag-select",
3176-
mutable:true,
3177-
ephemeral:false,
31783171
required:false,
31793172
value:{value:"[]",valid:true},
31803173
default_value:{value:"[]",valid:true},
3181-
options:[],
3182-
validations:[],
3183-
diagnostics:[],
3184-
icon:"",
31853174
styling:{
31863175
placeholder:"",
31873176
disabled:false,
@@ -3190,21 +3179,16 @@ export const mockTagSelectParameter: TypesGen.PreviewParameter = {
31903179
order:4,
31913180
};
31923181

3193-
exportconstmockSwitchParameter:TypesGen.PreviewParameter={
3182+
exportconstMockSwitchParameter:TypesGen.PreviewParameter={
3183+
...MockPreviewParameter,
31943184
name:"enable_monitoring",
31953185
display_name:"Enable Monitoring",
31963186
description:"Enable system monitoring",
31973187
type:"bool",
31983188
form_type:"switch",
3199-
mutable:true,
3200-
ephemeral:false,
32013189
required:false,
32023190
value:{value:"true",valid:true},
32033191
default_value:{value:"true",valid:true},
3204-
options:[],
3205-
validations:[],
3206-
diagnostics:[],
3207-
icon:"",
32083192
styling:{
32093193
placeholder:"",
32103194
disabled:false,
@@ -3213,21 +3197,15 @@ export const mockSwitchParameter: TypesGen.PreviewParameter = {
32133197
order:3,
32143198
};
32153199

3216-
exportconstmockSliderParameter:TypesGen.PreviewParameter={
3200+
exportconstMockSliderParameter:TypesGen.PreviewParameter={
3201+
...MockPreviewParameter,
32173202
name:"cpu_count",
32183203
display_name:"CPU Count",
32193204
description:"Number of CPU cores",
32203205
type:"number",
32213206
form_type:"slider",
3222-
mutable:true,
3223-
ephemeral:false,
3224-
required:true,
32253207
value:{value:"2",valid:true},
32263208
default_value:{value:"2",valid:true},
3227-
options:[],
3228-
validations:[],
3229-
diagnostics:[],
3230-
icon:"",
32313209
styling:{
32323210
placeholder:"",
32333211
disabled:false,
@@ -3236,14 +3214,13 @@ export const mockSliderParameter: TypesGen.PreviewParameter = {
32363214
order:2,
32373215
};
32383216

3239-
exportconstmockMultiSelectParameter:TypesGen.PreviewParameter={
3217+
exportconstMockMultiSelectParameter:TypesGen.PreviewParameter={
3218+
...MockPreviewParameter,
32403219
name:"ides",
32413220
display_name:"IDEs",
32423221
description:"Enabled IDEs",
32433222
type:"list(string)",
32443223
form_type:"multi-select",
3245-
mutable:true,
3246-
ephemeral:false,
32473224
required:false,
32483225
value:{value:"[]",valid:true},
32493226
default_value:{value:"[]",valid:true},
@@ -3273,25 +3250,18 @@ export const mockMultiSelectParameter: TypesGen.PreviewParameter = {
32733250
icon:"",
32743251
},
32753252
],
3276-
validations:[],
3277-
diagnostics:[],
3278-
icon:"",
3279-
styling:{},
32803253
order:5,
32813254
};
32823255

3283-
exportconstvalidationParameter:TypesGen.PreviewParameter={
3256+
exportconstMockValidationParameter:TypesGen.PreviewParameter={
3257+
...MockPreviewParameter,
32843258
name:"invalid_number",
32853259
display_name:"Invalid Parameter",
32863260
description:"Number parameter with validation error",
32873261
type:"number",
32883262
form_type:"input",
3289-
mutable:true,
3290-
ephemeral:false,
3291-
required:true,
32923263
value:{value:"50",valid:true},
32933264
default_value:{value:"50",valid:true},
3294-
options:[],
32953265
validations:[
32963266
{
32973267
validation_error:"Number must be between 0 and 100",
@@ -3301,12 +3271,36 @@ export const validationParameter: TypesGen.PreviewParameter = {
33013271
validation_monotonic:null,
33023272
},
33033273
],
3304-
diagnostics:[],
3305-
icon:"",
3306-
styling:{},
33073274
order:1,
33083275
};
33093276

3277+
exportconstMockDynamicParametersResponse:TypesGen.DynamicParametersResponse={
3278+
id:1,
3279+
parameters:[
3280+
MockDropdownParameter,
3281+
MockSliderParameter,
3282+
MockSwitchParameter,
3283+
MockTagSelectParameter,
3284+
MockMultiSelectParameter,
3285+
],
3286+
diagnostics:[],
3287+
};
3288+
3289+
exportconstMockDynamicParametersResponseWithError:TypesGen.DynamicParametersResponse={
3290+
id:2,
3291+
parameters:[MockDropdownParameter],
3292+
diagnostics:[
3293+
{
3294+
severity:"error",
3295+
summary:"Validation failed",
3296+
detail:"The selected instance type is not available in this region",
3297+
extra:{
3298+
code:"",
3299+
},
3300+
},
3301+
],
3302+
};
3303+
33103304
exportconstMockTemplateVersionExternalAuthGithub:TypesGen.TemplateVersionExternalAuth=
33113305
{
33123306
id:"github",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp