From e7fbae47aa18c75e523a6aaeadd396c0deed5317 Mon Sep 17 00:00:00 2001 From: Priyanka-Microsoft Date: Wed, 11 Mar 2026 12:30:57 +0530 Subject: [PATCH 1/3] codeQL fixes --- src/backend/sql_agents/helpers/comms_manager.py | 2 ++ src/frontend/src/pages/batchView.tsx | 2 -- src/frontend/src/pages/modernizationPage.tsx | 5 ++--- src/tests/backend/sql_agents/convert_script_test.py | 2 +- tests/e2e-test/pages/HomePage.py | 2 +- tests/e2e-test/pages/loginPage.py | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/backend/sql_agents/helpers/comms_manager.py b/src/backend/sql_agents/helpers/comms_manager.py index fddc0a7a..da6c9c6c 100644 --- a/src/backend/sql_agents/helpers/comms_manager.py +++ b/src/backend/sql_agents/helpers/comms_manager.py @@ -79,6 +79,8 @@ async def select_agent(self, agents, history): ), None, ) + # No matching case found, so explicitly return None + return None # class for termination strategy class ApprovalTerminationStrategy(TerminationStrategy): diff --git a/src/frontend/src/pages/batchView.tsx b/src/frontend/src/pages/batchView.tsx index 87d6cdda..5afcdb03 100644 --- a/src/frontend/src/pages/batchView.tsx +++ b/src/frontend/src/pages/batchView.tsx @@ -73,7 +73,6 @@ const BatchStoryPage = () => { const [selectedFileId, setSelectedFileId] = useState(""); const [expandedSections, setExpandedSections] = useState(["errors"]); const [batchSummary, setBatchSummary] = useState(null); - const [selectedFileContent, setSelectedFileContent] = useState(""); const [selectedFileTranslatedContent, setSelectedFileTranslatedContent] = useState(""); @@ -195,7 +194,6 @@ const BatchStoryPage = () => { const data = await response.json(); if (data) { - setSelectedFileContent(data.content || ""); setSelectedFileTranslatedContent(data.translated_content || ""); } diff --git a/src/frontend/src/pages/modernizationPage.tsx b/src/frontend/src/pages/modernizationPage.tsx index 66c03dd6..9327d1c8 100644 --- a/src/frontend/src/pages/modernizationPage.tsx +++ b/src/frontend/src/pages/modernizationPage.tsx @@ -497,7 +497,6 @@ const ModernizationPage = () => { const [fileId, setFileId] = React.useState(""); const [expandedSections, setExpandedSections] = React.useState([]); const [allFilesCompleted, setAllFilesCompleted] = useState(false); - const [progressPercentage, setProgressPercentage] = useState(0); const [isZipButtonDisabled, setIsZipButtonDisabled] = useState(true); const [fileLoading, setFileLoading] = useState(false); const [lastActivityTime, setLastActivityTime] = useState(Date.now()); @@ -1017,13 +1016,13 @@ useEffect(() => { // Set a timeout for initial loading - if no progress after 30 seconds, show error 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(() => { diff --git a/src/tests/backend/sql_agents/convert_script_test.py b/src/tests/backend/sql_agents/convert_script_test.py index b0b16baa..4fc71392 100644 --- a/src/tests/backend/sql_agents/convert_script_test.py +++ b/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() diff --git a/tests/e2e-test/pages/HomePage.py b/tests/e2e-test/pages/HomePage.py index a1afff95..97b2d937 100644 --- a/tests/e2e-test/pages/HomePage.py +++ b/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): """ diff --git a/tests/e2e-test/pages/loginPage.py b/tests/e2e-test/pages/loginPage.py index 0b412556..2fdad149 100644 --- a/tests/e2e-test/pages/loginPage.py +++ b/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 From ba5a7667fe2f15e8dd4661da1b476a96a36f13bf Mon Sep 17 00:00:00 2001 From: Priyanka-Microsoft Date: Thu, 12 Mar 2026 14:58:09 +0530 Subject: [PATCH 2/3] Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/backend/sql_agents/helpers/comms_manager.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/backend/sql_agents/helpers/comms_manager.py b/src/backend/sql_agents/helpers/comms_manager.py index da6c9c6c..fddc0a7a 100644 --- a/src/backend/sql_agents/helpers/comms_manager.py +++ b/src/backend/sql_agents/helpers/comms_manager.py @@ -79,8 +79,6 @@ async def select_agent(self, agents, history): ), None, ) - # No matching case found, so explicitly return None - return None # class for termination strategy class ApprovalTerminationStrategy(TerminationStrategy): From 46af08f9b07171e3a4728243b92db31f5253fe74 Mon Sep 17 00:00:00 2001 From: Priyanka-Microsoft Date: Thu, 12 Mar 2026 15:00:55 +0530 Subject: [PATCH 3/3] resolved copilot comment --- src/frontend/src/pages/modernizationPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/src/pages/modernizationPage.tsx b/src/frontend/src/pages/modernizationPage.tsx index 9327d1c8..53f128b5 100644 --- a/src/frontend/src/pages/modernizationPage.tsx +++ b/src/frontend/src/pages/modernizationPage.tsx @@ -1013,7 +1013,7 @@ 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 (showLoading) {