hopefully make the test green

johnstcn · johnstcn · commit 8772cf0eff98 · 2022-08-23T19:13:40.000Z
diff --git a/site/src/components/SettingsAccountForm/SettingsAccountForm.tsx b/site/src/components/SettingsAccountForm/SettingsAccountForm.tsx
@@ -8,6 +8,7 @@ import { LoadingButton } from "../LoadingButton/LoadingButton"
 import { Stack } from "../Stack/Stack"
 
 export interface AccountFormValues {
+  editable: boolean
   username: string
 }
 
@@ -22,6 +23,7 @@ const validationSchema = Yup.object({
 })
 
 export interface AccountFormProps {
+  editable: boolean
   email: string
   isLoading: boolean
   initialValues: AccountFormValues
@@ -32,6 +34,7 @@ export interface AccountFormProps {
 }
 
 export const AccountForm: FC<React.PropsWithChildren<AccountFormProps>> = ({
+  editable,
   email,
   isLoading,
   onSubmit,
@@ -63,6 +66,7 @@ export const AccountForm: FC<React.PropsWithChildren<AccountFormProps>> = ({
             {...getFieldHelpers("username")}
             onChange={onChangeTrimmed(form)}
             autoComplete="username"
+            disabled={!editable}
             fullWidth
             label={Language.usernameLabel}
             variant="outlined"
diff --git a/site/src/pages/UserSettingsPage/AccountPage/AccountPage.tsx b/site/src/pages/UserSettingsPage/AccountPage/AccountPage.tsx
@@ -11,7 +11,8 @@ export const Language = {
 export const AccountPage: React.FC = () => {
   const xServices = useContext(XServiceContext)
   const [authState, authSend] = useActor(xServices.authXService)
-  const { me, updateProfileError } = authState.context
+  const { me, permissions, updateProfileError } = authState.context
+  const canEditUsers = permissions && permissions.updateUsers
 
   if (!me) {
     throw new Error("No current user found")
@@ -23,7 +24,11 @@ export const AccountPage: React.FC = () => {
         email={me.email}
         updateProfileError={updateProfileError}
         isLoading={authState.matches("signedIn.profile.updatingProfile")}
-        initialValues={{ username: me.username }}
+        initialValues={{
+          username: me.username,
+          // Fail-open, as the API endpoint will check again on submit
+          editable: canEditUsers || false,
+        }}
         onSubmit={(data) => {
           authSend({
             type: "UPDATE_PROFILE",
