From 0c9264e8b34e273c99accf0ee22468b738c2c788 Mon Sep 17 00:00:00 2001
From: MokireddySampath <120497218+MokireddySampath@users.noreply.github.com>
Date: Thu, 4 Jan 2024 19:37:16 +0530
Subject: [PATCH] Bug 2819239:Screen reader does not announce the loading
 information which appears on invoking the 'Send' button. (#1703)

* Alert has been added and content also added accordign to the loader state

* Snapshot of tests have been updated
---
 .../QueryCopilot/QueryCopilotPromptbar.tsx    | 14 ++++++++++-
 .../Footer/__snapshots__/Footer.test.tsx.snap | 24 +++++++++----------
 src/hooks/useQueryCopilot.ts                  |  2 +-
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx b/src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx
index e51867ca8..a35d26a75 100644
--- a/src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx
+++ b/src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx
@@ -303,6 +303,16 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
     resetButtonState();
   };
 
+  const getAriaLabel = () => {
+    if (isGeneratingQuery === null) {
+      return " ";
+    } else if (isGeneratingQuery) {
+      return "Content is loading";
+    } else {
+      return "Content is updated";
+    }
+  };
+
   React.useEffect(() => {
     showTeachingBubble();
     useTabs.getState().setIsQueryErrorThrown(false);
@@ -379,7 +389,9 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
           onClick={() => startGenerateQueryProcess()}
           aria-label="Send"
         />
-        {isGeneratingQuery && <Spinner style={{ marginLeft: 8 }} />}
+        <div role="alert" aria-label={getAriaLabel()}>
+          {isGeneratingQuery && <Spinner style={{ marginLeft: 8 }} />}
+        </div>
         {showSamplePrompts && (
           <Callout
             styles={{ root: { minWidth: 400, maxWidth: "70vw" } }}
diff --git a/src/Explorer/QueryCopilot/V2/Footer/__snapshots__/Footer.test.tsx.snap b/src/Explorer/QueryCopilot/V2/Footer/__snapshots__/Footer.test.tsx.snap
index 729b0bb56..b6a7fa3c5 100644
--- a/src/Explorer/QueryCopilot/V2/Footer/__snapshots__/Footer.test.tsx.snap
+++ b/src/Explorer/QueryCopilot/V2/Footer/__snapshots__/Footer.test.tsx.snap
@@ -49,7 +49,7 @@ exports[`Footer snapshot test should not pass if no text 1`] = `
     />
   </Stack>
   <StyledTextFieldBase
-    disabled={false}
+    disabled={null}
     multiline={true}
     onChange={[Function]}
     onKeyDown={[Function]}
@@ -74,7 +74,7 @@ exports[`Footer snapshot test should not pass if no text 1`] = `
     value=""
   />
   <CustomizedIconButton
-    disabled={false}
+    disabled={null}
     iconProps={
       Object {
         "iconName": "Send",
@@ -134,7 +134,7 @@ exports[`Footer snapshot test should not pass text with non enter key 1`] = `
     />
   </Stack>
   <StyledTextFieldBase
-    disabled={false}
+    disabled={null}
     multiline={true}
     onChange={[Function]}
     onKeyDown={[Function]}
@@ -159,7 +159,7 @@ exports[`Footer snapshot test should not pass text with non enter key 1`] = `
     value=""
   />
   <CustomizedIconButton
-    disabled={false}
+    disabled={null}
     iconProps={
       Object {
         "iconName": "Send",
@@ -219,7 +219,7 @@ exports[`Footer snapshot test should open sample prompts on button click 1`] = `
     />
   </Stack>
   <StyledTextFieldBase
-    disabled={false}
+    disabled={null}
     multiline={true}
     onChange={[Function]}
     onKeyDown={[Function]}
@@ -244,7 +244,7 @@ exports[`Footer snapshot test should open sample prompts on button click 1`] = `
     value=""
   />
   <CustomizedIconButton
-    disabled={false}
+    disabled={null}
     iconProps={
       Object {
         "iconName": "Send",
@@ -304,7 +304,7 @@ exports[`Footer snapshot test should pass text with enter key 1`] = `
     />
   </Stack>
   <StyledTextFieldBase
-    disabled={false}
+    disabled={null}
     multiline={true}
     onChange={[Function]}
     onKeyDown={[Function]}
@@ -329,7 +329,7 @@ exports[`Footer snapshot test should pass text with enter key 1`] = `
     value="test message"
   />
   <CustomizedIconButton
-    disabled={false}
+    disabled={null}
     iconProps={
       Object {
         "iconName": "Send",
@@ -389,7 +389,7 @@ exports[`Footer snapshot test should pass text with icon button 1`] = `
     />
   </Stack>
   <StyledTextFieldBase
-    disabled={false}
+    disabled={null}
     multiline={true}
     onChange={[Function]}
     onKeyDown={[Function]}
@@ -414,7 +414,7 @@ exports[`Footer snapshot test should pass text with icon button 1`] = `
     value="test message"
   />
   <CustomizedIconButton
-    disabled={false}
+    disabled={null}
     iconProps={
       Object {
         "iconName": "Send",
@@ -474,7 +474,7 @@ exports[`Footer snapshot test should update user input 1`] = `
     />
   </Stack>
   <StyledTextFieldBase
-    disabled={false}
+    disabled={null}
     multiline={true}
     onChange={[Function]}
     onKeyDown={[Function]}
@@ -499,7 +499,7 @@ exports[`Footer snapshot test should update user input 1`] = `
     value=""
   />
   <CustomizedIconButton
-    disabled={false}
+    disabled={null}
     iconProps={
       Object {
         "iconName": "Send",
diff --git a/src/hooks/useQueryCopilot.ts b/src/hooks/useQueryCopilot.ts
index 5bcbfb861..f0b5edd74 100644
--- a/src/hooks/useQueryCopilot.ts
+++ b/src/hooks/useQueryCopilot.ts
@@ -104,7 +104,7 @@ export const useQueryCopilot: QueryCopilotStore = create((set) => ({
   correlationId: "",
   query: "SELECT * FROM c",
   selectedQuery: "",
-  isGeneratingQuery: false,
+  isGeneratingQuery: null,
   isGeneratingExplanation: false,
   isExecuting: false,
   dislikeQuery: undefined,