Skip to content

Commit 1a6eeae

Browse files
EmyrkEmyrk
committed
ui fixes
1 parent 1d93c82 commit 1a6eeae

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
if p != 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
return List(chats, Chat)
768768
}
769769

770-
func PreviewParameter(param previewtypes.Parameter) codersdk.Parameter {
771-
return codersdk.Parameter{
772-
ParameterData: codersdk.ParameterData{
770+
func PreviewParameter(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-
func PreviewParameterOption(o *previewtypes.ParameterOption) codersdk.ParameterOption {
823+
func PreviewParameterOption(o *previewtypes.ParameterOption) codersdk.PreviewParameterOption {
824824
if o == 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-
func PreviewParameterValidation(v *previewtypes.ParameterValidation) codersdk.ParameterValidation {
836+
func PreviewParameterValidation(v *previewtypes.ParameterValidation) codersdk.PreviewParameterValidation {
837837
if v == 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
Valid bool `json:"valid"`
6363
}
6464

65-
type Parameter struct {
66-
ParameterData
65+
type PreviewParameter struct {
66+
PreviewParameterData
6767
Value NullHCLString `json:"value"`
6868
Diagnostics []FriendlyDiagnostic `json:"diagnostics"`
6969
}
7070

71-
type ParameterData struct {
72-
Name string `json:"name"`
73-
DisplayName string `json:"display_name"`
74-
Description string `json:"description"`
75-
Type OptionType `json:"type"`
76-
FormType ParameterFormType `json:"form_type"`
77-
Styling ParameterStyling `json:"styling"`
78-
Mutable bool `json:"mutable"`
79-
DefaultValue NullHCLString `json:"default_value"`
80-
Icon string `json:"icon"`
81-
Options []ParameterOption `json:"options"`
82-
Validations []ParameterValidation `json:"validations"`
83-
Required bool `json:"required"`
71+
type PreviewParameterData struct {
72+
Name string `json:"name"`
73+
DisplayName string `json:"display_name"`
74+
Description string `json:"description"`
75+
Type OptionType `json:"type"`
76+
FormType ParameterFormType `json:"form_type"`
77+
Styling PreviewParameterStyling `json:"styling"`
78+
Mutable bool `json:"mutable"`
79+
DefaultValue NullHCLString `json:"default_value"`
80+
Icon string `json:"icon"`
81+
Options []PreviewParameterOption `json:"options"`
82+
Validations []PreviewParameterValidation `json:"validations"`
83+
Required bool `json:"required"`
8484
// legacy_variable_name was removed (= 14)
8585
Order int64 `json:"order"`
8686
Ephemeral bool `json:"ephemeral"`
8787
}
8888

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

95-
type ParameterOption struct {
95+
type PreviewParameterOption struct {
9696
Name string `json:"name"`
9797
Description string `json:"description"`
9898
Value NullHCLString `json:"value"`
9999
Icon string `json:"icon"`
100100
}
101101

102-
type ParameterValidation struct {
102+
type PreviewParameterValidation struct {
103103
Error string `json:"validation_error"`
104104

105105
// All validation attributes are optional.
@@ -119,7 +119,7 @@ type DynamicParametersRequest struct {
119119
type DynamicParametersResponse struct {
120120
ID int `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 about customizing 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
import type * as TypesGen from "api/typesGenerated";
2-
import type { PreviewDiagnostics, PreviewParameter } from "api/typesGenerated";
2+
import type { 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: readonly FriendlyDiagnostic[];
5555
disabledParams?: string[];
5656
error: unknown;
5757
externalAuth: TypesGen.TemplateVersionExternalAuth[];

0 commit comments

Comments
 (0)