Merge pull request #366 from microsoft/dev

chore: sync psl-abhar with dev

Author: Harmanpreet-Microsoft

src/frontend/src/components/uploadButton.tsx

@@ -387,6 +387,17 @@ const FileUploadZone: React.FC<FileUploadZoneProps> = ({
     }
   }, [fileLimitExceeded]);
 
+  // Auto-hide file rejection errors after 10 seconds
+  useEffect(() => {
+    if (fileRejectionErrors.length > 0) {
+      const timer = setTimeout(() => {
+        setFileRejectionErrors([]);
+      }, 5000);
+
+      return () => clearTimeout(timer);
+    }
+  }, [fileRejectionErrors]);
+
   return (
     <div style={{ width: '100%', minWidth: '720px', maxWidth: '800px', margin: '0 auto', marginTop: '0', padding: '16px', paddingBottom: '60px' }}>
       <ConfirmationDialog
@@ -565,9 +576,12 @@ const FileUploadZone: React.FC<FileUploadZoneProps> = ({
       <div style={{ display: 'flex', flexDirection: 'column', gap: '13px', width: '837px', paddingBottom: 10, borderRadius: '4px', }}>
         {/* Show file rejection errors for invalid type or size */}
          {fileRejectionErrors.length > 0 && (
+          <div style={{ width: uploadingFiles.some(f => f.status === 'completed') ? '837px' : '880px' }}>
             <MessageBar
               messageBarType={MessageBarType.error}
               isMultiline={true}
+              onDismiss={() => setFileRejectionErrors([])}
+              dismissButtonAriaLabel="Close"
               styles={messageBarErrorStyles}
             >
               <div style={{ display: "flex", alignItems: "center" }}>
@@ -578,6 +592,7 @@ const FileUploadZone: React.FC<FileUploadZoneProps> = ({
                 <div key={idx} style={{ marginLeft: "24px", marginTop: "2px" }}>{err}</div>
               ))}
             </MessageBar>
+          </div>
         )}
         {/* Show network error message bar if any file has error */}
         {uploadingFiles.some(f => f.status === 'error') && (

src/frontend/src/pages/batchView.tsx

@@ -73,7 +73,6 @@ const BatchStoryPage = () => {
   const [selectedFileId, setSelectedFileId] = useState<string>("");
   const [expandedSections, setExpandedSections] = useState(["errors"]);
   const [batchSummary, setBatchSummary] = useState<BatchSummary | null>(null);
-  const [selectedFileContent, setSelectedFileContent] = useState<string>("");
   const [selectedFileTranslatedContent, setSelectedFileTranslatedContent] = useState<string>("");
 
 
@@ -195,7 +194,6 @@ const BatchStoryPage = () => {
         const data = await response.json();
 
         if (data) {
-          setSelectedFileContent(data.content || "");
           setSelectedFileTranslatedContent(data.translated_content || "");
         }
 

src/frontend/src/pages/modernizationPage.tsx

@@ -497,7 +497,6 @@ const ModernizationPage = () => {
   const [fileId, setFileId] = React.useState<string>("");
   const [expandedSections, setExpandedSections] = React.useState<string[]>([]);
   const [allFilesCompleted, setAllFilesCompleted] = useState(false);
-  const [progressPercentage, setProgressPercentage] = useState(0);
   const [isZipButtonDisabled, setIsZipButtonDisabled] = useState(true);
   const [fileLoading, setFileLoading] = useState(false);
   const [lastActivityTime, setLastActivityTime] = useState<number>(Date.now());
@@ -1014,16 +1013,16 @@ useEffect(() => {
     };
   }, [handleWebSocketMessage]);
 
-  // Set a timeout for initial loading - if no progress after 30 seconds, show error
+  // Set a timeout for initial loading - if still loading after 30 seconds, show a warning message
   useEffect(() => {
     const loadingTimeout = setTimeout(() => {
-      if (progressPercentage < 5 && showLoading) {
+      if (showLoading) {
         setLoadingError('Processing is taking longer than expected. You can continue waiting or try again later.');
       }
     }, 30000);
 
     return () => clearTimeout(loadingTimeout);
-  }, [progressPercentage, showLoading]);
+  }, [showLoading]);
 
   // Add timeout mechanism to navigate if no activity for 30 seconds
   useEffect(() => {

src/tests/backend/sql_agents/convert_script_test.py

@@ -187,7 +187,7 @@ async def test_convert_script_cleanup_always_runs(self):
                         mock_sql_agents
                     )
                 except RuntimeError:
-                    pass
+                    pass  # Expected exception; verifying cleanup below
 
                 # Cleanup should be called even on exception
                 mock_comms_manager.cleanup.assert_called_once()

tests/e2e-test/pages/HomePage.py

@@ -52,7 +52,7 @@ class HomePage(BasePage):
     HARMFUL_FILE_2 = "//span[.='harmful_content_2 2.sql']"
 
     def __init__(self, page):
-        self.page = page
+        super().__init__(page)
 
     def navigate_to_base_url(self):
         """

tests/e2e-test/pages/loginPage.py

@@ -11,7 +11,7 @@ class LoginPage(BasePage):
     PERMISSION_ACCEPT_BUTTON = "//input[@type='submit']"
 
     def __init__(self, page):
-        self.page = page
+        super().__init__(page)
 
     def authenticate(self, username, password):
         # login with username and password in web url