finalize cli command

Emyrk · Emyrk · commit d92014e8f535 · 2024-06-03T09:38:40.000-05:00
diff --git a/cli/organization.go b/cli/organization.go
@@ -30,6 +30,7 @@ func (r *RootCmd) organizations() *serpent.Command {
 			r.switchOrganization(),
 			r.createOrganization(),
 			r.organizationRoles(),
+			r.organizationMembers(),
 		},
 	}
 
diff --git a/cli/organizationmembers.go b/cli/organizationmembers.go
@@ -12,7 +12,7 @@ import (
 
 func (r *RootCmd) organizationMembers() *serpent.Command {
 	formatter := cliui.NewOutputFormatter(
-		cliui.TableFormat([]codersdk.User{}, []string{"username", "email", "created_at", "status"}),
+		cliui.TableFormat([]codersdk.OrganizationMemberWithName{}, []string{"username"}),
 		cliui.JSONFormat(),
 	)
 
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/codersdk/organizations.go b/codersdk/organizations.go
@@ -56,8 +56,8 @@ type OrganizationMember struct {
 }
 
 type OrganizationMemberWithName struct {
-	Username string `table:"username" json:"username"`
-	OrganizationMember
+	Username           string `table:"username,default_sort" json:"username"`
+	OrganizationMember `table:"m,recursive_inline"`
 }
 
 type CreateOrganizationRequest struct {
diff --git a/codersdk/users.go b/codersdk/users.go
@@ -395,7 +395,7 @@ func (c *Client) UpdateUserRoles(ctx context.Context, user string, req UpdateRol
 }
 
 // OrganizationMembers lists all members in an organization
-func (c *Client) OrganizationMembers(ctx context.Context, organizationID uuid.UUID) ([]OrganizationMember, error) {
+func (c *Client) OrganizationMembers(ctx context.Context, organizationID uuid.UUID) ([]OrganizationMemberWithName, error) {
 	res, err := c.Request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/organizations/%s/members/", organizationID), nil)
 	if err != nil {
 		return nil, err
@@ -404,7 +404,7 @@ func (c *Client) OrganizationMembers(ctx context.Context, organizationID uuid.UU
 	if res.StatusCode != http.StatusOK {
 		return nil, ReadBodyAsError(res)
 	}
-	var members []OrganizationMember
+	var members []OrganizationMemberWithName
 	return members, json.NewDecoder(res.Body).Decode(&members)
 }
 
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ func (r RootCmd) organizations() serpent.Command {`
`30`	`30`	`r.switchOrganization(),`
`31`	`31`	`r.createOrganization(),`
`32`	`32`	`r.organizationRoles(),`
	`33`	`+ r.organizationMembers(),`
`33`	`34`	`},`
`34`	`35`	`}`
`35`	`36`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`
`13`	`13`	`func (r RootCmd) organizationMembers() serpent.Command {`
`14`	`14`	`formatter := cliui.NewOutputFormatter(`
`15`		`- cliui.TableFormat([]codersdk.User{}, []string{"username", "email", "created_at", "status"}),`
	`15`	`+ cliui.TableFormat([]codersdk.OrganizationMemberWithName{}, []string{"username"}),`
`16`	`16`	`cliui.JSONFormat(),`
`17`	`17`	`)`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@ type OrganizationMember struct {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`type OrganizationMemberWithName struct {`
`59`		- Username string `table:"username" json:"username"`
`60`		`- OrganizationMember`
	`59`	+ Username string `table:"username,default_sort" json:"username"`
	`60`	+ OrganizationMember `table:"m,recursive_inline"`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`type CreateOrganizationRequest struct {`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ func (c *Client) UpdateUserRoles(ctx context.Context, user string, req UpdateRol`
`395`	`395`	`}`
`396`	`396`
`397`	`397`	`// OrganizationMembers lists all members in an organization`
`398`		`-func (c *Client) OrganizationMembers(ctx context.Context, organizationID uuid.UUID) ([]OrganizationMember, error) {`
	`398`	`+func (c *Client) OrganizationMembers(ctx context.Context, organizationID uuid.UUID) ([]OrganizationMemberWithName, error) {`
`399`	`399`	`res, err := c.Request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/organizations/%s/members/", organizationID), nil)`
`400`	`400`	`if err != nil {`
`401`	`401`	`return nil, err`
`@@ -404,7 +404,7 @@ func (c *Client) OrganizationMembers(ctx context.Context, organizationID uuid.UU`
`404`	`404`	`if res.StatusCode != http.StatusOK {`
`405`	`405`	`return nil, ReadBodyAsError(res)`
`406`	`406`	`}`
`407`		`- var members []OrganizationMember`
	`407`	`+ var members []OrganizationMemberWithName`
`408`	`408`	`return members, json.NewDecoder(res.Body).Decode(&members)`
`409`	`409`	`}`
`410`	`410`