fix: Show suspended users in the UI

coder · Emyrk · May 31, 2022 · May 27, 2022 · May 27, 2022 · May 27, 2022
commit 489b2fe788582478ace03d467430a12480c2015d
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -216,11 +216,13 @@ func (q *fakeQuerier) GetUsers(_ context.Context, params database.GetUsersParams
 		users = tmp
 	}
 
-	if params.Status != "" {
+	if len(params.Status) > 0 {
 		usersFilteredByStatus := make([]database.User, 0, len(users))
 		for i, user := range users {
-			if params.Status == string(user.Status) {
-				usersFilteredByStatus = append(usersFilteredByStatus, users[i])
+			for _, status := range params.Status {
+				if user.Status == status {
+					usersFilteredByStatus = append(usersFilteredByStatus, users[i])
+				}
 			}
 		}
 		users = usersFilteredByStatus

diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/users.sql b/coderd/database/queries/users.sql
@@ -101,17 +101,19 @@ WHERE
 		WHEN @search :: text != '' THEN (
 			email LIKE concat('%', @search, '%')
 			OR username LIKE concat('%', @search, '%')
-		)	
+		)
 		ELSE true
 	END
 	-- Filter by status
 	AND CASE
 		-- @status needs to be a text because it can be empty, If it was
 		-- user_status enum, it would not.
-		WHEN @status :: text != '' THEN (
-			status = @status :: user_status
+		WHEN cardinality(@status :: user_status[]) > 0 THEN (
+			status = ANY(@status :: user_status[])
 		)
-		ELSE true
+		ELSE
+		    -- Only show active by default
+		    status = 'active'
 	END
 	-- End of filters
 ORDER BY

diff --git a/coderd/users.go b/coderd/users.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/go-chi/chi/v5"
@@ -105,10 +106,23 @@ func (api *API) postFirstUser(rw http.ResponseWriter, r *http.Request) {
 
 func (api *API) users(rw http.ResponseWriter, r *http.Request) {
 	var (
-		searchName   = r.URL.Query().Get("search")
-		statusFilter = r.URL.Query().Get("status")
+		searchName    = r.URL.Query().Get("search")
+		statusFilters = strings.Split(r.URL.Query().Get("status"), ",")
 	)
 
+	statuses := make([]database.UserStatus, 0)
+	for _, filter := range statusFilters {
+		switch database.UserStatus(filter) {
+		case database.UserStatusSuspended, database.UserStatusActive:
+			statuses = append(statuses, database.UserStatus(filter))
+		default:
+			httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
+				Message: fmt.Sprintf("%q is not a valid user status", filter),
+			})
+			return
+		}
+	}
+
 	// Reading all users across the site
 	if !api.Authorize(rw, r, rbac.ActionRead, rbac.ResourceUser) {
 		return
@@ -124,7 +138,7 @@ func (api *API) users(rw http.ResponseWriter, r *http.Request) {
 		OffsetOpt: int32(paginationParams.Offset),
 		LimitOpt:  int32(paginationParams.Limit),
 		Search:    searchName,
-		Status:    statusFilter,
+		Status:    statuses,
 	})
 	if errors.Is(err, sql.ErrNoRows) {
 		httpapi.Write(rw, http.StatusOK, []codersdk.User{})

diff --git a/scripts/develop.sh b/scripts/develop.sh
@@ -24,5 +24,11 @@ export CODER_DEV_ADMIN_PASSWORD=password
 	trap 'kill 0' SIGINT
 	CODERV2_HOST=http://127.0.0.1:3000 INSPECT_XSTATE=true yarn --cwd=./site dev &
 	go run -tags embed cmd/coder/main.go server --dev --tunnel=true &
+
+	# Just a minor sleep to ensure the first user was created to make the member.
+	sleep 2
+	# || yes to always exit code 0. If this fails, whelp.
+	go run cmd/coder/main.go users create --email=member@coder.com --username=member --password="${CODER_DEV_ADMIN_PASSWORD}" || yes
 	wait
 )
+
@@ -63,7 +63,7 @@ export const getApiKey = async (): Promise<TypesGen.GenerateAPIKeyResponse> => {
 }
 
 export const getUsers = async (): Promise<TypesGen.User[]> => {
-  const response = await axios.get<TypesGen.User[]>("/api/v2/users?status=active")
+  const response = await axios.get<TypesGen.User[]>("/api/v2/users?status=active,suspended")
   return response.data
 }
 

@@ -18,8 +18,10 @@ export const Language = {
   emptyMessage: "No users found",
   usernameLabel: "User",
   suspendMenuItem: "Suspend",
+  activateMenuItem: "Activate",
   resetPasswordMenuItem: "Reset password",
   rolesLabel: "Roles",
+  statusLabel: "Status",
 }
 
 export interface UsersTableProps {
@@ -49,6 +51,7 @@ export const UsersTable: React.FC<UsersTableProps> = ({
         <TableRow>
           <TableCell>{Language.usernameLabel}</TableCell>
           <TableCell>{Language.rolesLabel}</TableCell>
+          <TableCell>{Language.statusLabel}</TableCell>
           {/* 1% is a trick to make the table cell width fit the content */}
           {canEditUsers && <TableCell width="1%" />}
         </TableRow>
@@ -62,6 +65,9 @@ export const UsersTable: React.FC<UsersTableProps> = ({
               <TableCell>
                 <AvatarData title={u.username} subtitle={u.email} />
               </TableCell>
+              <TableCell>
+                {u.status}
+              </TableCell>
               <TableCell>
                 {canEditUsers ? (
                   <RoleSelect
@@ -78,16 +84,18 @@ export const UsersTable: React.FC<UsersTableProps> = ({
                 <TableCell>
                   <TableRowMenu
                     data={u}
-                    menuItems={[
-                      {
+                    menuItems={
+                      // Return either suspend or activate depending on status
+                      (u.status == "active" ? [{
                         label: Language.suspendMenuItem,
                         onClick: onSuspendUser,
-                      },
-                      {
+                      }] : [{
+                          label: Language.activateMenuItem,
+                          onClick: onSuspendUser,
+                      }]).concat({
                         label: Language.resetPasswordMenuItem,
                         onClick: onResetUserPassword,
-                      },
-                    ]}
+                      })}
                   />
                 </TableCell>
               )}