8000 feat: rich parameters: introduce display_name by mtojek · Pull Request #6919 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

feat: rich parameters: introduce display_name #6919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Apr 3, 2023
Merged

feat: rich parameters: introduce display_name #6919

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
48e3363
model
mtojek Mar 31, 2023
c4b6b93
DB
mtojek Mar 31, 2023
a11b69e
fix: DisplayName
mtojek Mar 31, 2023
f1aad27
proto
mtojek Mar 31, 2023
e4716cc
Proto
mtojek Mar 31, 2023
89927cb
Update go dep
mtojek Mar 31, 2023
a7bc12c
fixme
mtojek Mar 31, 2023
91d1a1c
Merge branch 'main' into 6852-display-name
mtojek Mar 31, 2023
63296c5
fix format
mtojek Mar 31, 2023
45f6bae
config
mtojek Mar 31, 2023
0f756cf
fmt
mtojek Mar 31, 2023
b14dde1
fix
mtojek Mar 31, 2023
c62f50f
8000 Fix
mtojek Mar 31, 2023
d4411cd
fix
mtojek Mar 31, 2023
1591bbd
chore(UI): redirecting from workspace page if 404 (#6880)
Kira-Pilot Mar 31, 2023
4261fe9
model
mtojek Mar 31, 2023
3aa6ce8
CLI: Display parameter
mtojek Mar 31, 2023
a0554df
fix
mtojek Mar 31, 2023
ad268b8
Merge branch 'main' into 6852-display-name
mtojek Mar 31, 2023
61dab98
update dep
mtojek Mar 31, 2023
a68cc51
Merge branch 'main' into 6852-display-name
mtojek Apr 3, 2023
9fe4100
fix
mtojek Apr 3, 2023
d71c97f
fix
mtojek Apr 3, 2023
3a947d4
fix
mtojek Apr 3, 2023
3ff3b62
UI changes
mtojek Apr 3, 2023
99872e1
fmt
mtojek Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: DisplayName
  • Loading branch information
@mtojek
mtojek committed Mar 31, 2023
commit a11b69eebd79575c13200b60cf2fde48d428b8fa
1 change: 1 addition & 0 deletions coderd/templateversions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,6 +1596,7 @@ func convertTemplateVersionParameter(param database.TemplateVersionParameter) (c
}
return codersdk.TemplateVersionParameter{
Name: param.Name,
DisplayName: param.DisplayName,
Description: param.Description,
DescriptionPlaintext: descriptionPlaintext,
Type: param.Type,
Expand Down
5 changes: 4 additions & 1 deletion coderd/workspaces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1792,6 +1792,7 @@ func TestWorkspaceWithRichParameters(t *testing.T) {
firstParameterValue = "1"

secondParameterName = "second_parameter"
secondParameterDisplayName = "Second Parameter"
secondParameterType = "number"
secondParameterDescription = "_This_ is second *parameter*"
secondParameterValue = "2"
Expand All @@ -1813,7 +1814,8 @@ func TestWorkspaceWithRichParameters(t *testing.T) {
Description: firstParameterDescription,
},
{
Name: secondParameterName,
Name: secondParameterName,
// FIXME: DisplayName: secondParameterDisplayName,
Type: secondParameterType,
Description: secondParameterDescription,
ValidationMin: 1,
Expand Down Expand Up @@ -1850,6 +1852,7 @@ func TestWorkspaceWithRichParameters(t *testing.T) {
require.Equal(t, firstParameterDescriptionPlaintext, templateRichParameters[0].DescriptionPlaintext)
require.Equal(t, codersdk.ValidationMonotonicOrder(""), templateRichParameters[0].ValidationMonotonic) // no validation for string
require.Equal(t, secondParameterName, templateRichParameters[1].Name)
require.Equal(t, secondParameterDisplayName, templateRichParameters[1].DisplayName)
require.Equal(t, secondParameterType, templateRichParameters[1].Type)
require.Equal(t, secondParameterDescription, templateRichParameters[1].Description)
require.Equal(t, secondParameterDescriptionPlaintext, templateRichParameters[1].DescriptionPlaintext)
Expand Down
1 change: 1 addition & 0 deletions codersdk/templateversions.go
View file
Open in desktop
< 5AF1 /tr>
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const (
// TemplateVersionParameter represents a parameter for a template version.
type TemplateVersionParameter struct {
Name string `json:"name"`
DisplayName string `json:"display_name"`
Description string `json:"description"`
DescriptionPlaintext string `json:"description_plaintext"`
Type string `json:"type" enums:"string,number,bool,list(string)"`
Expand Down
0