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

Commit1a6eeae

Browse files
committed
ui fixes
1 parent1d93c82 commit1a6eeae

File tree

5 files changed

+97
-63
lines changed

5 files changed

+97
-63
lines changed

‎cli/parameterresolver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ func (pr *ParameterResolver) resolveWithInput(resolved []codersdk.WorkspaceBuild
226226
ifp!=nil {
227227
continue
228228
}
229-
//Parameter has not been resolved yet, so CLI needs to determine if user should input it.
229+
//PreviewParameter has not been resolved yet, so CLI needs to determine if user should input it.
230230

231231
firstTimeUse:=pr.isFirstTimeUse(tvp.Name)
232232
promptParameterOption:=pr.isLastBuildParameterInvalidOption(tvp)

‎coderd/database/db2sdk/db2sdk.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -767,15 +767,15 @@ func Chats(chats []database.Chat) []codersdk.Chat {
767767
returnList(chats,Chat)
768768
}
769769

770-
funcPreviewParameter(param previewtypes.Parameter) codersdk.Parameter {
771-
return codersdk.Parameter{
772-
ParameterData: codersdk.ParameterData{
770+
funcPreviewParameter(param previewtypes.Parameter) codersdk.PreviewParameter {
771+
return codersdk.PreviewParameter{
772+
PreviewParameterData: codersdk.PreviewParameterData{
773773
Name:param.Name,
774774
DisplayName:param.DisplayName,
775775
Description:param.Description,
776776
Type:codersdk.OptionType(param.Type),
777777
FormType:codersdk.ParameterFormType(param.FormType),
778-
Styling: codersdk.ParameterStyling{
778+
Styling: codersdk.PreviewParameterStyling{
779779
Placeholder:param.Styling.Placeholder,
780780
Disabled:param.Styling.Disabled,
781781
Label:param.Styling.Label,
@@ -820,25 +820,25 @@ func PreviewHCLString(h previewtypes.HCLString) codersdk.NullHCLString {
820820
}
821821
}
822822

823-
funcPreviewParameterOption(o*previewtypes.ParameterOption) codersdk.ParameterOption {
823+
funcPreviewParameterOption(o*previewtypes.ParameterOption) codersdk.PreviewParameterOption {
824824
ifo==nil {
825825
// This should never be sent
826-
return codersdk.ParameterOption{}
826+
return codersdk.PreviewParameterOption{}
827827
}
828-
return codersdk.ParameterOption{
828+
return codersdk.PreviewParameterOption{
829829
Name:o.Name,
830830
Description:o.Description,
831831
Value:PreviewHCLString(o.Value),
832832
Icon:o.Icon,
833833
}
834834
}
835835

836-
funcPreviewParameterValidation(v*previewtypes.ParameterValidation) codersdk.ParameterValidation {
836+
funcPreviewParameterValidation(v*previewtypes.ParameterValidation) codersdk.PreviewParameterValidation {
837837
ifv==nil {
838838
// This should never be sent
839-
return codersdk.ParameterValidation{}
839+
return codersdk.PreviewParameterValidation{}
840840
}
841-
return codersdk.ParameterValidation{
841+
return codersdk.PreviewParameterValidation{
842842
Error:v.Error,
843843
Regex:v.Regex,
844844
Min:v.Min,

‎codersdk/parameters.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,44 +62,44 @@ type NullHCLString struct {
6262
Validbool`json:"valid"`
6363
}
6464

65-
typeParameterstruct {
66-
ParameterData
65+
typePreviewParameterstruct {
66+
PreviewParameterData
6767
ValueNullHCLString`json:"value"`
6868
Diagnostics []FriendlyDiagnostic`json:"diagnostics"`
6969
}
7070

71-
typeParameterDatastruct {
72-
Namestring`json:"name"`
73-
DisplayNamestring`json:"display_name"`
74-
Descriptionstring`json:"description"`
75-
TypeOptionType`json:"type"`
76-
FormTypeParameterFormType`json:"form_type"`
77-
StylingParameterStyling`json:"styling"`
78-
Mutablebool`json:"mutable"`
79-
DefaultValueNullHCLString`json:"default_value"`
80-
Iconstring`json:"icon"`
81-
Options []ParameterOption`json:"options"`
82-
Validations []ParameterValidation`json:"validations"`
83-
Requiredbool`json:"required"`
71+
typePreviewParameterDatastruct {
72+
Namestring`json:"name"`
73+
DisplayNamestring`json:"display_name"`
74+
Descriptionstring`json:"description"`
75+
TypeOptionType`json:"type"`
76+
FormTypeParameterFormType`json:"form_type"`
77+
StylingPreviewParameterStyling`json:"styling"`
78+
Mutablebool`json:"mutable"`
79+
DefaultValueNullHCLString`json:"default_value"`
80+
Iconstring`json:"icon"`
81+
Options []PreviewParameterOption`json:"options"`
82+
Validations []PreviewParameterValidation`json:"validations"`
83+
Requiredbool`json:"required"`
8484
// legacy_variable_name was removed (= 14)
8585
Orderint64`json:"order"`
8686
Ephemeralbool`json:"ephemeral"`
8787
}
8888

89-
typeParameterStylingstruct {
89+
typePreviewParameterStylingstruct {
9090
Placeholder*string`json:"placeholder,omitempty"`
9191
Disabled*bool`json:"disabled,omitempty"`
9292
Label*string`json:"label,omitempty"`
9393
}
9494

95-
typeParameterOptionstruct {
95+
typePreviewParameterOptionstruct {
9696
Namestring`json:"name"`
9797
Descriptionstring`json:"description"`
9898
ValueNullHCLString`json:"value"`
9999
Iconstring`json:"icon"`
100100
}
101101

102-
typeParameterValidationstruct {
102+
typePreviewParameterValidationstruct {
103103
Errorstring`json:"validation_error"`
104104

105105
// All validation attributes are optional.
@@ -119,7 +119,7 @@ type DynamicParametersRequest struct {
119119
typeDynamicParametersResponsestruct {
120120
IDint`json:"id"`
121121
Diagnostics []FriendlyDiagnostic`json:"diagnostics"`
122-
Parameters []Parameter`json:"parameters"`
122+
Parameters []PreviewParameter`json:"parameters"`
123123
// TODO: Workspace tags
124124
}
125125

‎site/src/api/typesGenerated.ts

Lines changed: 65 additions & 31 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
importtype*asTypesGenfrom"api/typesGenerated";
2-
importtype{PreviewDiagnostics,PreviewParameter}from"api/typesGenerated";
2+
importtype{FriendlyDiagnostic,PreviewParameter}from"api/typesGenerated";
33
import{Alert}from"components/Alert/Alert";
44
import{ErrorAlert}from"components/Alert/ErrorAlert";
55
import{Avatar}from"components/Avatar/Avatar";
@@ -51,7 +51,7 @@ export interface CreateWorkspacePageViewExperimentalProps {
5151
creatingWorkspace:boolean;
5252
defaultName?:string|null;
5353
defaultOwner:TypesGen.User;
54-
diagnostics:PreviewDiagnostics;
54+
diagnostics:readonlyFriendlyDiagnostic[];
5555
disabledParams?:string[];
5656
error:unknown;
5757
externalAuth:TypesGen.TemplateVersionExternalAuth[];

0 commit comments

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