Merge branch 'microsoft:main' into feat/show-only-enabled-auth

microsoft · Feb 29, 2024 · e5d279e · e5d279e
2 parents de27460 + 0d19294
commit e5d279e
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 19 deletions.
diff --git a/src/app/globals.css b/src/app/globals.css
@@ -10,7 +10,7 @@
     --card-foreground: 222.2 84% 4.9%;
     --popover: 0 0% 100%;
     --popover-foreground: 222.2 84% 4.9%;
-    --primary: 136 80% 42%;
+    --primary: 136 80% 29%;
     --primary-foreground: 210 40% 98%;
     --secondary: 210 40% 96.1%;
     --secondary-foreground: 222.2 47.4% 11.2%;

diff --git a/src/features/chat-page/chat-header/document-detail.tsx b/src/features/chat-page/chat-header/document-detail.tsx
@@ -19,7 +19,7 @@ export const DocumentDetail: FC<Props> = (props) => {
   return (
     <Sheet>
       <SheetTrigger asChild>
-        <Button variant={"outline"} className="gap-2">
+        <Button variant={"outline"} className="gap-2" aria-label="Current Chat Documents Menu">
           <File size={16} /> {props.chatDocuments.length}
         </Button>
       </SheetTrigger>

diff --git a/src/features/chat-page/chat-header/extension-detail.tsx b/src/features/chat-page/chat-header/extension-detail.tsx
@@ -35,7 +35,7 @@ export const ExtensionDetail: FC<Props> = (props) => {
   return (
     <Sheet>
       <SheetTrigger asChild>
-        <Button variant={"outline"} className="gap-2" disabled={props.disabled}>
+        <Button variant={"outline"} className="gap-2" disabled={props.disabled} aria-label="Current Chat Extensions Menu">
           <PocketKnife size={16} /> {installedCount} ({totalCount})
         </Button>
       </SheetTrigger>

diff --git a/src/features/chat-page/chat-header/persona-detail.tsx b/src/features/chat-page/chat-header/persona-detail.tsx
@@ -23,7 +23,7 @@ export const PersonaDetail: FC<Props> = (props) => {
   return (
     <Sheet>
       <SheetTrigger asChild>
-        <Button variant={"outline"} size={"icon"}>
+        <Button variant={"outline"} size={"icon"} aria-label="Current Chat Persona Menu">
           <VenetianMask size={16} />
         </Button>
       </SheetTrigger>

diff --git a/src/features/chat-page/chat-input/prompt/prompt-slider.tsx b/src/features/chat-page/chat-input/prompt/prompt-slider.tsx
@@ -33,6 +33,7 @@ export const PromptSlider: FC<SliderProps> = (props) => {
           type="button"
           variant={"ghost"}
           onClick={() => inputPromptStore.openPrompt()}
+          aria-label="Open prompt library"
         >
           <Book size={16} />
         </Button>

diff --git a/src/features/chat-page/chat-menu/chat-context-menu.tsx b/src/features/chat-page/chat-menu/chat-context-menu.tsx
@@ -37,7 +37,7 @@ export const ChatContextMenu = () => {
         {isLoading ? (
           <LoadingIndicator isLoading={isLoading} />
         ) : (
-          <MoreVertical size={18} />
+          <MoreVertical size={18} aria-label="Chat Menu Dropdown Menu"/>
         )}
       </DropdownMenuTrigger>
       <DropdownMenuContent side="right" align="start">

diff --git a/src/features/chat-page/chat-menu/chat-group.tsx b/src/features/chat-page/chat-menu/chat-group.tsx
@@ -7,7 +7,7 @@ interface Props extends PropsWithChildren {
 export const ChatGroup = (props: Props) => {
   return (
     <div className="flex flex-col">
-      <div className="text-sm text-muted-foreground/50 p-3">{props.title}</div>
+      <div className="text-sm text-muted-foreground p-3">{props.title}</div>
       <div>{props.children}</div>
     </div>
   );

diff --git a/src/features/chat-page/chat-menu/chat-menu-item.tsx b/src/features/chat-page/chat-menu/chat-menu-item.tsx
@@ -49,7 +49,7 @@ export const ChatMenuItem: FC<ChatMenuItemProps> = (props) => {
           {isLoading ? (
             <LoadingIndicator isLoading={isLoading} />
           ) : (
-            <MoreVertical size={18} />
+            <MoreVertical size={18} aria-label="Chat Menu Item Dropdown Menu" />
           )}
         </DropdownMenuTrigger>
         <DropdownMenuContent side="right" align="start">

diff --git a/src/features/extensions-page/add-extension/add-function.tsx b/src/features/extensions-page/add-extension/add-function.tsx
@@ -82,8 +82,8 @@ export const AddFunction = () => {
                   defaultValue={func.endpointType}
                   name="endpoint-type[]"
                   required
-                >
-                  <SelectTrigger className="w-[80px]">
+                  >
+                  <SelectTrigger className="w-[80px]" aria-label="Select HTTP method for API endpoint">
                     <SelectValue placeholder="GET" defaultValue={"GET"} />
                   </SelectTrigger>
                   <SelectContent>
@@ -103,8 +103,9 @@ export const AddFunction = () => {
               </div>
             </div>
 
+            <Label>GPT Function call definition (JSON)</Label>
             <div className="w-[580px] max-w-[580px]">
-              <input type="hidden" name="code[]" value={func.code} />
+              <input type="hidden" name="code[]" value={func.code}/>
               <CodeMirror
                 value={func.code}
                 lang="json"

diff --git a/src/features/extensions-page/add-extension/endpoint-header.tsx b/src/features/extensions-page/add-extension/endpoint-header.tsx
@@ -46,6 +46,7 @@ export const EndpointHeaderRow: FC<Props> = (props) => {
             headerId: props.header.id,
           })
         }
+        aria-label="Remove this header"
       >
         <Trash size={18} />
       </Button>

diff --git a/src/features/main-menu/main-menu.tsx b/src/features/main-menu/main-menu.tsx
@@ -26,37 +26,37 @@ export const MainMenu = async () => {
       <MenuBar>
         <MenuItemContainer>
           <MenuItem tooltip="Home" asChild>
-            <MenuLink href="/chat">
+            <MenuLink href="/chat" ariaLabel="Go to the Home page">
               <Home {...menuIconProps} />
             </MenuLink>
           </MenuItem>
           <MenuTrayToggle />
         </MenuItemContainer>
         <MenuItemContainer>
           <MenuItem tooltip="Chat">
-            <MenuLink href="/chat">
+            <MenuLink href="/chat" ariaLabel="Go to the Chat page">
               <MessageCircle {...menuIconProps} />
             </MenuLink>
           </MenuItem>
           <MenuItem tooltip="Persona">
-            <MenuLink href="/persona">
+            <MenuLink href="/persona" ariaLabel="Go to the Persona configuration page">
               <VenetianMask {...menuIconProps} />
             </MenuLink>
           </MenuItem>
           <MenuItem tooltip="extensions">
-            <MenuLink href="/extensions">
+            <MenuLink href="/extensions" ariaLabel="Go to the Extensions configuration page">
               <PocketKnife {...menuIconProps} />
             </MenuLink>
           </MenuItem>
           <MenuItem tooltip="prompts">
-            <MenuLink href="/prompt">
+            <MenuLink href="/prompt" ariaLabel="Go to the Prompt Library configuration page">
               <Book {...menuIconProps} />
             </MenuLink>
           </MenuItem>
           {user.isAdmin && (
             <>
               <MenuItem tooltip="reporting">
-                <MenuLink href="/reporting">
+                <MenuLink href="/reporting" ariaLabel="Go to the Admin reporting" >
                   <Sheet {...menuIconProps} />
                 </MenuLink>
               </MenuItem>

diff --git a/src/features/main-menu/menu-link.tsx b/src/features/main-menu/menu-link.tsx
@@ -7,6 +7,7 @@ import { ButtonLinkVariant } from "../ui/button";
 
 interface MenuLinkProps {
   href: string;
+  ariaLabel: string;
   children: React.ReactNode;
 }
 
@@ -19,6 +20,7 @@ export const MenuLink: FC<MenuLinkProps> = (props) => {
         path.startsWith(props.href) && props.href !== "/" ? "text-primary" : ""
       )}
       href={props.href}
+      aria-label={props.ariaLabel}
     >
       {props.children}
     </Link>

diff --git a/src/features/main-menu/theme-toggle.tsx b/src/features/main-menu/theme-toggle.tsx
@@ -13,20 +13,23 @@ export const ThemeToggle = () => {
           value="light"
           onClick={() => setTheme("light")}
           className="flex-1"
+          title="Light theme"
         >
           <Sun size={18} />
         </TabsTrigger>
         <TabsTrigger
           value="dark"
           onClick={() => setTheme("dark")}
           className="flex-1"
+          title="Dark theme"
         >
           <Moon size={18} />
         </TabsTrigger>
         <TabsTrigger
           value="system"
           onClick={() => setTheme("system")}
           className="flex-1"
+          title="System theme"
         >
           <Laptop2 size={18} />
         </TabsTrigger>

diff --git a/src/features/main-menu/user-profile.tsx b/src/features/main-menu/user-profile.tsx
@@ -28,7 +28,7 @@ export const UserProfile = () => {
             />
           </Avatar>
         ) : (
-          <CircleUserRound {...menuIconProps} />
+          <CircleUserRound {...menuIconProps} role="button" />
         )}
       </DropdownMenuTrigger>
       <DropdownMenuContent side="right" className="w-56" align="end">

diff --git a/src/features/ui/avatar.tsx b/src/features/ui/avatar.tsx
@@ -28,6 +28,7 @@ const AvatarImage = React.forwardRef<
     ref={ref}
     className={cn("aspect-square h-full w-full", className)}
     {...props}
+    alt=""
   />
 ));
 AvatarImage.displayName = AvatarPrimitive.Image.displayName;

diff --git a/src/features/ui/chat/chat-input-area/attach-file.tsx b/src/features/ui/chat/chat-input-area/attach-file.tsx
@@ -25,7 +25,7 @@ export const AttachFile = (props: {
 
   return (
     <>
-      <Button size="icon" variant={"ghost"} onClick={handleClick} type="button">
+      <Button size="icon" variant={"ghost"} onClick={handleClick} type="button" aria-label="Attach file to chat">
         <Paperclip size={16} />
       </Button>
       {/* This file input is hidden, and opens when the Button is clicked */}

diff --git a/src/features/ui/chat/chat-input-area/image-input.tsx b/src/features/ui/chat/chat-input-area/image-input.tsx
@@ -27,6 +27,7 @@ export const ImageInput: FC = () => {
           <button
             className="absolute right-1 top-1 bg-background/20 rounded-full p-[2px]"
             onClick={resetFileInput}
+            aria-label="Remove image from chat input"
           >
             <X size={12} className="stroke-background" />
           </button>
@@ -51,6 +52,7 @@ export const ImageInput: FC = () => {
         variant={"ghost"}
         type="button"
         onClick={handleButtonClick}
+        aria-label="Add an image to the chat input"
       >
         <ImageIcon size={16} />
       </Button>

diff --git a/src/features/ui/chat/chat-input-area/microphone.tsx b/src/features/ui/chat/chat-input-area/microphone.tsx
@@ -38,6 +38,7 @@ export const Microphone = (props: {
           className={
             props.isMicrophoneReady ? "bg-red-400 hover:bg-red-400" : ""
           }
+          aria-label="Microphone for speech input"
         >
           <Mic size={16} />
         </Button>

diff --git a/src/features/ui/chat/chat-input-area/stop-chat.tsx b/src/features/ui/chat/chat-input-area/stop-chat.tsx
@@ -8,6 +8,7 @@ export const StopChat = (props: { stop: () => void }) => {
       type="submit"
       variant={"ghost"}
       onClick={() => props.stop()}
+      aria-label="Stop speech readout"
     >
       <Square size={16} />
     </Button>

diff --git a/src/features/ui/chat/chat-input-area/submit-chat.tsx b/src/features/ui/chat/chat-input-area/submit-chat.tsx
@@ -6,7 +6,7 @@ export const SubmitChat = React.forwardRef<
   HTMLButtonElement,
   React.HTMLAttributes<HTMLButtonElement> // Add ChatInputAreaProps to the type definition
 >(({ ...props }, ref) => (
-  <Button size="icon" type="submit" variant={"ghost"} {...props} ref={ref}>
+  <Button size="icon" type="submit" variant={"ghost"} {...props} ref={ref} aria-label="Submit chat input">
     <Send size={16} />
   </Button>
 ));