Permissions page for template perms

Emyrk · Emyrk · commit 8e86149884c0 · 2023-07-25T12:32:25.000-04:00
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/codersdk/templates.go b/codersdk/templates.go
@@ -170,7 +170,7 @@ type UpdateTemplateACL struct {
 // ACLAvailable is a list of users and groups that can be added to a template
 // ACL.
 type ACLAvailable struct {
-	Users  []MinimalUser `json:"users"`
+	Users  []User `json:"users"`
 	Groups []Group       `json:"groups"`
 }
 
diff --git a/docs/api/enterprise.md b/docs/api/enterprise.md
diff --git a/docs/api/schemas.md b/docs/api/schemas.md
diff --git a/enterprise/coderd/templates.go b/enterprise/coderd/templates.go
@@ -57,17 +57,22 @@ func (api *API) templateAvailablePermissions(rw http.ResponseWriter, r *http.Req
 
 	sdkGroups := make([]codersdk.Group, 0, len(groups))
 	for _, group := range groups {
-		sdkGroups = append(sdkGroups, codersdk.Group{
-			ID:             group.ID,
-			Name:           group.Name,
-			OrganizationID: group.OrganizationID,
-			AvatarURL:      group.AvatarURL,
-			QuotaAllowance: int(group.QuotaAllowance),
-		})
+		// nolint:gocritic
+		members, err := api.Database.GetGroupMembers(dbauthz.AsSystemRestricted(ctx), group.ID)
+		if err != nil {
+			httpapi.InternalServerError(rw, err)
+			return
+		}
+
+		sdkGroups = append(sdkGroups, convertGroup(group, members))
 	}
 
 	httpapi.Write(ctx, rw, http.StatusOK, codersdk.ACLAvailable{
-		Users:  convertMinimalUser(users),
+		// No need to pass organization info here.
+		// TODO: @emyrk we should return a MinimalUser here instead of a full user.
+		// The FE requires the `email` field, so this cannot be done without
+		// a UI change.
+		Users:  convertUsers(users, map[uuid.UUID][]uuid.UUID{}),
 		Groups: sdkGroups,
 	})
 }
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -869,6 +869,15 @@ export const getDeploymentDAUs = async (
   return response.data
 }
 
+export const getTemplateACLAvailable = async (
+  templateId: string,
+  options: TypesGen.UsersRequest,
+): Promise<TypesGen.ACLAvailable> => {
+  const url = getURLWithSearchParams(`/api/v2/templates/${templateId}/acl/available`, options)
+  const response = await axios.get(url.toString())
+  return response.data
+}
+
 export const getTemplateACL = async (
   templateId: string,
 ): Promise<TypesGen.TemplateACL> => {
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -2,7 +2,7 @@
 
 // From codersdk/templates.go
 export interface ACLAvailable {
-  readonly users: MinimalUser[]
+  readonly users: User[]
   readonly groups: Group[]
 }
 
diff --git a/site/src/components/UserOrGroupAutocomplete/UserOrGroupAutocomplete.tsx b/site/src/components/UserOrGroupAutocomplete/UserOrGroupAutocomplete.tsx
@@ -21,19 +21,21 @@ export type UserOrGroupAutocompleteProps = {
   value: UserOrGroupAutocompleteValue
   onChange: (value: UserOrGroupAutocompleteValue) => void
   organizationId: string
+  templateID?: string
   exclude: UserOrGroupAutocompleteValue[]
 }
 
 export const UserOrGroupAutocomplete: React.FC<
   UserOrGroupAutocompleteProps
-> = ({ value, onChange, organizationId, exclude }) => {
+> = ({ value, onChange, organizationId, templateID, exclude }) => {
   const styles = useStyles()
   const [isAutocompleteOpen, setIsAutocompleteOpen] = useState(false)
   const [searchState, sendSearch] = useMachine(searchUsersAndGroupsMachine, {
     context: {
       userResults: [],
       groupResults: [],
       organizationId,
+      templateID,
     },
   })
   const { userResults, groupResults } = searchState.context
@@ -73,6 +75,7 @@ export const UserOrGroupAutocomplete: React.FC<
       }
       renderOption={(props, option) => {
         const isOptionGroup = isGroup(option)
+        console.log("option", option)
 
         return (
           <Box component="li" {...props}>
diff --git a/site/src/pages/TemplateSettingsPage/TemplatePermissionsPage/TemplatePermissionsPage.tsx b/site/src/pages/TemplateSettingsPage/TemplatePermissionsPage/TemplatePermissionsPage.tsx
@@ -64,6 +64,7 @@ export const TemplatePermissionsPage: FC<
         <Cond>
           <TemplatePermissionsPageView
             organizationId={organizationId}
+            templateID={template.id}
             templateACL={templateACL}
             canUpdatePermissions={Boolean(permissions?.canUpdateTemplate)}
             onAddUser={(user, role, reset) => {
diff --git a/site/src/pages/TemplateSettingsPage/TemplatePermissionsPage/TemplatePermissionsPageView.tsx b/site/src/pages/TemplateSettingsPage/TemplatePermissionsPage/TemplatePermissionsPageView.tsx
@@ -34,6 +34,7 @@ import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader"
 
 type AddTemplateUserOrGroupProps = {
   organizationId: string
+  templateID: string
   isLoading: boolean
   templateACL: TemplateACL | undefined
   onSubmit: (
@@ -47,6 +48,7 @@ const AddTemplateUserOrGroup: React.FC<AddTemplateUserOrGroupProps> = ({
   isLoading,
   onSubmit,
   organizationId,
+  templateID,
   templateACL,
 }) => {
   const styles = useStyles()
@@ -83,6 +85,7 @@ const AddTemplateUserOrGroup: React.FC<AddTemplateUserOrGroupProps> = ({
         <UserOrGroupAutocomplete
           exclude={excludeFromAutocomplete}
           organizationId={organizationId}
+          templateID={templateID}
           value={selectedOption}
           onChange={(newValue) => {
             setSelectedOption(newValue)
@@ -151,6 +154,7 @@ const RoleSelect: FC<SelectProps> = (props) => {
 
 export interface TemplatePermissionsPageViewProps {
   templateACL: TemplateACL | undefined
+  templateID: string
   organizationId: string
   canUpdatePermissions: boolean
   // User
@@ -177,6 +181,7 @@ export const TemplatePermissionsPageView: FC<
   templateACL,
   canUpdatePermissions,
   organizationId,
+  templateID,
   // User
   onAddUser,
   isAddingUser,
@@ -207,6 +212,7 @@ export const TemplatePermissionsPageView: FC<
         <Maybe condition={canUpdatePermissions}>
           <AddTemplateUserOrGroup
             templateACL={templateACL}
+            templateID={templateID}
             organizationId={organizationId}
             isLoading={isAddingUser || isAddingGroup}
             onSubmit={(value, role, resetAutocomplete) =>
diff --git a/site/src/utils/groups.ts b/site/src/utils/groups.ts
@@ -15,6 +15,10 @@ export const getGroupSubtitle = (group: Group): string => {
     return `All users`
   }
 
+  if(!group.members) {
+    return `0 members`
+  }
+
   if (group.members.length === 1) {
     return `1 member`
   }
diff --git a/site/src/xServices/template/searchUsersAndGroupsXService.ts b/site/src/xServices/template/searchUsersAndGroupsXService.ts
@@ -1,4 +1,4 @@
-import { getGroups, getUsers } from "api/api"
+import { getGroups, getTemplateACLAvailable, getUsers } from "api/api"
 import { Group, User } from "api/typesGenerated"
 import { queryToFilter } from "utils/filters"
 import { everyOneGroup } from "utils/groups"
@@ -15,6 +15,7 @@ export const searchUsersAndGroupsMachine = createMachine(
     schema: {
       context: {} as {
         organizationId: string
+        templateID?: string
         userResults: User[]
         groupResults: Group[]
       },
@@ -56,16 +57,26 @@ export const searchUsersAndGroupsMachine = createMachine(
   },
   {
     services: {
-      search: async ({ organizationId }, { query }) => {
-        const [userRes, groups] = await Promise.all([
-          getUsers(queryToFilter(query)),
-          getGroups(organizationId),
-        ])
+      search: async ({ organizationId, templateID }, { query }) => {
+        let users, groups
+        if(templateID && templateID !== "") {
+          const res = await getTemplateACLAvailable(templateID, queryToFilter(query))
+          users = res.users
+          groups = res.groups
+        } else {
+          const [userRes, groupsRes] = await Promise.all([
+            getUsers(queryToFilter(query)),
+            getGroups(organizationId),
+          ])
+
+          users = userRes.users
+          groups = groupsRes
+        }
 
         // The Everyone groups is not returned by the API so we have to add it
         // manually
         return {
-          users: userRes.users,
+          users: users,
           groups: [everyOneGroup(organizationId), ...groups],
         }
       },

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ type UpdateTemplateACL struct {`
`170`	`170`	`// ACLAvailable is a list of users and groups that can be added to a template`
`171`	`171`	`// ACL.`
`172`	`172`	`type ACLAvailable struct {`
`173`		- Users []MinimalUser `json:"users"`
	`173`	+ Users []User `json:"users"`
`174`	`174`	Groups []Group `json:"groups"`
`175`	`175`	`}`
`176`	`176`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`// From codersdk/templates.go`
`4`	`4`	`export interface ACLAvailable {`
`5`		`- readonly users: MinimalUser[]`
	`5`	`+ readonly users: User[]`
`6`	`6`	`readonly groups: Group[]`
`7`	`7`	`}`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,10 @@ export const getGroupSubtitle = (group: Group): string => {`
`15`	`15`	return `All users`
`16`	`16`	`}`
`17`	`17`
	`18`	`+ if(!group.members) {`
	`19`	+ return `0 members`
	`20`	`+ }`
	`21`	`+`
`18`	`22`	`if (group.members.length === 1) {`
`19`	`23`	return `1 member`
`20`	`24`	`}`