Skip to content

chore: change view perm to use #4496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 12, 2022
Merged

chore: change view perm to use #4496

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e73af5d
chore: change view perm to use
sreya Oct 11, 2022
222fe8d
update frontend
sreya Oct 11, 2022
ff5ddc4
use consistent verbiage
sreya Oct 11, 2022
ca3dd40
fix test helper
sreya Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update frontend
  • Loading branch information
@sreya
sreya committed Oct 11, 2022
commit 222fe8d5dcf711183f7062501d62429e2522d68f
23 changes: 14 additions & 9 deletions site/src/pages/TemplatePage/TemplatePermissionsPage/TemplatePermissionsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ const AddTemplateUserOrGroup: React.FC<AddTemplateUserOrGroupProps> = ({
const styles = useStyles()
const [selectedOption, setSelectedOption] =
useState<UserOrGroupAutocompleteValue>(null)
const [selectedRole, setSelectedRole] = useState<TemplateRole>("view")
const [selectedRole, setSelectedRole] = useState<TemplateRole>("use")
const excludeFromAutocomplete = templateACL
? [...templateACL.group, ...templateACL.users]
: []

const resetValues = () => {
setSelectedOption(null)
setSelectedRole("view")
setSelectedRole("use")
}

return (
Expand Down Expand Up @@ -89,16 +89,16 @@ const AddTemplateUserOrGroup: React.FC<AddTemplateUserOrGroupProps> = ({
/>

<Select
defaultValue="view"
defaultValue="use"
variant="outlined"
className={styles.select}
disabled={isLoading}
onChange={(event) => {
setSelectedRole(event.target.value as TemplateRole)
}}
>
<MenuItem key="view" value="view">
View
<MenuItem key="use" value="use">
Use
</MenuItem>
<MenuItem key="admin" value="admin">
Admin
Expand Down Expand Up @@ -129,17 +129,20 @@ const RoleSelect: FC<SelectProps> = (props) => {
className={styles.updateSelect}
{...props}
>
<MenuItem key="view" value="view" className={styles.menuItem}>
<MenuItem key="use" value="use" className={styles.menuItem}>
<div>
<div>View</div>
<div className={styles.menuItemSecondary}>Read, use</div>
<div>Use</div>
<div className={styles.menuItemSecondary}>
Can read and use this template to create workspaces.
</div>
</div>
</MenuItem>
<MenuItem key="admin" value="admin" className={styles.menuItem}>
<div>
<div>Admin</div>
<div className={styles.menuItemSecondary}>
Read, use, edit, push, and delete
Can modify all aspects of the template including permissions,
metadata, and template versions.
</div>
</div>
</MenuItem>
Expand Down Expand Up @@ -386,6 +389,8 @@ export const useStyles = makeStyles((theme) => {
lineHeight: "140%",
paddingTop: theme.spacing(1.5),
paddingBottom: theme.spacing(1.5),
whiteSpace: "normal",
inlineSize: "250px",
},

menuItemSecondary: {
Expand Down