Merge pull request #304 from microsoft/psl-codequality2

Prajwal-Microsoft · web-flow · commit 31fd2e8abb9c · 2025-12-19T18:05:16.000+05:30
fix: Reverting my changes from dev
diff --git a/docs/DeploymentGuide.md b/docs/DeploymentGuide.md
@@ -124,7 +124,7 @@ If you're not using one of the above options for opening the project, then you'l
 2. Download the project code:
 
     ```shell
-    azd init -t microsoft/Modernize-your-Code-Solution-Accelerator
+    azd init -t microsoft/Modernize-your-Code-Solution-Accelerator/
     ```
 
 3. Open the project folder in your terminal or editor.
@@ -164,7 +164,7 @@ To adjust quota settings, follow these [steps](../docs/AzureGPTQuotaSettings.md)
 
   <summary><b>Reusing an Existing Log Analytics Workspace</b></summary>
 
-  Guide to get your [Existing Workspace ID](./re-use-log-analytics.md)
+  Guide to get your [Existing Workspace ID](/docs/re-use-log-analytics.md)
 
 </details>
 
@@ -217,7 +217,7 @@ Rename `azure.yaml` to `azure_original.yaml` and `azure_custom.yaml` to `azure.y
 
 Go to `infra` directory
 
-Rename `main.bicep` to `main_original.bicep` and `main_custom.bicep` to `main.bicep`. Continue with the [deploying steps](#deploying-with-azd).
+Rename `main.bicep` to `main_original.bicep` and `main_custom.bicep` to `main.bicep`. Continue with the [deploying steps](https://github.com/microsoft/Modernize-your-code-solution-accelerator/blob/main/docs/DeploymentGuide.md#deploying-with-azd).
 
 ### 🛠️ Troubleshooting
  If you encounter any issues during the deployment process, please refer [troubleshooting](../docs/TroubleShootingSteps.md) document for detailed steps and solutions.
diff --git a/src/backend/api/api_routes.py b/src/backend/api/api_routes.py
@@ -279,7 +279,6 @@ async def batch_status_updates(
             try:
                 await websocket.receive_text()
             except asyncio.TimeoutError:
-                # TimeoutError is ignored to keep the WebSocket connection open without receiving data
                 pass
 
     except WebSocketDisconnect:
diff --git a/src/backend/common/database/cosmosdb.py b/src/backend/common/database/cosmosdb.py
@@ -352,6 +352,10 @@ async def update_batch_entry(
             batch["file_count"] = file_count
 
             await self.batch_container.replace_item(item=batch_id, body=batch)
+            # if isinstance(status, ProcessStatus):
+            #     self.logger.info(f"Updated batch {batch_id} to status {status.value}")
+            # else:
+            #     self.logger.info(f"Updated batch {batch_id} to status {status}")
 
             return batch
         except Exception as e:
diff --git a/src/backend/common/services/batch_service.py b/src/backend/common/services/batch_service.py
@@ -175,8 +175,6 @@ async def delete_batch(self, batch_id: UUID, user_id: str):
 
             self.logger.info(f"Successfully deleted batch with ID: {batch_id}")
             return {"message": "Batch deleted successfully", "batch_id": str(batch_id)}
-        else:
-            return {"message": "Batch not found", "batch_id": str(batch_id)}
 
     async def delete_file(self, file_id: UUID, user_id: str):
         """Delete a file and its logs, and update batch file count."""
diff --git a/src/backend/common/storage/blob_azure.py b/src/backend/common/storage/blob_azure.py
@@ -52,7 +52,7 @@ async def upload_file(
             raise
         try:
             # Upload the file
-            blob_client.upload_blob(
+            upload_results = blob_client.upload_blob(  # noqa: F841
                 file_content,
                 content_type=content_type,
                 metadata=metadata,
diff --git a/src/backend/sql_agents/convert_script.py b/src/backend/sql_agents/convert_script.py
@@ -66,7 +66,8 @@ async def convert_script(
 
         # orchestrate the chat
         current_migration = "No migration"
-        while True:
+        is_complete: bool = False
+        while not is_complete:
             await comms_manager.group_chat.add_chat_message(
                 ChatMessageContent(role=AuthorRole.USER, content=source_script)
             )
@@ -273,7 +274,9 @@ async def convert_script(
                 break
 
             if comms_manager.group_chat.is_complete:
-                break
+                is_complete = True
+
+            break
 
         migrated_query = current_migration
 
diff --git 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):
@@ -272,3 +270,17 @@ async def cleanup(self):
 
         except Exception as e:
             self.logger.error("Error during cleanup: %s", str(e))
+
+    def __del__(self):
+        """Destructor to ensure cleanup if not explicitly called."""
+        try:
+            # Only attempt cleanup if there's an active event loop
+            loop = asyncio.get_running_loop()
+            if loop and not loop.is_closed():
+                # Schedule cleanup as a task
+                loop.create_task(self.cleanup())
+        except RuntimeError:
+            # No event loop running, can't clean up asynchronously
+            self.logger.warning("No event loop available for cleanup in destructor")
+        except Exception as e:
+            self.logger.error("Error in destructor cleanup: %s", str(e))
diff --git a/src/backend/sql_agents/tools/src/Program.cs b/src/backend/sql_agents/tools/src/Program.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using Microsoft.SqlServer.TransactSql.ScriptDom;
 using Newtonsoft.Json;
 
@@ -43,14 +42,18 @@ static void Main(string[] args)
 
             IList<ParseError> errors = ParseSqlQuery(sqlQuery);
 
-            var errorList = errors
-                .Select(error => new Dictionary<string, object>
+            var errorList = new List<Dictionary<string, object>>();
+
+            foreach (var error in errors)
+            {
+                var errorDict = new Dictionary<string, object>
                 {
                     { "Line", error.Line },
                     { "Column", error.Column },
                     { "Error", error.Message }
-                })
-                .ToList();
+                };
+                errorList.Add(errorDict);
+            }
 
             string jsonOutput = JsonConvert.SerializeObject(errorList, Formatting.Indented);
             Console.WriteLine(jsonOutput);
diff --git a/src/frontend/frontend_server.py b/src/frontend/frontend_server.py
@@ -4,7 +4,7 @@
 from dotenv import load_dotenv
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import FileResponse
+from fastapi.responses import FileResponse, HTMLResponse
 from fastapi.staticfiles import StaticFiles
 
 # Load environment variables from .env file
diff --git a/src/frontend/src/api/utils.tsx b/src/frontend/src/api/utils.tsx
@@ -414,7 +414,7 @@ export const renderErrorSection = (batchSummary, expandedSections, setExpandedSe
 
 export const renderErrorContent = (batchSummary) => {
   // Group errors by file
-  const errorFiles = batchSummary.files.filter(file => file.error_count);
+  const errorFiles = batchSummary.files.filter(file => file.error_count && file.error_count);
   if (errorFiles.length === 0) {
     return (
       <div className={useStyles().errorItem}>
diff --git a/src/frontend/src/components/batchHistoryPanel.tsx b/src/frontend/src/components/batchHistoryPanel.tsx
@@ -1,5 +1,6 @@
 import React, { useState, useEffect, useRef } from "react";
-import { useDispatch } from 'react-redux';
+
+import { useDispatch, useSelector } from 'react-redux';
 import { Card, Spinner, Tooltip } from "@fluentui/react-components";
 import { useNavigate } from "react-router-dom";
 import ConfirmationDialog from "../commonComponents/ConfirmationDialog/confirmationDialogue";
@@ -20,7 +21,7 @@ interface BatchHistoryItem {
   status: string;
 }
 const HistoryPanel: React.FC<HistoryPanelProps> = ({ isOpen, onClose }) => {
-  const headers = {};
+  const headers = {}
   const [batchHistory, setBatchHistory] = useState<BatchHistoryItem[]>([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -80,6 +81,46 @@ const HistoryPanel: React.FC<HistoryPanelProps> = ({ isOpen, onClose }) => {
     }
   };
 
+  // Function to categorize batches
+  const categorizeBatches = () => {
+    const now = new Date();
+    const userTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+    // Get start of "Today", "Past 7 days", and "Past 30 days" in LOCAL time
+    const todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+    const past7DaysStart = new Date(todayStart);
+    const past30DaysStart = new Date(todayStart);
+
+    past7DaysStart.setDate(todayStart.getDate() - 7);
+    past30DaysStart.setDate(todayStart.getDate() - 30);
+
+    const todayBatches: BatchHistoryItem[] = [];
+    const past7DaysBatches: BatchHistoryItem[] = [];
+    const past30DaysBatches: BatchHistoryItem[] = [];
+
+    batchHistory.forEach(batch => {
+      // Convert UTC timestamp to user's local date
+      const updatedAtUTC = new Date(batch.created_at);
+      const updatedAtLocal = new Date(updatedAtUTC.toLocaleString("en-US", { timeZone: userTimeZone }));
+
+      // Extract only the local **date** part for comparison
+      const updatedDate = new Date(updatedAtLocal.getFullYear(), updatedAtLocal.getMonth(), updatedAtLocal.getDate());
+
+      // Categorize based on **exact day comparison**
+      if (updatedDate.getTime() === todayStart.getTime()) {
+        todayBatches.push(batch);
+      } else if (updatedDate.getTime() >= past7DaysStart.getTime()) {
+        past7DaysBatches.push(batch);
+      } else if (updatedDate.getTime() >= past30DaysStart.getTime()) {
+        past30DaysBatches.push(batch);
+      }
+    });
+
+    return { todayBatches, past7DaysBatches, past30DaysBatches };
+  };
+
+  // const { todayBatches, past7DaysBatches, past30DaysBatches } = categorizeBatches();
+
   const deleteBatchFromHistory = (batchId: string) => {
     // Get the current URL path
     const currentPath = window.location.pathname;
diff --git a/src/frontend/src/components/bottomBar.tsx b/src/frontend/src/components/bottomBar.tsx
@@ -1,5 +1,6 @@
 import { Button, Card, Dropdown, DropdownProps, Option } from "@fluentui/react-components"
-import React from "react"
+import React, { useState } from "react"
+import { useNavigate } from "react-router-dom"
 
 // Define possible upload states
 const UploadState = {
diff --git a/src/frontend/src/components/uploadButton.tsx b/src/frontend/src/components/uploadButton.tsx
@@ -68,6 +68,7 @@ const FileUploadZone: React.FC<FileUploadZoneProps> = ({
   const [uploadIntervals, setUploadIntervals] = useState<{ [key: string]: ReturnType<typeof setTimeout> }>({});
   const [showCancelDialog, setShowCancelDialog] = useState(false);
   const [showLogoCancelDialog, setShowLogoCancelDialog] = useState(false);
+  const [uploadState, setUploadState] = useState<'IDLE' | 'UPLOADING' | 'COMPLETED'>('IDLE');
   const [batchId, setBatchId] = useState<string>(uuidv4());
   const [allUploadsComplete, setAllUploadsComplete] = useState(false);
   const [fileLimitExceeded, setFileLimitExceeded] = useState(false);
@@ -97,6 +98,7 @@ const FileUploadZone: React.FC<FileUploadZoneProps> = ({
       }
     }
 
+    setUploadState(newState);
     onUploadStateChange?.(newState);
   }, [uploadingFiles, onUploadStateChange]);
 
@@ -278,6 +280,7 @@ const FileUploadZone: React.FC<FileUploadZoneProps> = ({
   Object.values(uploadIntervals).forEach(interval => clearInterval(interval));
   setUploadIntervals({});
   setUploadingFiles([]);
+  setUploadState('IDLE');
   onUploadStateChange?.('IDLE');
   setShowCancelDialog(false);
   setShowLogoCancelDialog(false);
diff --git a/src/frontend/src/main.jsx b/src/frontend/src/main.jsx
@@ -50,7 +50,7 @@ const Main = () => {
     const baseURL = config.API_URL.replace(/\/api$/, ''); // Remove '/api' if it appears at the end
     console.log('Checking connection to:', baseURL);
     try {
-      await fetch(`${baseURL}/health`);
+      const response = await fetch(`${baseURL}/health`);
     } catch (error) {
       console.error('Error connecting to backend:', error);
     }
diff --git a/src/frontend/src/pages/batchView.tsx b/src/frontend/src/pages/batchView.tsx
@@ -33,7 +33,7 @@ import PanelRight from "../components/Panels/PanelRight";
 import PanelRightToolbar from "../components/Panels/PanelRightToolbar";
 import BatchHistoryPanel from "../components/batchHistoryPanel";
 import ConfirmationDialog from "../commonComponents/ConfirmationDialog/confirmationDialogue";
-import { determineFileStatus, filesLogsBuilder, renderErrorSection, useStyles, renderFileError, filesErrorCounter, completedFiles, hasFiles, fileErrorCounter, BatchSummary } from "../api/utils";
+import { determineFileStatus, filesLogsBuilder, renderErrorSection, useStyles, renderFileError, filesErrorCounter, completedFiles, hasFiles, fileErrorCounter, BatchSummary, fileWarningCounter } from "../api/utils";
 export const History = bundleIcon(HistoryFilled, HistoryRegular);
 import { format } from "sql-formatter";
 
@@ -73,6 +73,7 @@ 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>("");
 
 
@@ -194,6 +195,7 @@ const BatchStoryPage = () => {
         const data = await response.json();
 
         if (data) {
+          setSelectedFileContent(data.content || "");
           setSelectedFileTranslatedContent(data.translated_content || "");
         }
 
@@ -207,6 +209,40 @@ const BatchStoryPage = () => {
     fetchFileContent();
   }, [selectedFileId]);
 
+
+  const renderWarningContent = () => {
+    if (!expandedSections.includes("warnings")) return null;
+
+    if (!batchSummary) return null;
+
+    // Group warnings by file
+    const warningFiles = files.filter(file => file.warningCount && file.warningCount > 0 && file.id !== "summary");
+
+    if (warningFiles.length === 0) {
+      return (
+        <div className={styles.errorItem}>
+          <Text>No warnings found.</Text>
+        </div>
+      );
+    }
+
+    return (
+      <div>
+        {warningFiles.map((file, fileIndex) => (
+          <div key={fileIndex} className={styles.errorItem}>
+            <div className={styles.errorTitle}>
+              <Text weight="semibold">{file.name} ({file.warningCount})</Text>
+              <Text className={styles.errorSource}>source</Text>
+            </div>
+            <div className={styles.errorDetails}>
+              <Text>Warning in file processing. See file for details.</Text>
+            </div>
+          </div>
+        ))}
+      </div>
+    );
+  };
+
   const renderContent = () => {
     // Define header content based on selected file
     const renderHeader = () => {
@@ -349,7 +385,7 @@ const BatchStoryPage = () => {
     }
 
     // Show the summary page when summary is selected
-    if (selectedFile.id === "summary") {
+    if (selectedFile.id === "summary" && batchSummary) {
       // Check if there are no errors and all files are processed successfully
       const noErrors = (batchSummary.error_count === 0);
       const allFilesProcessed = (batchSummary.completed_files === batchSummary.total_files);
diff --git a/src/frontend/src/pages/landingPage.tsx b/src/frontend/src/pages/landingPage.tsx
@@ -33,6 +33,7 @@ export const LandingPage = (): JSX.Element => {
   const dispatch = useDispatch(); // Add dispatch hook
   const [selectedTargetLanguage, setSelectedTargetLanguage] = useState<string[]>(["T-SQL"]);
   const [selectedCurrentLanguage, setSelectedCurrentLanguage] = useState<string[]>(["Informix"]);
+  const batchHistoryRef = useRef<{ triggerDeleteAll: () => void } | null>(null);
   const isPanelOpen = useSelector((state: RootState) => state.historyPanel.isOpen);
   const navigate = useNavigate();
 
diff --git a/src/frontend/src/pages/modernizationPage.tsx b/src/frontend/src/pages/modernizationPage.tsx
diff --git a/src/frontend/vite.config.js b/src/frontend/vite.config.js
diff --git a/src/tests/backend/common/storage/blob_azure_test.py b/src/tests/backend/common/storage/blob_azure_test.py
diff --git a/tests/e2e-test/pages/HomePage.py b/tests/e2e-test/pages/HomePage.py
diff --git a/tests/e2e-test/pages/loginPage.py b/tests/e2e-test/pages/loginPage.py
diff --git a/tests/e2e-test/tests/conftest.py b/tests/e2e-test/tests/conftest.py
diff --git a/tests/e2e-test/tests/test_codegen_gp_tc.py b/tests/e2e-test/tests/test_codegen_gp_tc.py
