Currently "activate" on ui does nothing

coder · Emyrk · May 31, 2022 · May 27, 2022 · May 27, 2022 · May 27, 2022
commit 55c5fe6ccef1826cdbb827cfaf057377ebb147b6
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -218,6 +218,11 @@ export const updateProfile = async (
   return response.data
 }
 
+export const activateUser = async (userId: TypesGen.User["id"]): Promise<TypesGen.User> => {
+  const response = await axios.put<TypesGen.User>(`/api/v2/users/${userId}/status/active`)
+  return response.data
+}
+
 export const suspendUser = async (userId: TypesGen.User["id"]): Promise<TypesGen.User> => {
   const response = await axios.put<TypesGen.User>(`/api/v2/users/${userId}/status/suspend`)
   return response.data

diff --git a/site/src/components/UsersTable/UsersTable.tsx b/site/src/components/UsersTable/UsersTable.tsx
@@ -65,9 +65,7 @@ export const UsersTable: React.FC<UsersTableProps> = ({
               <TableCell>
                 <AvatarData title={u.username} subtitle={u.email} />
               </TableCell>
-              <TableCell>
-                {u.status}
-              </TableCell>
+              <TableCell>{u.status}</TableCell>
               <TableCell>
                 {canEditUsers ? (
                   <RoleSelect
@@ -86,16 +84,25 @@ export const UsersTable: React.FC<UsersTableProps> = ({
                     data={u}
                     menuItems={
                       // Return either suspend or activate depending on status
-                      (u.status == "active" ? [{
-                        label: Language.suspendMenuItem,
-                        onClick: onSuspendUser,
-                      }] : [{
-                          label: Language.activateMenuItem,
-                          onClick: onSuspendUser,
-                      }]).concat({
+                      (u.status == "active"
+                        ? [
+                            {
+                              label: Language.suspendMenuItem,
+                              onClick: onSuspendUser,
+                            },
+                          ]
+                        : [
+                            {
+                              label: Language.activateMenuItem,
+                              // TODO: Activate user
+                              onClick: function () {},
+                            },
+                          ]
+                      ).concat({
                         label: Language.resetPasswordMenuItem,
                         onClick: onResetUserPassword,
-                      })}
+                      })
+                    }
                   />
                 </TableCell>
               )}

diff --git a/site/src/pages/LoginPage/LoginPage.tsx b/site/src/pages/LoginPage/LoginPage.tsx
@@ -2,12 +2,11 @@ import { makeStyles } from "@material-ui/core/styles"
 import { useActor } from "@xstate/react"
 import React, { useContext } from "react"
 import { Navigate, useLocation } from "react-router-dom"
+import { isApiError } from "../../api/errors"
 import { Footer } from "../../components/Footer/Footer"
 import { SignInForm } from "../../components/SignInForm/SignInForm"
 import { retrieveRedirect } from "../../util/redirect"
 import { XServiceContext } from "../../xServices/StateContext"
-import { AxiosError } from "axios"
-import {isApiError} from "../../api/errors";
 
 export const useStyles = makeStyles((theme) => ({
   root: {
@@ -35,7 +34,9 @@ export const LoginPage: React.FC = () => {
   const [authState, authSend] = useActor(xServices.authXService)
   const isLoading = authState.hasTag("loading")
   const redirectTo = retrieveRedirect(location.search)
-  const authErrorMessage = isApiError(authState.context.authError) ? authState.context.authError.response.data.message : undefined
+  const authErrorMessage = isApiError(authState.context.authError)
+    ? authState.context.authError.response.data.message
+    : undefined
   const getMethodsError = authState.context.getMethodsError
     ? (authState.context.getMethodsError as Error).message
     : undefined

diff --git a/site/src/xServices/auth/authXService.ts b/site/src/xServices/auth/authXService.ts
@@ -1,8 +1,8 @@
+import { AxiosError } from "axios"
 import { assign, createMachine } from "xstate"
 import * as API from "../../api/api"
 import * as TypesGen from "../../api/typesGenerated"
 import { displayError, displaySuccess } from "../../components/GlobalSnackbar/utils"
-import { AxiosError } from "axios"
 
 export const Language = {
   successProfileUpdate: "Updated settings.",