Skip to content

Commit c18379e

Browse files
sreyasreya
committed
Merge branch 'groups' of github.com:coder/coder into groups
2 parents 883b28c + a27d364 commit c18379e

File tree

4 files changed

+41
-22
lines changed

4 files changed

+41
-22
lines changed

‎site/src/components/TemplateLayout/TemplateLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export const TemplateLayout: FC = () => {
146146
combineClasses([styles.tabItem, isActive ? styles.tabItemActive : undefined])
147147
}
148148
>
149-
Collaborators
149+
Permissions
150150
</NavLink>
151151
</Stack>
152152
</Margins>

‎site/src/components/UserAutocomplete/UserAutocomplete.tsx

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,20 @@ import { User } from "api/typesGenerated"
77
import { AvatarData } from "components/AvatarData/AvatarData"
88
import debounce from "just-debounce-it"
99
import { ChangeEvent, useEffect, useState } from "react"
10+
import { combineClasses } from "util/combineClasses"
1011
import { searchUserMachine } from "xServices/users/searchUserXService"
1112

1213
export type UserAutocompleteProps = {
1314
value?: User | null
1415
onChange: (user: User | null) => void
16+
className?: string
1517
}
1618

17-
export const UserAutocomplete: React.FC<UserAutocompleteProps> = ({ value, onChange }) => {
19+
export const UserAutocomplete: React.FC<UserAutocompleteProps> = ({
20+
value,
21+
onChange,
22+
className,
23+
}) => {
1824
const styles = useStyles()
1925
const [isAutocompleteOpen, setIsAutocompleteOpen] = useState(false)
2026
const [searchState, sendSearch] = useMachine(searchUserMachine)
@@ -73,7 +79,7 @@ export const UserAutocomplete: React.FC<UserAutocompleteProps> = ({ value, onCha
7379
)}
7480
options={searchResults}
7581
loading={searchState.matches("searching")}
76-
className={styles.autocomplete}
82+
className={combineClasses([styles.autocomplete, className])}
7783
renderInput={(params) => (
7884
<TextField
7985
{...params}
@@ -95,6 +101,7 @@ export const UserAutocomplete: React.FC<UserAutocompleteProps> = ({ value, onCha
95101
/>
96102
)
97103
}
104+
98105
export const useStyles = makeStyles((theme) => {
99106
return {
100107
autocomplete: {
@@ -123,3 +130,17 @@ export const useStyles = makeStyles((theme) => {
123130
},
124131
}
125132
})
133+
134+
export const UserAutocompleteInline: React.FC<UserAutocompleteProps> = (props) => {
135+
const style = useInlineStyle()
136+
137+
return <UserAutocomplete {...props} className={style.inline} />
138+
}
139+
140+
export const useInlineStyle = makeStyles(() => {
141+
return {
142+
inline: {
143+
width: "300px",
144+
},
145+
}
146+
})

‎site/src/pages/GroupsPage/GroupPage.tsx

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { Margins } from "components/Margins/Margins"
1616
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader"
1717
import { Stack } from "components/Stack/Stack"
1818
import { TableRowMenu } from "components/TableRowMenu/TableRowMenu"
19-
import { UserAutocomplete } from "components/UserAutocomplete/UserAutocomplete"
19+
import { UserAutocompleteInline } from "components/UserAutocomplete/UserAutocomplete"
2020
import { useState } from "react"
2121
import { Helmet } from "react-helmet-async"
2222
import { useParams } from "react-router-dom"
@@ -44,7 +44,7 @@ const AddGroupMember: React.FC<{
4444
}}
4545
>
4646
<Stack direction="row" alignItems="center" spacing={1}>
47-
<UserAutocomplete
47+
<UserAutocompleteInline
4848
value={selectedUser}
4949
onChange={(newValue) => {
5050
setSelectedUser(newValue)
@@ -135,19 +135,17 @@ export const GroupPage: React.FC = () => {
135135
/>
136136
</TableCell>
137137
<TableCell width="1%">
138-
<TableCell>
139-
<TableRowMenu
140-
data={member}
141-
menuItems={[
142-
{
143-
label: "Remove",
144-
onClick: () => {
145-
send({ type: "REMOVE_MEMBER", userId: member.id })
146-
},
138+
<TableRowMenu
139+
data={member}
140+
menuItems={[
141+
{
142+
label: "Remove",
143+
onClick: () => {
144+
send({ type: "REMOVE_MEMBER", userId: member.id })
147145
},
148-
]}
149-
/>
150-
</TableCell>
146+
},
147+
]}
148+
/>
151149
</TableCell>
152150
</TableRow>
153151
))}

‎site/src/pages/TemplatePage/TemplatePermissionsPage/TemplatePermissionsPageView.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { LoadingButton } from "components/LoadingButton/LoadingButton"
1717
import { Stack } from "components/Stack/Stack"
1818
import { TableLoader } from "components/TableLoader/TableLoader"
1919
import { TableRowMenu } from "components/TableRowMenu/TableRowMenu"
20-
import { UserAutocomplete } from "components/UserAutocomplete/UserAutocomplete"
20+
import { UserAutocompleteInline } from "components/UserAutocomplete/UserAutocomplete"
2121
import { FC, useState } from "react"
2222

2323
const AddTemplateUser: React.FC<{
@@ -44,7 +44,7 @@ const AddTemplateUser: React.FC<{
4444
}}
4545
>
4646
<Stack direction="row" alignItems="center" spacing={1}>
47-
<UserAutocomplete
47+
<UserAutocompleteInline
4848
value={selectedUser}
4949
onChange={(newValue) => {
5050
setSelectedUser(newValue)
@@ -78,7 +78,7 @@ const AddTemplateUser: React.FC<{
7878
startIcon={<PersonAdd />}
7979
loading={isLoading}
8080
>
81-
Add collaborator
81+
Add user
8282
</LoadingButton>
8383
</Stack>
8484
</form>
@@ -135,8 +135,8 @@ export const TemplatePermissionsPageView: FC<
135135
<TableRow>
136136
<TableCell colSpan={999}>
137137
<EmptyState
138-
message="No collaborators yet"
139-
description="Add a collaborator using the controls above"
138+
message="No users yet"
139+
description="Add a user using the controls above"
140140
/>
141141
</TableCell>
142142
</TableRow>

0 commit comments

Comments
 (0)