Commit973cc2b

authored

chore: add edit organization role to cli (#13365)

Editing custom org roles from hidden org cli command.

1 parent24ba819 commit973cc2bCopy full SHA for 973cc2b

File tree

+484

-23

lines changed

+484

-23

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,10 @@ func RichParameter(inv *serpent.Invocation, templateVersionParameter codersdk.Te`
`43`	`43`	`return"",err`
`44`	`44`	`}`
`45`	`45`
`46`		`-values,err:=MultiSelect(inv,options)`
	`46`	`+values,err:=MultiSelect(inv,MultiSelectOptions{`
	`47`	`+Options:options,`
	`48`	`+Defaults:options,`
	`49`	`+})`
`47`	`50`	`iferr==nil {`
`48`	`51`	`v,err:=json.Marshal(&values)`
`49`	`52`	`iferr!=nil {`

Lines changed: 13 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ type SelectOptions struct {`
`56`	`56`	`Options []string`
`57`	`57`	`// Default will be highlighted first if it's a valid option.`
`58`	`58`	`Defaultstring`
	`59`	`+Messagestring`
`59`	`60`	`Sizeint`
`60`	`61`	`HideSearchbool`
`61`	`62`	`}`
`@@ -122,6 +123,7 @@ func Select(inv *serpent.Invocation, opts SelectOptions) (string, error) {`
`122`	`123`	`Options:opts.Options,`
`123`	`124`	`Default:defaultOption,`
`124`	`125`	`PageSize:opts.Size,`
	`126`	`+Message:opts.Message,`
`125`	`127`	`},&value,survey.WithIcons(func(is*survey.IconSet) {`
`126`	`128`	`is.Help.Text="Type to search"`
`127`	`129`	`ifopts.HideSearch {`
`@@ -138,15 +140,22 @@ func Select(inv *serpent.Invocation, opts SelectOptions) (string, error) {`
`138`	`140`	`returnvalue,err`
`139`	`141`	`}`
`140`	`142`
`141`		`-funcMultiSelect(inv*serpent.Invocation,items []string) ([]string,error) {`
	`143`	`+typeMultiSelectOptionsstruct {`
	`144`	`+Messagestring`
	`145`	`+Options []string`
	`146`	`+Defaults []string`
	`147`	`+}`
	`148`	`+`
	`149`	`+funcMultiSelect(inv*serpent.Invocation,optsMultiSelectOptions) ([]string,error) {`
`142`	`150`	`// Similar hack is applied to Select()`
`143`	`151`	`ifflag.Lookup("test.v")!=nil {`
`144`		`-returnitems,nil`
	`152`	`+returnopts.Defaults,nil`
`145`	`153`	`}`
`146`	`154`
`147`	`155`	`prompt:=&survey.MultiSelect{`
`148`		`-Options:items,`
`149`		`-Default:items,`
	`156`	`+Options:opts.Options,`
	`157`	`+Default:opts.Defaults,`
	`158`	`+Message:opts.Message,`
`150`	`159`	`}`
`151`	`160`
`152`	`161`	`varvalues []string`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,10 @@ func newMultiSelect(ptty *ptytest.PTY, items []string) ([]string, error) {`
`107`	`107`	`varvalues []string`
`108`	`108`	`cmd:=&serpent.Command{`
`109`	`109`	`Handler:func(inv*serpent.Invocation)error {`
`110`		`-selectedItems,err:=cliui.MultiSelect(inv,items)`
	`110`	`+selectedItems,err:=cliui.MultiSelect(inv, cliui.MultiSelectOptions{`
	`111`	`+Options:items,`
	`112`	`+Defaults:items,`
	`113`	`+})`
`111`	`114`	`iferr==nil {`
`112`	`115`	`values=selectedItems`
`113`	`116`	`}`

Comments

(0)