coder · Parkreiner · Feb 1, 2024 · Jan 26, 2024 · Jan 26, 2024 · Jan 26, 2024
diff --git a/site/src/api/queries/users.ts b/site/src/api/queries/users.ts
@@ -13,6 +13,7 @@ import type {
   UpdateUserAppearanceSettingsRequest,
   UsersRequest,
   User,
+  GenerateAPIKeyResponse,
 } from "api/typesGenerated";
 import { getAuthorizationKey } from "./authCheck";
 import { getMetadataAsJSON } from "utils/metadata";
@@ -134,6 +135,13 @@ export const me = (): UseQueryOptions<User> & {
   };
 };
 
+export function apiKey(): UseQueryOptions<GenerateAPIKeyResponse> {
+  return {
+    queryKey: [...meKey, "apiKey"],
+    queryFn: () => API.getApiKey(),
+  };
+}
+
 export const hasFirstUser = () => {
   return {
     queryKey: ["hasFirstUser"],

diff --git a/site/src/components/CodeExample/CodeExample.tsx b/site/src/components/CodeExample/CodeExample.tsx
@@ -1,4 +1,4 @@
-import { type FC } from "react";
+import { useRef, type FC } from "react";
 import { type Interpolation, type Theme } from "@emotion/react";
 import { MONOSPACE_FONT_FAMILY } from "theme/constants";
 import { CopyButton } from "../CopyButton/CopyButton";
@@ -17,16 +17,42 @@ export const CodeExample: FC<CodeExampleProps> = ({
   secret,
   className,
 }) => {
+  const buttonRef = useRef<HTMLButtonElement>(null);
+  const triggerButton = () => buttonRef.current?.click();
+
   return (
-    <div css={styles.container} className={className}>
+    /* eslint-disable-next-line jsx-a11y/no-static-element-interactions --
+       Expanding clickable area of CodeExample for better ergonomics, but don't
+       want to change the semantics of the HTML elements being rendered
+    */
+    <div
+      css={styles.container}
+      className={className}
+      onClick={(event) => {
+        if (event.target !== buttonRef.current) {
+          triggerButton();
+        }
+      }}
+      onKeyDown={(event) => {
+        if (event.key === "Enter") {
+          triggerButton();
+        }
+      }}
+      onKeyUp={(event) => {
+        if (event.key === " ") {
+          triggerButton();
+        }
+      }}
+    >
       <code css={[styles.code, secret && styles.secret]}>{code}</code>
-      <CopyButton text={code} />
+      <CopyButton ref={buttonRef} text={code} />
     </div>
   );
 };
 
 const styles = {
   container: (theme) => ({
+    cursor: "pointer",
     display: "flex",
     flexDirection: "row",
     alignItems: "center",
@@ -37,6 +63,10 @@ const styles = {
     padding: 8,
     lineHeight: "150%",
     border: `1px solid ${theme.experimental.l1.outline}`,
+
+    "&:hover": {
+      backgroundColor: theme.experimental.l2.hover.background,
+    },
   }),
 
   code: {

diff --git a/site/src/components/CopyButton/CopyButton.tsx b/site/src/components/CopyButton/CopyButton.tsx
@@ -2,7 +2,7 @@ import IconButton from "@mui/material/Button";
 import Tooltip from "@mui/material/Tooltip";
 import Check from "@mui/icons-material/Check";
 import { css, type Interpolation, type Theme } from "@emotion/react";
-import { type FC, type ReactNode } from "react";
+import { forwardRef, MouseEventHandler, type ReactNode } from "react";
 import { useClipboard } from "hooks/useClipboard";
 import { FileCopyIcon } from "../Icons/FileCopyIcon";
 
@@ -13,6 +13,7 @@ interface CopyButtonProps {
   wrapperStyles?: Interpolation<Theme>;
   buttonStyles?: Interpolation<Theme>;
   tooltipTitle?: string;
+  onClick?: MouseEventHandler;
 }
 
 export const Language = {
@@ -23,36 +24,44 @@ export const Language = {
 /**
  * Copy button used inside the CodeBlock component internally
  */
-export const CopyButton: FC<CopyButtonProps> = ({
-  text,
-  ctaCopy,
-  wrapperStyles,
-  buttonStyles,
-  tooltipTitle = Language.tooltipTitle,
-}) => {
-  const { isCopied, copy: copyToClipboard } = useClipboard(text);
+export const CopyButton = forwardRef<HTMLButtonElement, CopyButtonProps>(
+  (props, ref) => {
+    const {
+      text,
+      ctaCopy,
+      wrapperStyles,
+      buttonStyles,
+      onClick: outsideOnClick,
+      tooltipTitle = Language.tooltipTitle,
+    } = props;
+    const { isCopied, copyToClipboard } = useClipboard(text);
 
-  return (
-    <Tooltip title={tooltipTitle} placement="top">
-      <div css={[{ display: "flex" }, wrapperStyles]}>
-        <IconButton
-          css={[styles.button, buttonStyles]}
-          onClick={copyToClipboard}
-          size="small"
-          aria-label={Language.ariaLabel}
-          variant="text"
-        >
-          {isCopied ? (
-            <Check css={styles.copyIcon} />
-          ) : (
-            <FileCopyIcon css={styles.copyIcon} />
-          )}
-          {ctaCopy && <div css={{ marginLeft: 8 }}>{ctaCopy}</div>}
-        </IconButton>
-      </div>
-    </Tooltip>
-  );
-};
+    return (
+      <Tooltip title={tooltipTitle} placement="top">
+        <div css={[{ display: "flex" }, wrapperStyles]}>
+          <IconButton
+            ref={ref}
+            css={[styles.button, buttonStyles]}
+            size="small"
+            aria-label={Language.ariaLabel}
+            variant="text"
+            onClick={(event) => {
+              void copyToClipboard();
+              outsideOnClick?.(event);
+            }}
+          >
+            {isCopied ? (
+              <Check css={styles.copyIcon} />
+            ) : (
+              <FileCopyIcon css={styles.copyIcon} />
+            )}
+            {ctaCopy && <div css={{ marginLeft: 8 }}>{ctaCopy}</div>}
+          </IconButton>
+        </div>
+      </Tooltip>
+    );
+  },
+);
 
 const styles = {
   button: (theme) => css`

diff --git a/site/src/components/CopyableValue/CopyableValue.tsx b/site/src/components/CopyableValue/CopyableValue.tsx
@@ -16,8 +16,8 @@ export const CopyableValue: FC<CopyableValueProps> = ({
   children,
   ...attrs
 }) => {
-  const { isCopied, copy } = useClipboard(value);
-  const clickableProps = useClickable<HTMLSpanElement>(copy);
+  const { isCopied, copyToClipboard } = useClipboard(value);
+  const clickableProps = useClickable<HTMLSpanElement>(copyToClipboard);
 
   return (
     <Tooltip