UI fixes

mtojek · mtojek · commit 08b9cbba451a · 2023-07-25T12:15:21.000+02:00
diff --git a/coderd/users.go b/coderd/users.go
@@ -12,6 +12,8 @@ import (
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
 
+	"cdr.dev/slog"
+
 	"github.com/coder/coder/coderd/audit"
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/database/db2sdk"
@@ -713,6 +715,12 @@ func (api *API) putUserStatus(status database.UserStatus) func(rw http.ResponseW
 			return
 		}
 
+		err = api.Pubsub.Publish("licenses", []byte("add")) // FIXME PubsubEventLicenses
+		if err != nil {
+			api.Logger.Error(context.Background(), "failed to publish license add", slog.Error(err))
+			// don't fail the HTTP request, since we did write it successfully to the database
+		}
+
 		httpapi.Write(ctx, rw, http.StatusOK, db2sdk.User(suspendedUser, organizations))
 	}
 }
diff --git a/site/src/i18n/en/usersPage.json b/site/src/i18n/en/usersPage.json
@@ -5,7 +5,7 @@
   "deleteMenuItem": "Delete",
   "listWorkspacesMenuItem": "View workspaces",
   "activateMenuItem": "Activate",
-  "markUserDormantMenuItem": "Mark user as dormant",
+  "markUserDormantMenuItem": "Mark as dormant",
   "resetPasswordMenuItem": "Reset password",
   "editUserRolesTooltip": "Edit user roles",
   "fieldSetRolesTooltip": "Available roles",
diff --git a/site/src/pages/UsersPage/UsersPage.tsx b/site/src/pages/UsersPage/UsersPage.tsx
@@ -29,10 +29,10 @@ export const Language = {
   activateDialogTitle: "Activate user",
   activateDialogAction: "Activate",
   activateDialogMessagePrefix: "Do you want to activate the user",
-  markUserDormantDialogTitle: "Mark user dormant",
-  markUserDormantDialogAction: "Mark dormant",
+  markUserDormantDialogTitle: "Mark user as dormant",
+  markUserDormantDialogAction: "Mark as dormant",
   markUserDormantDialogMessagePrefix:
-    "Do you want to mark the user account dormant",
+    "Do you want to mark the user account as dormant",
 }
 
 const getSelectedUser = (id: string, users?: User[]) =>
@@ -262,8 +262,8 @@ export const UsersPage: FC<{ children?: ReactNode }> = () => {
           usersState.matches("markingUserDormant")
         }
         confirmLoading={usersState.matches("markingUserDormant")}
-        title={Language.markUserDormantDialogTitle}
-        confirmText={Language.markUserDormantDialogAction}
+        title="Mark user as dormant"
+        confirmText="Mark as dormant"
         onConfirm={() => {
           usersSend("CONFIRM_USER_DORMANT")
         }}
@@ -272,9 +272,8 @@ export const UsersPage: FC<{ children?: ReactNode }> = () => {
         }}
         description={
           <>
-            {Language.markUserDormantDialogMessagePrefix}
-            {usernameToMarkDormant && " "}
-            <strong>{usernameToMarkDormant ?? ""}</strong>?
+            Do you want to mark the user {" "}
+            <strong>{usernameToMarkDormant ?? ""}</strong> as dormant?
           </>
         }
       />

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ import (`
`12`	`12`	`"github.com/google/uuid"`
`13`	`13`	`"golang.org/x/xerrors"`
`14`	`14`
	`15`	`+ "cdr.dev/slog"`
	`16`	`+`
`15`	`17`	`"github.com/coder/coder/coderd/audit"`
`16`	`18`	`"github.com/coder/coder/coderd/database"`
`17`	`19`	`"github.com/coder/coder/coderd/database/db2sdk"`
`@@ -713,6 +715,12 @@ func (api *API) putUserStatus(status database.UserStatus) func(rw http.ResponseW`
`713`	`715`	`return`
`714`	`716`	`}`
`715`	`717`
	`718`	`+ err = api.Pubsub.Publish("licenses", []byte("add")) // FIXME PubsubEventLicenses`
	`719`	`+ if err != nil {`
	`720`	`+ api.Logger.Error(context.Background(), "failed to publish license add", slog.Error(err))`
	`721`	`+ // don't fail the HTTP request, since we did write it successfully to the database`
	`722`	`+ }`
	`723`	`+`
`716`	`724`	`httpapi.Write(ctx, rw, http.StatusOK, db2sdk.User(suspendedUser, organizations))`
`717`	`725`	`}`
`718`	`726`	`}`