Skip to content

feat: add "display_order" column to coder_parameter to keep parameters sorted in UI #8227

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 25 commits into from
Jun 30, 2023
Merged

feat: add "display_order" column to coder_parameter to keep parameters sorted in UI #8227

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3e9964f
WIP
mtojek Jun 27, 2023
0d37f91
Merge branch 'main' into 8193-order-parameters
mtojek Jun 27, 2023
bb709b6
proto
mtojek Jun 27, 2023
18e7eb4
insert priority
mtojek Jun 27, 2023
648d992
wiring spaghetti
mtojek Jun 27, 2023
4261497
Sort params
mtojek Jun 27, 2023
c896115
fix: migration
mtojek Jun 27, 2023
c22c600
fmt
mtojek Jun 27, 2023
626cfe4
fmt
mtojek Jun 27, 2023
c42a731
make gen
mtojek Jun 27, 2023
56f422f
fix gen
mtojek Jun 27, 2023
dd4cc71
fix
mtojek Jun 27, 2023
91fa3ec
Implement test
mtojek Jun 27, 2023
a36f616
make gen
mtojek Jun 27, 2023
8ab123b
Merge branch 'main' into 8193-order-parameters
mtojek Jun 30, 2023
6ed37b5
Renamed priority to order
mtojek Jun 30, 2023
269555e
Fix: order
mtojek Jun 30, 2023
57a0fd4
remove orderedRichParameters
mtojek Jun 30, 2023
1e54ace
Correct order
mtojek Jun 30, 2023
091888b
Terraform tests ok
mtojek Jun 30, 2023
1620758
fix: LOWER
mtojek Jun 30, 2023
f97db90
fix
mtojek Jun 30, 2023
0efc2ae
fmt proto
mtojek Jun 30, 2023
8a0ac74
fix
mtojek Jun 30, 2023
82b8b7b
fix: make gen
mtojek Jun 30, 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: order
  • Loading branch information
@mtojek
mtojek committed Jun 30, 2023
commit 269555ead024e731e26da65d71beedb5fafcc896
19 changes: 15 additions & 4 deletions coderd/templateversions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,6 +1315,11 @@ func TestTemplateVersionParameters_Order(t *testing.T) {
fourthParameterType = "number"
fourthParameterValue = "3"
fourthParameterOrder = 2

fifthParameterName = "fifth_parameter"
fifthParameterType = "string"
fifthParameterValue = "aaa"
// no order
)

client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
Expand Down Expand Up @@ -1346,6 +1351,11 @@ func TestTemplateVersionParameters_Order(t *testing.T) {
Type: fourthParameterType,
Order: fourthParameterOrder,
},
{
Name: fifthParameterName,
Type: fifthParameterType,
// No order
},
},
},
},
Expand All @@ -1364,9 +1374,10 @@ func TestTemplateVersionParameters_Order(t *testing.T) {

templateRichParameters, err := client.TemplateVersionRichParameters(ctx, version.ID)
require.NoError(t, err)
require.Len(t, templateRichParameters, 4)
require.Equal(t, secondParameterName, templateRichParameters[0].Name)
require.Equal(t, thirdParameterName, templateRichParameters[1].Name)
require.Len(t, templateRichParameters, 5)
require.Equal(t, fifthParameterName, templateRichParameters[0].Name)
require.Equal(t, firstParameterName, templateRichParameters[1].Name)
require.Equal(t, fourthParameterName, templateRichParameters[2].Name)
require.Equal(t, firstParameterName, templateRichParameters[3].Name)
require.Equal(t, secondParameterName, templateRichParameters[3].Name)
require.Equal(t, thirdParameterName, templateRichParameters[4].Name)
}