Jun 3, 2024 · May 24, 2024 · May 24, 2024 · May 24, 2024 · May 24, 2024 · May 29, 2024
diff --git a/cli/cliui/parameter.go b/cli/cliui/parameter.go
 return "", err
 }

 values, err := MultiSelect(inv, options)
 values, err := MultiSelect(inv, MultiSelectOptions{
 Options:  options,
 Defaults: options,
 })
 if err == nil {
 v, err := json.Marshal(&values)
 if err != nil {
diff --git a/cli/cliui/select.go b/cli/cliui/select.go
 Options []string
 // Default will be highlighted first if it's a valid option.
 Default    string
 Message    string
 Size       int
 HideSearch bool
 }
 Options:  opts.Options,
 Default:  defaultOption,
 PageSize: opts.Size,
 Message:  opts.Message,
 }, &value, survey.WithIcons(func(is *survey.IconSet) {
 is.Help.Text = "Type to search"
 if opts.HideSearch {
 return value, err
 }

 func MultiSelect(inv *serpent.Invocation, items []string) ([]string, error) {
 type MultiSelectOptions struct {
 Message  string
 Options  []string
 Defaults []string
 }

 func MultiSelect(inv *serpent.Invocation, opts MultiSelectOptions) ([]string, error) {
 // Similar hack is applied to Select()
 if flag.Lookup("test.v") != nil {
 returnitems, nil
 returnopts.Defaults, nil
 }

 prompt := &survey.MultiSelect{
 Options: items,
 Default: items,
 Options: opts.Options,
 Default: opts.Defaults,
 Message: opts.Message,
 }

 var values []string
diff --git a/cli/cliui/select_test.go b/cli/cliui/select_test.go
 var values []string
 cmd := &serpent.Command{
 Handler: func(inv *serpent.Invocation) error {
 selectedItems, err := cliui.MultiSelect(inv, items)
 selectedItems, err := cliui.MultiSelect(inv, cliui.MultiSelectOptions{
 Options:  items,
 Defaults: items,
 })
 if err == nil {
 values = selectedItems
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,7 +43,10 @@ func RichParameter(inv *serpent.Invocation, templateVersionParameter codersdk.Te
		return "", err
		}

		values, err := MultiSelect(inv, options)
		values, err := MultiSelect(inv, MultiSelectOptions{
		Options: options,
		Defaults: options,
		})
		if err == nil {
		v, err := json.Marshal(&values)
		if err != nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -56,6 +56,7 @@ type SelectOptions struct {
		Options []string
		// Default will be highlighted first if it's a valid option.
		Default string
		Message string
		Size int
		HideSearch bool
		}
Expand DownExpand Up		@@ -122,6 +123,7 @@ func Select(inv *serpent.Invocation, opts SelectOptions) (string, error) {
		Options: opts.Options,
		Default: defaultOption,
		PageSize: opts.Size,
		Message: opts.Message,
		}, &value, survey.WithIcons(func(is *survey.IconSet) {
		is.Help.Text = "Type to search"
		if opts.HideSearch {
Expand All		@@ -138,15 +140,22 @@ func Select(inv *serpent.Invocation, opts SelectOptions) (string, error) {
		return value, err
		}

		func MultiSelect(inv *serpent.Invocation, items []string) ([]string, error) {
		type MultiSelectOptions struct {
		Message string
		Options []string
		Defaults []string
		}

		func MultiSelect(inv *serpent.Invocation, opts MultiSelectOptions) ([]string, error) {
		// Similar hack is applied to Select()
		if flag.Lookup("test.v") != nil {
		returnitems, nil
		returnopts.Defaults, nil
		}

		prompt := &survey.MultiSelect{
Copy link Member johnstcnMay 31, 2024• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. The prompt doesn't explain the keybindings: `<space>` to select `<enter>` to submit and return to the previous list `<arrow keys>` to navigate Copy link MemberAuthor EmyrkMay 31, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Yup it does not. I added it as a note in the PR, just made it an issue:#13427 I talked to@mtojek about this, and I also see Kyle made some adjustments. Essentially, we cannot have different survey templates for different questions. They all share the same global. This global has all the things you mentioned and more. I'd like to revert our change as much as possible, but I'll have to probably adjust every instance that we use this and make sure I did not break anything. Feels excessive for this PR imo.
		Options: items,
		Default: items,
		Options: opts.Options,
		Default: opts.Defaults,
		Message: opts.Message,
		}

		var values []string
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -107,7 +107,10 @@ func newMultiSelect(ptty *ptytest.PTY, items []string) ([]string, error) {
		var values []string
		cmd := &serpent.Command{
		Handler: func(inv *serpent.Invocation) error {
		selectedItems, err := cliui.MultiSelect(inv, items)
		selectedItems, err := cliui.MultiSelect(inv, cliui.MultiSelectOptions{
		Options: items,
		Defaults: items,
		})
		if err == nil {
		values = selectedItems
		}
Expand Down