feat: rich parameters: introduce display_name (#6919)

* model

* DB

* fix: DisplayName

* proto

* Proto

* Update go dep

* fixme

* fix format

* config

* fmt

* fix

* Fix

* fix

* chore(UI): redirecting from workspace page if 404 (#6880)

* model

* CLI: Display parameter

* fix

* update dep

* fix

* fix

* fix

* UI changes

* fmt

---------

Co-authored-by: Kira Pilot <kira@coder.com>
This commit is contained in:
Marcin Tojek
2023-04-03 14:37:47 +02:00
committed by GitHub
parent d9d44c1188
commit 633dfbdb2e
25 changed files with 370 additions and 297 deletions

View File

@ -3677,7 +3677,7 @@ func (q *sqlQuerier) UpdateTemplateScheduleByID(ctx context.Context, arg UpdateT
}
const getTemplateVersionParameters = `-- name: GetTemplateVersionParameters :many
SELECT template_version_id, name, description, type, mutable, default_value, icon, options, validation_regex, validation_min, validation_max, validation_error, validation_monotonic, required, legacy_variable_name FROM template_version_parameters WHERE template_version_id = $1
SELECT template_version_id, name, description, type, mutable, default_value, icon, options, validation_regex, validation_min, validation_max, validation_error, validation_monotonic, required, legacy_variable_name, display_name FROM template_version_parameters WHERE template_version_id = $1
`
func (q *sqlQuerier) GetTemplateVersionParameters(ctx context.Context, templateVersionID uuid.UUID) ([]TemplateVersionParameter, error) {
@ -3705,6 +3705,7 @@ func (q *sqlQuerier) GetTemplateVersionParameters(ctx context.Context, templateV
&i.ValidationMonotonic,
&i.Required,
&i.LegacyVariableName,
&i.DisplayName,
); err != nil {
return nil, err
}
@ -3736,7 +3737,8 @@ INSERT INTO
validation_error,
validation_monotonic,
required,
legacy_variable_name
legacy_variable_name,
display_name
)
VALUES
(
@ -3754,8 +3756,9 @@ VALUES
$12,
$13,
$14,
$15
) RETURNING template_version_id, name, description, type, mutable, default_value, icon, options, validation_regex, validation_min, validation_max, validation_error, validation_monotonic, required, legacy_variable_name
$15,
$16
) RETURNING template_version_id, name, description, type, mutable, default_value, icon, options, validation_regex, validation_min, validation_max, validation_error, validation_monotonic, required, legacy_variable_name, display_name
`
type InsertTemplateVersionParameterParams struct {
@ -3774,6 +3777,7 @@ type InsertTemplateVersionParameterParams struct {
ValidationMonotonic string `db:"validation_monotonic" json:"validation_monotonic"`
Required bool `db:"required" json:"required"`
LegacyVariableName string `db:"legacy_variable_name" json:"legacy_variable_name"`
DisplayName string `db:"display_name" json:"display_name"`
}
func (q *sqlQuerier) InsertTemplateVersionParameter(ctx context.Context, arg InsertTemplateVersionParameterParams) (TemplateVersionParameter, error) {
@ -3793,6 +3797,7 @@ func (q *sqlQuerier) InsertTemplateVersionParameter(ctx context.Context, arg Ins
arg.ValidationMonotonic,
arg.Required,
arg.LegacyVariableName,
arg.DisplayName,
)
var i TemplateVersionParameter
err := row.Scan(
@ -3811,6 +3816,7 @@ func (q *sqlQuerier) InsertTemplateVersionParameter(ctx context.Context, arg Ins
&i.ValidationMonotonic,
&i.Required,
&i.LegacyVariableName,
&i.DisplayName,
)
return i, err
}